From e2a169b30902b1bc1eee647e9c66180673f5af03 Mon Sep 17 00:00:00 2001 From: yannk Date: Sat, 12 Feb 2022 19:09:41 +0100 Subject: [PATCH] Minor corections to scaling/collisions in models from conversion Alpha1 to Alpha2 --- maps/basic_setup.tscn | 12 ++++++------ maps/obstacles.tscn | 12 ++++++++---- maps/ramp-complex.tscn | 10 +++++----- maps/ramp-moving.tscn | 6 +++--- maps/ramp.tscn | 4 ++-- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/maps/basic_setup.tscn b/maps/basic_setup.tscn index 72812ab..18ad6cb 100644 --- a/maps/basic_setup.tscn +++ b/maps/basic_setup.tscn @@ -5,7 +5,7 @@ [ext_resource type="PackedScene" uid="uid://omess6wwwwcq" path="res://maps/ramp-moving.tscn" id="3_bvbgo"] [ext_resource type="PackedScene" path="res://maps/moutain.tscn" id="3_rbp35"] [ext_resource type="PackedScene" path="res://maps/cave.tscn" id="4_pc85h"] -[ext_resource type="PackedScene" path="res://maps/ramp.tscn" id="5_dfm8h"] +[ext_resource type="PackedScene" uid="uid://b61edh0bre65c" path="res://maps/ramp.tscn" id="5_dfm8h"] [ext_resource type="PackedScene" uid="uid://bl1widitqdugs" path="res://maps/obstacles.tscn" id="5_mi3we"] [ext_resource type="PackedScene" uid="uid://bkcvep4ijijmc" path="res://maps/water-zone.tscn" id="6_0o80c"] [ext_resource type="PackedScene" uid="uid://c7sga2ipka52x" path="res://maps/waypoint/waypoint.tscn" id="7_5rpqq"] @@ -43,12 +43,12 @@ shadow_enabled = true environment = SubResource( "Environment_n5kgx" ) [node name="floor" type="MeshInstance3D" parent="."] -transform = Transform3D(80, 0, 0, 0, 0.1, 0, 0, 0, 80, 0, -0.1, 0) +transform = Transform3D(80, 0, 0, 0, 0.1, 0, 0, 0, 80, 0, 0, 0) mesh = SubResource( "BoxMesh_k23th" ) [node name="StaticBody3D" type="StaticBody3D" parent="floor"] -[node name="@@44976" type="CollisionShape3D" parent="floor/StaticBody3D"] +[node name="44976" type="CollisionShape3D" parent="floor/StaticBody3D"] shape = SubResource( "ConcavePolygonShape3D_lld3w" ) [node name="labels" type="Node3D" parent="."] @@ -96,7 +96,7 @@ modulate = Color(1, 0.192157, 0.156863, 1) text = "Nage implémentée" [node name="ramp-complex" parent="." instance=ExtResource( "2_4eueh" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0, 15) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0.1, 15) [node name="ramp-moving" parent="." instance=ExtResource( "3_bvbgo" )] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12, 0, 15) @@ -105,7 +105,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12, 0, transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 17.5054, -0.419849, -19.5951) [node name="obstacles" parent="." instance=ExtResource( "5_mi3we" )] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3, 0, 19) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3, 0.05, 19) [node name="cave" parent="." instance=ExtResource( "4_pc85h" )] transform = Transform3D(-0.344037, 0, 0.938956, 0, 1, 0, -0.938956, 0, -0.344037, 29.908, -0.141321, 29.4435) @@ -114,7 +114,7 @@ transform = Transform3D(-0.344037, 0, 0.938956, 0, 1, 0, -0.938956, 0, -0.344037 transform = Transform3D(-0.218552, 0, -0.975825, 0, 1, 0, 0.975825, 0, -0.218552, -27.5919, 0, 5.449) [node name="water-zone" parent="." instance=ExtResource( "6_0o80c" )] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -79.9445, 0, 0) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -79.945, 0.05, 0) [node name="panel" parent="." instance=ExtResource( "11_vd4qp" )] transform = Transform3D(-0.947718, 0, 0.319108, 0, 1, 0, -0.319108, 0, -0.947718, -14, 0, -1) diff --git a/maps/obstacles.tscn b/maps/obstacles.tscn index d4592c0..c04e6cb 100644 --- a/maps/obstacles.tscn +++ b/maps/obstacles.tscn @@ -12,41 +12,45 @@ data = PackedVector3Array(-1, 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, - transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) [node name="obstacle1" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.5, 0) +transform = Transform3D(1, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.25, 0) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") [node name="collision" type="StaticBody3D" parent="obstacle1"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) [node name="shape" type="CollisionShape3D" parent="obstacle1/collision"] shape = SubResource( "ConcavePolygonShape3D_y7uft" ) [node name="obstacle2" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.25, 0, 0, 0, 0.5, 2, 0.25, 0) +transform = Transform3D(1, 0, 0, 0, 0.25, 0, 0, 0, 0.5, 1, 0.125, 0) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") [node name="collision" type="StaticBody3D" parent="obstacle2"] [node name="shape" type="CollisionShape3D" parent="obstacle2/collision"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) shape = SubResource( "ConcavePolygonShape3D_y7uft" ) [node name="obstacle3" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.125, 0, 0, 0, 0.5, 4, 0.125, 0) +transform = Transform3D(1, 0, 0, 0, 0.125, 0, 0, 0, 0.5, 2, 0.063, 0) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") [node name="collision" type="StaticBody3D" parent="obstacle3"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) [node name="shape" type="CollisionShape3D" parent="obstacle3/collision"] shape = SubResource( "ConcavePolygonShape3D_y7uft" ) [node name="obstacle4" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.063, 0, 0, 0, 0.5, 6, 0.0625, 0) +transform = Transform3D(1, 0, 0, 0, 0.063, 0, 0, 0, 0.5, 3, 0.031, 0) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") [node name="collision" type="StaticBody3D" parent="obstacle4"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) [node name="shape" type="CollisionShape3D" parent="obstacle4/collision"] shape = SubResource( "ConcavePolygonShape3D_y7uft" ) diff --git a/maps/ramp-complex.tscn b/maps/ramp-complex.tscn index 7bcbcdc..0dbccec 100644 --- a/maps/ramp-complex.tscn +++ b/maps/ramp-complex.tscn @@ -10,7 +10,7 @@ material = ExtResource( "1_6ofch" ) [node name="ramp-complex" type="Node3D"] [node name="ramp" type="MeshInstance3D" parent="."] -transform = Transform3D(3.39928, 0.0527074, 0, -2.1083, 0.0849819, 0, 0, 0, 2, 2.18919, 0.954236, 1.27697) +transform = Transform3D(3.39928, 0.0527074, 0, -2.1083, 0.0849819, 0, 0, 0, 2, 4.18627, 0.954236, 1.3169) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -20,7 +20,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="ramp2" type="MeshInstance3D" parent="."] -transform = Transform3D(4.76837e-07, 0, 2, -2.10782, 0.0849894, 1.19209e-07, -3.39957, -0.0526954, 2.38419e-07, -1.99663, 0.941421, -1.4163) +transform = Transform3D(4.76837e-07, 0, 2, -2.10782, 0.0849894, 1.19209e-07, -3.39957, -0.0526954, 2.38419e-07, -2.00083, 0.938409, -1.36431) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -30,7 +30,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="ramp-horizontal" type="MeshInstance3D" parent="."] -transform = Transform3D(3.503, 0, 0, 0, 0.1, 0, 0, 0, 2, -1.26628, 2, 1.27697) +transform = Transform3D(5.56271, 0, 0, 0, 0.1, 0, 0, 0, 2, -0.230877, 2, 1.3273) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -40,7 +40,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="wall" type="MeshInstance3D" parent="."] -transform = Transform3D(4, 0, 0, 0, 0, -4, 0, 0.1, 0, -0.978678, 2, 2.29982) +transform = Transform3D(5.33192, 0, 0, 0, 0, -4, 0, 0.1, 0, -0.413411, 2, 2.29982) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -50,7 +50,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="wall2" type="MeshInstance3D" parent="."] -transform = Transform3D(1.19209e-07, 0.1, 0, 0, 0, -4, -2, 8.9407e-09, 0, -3.1104, 2, 1.19322) +transform = Transform3D(1.19209e-07, 0.1, 0, 0, 0, -4, -2, 8.9407e-09, 0, -3.06007, 2, 1.31887) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") diff --git a/maps/ramp-moving.tscn b/maps/ramp-moving.tscn index 5ebc5e1..5a4db3e 100644 --- a/maps/ramp-moving.tscn +++ b/maps/ramp-moving.tscn @@ -46,7 +46,7 @@ tracks/0/keys = { transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0) [node name="ramp" type="MeshInstance3D" parent="."] -transform = Transform3D(1.69964, 0.0527074, 0, -1.05415, 0.0849819, 0, 0, 0, 2, 14.8888, 1, 1.27697) +transform = Transform3D(3.39928, 0.0527075, 0, -2.1083, 0.0849819, 0, 0, 0, 2, 8.39045, 0.946381, 0.47924) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -56,7 +56,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="ramp2" type="MeshInstance3D" parent="."] -transform = Transform3D(-1.69979, -0.0526956, -8.74228e-08, -1.05391, 0.0849893, 0, 1.14822e-08, 1.03494e-08, -2, -6.26628, 1, 1.27697) +transform = Transform3D(-3.39957, -0.0526954, -3.01992e-07, -2.10782, 0.0849894, 1.69867e-07, 3.34297e-07, 1.51752e-08, -2, -9.33595, 0.946381, 0.47924) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -66,7 +66,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="moving" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.71566, 0, 1.90735e-06) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.929277, -0.00125802, -0.797728) [node name="AnimatableBody3D" type="AnimatableBody3D" parent="moving"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.30321, 0, 0) diff --git a/maps/ramp.tscn b/maps/ramp.tscn index 6ce7a20..45ea558 100644 --- a/maps/ramp.tscn +++ b/maps/ramp.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=3 format=3] +[gd_scene load_steps=3 format=3 uid="uid://b61edh0bre65c"] [ext_resource type="PackedScene" uid="uid://budtp4buplhtl" path="res://maps/imports/ramp.gltf" id="1_pcnfk"] -[ext_resource type="Material" path="res://maps/materials/simple_grid_world.material" id="2_4pnrr"] +[ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="2_4pnrr"] [node name="ramp" instance=ExtResource( "1_pcnfk" )]