mirror of
https://github.com/Relintai/broken_seals.git
synced 2024-11-13 20:47:19 +01:00
Updated the engine. I backported most improvements to core math classes from Godot 4.
This commit is contained in:
parent
c24d9c0edf
commit
2a12115884
2
HEADS
2
HEADS
@ -1 +1 @@
|
|||||||
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "730bce85870bbeea282c0db4ea441bd182b9d0eb"}}
|
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "8c2e76840c6adf867c8e90dd34d18ccd7cf0aedf"}}
|
@ -273,7 +273,7 @@ func spawn(start_x : int, start_z : int) -> void:
|
|||||||
|
|
||||||
chunk_create(x, z)
|
chunk_create(x, z)
|
||||||
|
|
||||||
# add_prop(Transform().translated(Vector3(0, 2, 0)), test_prop)
|
# add_prop(Transform().translated_local(Vector3(0, 2, 0)), test_prop)
|
||||||
|
|
||||||
set_process(true)
|
set_process(true)
|
||||||
|
|
||||||
|
@ -339,7 +339,7 @@ func spawn(start_x : int, start_z : int) -> void:
|
|||||||
if !chunk_get(x, z):
|
if !chunk_get(x, z):
|
||||||
chunk_create(x, z)
|
chunk_create(x, z)
|
||||||
|
|
||||||
# add_prop(Transform().translated(Vector3(0, 2, 0)), test_prop)
|
# add_prop(Transform().translated_local(Vector3(0, 2, 0)), test_prop)
|
||||||
|
|
||||||
set_process(true)
|
set_process(true)
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ func spawn_room(room_lworld_transform : Transform, room : PropData, level : int
|
|||||||
var lworld_curr_portal : Transform = current_portal.transform
|
var lworld_curr_portal : Transform = current_portal.transform
|
||||||
#portal center should be precalculated
|
#portal center should be precalculated
|
||||||
#this will only work with the current portals
|
#this will only work with the current portals
|
||||||
lworld_curr_portal = lworld_curr_portal.translated(Vector3(-0.5, 0, 0))
|
lworld_curr_portal = lworld_curr_portal.translated_local(Vector3(-0.5, 0, 0))
|
||||||
lworld_curr_portal.basis = lworld_curr_portal.basis.rotated(Vector3(0, 1, 0), PI)
|
lworld_curr_portal.basis = lworld_curr_portal.basis.rotated(Vector3(0, 1, 0), PI)
|
||||||
room_lworld_transform = room_lworld_transform * lworld_curr_portal.inverse()
|
room_lworld_transform = room_lworld_transform * lworld_curr_portal.inverse()
|
||||||
|
|
||||||
@ -213,7 +213,7 @@ func spawn_room(room_lworld_transform : Transform, room : PropData, level : int
|
|||||||
var offset_current_portal_lworld_position : Transform = current_portal_lworld_position
|
var offset_current_portal_lworld_position : Transform = current_portal_lworld_position
|
||||||
#portal center should be precalculated
|
#portal center should be precalculated
|
||||||
#this will only work with the current portals
|
#this will only work with the current portals
|
||||||
offset_current_portal_lworld_position = offset_current_portal_lworld_position.translated(Vector3(-0.5, 0, 0))
|
offset_current_portal_lworld_position = offset_current_portal_lworld_position.translated_local(Vector3(-0.5, 0, 0))
|
||||||
|
|
||||||
var ab : PoolVector2Array = room_hulls[new_room]
|
var ab : PoolVector2Array = room_hulls[new_room]
|
||||||
var tfab : PoolVector2Array = PoolVector2Array()
|
var tfab : PoolVector2Array = PoolVector2Array()
|
||||||
|
@ -90,7 +90,7 @@ func teleport():
|
|||||||
if !_dungeon:
|
if !_dungeon:
|
||||||
_dungeon = dungeon.instance() as Spatial
|
_dungeon = dungeon.instance() as Spatial
|
||||||
var t : Transform = global_transform
|
var t : Transform = global_transform
|
||||||
t = t.translated(Vector3(0, -500, 0))
|
t = t.translated_local(Vector3(0, -500, 0))
|
||||||
_dungeon.transform = t
|
_dungeon.transform = t
|
||||||
_dungeon.min_level = min_level
|
_dungeon.min_level = min_level
|
||||||
_dungeon.max_level = max_level
|
_dungeon.max_level = max_level
|
||||||
@ -104,8 +104,8 @@ func teleport():
|
|||||||
|
|
||||||
_dungeon_back_teleporter = dungeon_back_teleporter.instance() as Spatial
|
_dungeon_back_teleporter = dungeon_back_teleporter.instance() as Spatial
|
||||||
var tdb : Transform = global_transform
|
var tdb : Transform = global_transform
|
||||||
tdb = tdb.translated(Vector3(0, -500, 0))
|
tdb = tdb.translated_local(Vector3(0, -500, 0))
|
||||||
tdb = tdb.translated(Vector3(1, 0, -1))
|
tdb = tdb.translated_local(Vector3(1, 0, -1))
|
||||||
_dungeon_back_teleporter.transform = tdb
|
_dungeon_back_teleporter.transform = tdb
|
||||||
_dungeon_back_teleporter.teleport_to = global_transform.xform(Vector3())
|
_dungeon_back_teleporter.teleport_to = global_transform.xform(Vector3())
|
||||||
get_parent().add_child(_dungeon_back_teleporter)
|
get_parent().add_child(_dungeon_back_teleporter)
|
||||||
|
Loading…
Reference in New Issue
Block a user