Pilot internal development release 20220412 (#108)

* Pilot internal development release 20220412 * Revert Unnecessary Changes
BoomingTech · Apr 12, 2022 · 095c25c · 095c25c
1 parent d508c8a
commit 095c25c
Show file tree

Hide file tree

Showing 41 changed files with 902 additions and 651 deletions.
diff --git a/engine/asset/objects/character/player/components/motor/player.motor.json b/engine/asset/objects/character/player/components/motor/player.motor.json
@@ -1,8 +1,12 @@
 {
   "move_speed": 5,
-  "half_extent": {
-    "x" : 0.3,
-    "y" : 0.3,
-    "z" : 1
+  "controller_config": {
+    "$context":{
+      "capsule_shape" : {
+        "radius": 0.3,
+        "half_height": 0.7
+      }
+    },
+    "$typeName": "PhysicsControllerConfig"
   }
 }
diff --git a/engine/asset/objects/character/player/components/rigid_body/player.rigid_body.json b/engine/asset/objects/character/player/components/rigid_body/player.rigid_body.json
@@ -1,27 +1,26 @@
 {
   "shapes": [
     {
-      "$context":{
-        "local_transform": {
-          "translation" : {
-            "x": 0,
-            "y": 0,
-            "z": 1
-          },
-          "rotate": {},
-          "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
-          }
+      "local_transform": {
+        "translation" : {
+          "x": 0,
+          "y": 0,
+          "z": 1
         },
-        "half_extents": {
-          "x": 0.3,
-          "y": 0.3,
+        "rotate": {},
+        "scale": {
+          "x": 1,
+          "y": 1,
           "z": 1
         }
       },
-      "$typeName": "RigidBodyBoxShape"
+      "geometry": {
+        "$context":{
+          "radius": 0.3,
+          "half_height": 0.7
+        },
+        "$typeName": "Capsule"
+      }
     }
   ],
   "inverse_mass": 0.8

diff --git a/engine/asset/objects/environment/fence/rigid_body/fence.rigid_body.json b/engine/asset/objects/environment/fence/rigid_body/fence.rigid_body.json
@@ -1,96 +1,104 @@
 {
   "shapes": [
     {
-      "$context":{
-        "local_transform": {
-          "position" : {
-            "x": 0,
-            "y": 24,
-            "z": 6
-          },
-          "rotate": {},
-          "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
-          }
-        },
-        "half_extents": {
-          "x": 43,
-          "y": 0.5,
+      "local_transform": {
+        "position" : {
+          "x": 0,
+          "y": 24,
           "z": 6
+        },
+        "rotate": {},
+        "scale": {
+          "x": 1,
+          "y": 1,
+          "z": 1
         }
       },
-      "$typeName": "RigidBodyBoxShape"
-    },
-    {
-      "$context":{
-        "local_transform": {
-          "position" : {
-            "x": 0,
-            "y": -24,
+      "geometry": {
+        "$context":{
+          "half_extents": {
+            "x": 43,
+            "y": 0.5,
             "z": 6
-          },
-          "rotate": {},
-          "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
           }
         },
-        "half_extents": {
-          "x": 43,
-          "y": 0.5,
+        "$typeName": "Box"
+      }
+    },
+    {
+      "local_transform": {
+        "position" : {
+          "x": 0,
+          "y": -24,
           "z": 6
+        },
+        "rotate": {},
+        "scale": {
+          "x": 1,
+          "y": 1,
+          "z": 1
         }
       },
-      "$typeName": "RigidBodyBoxShape"
-    },
-    {
-      "$context":{
-        "local_transform": {
-          "position" : {
-            "x": 42.5,
-            "y": 0,
+      "geometry": {
+        "$context":{
+          "half_extents": {
+            "x": 43,
+            "y": 0.5,
             "z": 6
-          },
-          "rotate": {},
-          "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
           }
         },
-        "half_extents": {
-          "x": 0.5,
-          "y": 43,
+        "$typeName": "Box"
+      }
+    },
+    {
+      "local_transform": {
+        "position" : {
+          "x": 42.5,
+          "y": 0,
           "z": 6
+        },
+        "rotate": {},
+        "scale": {
+          "x": 1,
+          "y": 1,
+          "z": 1
         }
       },
-      "$typeName": "RigidBodyBoxShape"
-    },
-    {
-      "$context":{
-        "local_transform": {
-          "position" : {
-            "x": -43,
-            "y": 0,
+      "geometry": {
+        "$context":{
+          "half_extents": {
+            "x": 0.5,
+            "y": 43,
             "z": 6
-          },
-          "rotate": {},
-          "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
           }
         },
-        "half_extents": {
-          "x": 0.5,
-          "y": 43,
+        "$typeName": "Box"
+      }
+    },
+    {
+      "local_transform": {
+        "position" : {
+          "x": -43,
+          "y": 0,
           "z": 6
+        },
+        "rotate": {},
+        "scale": {
+          "x": 1,
+          "y": 1,
+          "z": 1
         }
       },
-      "$typeName": "RigidBodyBoxShape"
+      "geometry": {
+        "$context":{
+          "half_extents": {
+            "x": 0.5,
+            "y": 43,
+            "z": 6
+          }
+        },
+        "$typeName": "Box"
+      }
     }
   ],
   "inverse_mass": 0,

diff --git a/engine/asset/objects/environment/floor/rigid_body/floor.rigid_body.json b/engine/asset/objects/environment/floor/rigid_body/floor.rigid_body.json
@@ -1,27 +1,29 @@
 {
   "shapes": [
     {
-      "$context":{
-        "local_transform": {
-          "position" : {
-            "x": 0,
-            "y": 0,
-            "z": -0.1
-          },
-          "rotate": {},
-          "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
-          }
+      "local_transform": {
+        "position" : {
+          "x": 0,
+          "y": 0,
+          "z": -0.1
         },
-        "half_extents": {
-          "x": 10,
-          "y": 10,
-          "z": 0.1
+        "rotate": {},
+        "scale": {
+          "x": 1,
+          "y": 1,
+          "z": 1
         }
       },
-      "$typeName": "RigidBodyBoxShape"
+      "geometry": {
+        "$context":{
+          "half_extents": {
+            "x": 10,
+            "y": 10,
+            "z": 0.1
+          }
+        },
+        "$typeName": "Box"
+      }
     }
   ],
   "inverse_mass": 0,