réparation des collisions

pull/35/head
Valentin Stark 3 years ago
parent 4784daeba8
commit 54ced13fab
  1. 2
      utils/camera/CameraController.gd
  2. 2
      utils/world_generation/WorldGeneration.gd
  3. 7
      world/game.tscn

@ -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

@ -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

@ -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"]

Loading…
Cancel
Save