Explorar el Código

Integration fixes: apple picking works now

Signed-off-by: Adam Dabrowski <[email protected]>
Adam Dabrowski hace 2 años
padre
commit
300aabd5c0

+ 1 - 4
Project/Gem/Scripts/apple_kraken_manipulator.lua

@@ -204,10 +204,7 @@ function manipulator_control:_getWorldPosition(target_position)
 
     local pos = Transform.TransformVector(tm, target_position - gripper_pos)
 
-    TransformBus.Event.SetLocalTranslation(self.Properties.debug, pos) 
-
-    -- Gripper is not in manipulator reference - it must be rotated
-    pos = Vector3(pos['y'], pos['z'], pos['x'])
+    TransformBus.Event.SetLocalTranslation(self.Properties.debug, pos)
 
     return pos
 end

+ 1 - 1
Project/Levels/playground/playground.prefab

@@ -642,7 +642,7 @@
                     "Controller": {
                         "Configuration": {
                             "Field of View": 60.0,
-                            "EditorEntityId": 4775340173132170150
+                            "EditorEntityId": 2161920439331080165
                         }
                     }
                 },

+ 12 - 14
Project/Prefabs/Apple.prefab

@@ -20,9 +20,9 @@
                 "Parent Entity": "",
                 "Transform Data": {
                     "Translate": [
-                        -0.09844169020652771,
-                        0.42729446291923523,
-                        1.9483000040054321
+                        0.22987917065620422,
+                        -0.10305754840373993,
+                        1.2093260288238525
                     ],
                     "Rotate": [
                         -1.8461143970489502,
@@ -160,17 +160,15 @@
                 },
                 "Component_[6717239618132726328]": {
                     "$type": "EditorDisabledCompositionComponent",
-                    "Id": 6717239618132726328,
-                    "DisabledComponents": [
-                        {
-                            "$type": "EditorRigidBodyComponent",
-                            "Id": 7138985039715548058,
-                            "Configuration": {
-                                "entityId": "",
-                                "Gravity Enabled": false
-                            }
-                        }
-                    ]
+                    "Id": 6717239618132726328
+                },
+                "Component_[7138985039715548058]": {
+                    "$type": "EditorRigidBodyComponent",
+                    "Id": 7138985039715548058,
+                    "Configuration": {
+                        "entityId": "",
+                        "Gravity Enabled": false
+                    }
                 },
                 "Component_[7230618248793844206]": {
                     "$type": "AZ::Render::EditorMeshComponent",

+ 2 - 2
Project/Registry/physxsystemconfiguration.setreg

@@ -3,9 +3,9 @@
         "Gems": {
             "PhysX": {
                 "PhysXSystemConfiguration": {
+                    "MaxTimestep": 0.019999999552965164,
+                    "FixedTimeStep": 0.004000000189989805,
                     "OverlapBufferSize": 256,
-                    "MaxTimestep": 0.05000000074505806,
-                    "FixedTimeStep": 0.00800000037997961,
                     "CollisionConfig": {
                         "Layers": {
                             "LayerNames": [