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 HEADS, and remove the code that got ported to Voxelman.

Browse Source
This commit is contained in:
Relintai 2020-03-15 19:36:35 +01:00
parent 16d4c9ae2e
commit 0c99bd0d35
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "34dc32aeb8b06947897f75399c15f3eb9c211d7b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "bff7b220c40216f625a028af144b174620106c59"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "080e8f2437f8cdfdd49ca9dacb705de2b4bbe538"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "9b1868668de4242ccc0565cf3c6b5e1c375f1576"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "0007d4793ef76b1998586018b66382b0fc8a9c99"}}
{"engine": {"3.2": "809dc1a12ae16c6665a837e1ae7e3359650aadb0", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3367f3bc96b1eac86bdbfffe007221636c0e2937"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "666695a220938190c91f201aa773dfa5a31e6a4d"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "ec07898853d3d50c0ebd6e6ea8706084548901c2"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "0007d4793ef76b1998586018b66382b0fc8a9c99"}}

1
game/scenes/World.tscn
View File

@ -51,7 +51,6 @@ glow_intensity = 1.6
glow_strength = 1.1
glow_bloom = 0.1
glow_hdr_luminance_cap = 1.0
adjustment_enabled = true
[node name="World" type="VoxelWorld" groups=[
"save",

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

@ -39,16 +39,10 @@ var lod_data : Array = [
1 #CHUNK_INDEX_BACK
]
func _ready():
connect("visibility_changed", self, "visibility_changed")
set_notify_transform(true)
#func _enter_tree():
# create_debug_immediate_geometry()
func _create_meshers():
var mesher : TVVoxelMesher = TVVoxelMesher.new()
mesher.base_light_value = 0.45
@ -66,9 +60,6 @@ func _create_meshers():
_prop_texture_packer.background_color = Color(0, 0, 0, 1)
_prop_texture_packer.texture_flags = Texture.FLAG_MIPMAPS
func _process_props():
pass
func spawn_prop_entities(parent_transform : Transform, prop : PropData):
for i in range(prop.get_prop_count()):
var p : PropDataEntry = prop.get_prop(i)
@ -285,10 +276,6 @@ func _build_phase(phase):
# set_physics_process_internal(true)
active_build_phase_type = VoxelChunkDefault.BUILD_PHASE_TYPE_PHYSICS_PROCESS
return
elif phase == VoxelChunkDefault.BUILD_PHASE_FINALIZE:
_notification(NOTIFICATION_TRANSFORM_CHANGED)
._build_phase(phase)
else:
._build_phase(phase)
@ -332,28 +319,6 @@ func _build_phase_physics_process(phase):
else:
._build_phase_physics_process(phase)
func visibility_changed() -> void:
if get_mesh_instance_rid() != RID():
VisualServer.instance_set_visible(get_mesh_instance_rid(), visible)
if get_prop_mesh_instance_rid() != RID():
VisualServer.instance_set_visible(get_prop_mesh_instance_rid(), visible)
func _notification(what: int) -> void:
if what == NOTIFICATION_TRANSFORM_CHANGED:
if get_mesh_instance_rid() != RID():
VisualServer.instance_set_transform(get_mesh_instance_rid(), transform)
if get_prop_mesh_instance_rid() != RID():
VisualServer.instance_set_transform(get_prop_mesh_instance_rid(), transform)
if get_body_rid() != RID():
PhysicsServer.body_set_state(get_body_rid(), PhysicsServer.BODY_STATE_TRANSFORM, transform)
if get_prop_body_rid() != RID():
PhysicsServer.body_set_state(get_prop_body_rid(), PhysicsServer.BODY_STATE_TRANSFORM, transform)
#func _draw_debug_voxel_lights(debug_drawer):
# for light in _lightsarr:
# var pos_x = (light.get_world_position_x() - (size_x * position_x)) ;