new cyl

4 files changed, 79 insertions, 8 deletions

diff --git a/scenefiles-4d/sphere_collision.json b/scenefiles-4d/sphere_collision.json
index a6d6441..f2d7a6a 100644
--- a/scenefiles-4d/sphere_collision.json
+++ b/scenefiles-4d/sphere_collision.json
@@ -4,7 +4,7 @@
     "ambientCoeff": 0.5,
     "diffuseCoeff": 0.5,
     "specularCoeff": 0.5,
-    "transparentCoeff": 0,
+    "transparentCoeff": 0.5,
     "gravity": [0.0, -0.0098, 0.0, 0.0]
   },
   "cameraData": {
@@ -42,7 +42,10 @@
               "diffuse": [1.0, 0.0, 0.0],
               "specular": [1.0, 1.0, 1.0],
               "shininess": 25.0,
-              "velocity": [0.0, 0.0, 0.0, 0.0]
+              "velocity": [0.0, 0.0, 0.0, 0.0],
+              "reflective": [0.6, 0.6, 0.6],
+              "transparent": [0.8, 0.6, 0.6],
+              "ior": 1.01
             }
           ]
         },
@@ -56,7 +59,10 @@
               "diffuse": [0.0, 1.0, 0.0],
               "specular": [1.0, 1.0, 1.0],
               "shininess": 25.0,
-              "velocity": [-0.1, 0.0, 0.0, -0.1]
+              "velocity": [-0.03, 0.0, 0.0, -0.03],
+              "reflective": [0.6, 0.6, 0.6],
+              "transparent": [0.2, 0.2, 0.2],
+              "ior": 1.01
             }
           ]
         }
diff --git a/scenefiles-4d/unit_cone.json b/scenefiles-4d/unit_cone.json
index 42bf44b..641a945 100644
--- a/scenefiles-4d/unit_cone.json
+++ b/scenefiles-4d/unit_cone.json
@@ -21,7 +21,32 @@
         {
           "type": "directional",
           "color": [1.0, 1.0, 1.0],
-          "direction": [-3.0, -2.0, -1.0, 0.0]
+          "direction": [3.0, 3.0, 3.0, 3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 0.0, 0.0],
+          "direction": [3.0, -3.0, 3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [0.0, 0.0, 1.0],
+          "direction": [-3.0, 3.0, 3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 0.0, 1.0],
+          "direction": [-3.0, -3.0, -3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 1.0, 0.0],
+          "direction": [-3.0, -3.0, 3.0, 3.0]
+        },
+        {
+          "type": "directional",
+          "color": [0.0, 1.0, 1.0],
+          "direction": [3.0, 3.0, -3.0, -3.0]
         }
       ]
     },
@@ -34,7 +59,7 @@
           "primitives": [
             {
               "type": "cone",
-              "diffuse": [1.0, 0.0, 0.0],
+              "diffuse": [1.0, 1.0, 1.0],
               "specular": [1.0, 1.0, 1.0],
               "shininess": 25.0,
               "velocity": [0.0, 0.0, 0.0, 0.0]
diff --git a/scenefiles-4d/unit_cube.json b/scenefiles-4d/unit_cube.json
index b21615a..7bf63cc 100644
--- a/scenefiles-4d/unit_cube.json
+++ b/scenefiles-4d/unit_cube.json
@@ -32,6 +32,21 @@
           "type": "directional",
           "color": [0.0, 0.0, 1.0],
           "direction": [-3.0, 3.0, 3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 0.0, 1.0],
+          "direction": [-3.0, -3.0, -3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 1.0, 0.0],
+          "direction": [-3.0, -3.0, 3.0, 3.0]
+        },
+        {
+          "type": "directional",
+          "color": [0.0, 1.0, 1.0],
+          "direction": [3.0, 3.0, -3.0, -3.0]
         }
       ]
     },
@@ -44,7 +59,7 @@
           "primitives": [
             {
               "type": "cube",
-              "diffuse": [1.0, 0.0, 1.0],
+              "diffuse": [1.0, 1.0, 1.0],
               "specular": [1.0, 1.0, 1.0],
               "shininess": 25.0,
               "velocity": [0.0, 0.0, 0.0, 0.0]
diff --git a/scenefiles-4d/unit_cylinder.json b/scenefiles-4d/unit_cylinder.json
index 62e9cef..bae9327 100644
--- a/scenefiles-4d/unit_cylinder.json
+++ b/scenefiles-4d/unit_cylinder.json
@@ -21,7 +21,32 @@
         {
           "type": "directional",
           "color": [1.0, 1.0, 1.0],
-          "direction": [-3.0, -2.0, -1.0, 0.0]
+          "direction": [3.0, 3.0, 3.0, 3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 0.0, 0.0],
+          "direction": [3.0, -3.0, 3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [0.0, 0.0, 1.0],
+          "direction": [-3.0, 3.0, 3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 0.0, 1.0],
+          "direction": [-3.0, -3.0, -3.0, -3.0]
+        },
+        {
+          "type": "directional",
+          "color": [1.0, 1.0, 0.0],
+          "direction": [-3.0, -3.0, 3.0, 3.0]
+        },
+        {
+          "type": "directional",
+          "color": [0.0, 1.0, 1.0],
+          "direction": [3.0, 3.0, -3.0, -3.0]
         }
       ]
     },
@@ -34,7 +59,7 @@
           "primitives": [
             {
               "type": "cylinder",
-              "diffuse": [1.0, 0.0, 0.0],
+              "diffuse": [1.0, 1.0, 1.0],
               "specular": [1.0, 1.0, 1.0],
               "shininess": 25.0,
               "velocity": [0.0, 0.0, 0.0, 0.0]