Delete unused scenes and tweak scenes. Implement border friction.

electronicarts · Aug 14, 2024 · 03c25d9 · 03c25d9
1 parent 9666d8f
commit 03c25d9
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 232 deletions.
diff --git a/scenes/4Materials.json b/scenes/4Materials.json
diff --git a/scenes/folding.json b/scenes/folding.json
@@ -0,0 +1,85 @@
+{
+    "version": 2,
+    "resolution": [
+        2309,
+        1184
+    ],
+    "shapes": [
+        {
+            "id": "shape0",
+            "position": {
+                "x": 2123.19765625,
+                "y": 234.004569687738
+            },
+            "rotation": 0,
+            "halfSize": {
+                "x": "56",
+                "y": "48"
+            },
+            "shape": "0",
+            "function": "0",
+            "emitMaterial": "3",
+            "emissionRate": "10.4",
+            "radius": 90.18524136937822
+        },
+        {
+            "id": "shape1",
+            "position": {
+                "x": 98.31289062500001,
+                "y": 1047.3846153846155
+            },
+            "rotation": 0,
+            "halfSize": {
+                "x": "96",
+                "y": "655"
+            },
+            "shape": "0",
+            "function": "2",
+            "emitMaterial": "0",
+            "emissionRate": "1",
+            "radius": 90.18524136937822
+        }
+    ],
+    "settings": [
+        {
+            "name": "simResDivisor",
+            "type": "combo",
+            "value": "16"
+        },
+        {
+            "name": "particlesPerCellAxis",
+            "type": "range",
+            "value": "3"
+        },
+        {
+            "name": "simRate",
+            "type": "combo",
+            "value": "480"
+        },
+        {
+            "name": "liquidViscosity",
+            "type": "range",
+            "value": "0"
+        },
+        {
+            "name": "elasticityRatio",
+            "type": "range",
+            "value": "0.07"
+        },
+        {
+            "name": "plasticity",
+            "type": "range",
+            "value": "0.88"
+        },
+        {
+            "name": "borderFriction",
+            "type": "range",
+            "value": "0.03"
+        },
+        {
+            "name": "renderMode",
+            "type": "combo",
+            "value": "0"
+        }
+    ]
+}
diff --git a/scenes/manifest.json b/scenes/manifest.json
@@ -3,5 +3,6 @@
     { "scene": "./scenes/seedLogo.json", "name": "SEED Logo" },
     { "scene": "./scenes/sillyRubber.json", "name": "Rubber"},
     { "scene": "./scenes/plasticPress.json", "name": "Plastic Press"},
-    { "scene": "./scenes/boxFracture.json", "name": "Box Fracture"}
+    { "scene": "./scenes/boxFracture.json", "name": "Box Fracture"},
+    { "scene": "./scenes/folding.json", "name": "Other Brands Are Available"}
 ]
diff --git a/scenes/pyramid.json b/scenes/pyramid.json
diff --git a/scenes/sandPile.json b/scenes/sandPile.json
diff --git a/scenes/sillyRubber.json b/scenes/sillyRubber.json
@@ -1,34 +1,44 @@
 {
     "version": 2,
     "resolution": [
-        1102,
-        1121
+        1290,
+        1313
     ],
     "shapes": [
         {
             "id": "shape0",
             "position": {
-                "x": 551,
-                "y": 560.5
+                "x": 645,
+                "y": 656.5
             },
             "rotation": 0,
             "halfSize": {
-                "x": "230",
-                "y": "230"
+                "x": "269",
+                "y": "269"
             },
             "shape": "0",
             "function": "3",
             "emitMaterial": "1",
             "emissionRate": "1",
-            "radius": 100
+            "radius": 117.09372300179994
         }
     ],
     "settings": [
+        {
+            "name": "simResDivisor",
+            "type": "combo",
+            "value": "16"
+        },
         {
             "name": "particlesPerCellAxis",
             "type": "range",
             "value": "5"
         },
+        {
+            "name": "simRate",
+            "type": "combo",
+            "value": "480"
+        },
         {
             "name": "fixedPointMultiplierExponent",
             "type": "range",
@@ -39,15 +49,10 @@
             "type": "range",
             "value": "0"
         },
-        {
-            "name": "iterationCount",
-            "type": "range",
-            "value": "8"
-        },
         {
             "name": "elasticityRatio",
             "type": "range",
-            "value": "0.19"
+            "value": "0.08"
         },
         {
             "name": "borderFriction",