diff options
Diffstat (limited to 'MeshSketch.hs')
-rw-r--r-- | MeshSketch.hs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/MeshSketch.hs b/MeshSketch.hs index 56bbdaa..a51cd3d 100644 --- a/MeshSketch.hs +++ b/MeshSketch.hs | |||
@@ -333,7 +333,15 @@ new = do | |||
333 | mpipeline <- loadPipeline ppath $ do | 333 | mpipeline <- loadPipeline ppath $ do |
334 | defObjectArray "SkyCube" Triangles $ do | 334 | defObjectArray "SkyCube" Triangles $ do |
335 | "position" @: Attribute_V3F | 335 | "position" @: Attribute_V3F |
336 | defObjectArray "objects" Triangles $ do | 336 | defObjectArray "objects0" Triangles $ do |
337 | "position" @: Attribute_V4F | ||
338 | "normal" @: Attribute_V3F | ||
339 | "uvw" @: Attribute_V3F | ||
340 | defObjectArray "objects1" Triangles $ do | ||
341 | "position" @: Attribute_V4F | ||
342 | "normal" @: Attribute_V3F | ||
343 | "uvw" @: Attribute_V3F | ||
344 | defObjectArray "objects2" Triangles $ do | ||
337 | "position" @: Attribute_V4F | 345 | "position" @: Attribute_V4F |
338 | "normal" @: Attribute_V3F | 346 | "normal" @: Attribute_V3F |
339 | "uvw" @: Attribute_V3F | 347 | "uvw" @: Attribute_V3F |
@@ -355,6 +363,7 @@ new = do | |||
355 | "PointsStart" @: Int | 363 | "PointsStart" @: Int |
356 | "diffuseTexture" @: FTexture2D | 364 | "diffuseTexture" @: FTexture2D |
357 | "diffuseColor" @: V4F | 365 | "diffuseColor" @: V4F |
366 | "specularReflectivity" @: V4F | ||
358 | return mpipeline | 367 | return mpipeline |
359 | either (\e _ -> hPutStrLn stderr e >> throwIO (userError e)) (&) m $ \pipeline -> do | 368 | either (\e _ -> hPutStrLn stderr e >> throwIO (userError e)) (&) m $ \pipeline -> do |
360 | mapM_ (putStrLn . ppShow) (targets $ dynamicPipeline pipeline) | 369 | mapM_ (putStrLn . ppShow) (targets $ dynamicPipeline pipeline) |