Slightly changed colors

This commit is contained in:
Yann Esposito (Yogsototh) 2012-05-31 10:41:32 +02:00
parent 114bcd2fc8
commit 3c1462fa81
2 changed files with 11 additions and 4 deletions

View file

@ -83,16 +83,17 @@
> -- And the shape function > -- And the shape function
> initialWorld :: World > initialWorld :: World
> initialWorld = World { > initialWorld = World {
> angle = makePoint3D (-30,-30,0) > angle = makePoint3D (30,30,0)
> , position = makePoint3D (0,0,0) > , position = makePoint3D (0,0,0)
> , scale = 0.8 > , scale = 1.0
> , box = Box3D { minPoint = makePoint3D (-2,-2,-2) > , box = Box3D { minPoint = makePoint3D (-2,-2,-2)
> , maxPoint = makePoint3D (2,2,2) > , maxPoint = makePoint3D (2,2,2)
> , resolution = 0.16 } > , resolution = 0.02 }
> , told = 0 > , told = 0
> , cache = objectFunctionFromWorld initialWorld > , cache = objectFunctionFromWorld initialWorld
> } > }
> >
> objectFunctionFromWorld :: World -> [YObject]
> objectFunctionFromWorld w = [Atoms atomList] > objectFunctionFromWorld w = [Atoms atomList]
> where atomListPositive = > where atomListPositive =
> getObject3DFromShapeFunction (shapeFunc (resolution (box w))) (box w) > getObject3DFromShapeFunction (shapeFunc (resolution (box w))) (box w)

View file

@ -237,12 +237,18 @@ yMainLoop inputActionMap
specular (Light 0) $= Color4 1 1 1 1 specular (Light 0) $= Color4 1 1 1 1
position (Light 0) $= Vertex4 1 1 0 1 position (Light 0) $= Vertex4 1 1 0 1
light (Light 0) $= Enabled light (Light 0) $= Enabled
ambient (Light 1) $= Color4 0 0 0 1
diffuse (Light 1) $= Color4 1 0.9 0.0 1
specular (Light 1) $= Color4 1 1 1 1
position (Light 1) $= Vertex4 0 0 1 1
light (Light 1) $= Enabled
colorMaterial $= Just (Front,AmbientAndDiffuse) colorMaterial $= Just (Front,AmbientAndDiffuse)
-- materialDiffuse Front $= Color4 0.5 0.5 0.5 1
materialDiffuse Front $= Color4 0.5 0.5 0.5 1 materialDiffuse Front $= Color4 0.5 0.5 0.5 1
materialAmbient Front $= Color4 0.5 0.5 0.5 1 materialAmbient Front $= Color4 0.5 0.5 0.5 1
materialSpecular Front $= Color4 0.2 0.2 0.2 1 materialSpecular Front $= Color4 0.2 0.2 0.2 1
materialEmission Front $= Color4 0.3 0.3 0.3 1 materialEmission Front $= Color4 0.3 0.3 0.3 1
materialShininess Front $= 50.0 materialShininess Front $= 1.0
-- We enter the main loop -- We enter the main loop
mainLoop mainLoop