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

Figured out room transforms.

Browse Source
This commit is contained in:
Relintai 2021-08-25 01:03:27 +02:00
parent 2b2d175a66
commit 1d5fff0f06
2 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
game/scripts/dungeons/dungeon.gd
View File

@ -116,29 +116,41 @@ func generate() -> void:
spawn_room(Transform(), start_room)
func spawn_room(tf : Transform, room : PropData, level : int = 0, current_portal : PropDataPortal = null) -> void:
if level > 2:
func spawn_room(room_lworld_transform : Transform, room : PropData, level : int = 0, current_portal : PropDataPortal = null) -> void:
if level > 4:
return
var sr : PropInstanceMerger = PropInstanceMerger.new()
sr.prop_data = start_room
sr.prop_data = room
add_child(sr)
sr.transform = tf
if current_portal:
var lworld_curr_portal : Transform = current_portal.transform
#portal center should be precalculated
#this will only work with the current portals
lworld_curr_portal = lworld_curr_portal.translated(Vector3(-0.5, 0, 0))
lworld_curr_portal.basis = lworld_curr_portal.basis.rotated(Vector3(0, 1, 0), PI)
room_lworld_transform = room_lworld_transform * lworld_curr_portal.inverse()
sr.transform = room_lworld_transform
if Engine.editor_hint and debug:
sr.owner = get_tree().edited_scene_root
var caabb : AABB = room_aabbs[room]
caabb.position = tf.xform(Vector3())
current_aabbs.push_back(caabb)
#var caabb : AABB = room_aabbs[room]
#caabb.position = tf.xform(Vector3())
#current_aabbs.push_back(caabb)
for pe in room.props:
if pe is PropDataPortal:
if pe == current_portal:
continue
var ntf : Transform = pe.transform * tf
var current_portal_lworld_position : Transform = room_lworld_transform * pe.transform
var d : Array = portal_map[pe]
if d.size() == 0:
@ -154,24 +166,27 @@ func spawn_room(tf : Transform, room : PropData, level : int = 0, current_portal
#todo figure out the transforms
var poffset : Vector3 = new_room_portal.transform.xform(Vector3())
poffset.x += 1
#middle of the current portal
var offset_current_portal_lworld_position : Transform = current_portal_lworld_position
#portal center should be precalculated
#this will only work with the current portals
offset_current_portal_lworld_position = offset_current_portal_lworld_position.translated(Vector3(-0.5, 0, 0))
var offsert_ntf : Transform = ntf
offsert_ntf = offsert_ntf.translated(-poffset)
var ab : AABB = room_aabbs[new_room]
ab.position = offsert_ntf.xform(Vector3())
#var ab : AABB = room_aabbs[new_room]
#ab.position = offsert_ntf.xform(Vector3())
test_spawn_pos(offset_current_portal_lworld_position)
var can_spawn : bool = true
for saab in current_aabbs:
if ab.intersects(saab):
#todo implement plugs
can_spawn = false
break
#for saab in current_aabbs:
# if ab.intersects(saab):
# #todo implement plugs
# can_spawn = false
# break
if can_spawn:
spawn_room(offsert_ntf, new_room, level + 1, new_room_portal)
spawn_room(offset_current_portal_lworld_position, new_room, level + 1, new_room_portal)
func clear() -> void:
if Engine.editor_hint and debug:
@ -183,6 +198,20 @@ func clear() -> void:
for c in get_children():
c.queue_free()
func test_spawn_pos(lworld_position : Transform):
var testspat : ImmediateGeometry = ImmediateGeometry.new()
add_child(testspat)
testspat.transform = lworld_position
testspat.begin(Mesh.PRIMITIVE_LINES)
testspat.add_vertex(Vector3(0, -0.5, 0))
testspat.add_vertex(Vector3(0, 0.5, 0))
testspat.add_vertex(Vector3(-0.5, 0, 0))
testspat.add_vertex(Vector3(0.5, 0, 0))
testspat.add_vertex(Vector3(0, 0, -0.5))
testspat.add_vertex(Vector3(0, 0, 0.5))
testspat.end()
func set_generate(on) -> void:
if on:
generate()

15
game/test_dungeon/Dungtest.tscn
View File

@ -1,21 +1,32 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://scripts/dungeons/dungeon.gd" type="Script" id=1]
[ext_resource path="res://test_rooms/Room1.tres" type="PropData" id=2]
[ext_resource path="res://debug/FreeLookCamera.gd" type="Script" id=3]
[ext_resource path="res://test_rooms/Room3.tres" type="PropData" id=4]
[ext_resource path="res://test_rooms/Room5.tres" type="PropData" id=5]
[ext_resource path="res://test_rooms/Room4.tres" type="PropData" id=6]
[sub_resource type="ProceduralSky" id=2]
[sub_resource type="Environment" id=1]
background_mode = 2
background_sky = SubResource( 2 )
[node name="Dungtest" type="Spatial"]
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 1, 0, 0, 0, 0.618285, 0.785954, 0, -0.785954, 0.618285, 0, 7.04604, 18.7882 )
[node name="Camera" type="Camera" parent="."]
transform = Transform( 1, 0, 0, 0, 0.937221, 0.348736, 0, -0.348736, 0.937221, 0, 3.89185, 8.51114 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1, -3 )
current = true
script = ExtResource( 3 )
[node name="Dungeon" type="Spatial" parent="."]
script = ExtResource( 1 )
start_room = ExtResource( 2 )
rooms = [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 5 ) ]
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource( 1 )