-
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
460 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,39 @@ | ||
[gd_scene load_steps=5 format=3 uid="uid://drx0fpy7f8xl3"] | ||
[gd_scene load_steps=7 format=3 uid="uid://drx0fpy7f8xl3"] | ||
|
||
[ext_resource type="Script" path="res://content/system/areas/area.gd" id="1_d66b1"] | ||
[ext_resource type="Script" path="res://content/functions/movable.gd" id="2_bbykk"] | ||
[ext_resource type="PackedScene" uid="uid://blrhy2uccrdn4" path="res://content/ui/components/input/input.tscn" id="3_330yx"] | ||
|
||
[sub_resource type="BoxShape3D" id="BoxShape3D_facyw"] | ||
size = Vector3(0.1, 0.1, 0.1) | ||
|
||
[sub_resource type="BoxMesh" id="BoxMesh_3s51v"] | ||
size = Vector3(0.1, 0.1, 0.1) | ||
|
||
[sub_resource type="BoxShape3D" id="BoxShape3D_v55b2"] | ||
|
||
[node name="Area" type="StaticBody3D"] | ||
script = ExtResource("1_d66b1") | ||
|
||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] | ||
shape = SubResource("BoxShape3D_facyw") | ||
disabled = true | ||
|
||
[node name="MeshInstance3D" type="MeshInstance3D" parent="."] | ||
visible = false | ||
mesh = SubResource("BoxMesh_3s51v") | ||
|
||
[node name="Movable" type="Node" parent="."] | ||
script = ExtResource("2_bbykk") | ||
restricted = true | ||
|
||
[node name="Area3D" type="Area3D" parent="."] | ||
collision_layer = 32 | ||
collision_mask = 32 | ||
|
||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] | ||
shape = SubResource("BoxShape3D_v55b2") | ||
|
||
[node name="Input" parent="." instance=ExtResource("3_330yx")] | ||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.07, 0) | ||
text = "Area" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,74 @@ | ||
extends Node3D | ||
|
||
const AreaScene = preload ("./area.tscn") | ||
const AreaNode = preload ("./area.gd") | ||
|
||
var editing = false: | ||
set(value): | ||
editing = value | ||
|
||
if is_node_ready() == false: return | ||
|
||
for area in get_children(): | ||
area.edit = value | ||
|
||
Store.house.save_local() | ||
|
||
func _ready(): | ||
R.effect(func(_arg): | ||
pass | ||
Store.house.on_loaded.connect(func(): | ||
load_areas() | ||
) | ||
|
||
func load_areas(): | ||
var areas = Store.house.state.areas | ||
|
||
# Remove all areas | ||
for child in get_children(): | ||
remove_child(child) | ||
child.queue_free() | ||
|
||
print("Loading areas: ", areas) | ||
|
||
for area in areas: | ||
var area_scene = AreaScene.instantiate() | ||
area_scene.id = area.id | ||
area_scene.edit = editing | ||
area_scene.name = area.name | ||
add_child(area_scene) | ||
area_scene.global_position = area.position | ||
area_scene.global_rotation = area.rotation | ||
area_scene.size = area.size | ||
|
||
if HomeApi.has_integration() == false: | ||
return | ||
|
||
HomeApi.api.integration_handler.create_area.call_deferred(area.id, area.name) | ||
|
||
func create_area(name: String): | ||
var area = AreaScene.instantiate() | ||
area.id = next_valid_id() | ||
area.name = name | ||
area.position = App.camera.global_position + App.camera.global_transform.basis.z * - 1 | ||
area.size = Vector3(0.5, 0.5, 0.5) | ||
area.edit = true | ||
add_child(area) | ||
|
||
if HomeApi.has_integration() == false: | ||
return | ||
|
||
HomeApi.api.integration_handler.create_area.call_deferred(area.id, area.name) | ||
|
||
func rename_area(id: int, name: String): | ||
for area in get_children(): | ||
if area is AreaNode&&area.id == id: | ||
area.name = name | ||
area.save_to_store() | ||
break | ||
|
||
func next_valid_id(): | ||
var id = 0 | ||
for area in Store.house.state.areas: | ||
if area.id > id: | ||
id = area.id | ||
|
||
return id + 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,19 @@ | ||
[gd_scene load_steps=2 format=3 uid="uid://b2kjh1fpjptdr"] | ||
[gd_scene load_steps=3 format=3 uid="uid://b2kjh1fpjptdr"] | ||
|
||
[ext_resource type="Script" path="res://content/system/camera/camera.gd" id="1_gapgs"] | ||
|
||
[sub_resource type="SphereShape3D" id="SphereShape3D_wsvuf"] | ||
radius = 0.05 | ||
|
||
[node name="XRCamera3D" type="XRCamera3D"] | ||
transform = Transform3D(0.999999, 0.00106283, -0.000420545, -0.00106267, 0.999999, 0.000379457, 0.000420948, -0.000378989, 1, 0.0356617, 0.71033, 0.00564247) | ||
cull_mask = 524287 | ||
current = true | ||
script = ExtResource("1_gapgs") | ||
|
||
[node name="Area3D" type="Area3D" parent="."] | ||
collision_layer = 32 | ||
collision_mask = 32 | ||
|
||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] | ||
shape = SubResource("SphereShape3D_wsvuf") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,24 @@ | ||
extends Node3D | ||
|
||
@onready var background = $Background | ||
@onready var add_button = $Interface/TabsContent3D/AreasMenu/AddButton | ||
@onready var name_input = $Interface/TabsContent3D/AreasMenu/NameInput | ||
|
||
func _ready(): | ||
background.visible = false | ||
|
||
visibility_changed.connect(func(): | ||
if visible: | ||
pass | ||
App.areas.editing=visible | ||
) | ||
|
||
tree_entered.connect(func(): | ||
App.areas.editing=true | ||
) | ||
|
||
tree_exiting.connect(func(): | ||
App.areas.editing=false | ||
) | ||
|
||
add_button.on_button_up.connect(func(): | ||
App.areas.create_area(name_input.text) | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.