Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Voxelman to the latest.

Browse Source
This commit is contained in:
Relintai 2020-04-06 14:40:14 +02:00
parent 7b2475be36
commit 590238216c
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "b03cbf18f7ecb26aca7a823ad680403620bde845"}, "entity_spell_system": {"master": "dc0c6d224b7ee3683267596efedde8184ac335e4"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "d717c9886b7e245b78eb3c19bcb53008ac5fc58c"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "e1f43af57110a2ac518b883012fb7e6d3eb8d120"}} {"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "b03cbf18f7ecb26aca7a823ad680403620bde845"}, "entity_spell_system": {"master": "dc0c6d224b7ee3683267596efedde8184ac335e4"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "81dc8bcb36999bfd3cdaf84732cb911a788912d3"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "e1f43af57110a2ac518b883012fb7e6d3eb8d120"}}

4
game/scenes/Menu.tscn
View File

@ -558,10 +558,9 @@ transform = Transform( 1, 1.49012e-08, 0, 0, 0.990268, -0.139173, -2.98023e-08,
transform = Transform( 0.907555, -0.0761572, 0.41297, 0.0262364, 0.99178, 0.12524, -0.419113, -0.102827, 0.902093, 0.752064, 1.69463, 3.15021 ) transform = Transform( 0.907555, -0.0761572, 0.41297, 0.0262364, 0.99178, 0.12524, -0.419113, -0.102827, 0.902093, 0.752064, 1.69463, 3.15021 )
current = true current = true
[node name="World" type="VoxelWorld" parent="." groups=[ [node name="World" type="VoxelWorldDefault" parent="." groups=[
"save", "save",
]] ]]
data_margin_start = 1
data_margin_end = 2 data_margin_end = 2
use_threads = false use_threads = false
max_concurrent_generations = 1 max_concurrent_generations = 1
@ -569,6 +568,7 @@ library = ExtResource( 17 )
level_generator = SubResource( 1 ) level_generator = SubResource( 1 )
voxel_scale = 1.6 voxel_scale = 1.6
chunk_spawn_range = 1 chunk_spawn_range = 1
build_flags = 511
script = ExtResource( 16 ) script = ExtResource( 16 )
show_loading_screen = false show_loading_screen = false
generate_on_ready = true generate_on_ready = true

4
game/scenes/World.tscn
View File

@ -52,16 +52,16 @@ glow_strength = 1.1
glow_bloom = 0.1 glow_bloom = 0.1
glow_hdr_luminance_cap = 1.0 glow_hdr_luminance_cap = 1.0
[node name="World" type="VoxelWorld" groups=[ [node name="World" type="VoxelWorldDefault" groups=[
"save", "save",
]] ]]
data_margin_start = 1
data_margin_end = 2 data_margin_end = 2
max_concurrent_generations = 4 max_concurrent_generations = 4
max_frame_chunk_build_steps = 4 max_frame_chunk_build_steps = 4
library = ExtResource( 2 ) library = ExtResource( 2 )
level_generator = SubResource( 1 ) level_generator = SubResource( 1 )
voxel_scale = 3.0 voxel_scale = 3.0
build_flags = 511
script = ExtResource( 8 ) script = ExtResource( 8 )
[node name="WorldEnvironment" type="WorldEnvironment" parent="."] [node name="WorldEnvironment" type="WorldEnvironment" parent="."]

1
game/voxelman/world/TVVoxelChunk.gd
View File

@ -37,6 +37,7 @@ func _create_meshers():
mesher.uv_margin = Rect2(0.017, 0.017, 1 - 0.034, 1 - 0.034) mesher.uv_margin = Rect2(0.017, 0.017, 1 - 0.034, 1 - 0.034)
mesher.lod_size = lod_size mesher.lod_size = lod_size
mesher.voxel_scale = voxel_scale mesher.voxel_scale = voxel_scale
mesher.build_flags = build_flags
add_mesher(mesher) add_mesher(mesher)
#add_mesher(VoxelMesherCubic.new()) #add_mesher(VoxelMesherCubic.new())

2
game/voxelman/world/TVVoxelWorld.gd
View File

@ -1,5 +1,5 @@
tool tool
extends VoxelWorld extends VoxelWorldDefault
# Copyright Péter Magyar relintai@gmail.com # Copyright Péter Magyar relintai@gmail.com
# MIT License, might be merged into the Voxelman engine module # MIT License, might be merged into the Voxelman engine module