Fix lights

rohitvarkey · Oct 20, 2015 · 732986c · 732986c
1 parent e657e03
commit 732986c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/container.jl b/src/container.jl
@@ -52,7 +52,7 @@ function compose!(a::Context, b::Material)
 end
 
 function compose!(a::Context, b::Light)
-    a.container_children = cons(b, a.light_children)
+    a.light_children = cons(b, a.light_children)
     return a
 end
 

diff --git a/src/patchable.jl b/src/patchable.jl
@@ -270,29 +270,26 @@ function draw(img::Patchable3D, parent_box::AbsoluteBox, light::Light)
 end
 
 function draw(img::Patchable3D, light::AmbientLight)
-    color = string("#" * hex(light.color))
-    ThreeJS.ambientlight(color)
+    ThreeJS.ambientlight(light.color)
 end
 
 function draw(img::Patchable3D, light::PointLight)
-    color = string("#" * hex(light.color))
     ThreeJS.pointlight(
         light.position[1].value,
         light.position[2].value,
         light.position[3].value,
-        color=color,
+        color=light.color,
         intensity=light.intensity,
         distance=light.distance.value,
     )
 end
 
 function draw(img::Patchable3D, light::SpotLight)
-    color = string("#" * hex(light.color))
     ThreeJS.spotlight(
         light.position[1].value,
         light.position[2].value,
         light.position[3].value,
-        color=color,
+        color=light.color,
         intensity=light.intensity,
         distance=light.distance.value,
         angle=light.angle,