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

Small cleanups and updated Voxelman to the latest, to get the prop job fixes.

Browse Source
This commit is contained in:
Relintai 2020-10-06 19:26:13 +02:00
parent 3e687befd0
commit e9ade41995
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "4162df439727fad01b0d1240df69f59ba97ed422", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "cdc8b7830daf3341871be1c9b38eceeed947f4a1"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "8c06a778f2dafbfb88196428da8d275da84f5158"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
{"engine": {"3.2": "4162df439727fad01b0d1240df69f59ba97ed422", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "cdc8b7830daf3341871be1c9b38eceeed947f4a1"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "3add3daef4c4f90a435ffff68a5714c3921634f5"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}

4
game/modules/planets/test_planet/biomes/simple_biome.gd
View File

@ -30,7 +30,7 @@ func _setup():
for i in range(get_dungeon_count()):
var d : Dungeon = get_dungeon(i)
d.setup()
func _generate_chunk(chunk: VoxelChunk, spawn_mobs: bool) -> void:
# var chunk : VoxelChunk = chunk.get_chunk()
@ -52,7 +52,7 @@ func _generate_chunk(chunk: VoxelChunk, spawn_mobs: bool) -> void:
entrance_position *= voxel_scale
terrarin_gen.generate_simple_terrarin(chunk, spawn_mobs)
for i in range(get_dungeon_count()):
get_dungeon(i).generate_chunk(chunk, spawn_mobs)

1
game/scenes/World.tscn
View File

@ -71,6 +71,7 @@ chunk_spawn_range = 6
build_flags = 511
lod_update_interval = 2.0
script = ExtResource( 8 )
show_loading_screen = false
spawn_height = 3
test_prop = ExtResource( 4 )

1
game/test_props/MeshDataInstance.tres
View File

@ -7,7 +7,6 @@
[ext_resource path="res://test_props/MeshDataInstance2.tres" type="PropData" id=5]
[ext_resource path="res://test_props/MeshDataInstance2.tscn" type="PackedScene" id=6]
[sub_resource type="PropDataMeshData" id=1]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.879526, 0, 0.182433 )
mesh = ExtResource( 1 )

17
game/test_props/MeshDataInstance.tscn
View File

File diff suppressed because one or more lines are too long

1
game/voxelman/debug/TestVoxelMesher.gd
View File

@ -377,6 +377,7 @@ func _add_chunk(buffer : VoxelChunk) -> void:
var x_size : int = buffer.get_size_x() - 1
var y_size : int = buffer.get_size_y() - 1
var z_size : int = buffer.get_size_z() - 1
var lod_size : int = 1
for y in range(0, y_size, lod_size):
for z in range(0, z_size, lod_size):

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

@ -87,9 +87,9 @@ func _create_meshers():
_prop_texture_packer.background_color = Color(0, 0, 0, 1)
_prop_texture_packer.texture_flags = Texture.FLAG_MIPMAPS
add_job(lj);
add_job(tj);
add_job(pj);
add_job(lj)
add_job(tj)
add_job(pj)
#func _build_phase(phase):
# if phase == VoxelChunkDefault.BUILD_PHASE_SETUP: