From 54ced13fab69769cb8f0773b318b46409b1cb0c3 Mon Sep 17 00:00:00 2001 From: Valentin Stark Date: Thu, 25 Aug 2022 00:13:14 +0200 Subject: [PATCH] =?UTF-8?q?r=C3=A9paration=20des=20collisions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/camera/CameraController.gd | 2 +- utils/world_generation/WorldGeneration.gd | 2 +- world/game.tscn | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/utils/camera/CameraController.gd b/utils/camera/CameraController.gd index 9c83ece..27ac236 100644 --- a/utils/camera/CameraController.gd +++ b/utils/camera/CameraController.gd @@ -25,7 +25,7 @@ export(float, 10,100) var max_zoom = 100 export(float, 1,3) var zoom_sensibility = 1.4 export(float, 1,3) var rotation_sensibility = 2.3 -export(float, 1.0, 10.0) var height = 15.0 +export(float, 1.0, 20.0) var height = 15.0 var pitch : float var yaw : float diff --git a/utils/world_generation/WorldGeneration.gd b/utils/world_generation/WorldGeneration.gd index 09f10e6..d23bcc6 100644 --- a/utils/world_generation/WorldGeneration.gd +++ b/utils/world_generation/WorldGeneration.gd @@ -326,7 +326,7 @@ func create_mesh(): mi.mesh = st.commit() var material = load("res://world/world.material") mi.set_surface_material(0, material) - mi.create_convex_collision() + mi.create_trimesh_collision() mi.cast_shadow = GeometryInstance.SHADOW_CASTING_SETTING_ON return mi diff --git a/world/game.tscn b/world/game.tscn index 2ce16b1..8236374 100644 --- a/world/game.tscn +++ b/world/game.tscn @@ -172,6 +172,7 @@ environment = ExtResource( 3 ) [node name="CamBase" parent="World3d" instance=ExtResource( 5 )] [node name="Camera" parent="World3d/CamBase" index="0"] +physics_interpolation_mode = 1 transform = Transform( 1, 0, 0, 0, 0.659983, -0.75128, 0, 0.75128, 0.659983, 0, -5.72205e-06, 6.618 ) fov = 55.0 depth_threshold = 0.001 @@ -183,12 +184,6 @@ transform = Transform( 0.971628, 0.168947, -0.16552, 0, 0.699825, 0.714314, 0.23 light_energy = 0.1 shadow_enabled = true -[node name="CSGBox" type="CSGBox" parent="World3d"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 72.3742, 1.07915, 70.9729 ) -width = 15.1059 -height = 12.3889 -depth = 42.8385 - [connection signal="map_clicked" from="UI/Map" to="World3d/CamBase/Camera" method="_on_Map_map_clicked"] [connection signal="camera_moved" from="World3d/CamBase/Camera" to="UI/Map/Cursor" method="_on_Camera_camera_moved"]