From 148cee772b4d5cde731864ddc71f2b7458817fb2 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 18 Apr 2021 19:55:34 +0200 Subject: [PATCH] Now the game uses terraman instead of voxelman ingame. --- game/player/Body.gd | 4 +- game/scenes/Main.tscn | 2 +- game/scenes/World.tscn | 12 ++--- game/tw/TerraWorldBlocky.tscn | 65 +++++++++++++++++++++++++-- game/tw/new_terramanlevelgenerator.gd | 10 +++-- 5 files changed, 76 insertions(+), 17 deletions(-) diff --git a/game/player/Body.gd b/game/player/Body.gd index 7dd60c79..02aa5b73 100644 --- a/game/player/Body.gd +++ b/game/player/Body.gd @@ -84,7 +84,7 @@ var death_timer : float = 0 var last_mouse_over : Entity = null -var world : VoxelWorld = null +var world : TerraWorld = null var entity : Entity var model_rotation_node : Spatial @@ -125,7 +125,7 @@ func _ready() -> void: # set_process_unhandled_input(false) func _enter_tree(): - world = get_node(world_path) as VoxelWorld + world = get_node(world_path) as TerraWorld set_physics_process(true) diff --git a/game/scenes/Main.tscn b/game/scenes/Main.tscn index 29a85c3f..5370e8e1 100644 --- a/game/scenes/Main.tscn +++ b/game/scenes/Main.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://scenes/MainScene.gd" type="Script" id=1] -[ext_resource path="res://scenes/World.tscn" type="PackedScene" id=2] +[ext_resource path="res://tw/TerraWorldBlocky.tscn" type="PackedScene" id=2] [ext_resource path="res://menu/Menu.tscn" type="PackedScene" id=3] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4] [ext_resource path="res://ui/debug/DebugInfo.tscn" type="PackedScene" id=5] diff --git a/game/scenes/World.tscn b/game/scenes/World.tscn index 6c11a9c8..2a7c30e6 100644 --- a/game/scenes/World.tscn +++ b/game/scenes/World.tscn @@ -7,14 +7,14 @@ [ext_resource path="res://modules/planets/test_planet/DungeonPlanetData.tres" type="Planet" id=5] [ext_resource path="res://voxelman/world/TVVoxelWorld.gd" type="Script" id=8] -[sub_resource type="VoxelmanLevelGenerator" id=1] +[sub_resource type="VoxelmanLevelGenerator" id=50] script = ExtResource( 1 ) _force_planet = -1 _level_seed = 0 _spawn_mobs = false planet = ExtResource( 5 ) -[sub_resource type="ProceduralSky" id=2] +[sub_resource type="ProceduralSky" id=48] sky_top_color = Color( 0.34902, 0.643137, 0.705882, 1 ) sky_horizon_color = Color( 0.27451, 0.278431, 0.207843, 1 ) sky_curve = 0.263535 @@ -31,9 +31,9 @@ sun_angle_max = 23.15 sun_energy = 9.29 texture_size = 0 -[sub_resource type="Environment" id=3] +[sub_resource type="Environment" id=49] background_mode = 2 -background_sky = SubResource( 2 ) +background_sky = SubResource( 48 ) ambient_light_color = Color( 0.870588, 0.870588, 0.870588, 1 ) ambient_light_energy = 1.67 ambient_light_sky_contribution = 0.09 @@ -62,7 +62,7 @@ data_margin_end = 2 max_concurrent_generations = 8 max_frame_chunk_build_steps = 4 library = ExtResource( 2 ) -level_generator = SubResource( 1 ) +level_generator = SubResource( 50 ) voxel_scale = 2.0 chunk_spawn_range = 6 build_flags = 511 @@ -73,7 +73,7 @@ spawn_height = 3 test_prop = ExtResource( 4 ) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource( 3 ) +environment = SubResource( 49 ) __meta__ = { "_editor_description_": "" } diff --git a/game/tw/TerraWorldBlocky.tscn b/game/tw/TerraWorldBlocky.tscn index 8ef32aef..a875a4f5 100644 --- a/game/tw/TerraWorldBlocky.tscn +++ b/game/tw/TerraWorldBlocky.tscn @@ -1,16 +1,73 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://tw/new_terramanlibrarymerger.tres" type="TerramanLibraryMerger" id=1] [ext_resource path="res://tw/TerraWorldBlocky.gd" type="Script" id=2] [ext_resource path="res://tw/new_terramanlevelgenerator.tres" type="TerramanLevelGenerator" id=3] +[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=4] +[ext_resource path="res://test_props/MeshDataInstance.tres" type="PropData" id=5] -[node name="TerraWorldBlocky" type="TerraWorldBlocky"] +[sub_resource type="ProceduralSky" id=48] +sky_top_color = Color( 0.34902, 0.643137, 0.705882, 1 ) +sky_horizon_color = Color( 0.27451, 0.278431, 0.207843, 1 ) +sky_curve = 0.263535 +sky_energy = 0.3 +ground_bottom_color = Color( 0.196078, 0.152941, 0.152941, 1 ) +ground_horizon_color = Color( 0.223529, 0.192157, 0.164706, 1 ) +ground_curve = 0.101965 +ground_energy = 0.4 +sun_color = Color( 0.45098, 0.352941, 0.113725, 1 ) +sun_latitude = 39.71 +sun_longitude = -8.09 +sun_angle_min = 0.0 +sun_angle_max = 23.15 +sun_energy = 9.29 +texture_size = 0 + +[sub_resource type="Environment" id=49] +background_mode = 2 +background_sky = SubResource( 48 ) +ambient_light_color = Color( 0.870588, 0.870588, 0.870588, 1 ) +ambient_light_energy = 1.67 +ambient_light_sky_contribution = 0.09 +fog_enabled = true +fog_color = Color( 0.184314, 0.207843, 0.156863, 1 ) +fog_sun_color = Color( 0.196078, 0.266667, 0.309804, 1 ) +fog_sun_amount = 0.53 +fog_depth_begin = 155.9 +fog_depth_end = 379.9 +fog_depth_curve = 1.18921 +tonemap_mode = 2 +tonemap_exposure = 0.83 +auto_exposure_max_luma = 7.33 +ss_reflections_enabled = true +ssao_enabled = true +glow_levels/3 = false +glow_intensity = 1.6 +glow_strength = 1.1 +glow_bloom = 0.1 +glow_hdr_luminance_cap = 1.0 + +[node name="World" type="TerraWorldBlocky"] +world_height = 100.0 library = ExtResource( 1 ) level_generator = ExtResource( 3 ) voxel_scale = 2.0 build_flags = 510 +num_lods = 1 script = ExtResource( 2 ) +test_prop = ExtResource( 5 ) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource( 49 ) +__meta__ = { +"_editor_description_": "" +} [node name="DirectionalLight" type="DirectionalLight" parent="."] -transform = Transform( -0.839321, 0.447369, -0.30887, 0.215012, 0.795005, 0.567219, 0.49931, 0.409668, -0.763454, -40.7817, 19.7414, -39.9584 ) -light_energy = 2.5 +transform = Transform( -0.797163, 0.45442, 0.397535, 0.124932, -0.520028, 0.844963, 0.590697, 0.723238, 0.357776, 0, 18.834, 0 ) +layers = 3 +light_color = Color( 1, 0.878431, 0.878431, 1 ) +light_energy = 0.87 +light_specular = 0.65 +shadow_bias = 0.07 +script = ExtResource( 4 ) diff --git a/game/tw/new_terramanlevelgenerator.gd b/game/tw/new_terramanlevelgenerator.gd index 84ad61c9..06d61811 100644 --- a/game/tw/new_terramanlevelgenerator.gd +++ b/game/tw/new_terramanlevelgenerator.gd @@ -13,11 +13,13 @@ func _generate_chunk(chunk: TerraChunk) -> void: var vx : int = x + (chunk.position_x * chunk.size_x) var vz : int = z + (chunk.position_z * chunk.size_z) - var val : float = (s.get_noise_2d(vx, vz) + 2) * 20.0 + var val : float = (s.get_noise_2d(vx, vz) + 2) + val *= val + val *= 20.0 chunk.set_voxel(val, x, z, TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL) - - if val < 33: + + if val < 50: chunk.set_voxel(2, x, z, TerraChunkDefault.DEFAULT_CHANNEL_TYPE) - elif val > 42: + elif val > 70: chunk.set_voxel(4, x, z, TerraChunkDefault.DEFAULT_CHANNEL_TYPE)