From 818edca7cf14fcfe1e8a916382e9c70f53c5468e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davy=20H=C3=A9lard?= Date: Wed, 23 Aug 2023 10:47:47 +0200 Subject: [PATCH] [3D Lane runner] Use unified actions --- examples/3d-lane-runner/3d-lane-runner.json | 52 +++++++++++++++++---- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/examples/3d-lane-runner/3d-lane-runner.json b/examples/3d-lane-runner/3d-lane-runner.json index 257944b06..e6061ae7b 100644 --- a/examples/3d-lane-runner/3d-lane-runner.json +++ b/examples/3d-lane-runner/3d-lane-runner.json @@ -559,7 +559,7 @@ "gridColor": 10401023, "gridAlpha": 0.8, "snap": true, - "zoomFactor": 0.36732575450588595, + "zoomFactor": 0.3925161175488267, "windowMask": false }, "objectsGroups": [ @@ -1494,7 +1494,7 @@ "rightFaceVisible": false, "topFaceVisible": true, "bottomFaceVisible": false, - "frontFaceResourceRepeat": true, + "frontFaceResourceRepeat": false, "backFaceResourceRepeat": false, "leftFaceResourceRepeat": false, "rightFaceResourceRepeat": false, @@ -1980,7 +1980,7 @@ "parameters": [ "", "=", - "lerp(Scene3D::CameraZ(), Player.Z(), 0.05 * 60 * TimeDelta())", + "lerp(Scene3D::CameraZ(), Player.Object3D::Z(), 0.05 * 60 * TimeDelta())", "", "" ] @@ -2351,10 +2351,11 @@ }, { "type": { - "value": "Scene3D::Model3DObject::SetAnimationName" + "value": "AnimatableCapability::AnimatableBehavior::SetName" }, "parameters": [ "Player", + "Animation", "=", "\"RunRight\"" ] @@ -2460,10 +2461,11 @@ }, { "type": { - "value": "Scene3D::Model3DObject::SetAnimationName" + "value": "AnimatableCapability::AnimatableBehavior::SetName" }, "parameters": [ "Player", + "Animation", "=", "\"RunLeft\"" ] @@ -2500,10 +2502,11 @@ }, { "type": { - "value": "Scene3D::Model3DObject::AnimationName" + "value": "AnimatableCapability::AnimatableBehavior::Name" }, "parameters": [ "Player", + "Animation", "!=", "\"Run\"" ] @@ -2512,10 +2515,11 @@ "actions": [ { "type": { - "value": "Scene3D::Model3DObject::SetAnimationName" + "value": "AnimatableCapability::AnimatableBehavior::SetName" }, "parameters": [ "Player", + "Animation", "=", "\"Run\"" ] @@ -2861,10 +2865,11 @@ }, { "type": { - "value": "Scene3D::Model3DObject::SetAnimationName" + "value": "AnimatableCapability::AnimatableBehavior::SetName" }, "parameters": [ "Player", + "Animation", "=", "\"Death\"" ] @@ -3013,10 +3018,11 @@ "actions": [ { "type": { - "value": "Scene3D::Model3DObject::SetRotationY" + "value": "Scene3D::Base3DBehavior::SetRotationY" }, "parameters": [ "Coin", + "Object3D", "+", "60 * TimeDelta()" ] @@ -3289,6 +3295,26 @@ } ], "behaviorsSharedData": [ + { + "name": "Animation", + "type": "AnimatableCapability::AnimatableBehavior" + }, + { + "name": "Effect", + "type": "EffectCapability::EffectBehavior" + }, + { + "name": "Flippable", + "type": "FlippableCapability::FlippableBehavior" + }, + { + "name": "Object3D", + "type": "Scene3D::Base3DBehavior" + }, + { + "name": "Opacity", + "type": "OpacityCapability::OpacityBehavior" + }, { "name": "Platform", "type": "PlatformBehavior::PlatformBehavior" @@ -3297,6 +3323,14 @@ "name": "PlatformerObject", "type": "PlatformBehavior::PlatformerObjectBehavior" }, + { + "name": "Resizable", + "type": "ResizableCapability::ResizableBehavior" + }, + { + "name": "Scale", + "type": "ScalableCapability::ScalableBehavior" + }, { "name": "Tween", "type": "Tween::TweenBehavior"