diff --git a/world/World3d.gd b/world/World3d.gd index 5626a04..0a0ded5 100644 --- a/world/World3d.gd +++ b/world/World3d.gd @@ -24,12 +24,12 @@ func draw_world(): st.add_vertex(Vector3(edge.end().point3d().x, triangle.get_elevation(), edge.end().point3d().z) * factor) st.add_vertex(Vector3(edge.end().point3d().x, edge.opposite_triangle().get_elevation(), edge.end().point3d().z) * factor) st.add_vertex(Vector3(edge.start().point3d().x, edge.opposite_triangle().get_elevation(), edge.start().point3d().z) * factor) - + for point in triangle.points(): st.add_vertex(Vector3(point.point3d().x, triangle.get_elevation(), point.point3d().z) * factor) st.generate_normals() - st.generate_tangents() +# st.generate_tangents() st.index() # Commit to a mesh. var mesh = st.commit() @@ -42,8 +42,11 @@ func draw_world(): mi.cast_shadow = GeometryInstance.SHADOW_CASTING_SETTING_ON print(mi) add_child(mi) + Global.print_debug(OS.get_ticks_msec() / 1000.0) func _on_Game_world_loaded(game_terrain): terrain = game_terrain draw_world() +# 18 - 42 +# 4 - 9 diff --git a/world/game.gd b/world/game.gd index 2550823..4fd0c80 100644 --- a/world/game.gd +++ b/world/game.gd @@ -23,7 +23,7 @@ func _ready(): noise.seed = rng.randi() noise.octaves = octaves - var terrain_name="bonjour" + var terrain_name="bonjour90" terrain = Terrain.new() print(terrain.list()) @@ -36,6 +36,7 @@ func _ready(): if terrain.is_created() or terrain.is_loaded(): init_data() add_trees() + Global.print_debug(OS.get_ticks_msec() / 1000.0) emit_signal("world_loaded", terrain) else: Global.print_debug("Pas de terrain, pas de construction ...") @@ -178,7 +179,7 @@ func triangle_find_elevation(triangle): return elevation func triangle_is_water(triangle): - if triangle.get_elevation() <= 0: + if triangle.get_elevation() < 0: return true return false diff --git a/world/game.tscn b/world/game.tscn index a1855c0..26c0e5f 100644 --- a/world/game.tscn +++ b/world/game.tscn @@ -43,7 +43,7 @@ fov = 55.0 zoom_sensibility = 1.436 [node name="DirectionalLight" type="DirectionalLight" parent="World3d"] -transform = Transform( 1, 0, 0, 0, 0.641744, 0.766919, 0, -0.766919, 0.641744, 0, 1.41623, 0 ) +transform = Transform( 0.971628, 0.168947, -0.16552, 0, 0.699825, 0.714314, 0.236516, -0.694047, 0.67997, 0, 1.41623, 14.8745 ) light_energy = 0.1 shadow_enabled = true diff --git a/world/world.material b/world/world.material index 2448577..ae35355 100644 Binary files a/world/world.material and b/world/world.material differ diff --git a/world/world.tres b/world/world.tres index f8baa3f..ac212ee 100644 --- a/world/world.tres +++ b/world/world.tres @@ -1,4 +1,4 @@ [gd_resource type="SpatialMaterial" format=2] [resource] -albedo_color = Color( 0.109804, 0.305882, 0.0745098, 1 ) +albedo_color = Color( 0.125, 0.5, 0.275, 1 )