alexandru.stanciu/immersive-home
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #134 from Nitwel/improvements

Browse Source 
Allow for resizing entities
This commit is contained in:
Nitwel 2024-05-01 17:54:34 +02:00 committed by GitHub
commit b48f7531a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/content/entities/button/button.tscn
View File

@ -5,7 +5,7 @@
[ext_resource type="Script" path="res://content/functions/movable.gd" id="3_vrobf"]
[sub_resource type="BoxShape3D" id="BoxShape3D_um5pa"]
size = Vector3(0.07, 0.07, 0.012)
size = Vector3(0.05, 0.05, 0.012)
[node name="Button" type="StaticBody3D"]
script = ExtResource("1_ja7lt")
@ -14,7 +14,8 @@ script = ExtResource("1_ja7lt")
[node name="Movable" type="Node" parent="."]
script = ExtResource("3_vrobf")
resizable = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.00222015, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.005)
shape = SubResource("BoxShape3D_um5pa")

1
app/content/entities/camera/camera.tscn
View File

@ -25,3 +25,4 @@ shape = SubResource("BoxShape3D_te0pn")
[node name="Movable" type="Node" parent="."]
script = ExtResource("2_e2u6o")
resizable = true

1
app/content/entities/light/light.tscn
View File

@ -38,6 +38,7 @@ shape = SubResource("SphereShape3D_ukj14")
[node name="Movable" type="Node" parent="."]
script = ExtResource("4_4sfxb")
resizable = true
[node name="Lightbulb" type="CSGCombiner3D" parent="."]
transform = Transform3D(1, 9.69949e-05, 0.000589194, -9.77749e-05, 0.999999, 0.00135802, -0.000589065, -0.00135808, 0.999999, 0, 0, 0)

1
app/content/entities/line_chart/line_chart.tscn
View File

@ -20,6 +20,7 @@ shape = SubResource("BoxShape3D_rmm5v")
[node name="Movable" type="Node" parent="."]
script = ExtResource("3_lidml")
resizable = true
[node name="Timer" type="Timer" parent="."]
wait_time = 60.0

1
app/content/entities/media_player/media_player.tscn
View File

@ -58,6 +58,7 @@ pixel_size = 0.001
[node name="Movable" type="Node" parent="."]
script = ExtResource("3_bguto")
resizable = true
[node name="Slider" parent="." instance=ExtResource("4_w73hw")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0562844, 0)

1
app/content/entities/number/number.tscn
View File

@ -20,3 +20,4 @@ shape = SubResource("BoxShape3D_7mk8w")
[node name="Movable" type="Node" parent="."]
script = ExtResource("3_x8wda")
resizable = true

1
app/content/entities/sensor/sensor.tscn
View File

@ -26,6 +26,7 @@ font_size = 80
[node name="Movable" type="Node" parent="."]
script = ExtResource("2_fpq5q")
resizable = true
[node name="Button" parent="." instance=ExtResource("5_bmtkc")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.1, 0)

1
app/content/entities/switch/switch.tscn
View File

@ -36,3 +36,4 @@ sprite_frames = SubResource("SpriteFrames_ldpuo")
[node name="Movable" type="Node" parent="."]
script = ExtResource("4_6xr03")
resizable = true

2
app/content/system/house/house.gd
View File

@ -49,6 +49,7 @@ func update_house():
entity_instance.global_position = entity.position
entity_instance.global_rotation = entity.rotation
entity_instance.scale = Vector3(entity.scale, entity.scale, entity.scale) if entity.has("scale") else Vector3(1, 1, 1)
loaded.value = true
@ -245,6 +246,7 @@ func save_all_entities():
"id": entity.entity_id,
"position": entity.global_position,
"rotation": entity.global_rotation,
"scale": entity.scale.x,
"room": String(room.name),
}

11
app/content/ui/menu/menu.tscn
View File

@ -198,7 +198,6 @@ shape = SubResource("BoxShape3D_e1esh")
[node name="Movable" type="Node" parent="."]
script = ExtResource("2_8coxu")
resizable = false
[node name="AnimationContainer" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.23, 0.15, 0)
@ -226,38 +225,38 @@ size = Vector3(0.05, 0.4, 1)
[node name="View" parent="AnimationContainer/Tabs" instance=ExtResource("5_w4i01")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.025, 0)
label = "visibility"
size = Vector3(0.05, 0.05, 0.01)
icon = true
toggleable = true
disabled = true
size = Vector3(0.05, 0.05, 0.01)
[node name="Edit" parent="AnimationContainer/Tabs" instance=ExtResource("5_w4i01")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.085, 0)
label = "widgets"
size = Vector3(0.05, 0.05, 0.01)
icon = true
toggleable = true
size = Vector3(0.05, 0.05, 0.01)
[node name="Room" parent="AnimationContainer/Tabs" instance=ExtResource("5_w4i01")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.145, 0)
label = "view_in_ar"
size = Vector3(0.05, 0.05, 0.01)
icon = true
toggleable = true
size = Vector3(0.05, 0.05, 0.01)
[node name="Automate" parent="AnimationContainer/Tabs" instance=ExtResource("5_w4i01")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.205, 0)
label = "schema"
size = Vector3(0.05, 0.05, 0.01)
icon = true
toggleable = true
size = Vector3(0.05, 0.05, 0.01)
[node name="Settings" parent="AnimationContainer/Tabs" instance=ExtResource("5_w4i01")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.265, 0)
label = "settings"
size = Vector3(0.05, 0.05, 0.01)
icon = true
toggleable = true
size = Vector3(0.05, 0.05, 0.01)
[node name="TabsContent" type="Node3D" parent="AnimationContainer" node_paths=PackedStringArray("tabs")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.02, 0.00999999, 0)

1
app/lib/stores/house.gd
View File

@ -16,6 +16,7 @@ func _init():
## id: String
## position: Vec3
## rotation: Vec3
## scale: float
## room: String
## interface: String
"entities": [],