diff --git a/HEADS b/HEADS index 5ea42795..c61cbf8e 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "76678b2609921f27f52c1a2e2bd62b8d2a27bb4b", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "a67d0393ca22212be2c957ff3634e554242d70c9", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "3fedb4c8534af36d89a1a1a34a6b5ed4d333927a", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"} \ No newline at end of file +{"engine": "4b3123104cb766a11a9cb93afb08af118712f012", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "a67d0393ca22212be2c957ff3634e554242d70c9", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "3fedb4c8534af36d89a1a1a34a6b5ed4d333927a", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"} \ No newline at end of file diff --git a/game/data/voxel_libraries/1_main_lib_merger_empty.tres b/game/data/voxel_libraries/1_main_lib_merger_empty.tres index a00129a7..37455207 100644 --- a/game/data/voxel_libraries/1_main_lib_merger_empty.tres +++ b/game/data/voxel_libraries/1_main_lib_merger_empty.tres @@ -10,5 +10,4 @@ [resource] material = ExtResource( 1 ) prop_material = ExtResource( 1 ) -texture_flags = 1 voxel_surfaces = [ ExtResource( 7 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 5 ), ExtResource( 2 ) ] diff --git a/game/data/voxel_surfaces/2_test.tres b/game/data/voxel_surfaces/2_test.tres index 6c24b704..6d7309f6 100644 --- a/game/data/voxel_surfaces/2_test.tres +++ b/game/data/voxel_surfaces/2_test.tres @@ -1,6 +1,6 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/stone_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_textures/Rock24_col.png" type="Texture" id=1] [resource] resource_name = "Test" diff --git a/game/data/voxel_surfaces/3_test2.tres b/game/data/voxel_surfaces/3_test2.tres index a396943f..fd35d529 100644 --- a/game/data/voxel_surfaces/3_test2.tres +++ b/game/data/voxel_surfaces/3_test2.tres @@ -1,6 +1,6 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/grass_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_textures/Ground03_col.png" type="Texture" id=1] [resource] resource_name = "Test2" diff --git a/game/data/voxel_textures/Ground03_col.png b/game/data/voxel_textures/Ground03_col.png new file mode 100644 index 00000000..6158cc62 Binary files /dev/null and b/game/data/voxel_textures/Ground03_col.png differ diff --git a/game/data/voxel_textures/Ground03_col.png.import b/game/data/voxel_textures/Ground03_col.png.import new file mode 100644 index 00000000..fb29b043 --- /dev/null +++ b/game/data/voxel_textures/Ground03_col.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Ground03_col.png-789a075092f5c979e6b761f44f4a710f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/voxel_textures/Ground03_col.png" +dest_files=[ "res://.import/Ground03_col.png-789a075092f5c979e6b761f44f4a710f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/game/data/voxel_textures/Rock24_col.png b/game/data/voxel_textures/Rock24_col.png new file mode 100644 index 00000000..ca7142a2 Binary files /dev/null and b/game/data/voxel_textures/Rock24_col.png differ diff --git a/game/data/voxel_textures/Rock24_col.png.import b/game/data/voxel_textures/Rock24_col.png.import new file mode 100644 index 00000000..c1532dd1 --- /dev/null +++ b/game/data/voxel_textures/Rock24_col.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Rock24_col.png-c2b54976c6c2af9913c7b01dd6049a0a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/voxel_textures/Rock24_col.png" +dest_files=[ "res://.import/Rock24_col.png-c2b54976c6c2af9913c7b01dd6049a0a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/game/scripts/biomes/simple_biome.gd b/game/scripts/biomes/simple_biome.gd index e72184c6..ca0ffc1c 100644 --- a/game/scripts/biomes/simple_biome.gd +++ b/game/scripts/biomes/simple_biome.gd @@ -79,9 +79,9 @@ func generate_terrarin(chunk : VoxelChunk, spawn_mobs: bool) -> void: else: chunk.set_voxel(2, x, y, z, VoxelChunk.DEFAULT_CHANNEL_TYPE) - var val2 : float = (val - int(val)) * 3.0 + var val2 : float = (val - int(val)) * 4.0 val2 = int(val2) - val2 /= 3.0 + val2 /= 4.0 chunk.set_voxel(int(255.0 * val2), x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL) # chunk.set_voxel(int(255.0 * (val - int(val)) / 180.0) * 180, x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL) diff --git a/game/voxelman/transvoxel_mesher/TVVoxelWorld.gd b/game/voxelman/transvoxel_mesher/TVVoxelWorld.gd index 38c0b76b..720b7151 100644 --- a/game/voxelman/transvoxel_mesher/TVVoxelWorld.gd +++ b/game/voxelman/transvoxel_mesher/TVVoxelWorld.gd @@ -171,7 +171,7 @@ func setup_client_seed(pseed : int) -> void: func load_character(file_name : String) -> void: _player_file_name = file_name - _player = Entities.load_player(file_name, Vector3(5, 10, 5), 1) as Entity + _player = Entities.load_player(file_name, Vector3(5, 30, 5), 1) as Entity #TODO hack, do this properly _player.set_physics_process(false)