diff --git a/examples/platformer-3d-wipeout/assets/models/Base 1 Ramp Low To Mid White Blue.glb b/examples/platformer-3d-wipeout/assets/models/Base 1 Ramp Low To Mid White Blue.glb new file mode 100644 index 000000000..85c7998f1 Binary files /dev/null and b/examples/platformer-3d-wipeout/assets/models/Base 1 Ramp Low To Mid White Blue.glb differ diff --git a/examples/platformer-3d-wipeout/platformer-3d-wipeout.json b/examples/platformer-3d-wipeout/platformer-3d-wipeout.json index 6446b73a8..f54e52c95 100644 --- a/examples/platformer-3d-wipeout/platformer-3d-wipeout.json +++ b/examples/platformer-3d-wipeout/platformer-3d-wipeout.json @@ -1,9 +1,9 @@ { "firstLayout": "Game Scene", "gdVersion": { - "build": 248, + "build": 252, "major": 5, - "minor": 5, + "minor": 6, "revision": 0 }, "properties": { @@ -234,13 +234,6 @@ "name": "assets\\models\\Base_1x1_Low_White_Blue.glb", "userAdded": false }, - { - "file": "assets/models/Base_1x1_Ramp_Low_To_Tall_White_Blue.glb", - "kind": "model3D", - "metadata": "", - "name": "assets\\models\\Base_1x1_Ramp_Low_To_Mid_White_Blue.glb", - "userAdded": false - }, { "file": "assets/models/Base_1x1_Tall_White_Blue.glb", "kind": "model3D", @@ -285,6 +278,17 @@ "identifier": "https://asset-resources.gdevelop.io/public-resources/Settings UI/Toggle Switch/0af9e04c0c382482aeeaa36bc713a626249d6f6df3280bbccc6a042973ad555c_Small Plastic Green Round Switch_On.png", "name": "Small Plastic Green Round Switch_On.png" } + }, + { + "file": "assets/models/Base 1 Ramp Low To Mid White Blue.glb", + "kind": "model3D", + "metadata": "", + "name": "assets\\models\\Base 1 Ramp Low To Mid White Blue.glb", + "userAdded": false, + "origin": { + "identifier": "https://asset-resources.gdevelop.io/public-resources/Wipeout 3D/Platform/Ramp/Blue/2491e7be7cd1a178d20b6440fdf32dec72649dc05baf24d68c4b618fb9bd0009_Base 1 Ramp Low To Mid White Blue.glb", + "name": "Base 1 Ramp Low To Mid White Blue.glb" + } } ] }, @@ -376,7 +380,7 @@ "gridColor": 10401023, "gridAlpha": 0.8, "snap": false, - "zoomFactor": 0.18923010380623995, + "zoomFactor": 0.5843784410741274, "windowMask": false, "selectedLayer": "Base meshes" }, @@ -404,9 +408,6 @@ }, { "name": "Pad_Bumper_Red_White_Red" - }, - { - "name": "Base_1x1_Ramp_Base_To_Mid_White_Blue" } ] }, @@ -2515,24 +2516,6 @@ "stringProperties": [], "initialVariables": [] }, - { - "angle": 0, - "customSize": true, - "depth": 8, - "height": 318, - "layer": "", - "name": "Box_Collider", - "persistentUuid": "ed5515d9-d409-41e6-a8d5-6a63b2416217", - "rotationY": 338, - "width": 316, - "x": 104, - "y": 2079, - "z": 122, - "zOrder": 0, - "numberProperties": [], - "stringProperties": [], - "initialVariables": [] - }, { "angle": 0, "customSize": true, @@ -2551,42 +2534,6 @@ "stringProperties": [], "initialVariables": [] }, - { - "angle": 0, - "customSize": true, - "depth": 8, - "height": 646, - "layer": "", - "name": "Box_Collider", - "persistentUuid": "1cb0048e-6758-4ddc-8b43-c74726b3a897", - "rotationY": 313, - "width": 109, - "x": 2006, - "y": 2398, - "z": 363, - "zOrder": 0, - "numberProperties": [], - "stringProperties": [], - "initialVariables": [] - }, - { - "angle": 0, - "customSize": true, - "depth": 8, - "height": 646, - "layer": "", - "name": "Box_Collider", - "persistentUuid": "ec24dacf-8544-4361-80c3-d8f0fa23e111", - "rotationY": 47, - "width": 109, - "x": 1597, - "y": 2398, - "z": 363, - "zOrder": 0, - "numberProperties": [], - "stringProperties": [], - "initialVariables": [] - }, { "angle": 0, "customSize": true, @@ -2735,23 +2682,6 @@ "stringProperties": [], "initialVariables": [] }, - { - "angle": 0, - "customSize": false, - "height": 319.1296428345515, - "keepRatio": true, - "layer": "", - "name": "Base_1x1_Ramp_Base_To_Mid_White_Blue", - "persistentUuid": "ff312e3b-21c4-4cd6-89b3-536d05f09571", - "width": 319.30397033691406, - "x": 257, - "y": 2240, - "z": -9, - "zOrder": 17, - "numberProperties": [], - "stringProperties": [], - "initialVariables": [] - }, { "angle": 274, "customSize": false, @@ -2933,6 +2863,22 @@ "numberProperties": [], "stringProperties": [], "initialVariables": [] + }, + { + "angle": 180, + "customSize": false, + "height": 318.8257771809101, + "layer": "", + "name": "Base_1_Ramp_Low_To_Mid_White_Blue", + "persistentUuid": "0c925e80-3a58-423c-af84-85dddd620ec2", + "width": 319, + "x": 251, + "y": 2244, + "z": -9, + "zOrder": 0, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] } ], "objects": [ @@ -3250,10 +3196,10 @@ "name": "Physics3D", "type": "Physics3D::Physics3DBehavior", "object3D": "Object3D", - "bodyType": "Kinematic", + "bodyType": "Static", "bullet": false, "fixedRotation": false, - "shape": "Box", + "shape": "Mesh", "shapeOrientation": "Z", "shapeDimensionA": 0, "shapeDimensionB": 0, @@ -3307,7 +3253,7 @@ "bodyType": "Static", "bullet": false, "fixedRotation": false, - "shape": "Capsule", + "shape": "Mesh", "shapeOrientation": "Z", "shapeDimensionA": 0, "shapeDimensionB": 0, @@ -3407,7 +3353,37 @@ "type": "Scene3D::Model3DObject", "variables": [], "effects": [], - "behaviors": [], + "behaviors": [ + { + "name": "Physics3D", + "type": "Physics3D::Physics3DBehavior", + "object3D": "Object3D", + "bodyType": "Static", + "bullet": false, + "fixedRotation": false, + "shape": "Mesh", + "meshShapeResourceName": "", + "shapeOrientation": "Z", + "shapeDimensionA": 0, + "shapeDimensionB": 0, + "shapeDimensionC": 0, + "shapeOffsetX": 0, + "shapeOffsetY": 0, + "shapeOffsetZ": 0, + "massCenterOffsetX": 0, + "massCenterOffsetY": 0, + "massCenterOffsetZ": 0, + "massOverride": 0, + "density": 1, + "friction": 0.3, + "restitution": 0.1, + "linearDamping": 0.1, + "angularDamping": 0.1, + "gravityScale": 1, + "layers": 17, + "masks": 17 + } + ], "content": { "centerLocation": "ObjectCenter", "crossfadeDuration": 0.1, @@ -3793,31 +3769,6 @@ "isReceivingShadow": true } }, - { - "assetStoreId": "", - "name": "Base_1x1_Ramp_Base_To_Mid_White_Blue", - "type": "Scene3D::Model3DObject", - "variables": [], - "effects": [], - "behaviors": [], - "content": { - "centerLocation": "ObjectCenter", - "crossfadeDuration": 0.1, - "depth": 199.18555437998833, - "height": 319.1296266437926, - "isCastingShadow": true, - "isReceivingShadow": true, - "keepAspectRatio": false, - "materialType": "KeepOriginal", - "modelResourceName": "assets\\models\\Base_1x1_Ramp_Low_To_Mid_White_Blue.glb", - "originLocation": "ModelOrigin", - "rotationX": 0, - "rotationY": 0, - "rotationZ": 0, - "width": 319.30397033691406, - "animations": [] - } - }, { "assetStoreId": "", "name": "WaterPlane", @@ -3920,6 +3871,61 @@ "lineHeight": 0, "color": "255;255;255" } + }, + { + "assetStoreId": "1a9b1590b79c2250809417018cb4512cf94e6c7d6703978806c6da289daa3104", + "name": "Base_1_Ramp_Low_To_Mid_White_Blue", + "type": "Scene3D::Model3DObject", + "variables": [], + "effects": [], + "behaviors": [ + { + "name": "Physics3D", + "type": "Physics3D::Physics3DBehavior", + "object3D": "Object3D", + "bodyType": "Static", + "bullet": false, + "fixedRotation": false, + "shape": "Mesh", + "meshShapeResourceName": "", + "shapeOrientation": "Z", + "shapeDimensionA": 0, + "shapeDimensionB": 0, + "shapeDimensionC": 0, + "shapeOffsetX": 0, + "shapeOffsetY": 0, + "shapeOffsetZ": 0, + "massCenterOffsetX": 0, + "massCenterOffsetY": 0, + "massCenterOffsetZ": 0, + "massOverride": 0, + "density": 1, + "friction": 0.3, + "restitution": 0.1, + "linearDamping": 0.1, + "angularDamping": 0.1, + "gravityScale": 1, + "layers": 17, + "masks": 17 + } + ], + "content": { + "centerLocation": "ModelOrigin", + "crossfadeDuration": 0.10000000149011612, + "depth": 319, + "height": 319, + "isCastingShadow": true, + "isReceivingShadow": true, + "keepAspectRatio": true, + "materialType": "StandardWithoutMetalness", + "modelResourceName": "assets\\models\\Base 1 Ramp Low To Mid White Blue.glb", + "originLocation": "ModelOrigin", + "rotationX": 90, + "rotationY": 0, + "rotationZ": 0, + "width": 319, + "animations": [] + } } ], "objectsFolderStructure": { @@ -3984,7 +3990,7 @@ "objectName": "Base_1_Ramp_Base_to_Tall_White_Blue" }, { - "objectName": "Base_1x1_Ramp_Base_To_Mid_White_Blue" + "objectName": "Base_1_Ramp_Low_To_Mid_White_Blue" }, { "objectName": "Base_1_Tall_White_Blue" @@ -8068,7 +8074,99 @@ "name": "ForwardZ" } ], - "sharedPropertyDescriptors": [] + "propertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "propertyName": "Object3D" + }, + { + "folderName": "Catch-up speed", + "children": [ + { + "propertyName": "RotationHalfwayDuration" + }, + { + "propertyName": "ElevationHalfwayDuration" + }, + { + "propertyName": "TranslationZHalfwayDuration" + } + ] + }, + { + "folderName": "Position", + "children": [ + { + "propertyName": "Distance" + }, + { + "propertyName": "OffsetX" + }, + { + "propertyName": "OffsetY" + }, + { + "propertyName": "OffsetZ" + }, + { + "propertyName": "RotationAngleOffset" + }, + { + "propertyName": "ElevationAngleOffset" + }, + { + "propertyName": "FollowFreeAreaZMax" + }, + { + "propertyName": "FollowFreeAreaZMin" + } + ] + }, + { + "propertyName": "RotationLogSpeed" + }, + { + "propertyName": "ElevationLogSpeed" + }, + { + "propertyName": "TranslationZLogSpeed" + }, + { + "propertyName": "IsCalledManually" + }, + { + "propertyName": "CameraZ" + }, + { + "propertyName": "HasJustBeenCreated" + }, + { + "propertyName": "IsRotatingWithObject" + }, + { + "propertyName": "IsElevatingWithObject" + }, + { + "propertyName": "RotationMode" + }, + { + "propertyName": "TargetedRotationAngle" + }, + { + "propertyName": "TargetedElevationAngle" + }, + { + "propertyName": "ForwardX" + }, + { + "propertyName": "ForwardY" + }, + { + "propertyName": "ForwardZ" + } + ] + } } ], "eventsBasedObjects": [] @@ -11234,6 +11332,106 @@ "name": "TargetedRotationSpeed" } ], + "propertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "folderName": "Rotation", + "children": [ + { + "propertyName": "RotationSpeedMax" + }, + { + "propertyName": "RotationAcceleration" + }, + { + "propertyName": "RotationDeceleration" + } + ] + }, + { + "propertyName": "TranslationSpeedMax" + }, + { + "propertyName": "TranslationAcceleration" + }, + { + "propertyName": "TranslationDeceleration" + }, + { + "propertyName": "CurrentRotationSpeed" + }, + { + "propertyName": "PreviousRotationSpeed" + }, + { + "propertyName": "CurrentForwardSpeed" + }, + { + "propertyName": "CurrentSidewaysSpeed" + }, + { + "propertyName": "PreviousForwardSpeed" + }, + { + "propertyName": "PreviousSidewaysSpeed" + }, + { + "propertyName": "HasPressedTurnLeft" + }, + { + "propertyName": "HasPressedTurnRight" + }, + { + "propertyName": "HasPressedTurnLeftLast" + }, + { + "propertyName": "HadPressedTurnLeft" + }, + { + "propertyName": "HadPressedTurnRight" + }, + { + "propertyName": "HasPressedMoveForward" + }, + { + "propertyName": "HasPressedMoveBackward" + }, + { + "propertyName": "HadPressedMoveForward" + }, + { + "propertyName": "HadPressedMoveBackward" + }, + { + "propertyName": "HasPressedMoveBackwardLast" + }, + { + "propertyName": "HasPressedMoveLeft" + }, + { + "propertyName": "HasPressedMoveRight" + }, + { + "propertyName": "HadPressedMoveLeft" + }, + { + "propertyName": "HadPressedMoveRight" + }, + { + "propertyName": "HasPressedMoveLeftLast" + }, + { + "propertyName": "TargetedForwardSpeed" + }, + { + "propertyName": "TargetedSidewaysSpeed" + }, + { + "propertyName": "TargetedRotationSpeed" + } + ] + }, "sharedPropertyDescriptors": [ { "value": "0", @@ -11248,7 +11446,18 @@ "label": "", "name": "Sin" } - ] + ], + "sharedPropertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "propertyName": "Cos" + }, + { + "propertyName": "Sin" + } + ] + } } ], "eventsBasedObjects": [] @@ -12722,7 +12931,32 @@ "name": "ShouldLock" } ], - "sharedPropertyDescriptors": [] + "propertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "propertyName": "Object3D" + }, + { + "propertyName": "HorizontalSpeed" + }, + { + "propertyName": "VerticalSpeed" + }, + { + "propertyName": "VerticalAngleMin" + }, + { + "propertyName": "VerticalAngleMax" + }, + { + "propertyName": "OffsetZ" + }, + { + "propertyName": "ShouldLock" + } + ] + } } ], "eventsBasedObjects": [] @@ -13840,7 +14074,9 @@ } ], "propertyDescriptors": [], - "sharedPropertyDescriptors": [] + "propertiesFolderStructure": { + "folderName": "__ROOT" + } } ], "eventsBasedObjects": [ @@ -14022,6 +14258,9 @@ } ], "propertyDescriptors": [], + "propertiesFolderStructure": { + "folderName": "__ROOT" + }, "variants": [] } ] @@ -14741,7 +14980,23 @@ "name": "WasChecked" } ], - "sharedPropertyDescriptors": [] + "propertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "propertyName": "ButtonFSM" + }, + { + "propertyName": "IsChecked" + }, + { + "propertyName": "PreviousIsChecked" + }, + { + "propertyName": "WasChecked" + } + ] + } }, { "description": "The finite state machine used internally by the button object.", @@ -15908,7 +16163,29 @@ "name": "Index" } ], - "sharedPropertyDescriptors": [] + "propertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "propertyName": "ShouldCheckHovering" + }, + { + "propertyName": "State" + }, + { + "propertyName": "TouchId" + }, + { + "propertyName": "TouchIsInside" + }, + { + "propertyName": "MouseIsInside" + }, + { + "propertyName": "Index" + } + ] + } } ], "eventsBasedObjects": [ @@ -17118,6 +17395,17 @@ "name": "PreviousIsChecked" } ], + "propertiesFolderStructure": { + "folderName": "__ROOT", + "children": [ + { + "propertyName": "IsChecked" + }, + { + "propertyName": "PreviousIsChecked" + } + ] + }, "variants": [ { "areaMaxX": 143,