Skip to content

Commit 23303ac

Browse files
not-my-usernamenot-my-username
authored
Merge pull request #20 from SpectrumPro/dev
V0.4.0
2 parents d1dbe06 + ea10e5a commit 23303ac

File tree

624 files changed

+2329
-286835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

624 files changed

+2329
-286835
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ Export/
2020
android/
2121

2222
.DS_Store
23+
24+
Debug_save.spshow
25+
*.spshow

‎Add_fixture.tscn‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
[gd_scene load_steps=2 format=3 uid="uid://c3lrdtiw05qft"]
1+
[gd_scene load_steps=3 format=3 uid="uid://c3lrdtiw05qft"]
22

33
[ext_resource type="Theme" uid="uid://cyua45ur0ijqo" path="res://Main.theme" id="1_460tm"]
4+
[ext_resource type="Script" path="res://Scripts/Add_fixture.gd" id="2_q8wav"]
45

56
[node name="PanelContainer" type="PanelContainer"]
67
anchors_preset = 15
@@ -11,6 +12,7 @@ grow_vertical = 2
1112
size_flags_horizontal = 3
1213
size_flags_vertical = 3
1314
theme = ExtResource("1_460tm")
15+
script = ExtResource("2_q8wav")
1416

1517
[node name="MarginContainer" type="MarginContainer" parent="."]
1618
layout_mode = 2
@@ -41,9 +43,12 @@ layout_mode = 2
4143
layout_mode = 2
4244
text = "Channel"
4345

44-
[node name="SpinBox" type="SpinBox" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer"]
46+
[node name="Channel" type="SpinBox" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer"]
4547
layout_mode = 2
4648
size_flags_horizontal = 10
49+
min_value = 1.0
50+
max_value = 512.0
51+
value = 1.0
4752

4853
[node name="HBoxContainer3" type="HBoxContainer" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer"]
4954
layout_mode = 2
@@ -53,14 +58,9 @@ layout_mode = 2
5358
text = "Universe"
5459

5560
[node name="Fixture Universe Option" type="OptionButton" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer3"]
56-
custom_minimum_size = Vector2(200, 0)
61+
custom_minimum_size = Vector2(200, 40)
5762
layout_mode = 2
5863
size_flags_horizontal = 10
59-
item_count = 2
60-
popup/item_0/text = "Universe 1"
61-
popup/item_0/id = 0
62-
popup/item_1/text = "Universe 2"
63-
popup/item_1/id = 1
6464

6565
[node name="HSeparator" type="HSeparator" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer"]
6666
layout_mode = 2
@@ -96,9 +96,12 @@ size_flags_vertical = 10
9696
layout_mode = 2
9797
text = "Quantity"
9898

99-
[node name="SpinBox" type="SpinBox" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer5"]
99+
[node name="Quantity" type="SpinBox" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer5"]
100100
layout_mode = 2
101101
size_flags_horizontal = 10
102+
min_value = 1.0
103+
max_value = 512.0
104+
value = 1.0
102105

103106
[node name="HBoxContainer6" type="HBoxContainer" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer"]
104107
layout_mode = 2
@@ -108,7 +111,7 @@ size_flags_vertical = 8
108111
layout_mode = 2
109112
text = "Offset"
110113

111-
[node name="SpinBox" type="SpinBox" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer6"]
114+
[node name="Offset" type="SpinBox" parent="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer6"]
112115
layout_mode = 2
113116
size_flags_horizontal = 10
114117

@@ -120,3 +123,8 @@ size_flags_vertical = 8
120123
layout_mode = 2
121124
size_flags_horizontal = 3
122125
text = "Add Fixture"
126+
127+
[connection signal="value_changed" from="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer/Channel" to="." method="_on_channel_value_changed"]
128+
[connection signal="value_changed" from="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer5/Quantity" to="." method="_on_quantity_value_changed"]
129+
[connection signal="value_changed" from="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer6/Offset" to="." method="_on_offset_value_changed"]
130+
[connection signal="pressed" from="MarginContainer/HSplitContainer/PanelContainer/VBoxContainer/HBoxContainer2/Add Fixture Button" to="." method="_on_add_fixture_button_pressed"]

‎Assets/3D/Room Lights.gd‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,3 @@ func _ready():
66
for n in self.get_children():
77
n.light_energy = 0.01
88
# n.light_energy = 1
9-
10-
11-
# Called every frame. 'delta' is the elapsed time since the previous frame.
12-
func _process(delta):
13-
pass

‎Assets/Icons/Mix.svg‎

Lines changed: 58 additions & 0 deletions
Loading

‎Assets/Icons/Mix.svg.import‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://cols1ubfr2ttn"
6+
path="res://.godot/imported/Mix.svg-edd2659a9579534905808c138400531f.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Assets/Icons/Mix.svg"
14+
dest_files=["res://.godot/imported/Mix.svg-edd2659a9579534905808c138400531f.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false

‎Assets/Icons/Palette.svg‎

Lines changed: 38 additions & 0 deletions
Loading

‎Assets/Icons/Palette.svg.import‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://cxj2da5hi1g4s"
6+
path="res://.godot/imported/Palette.svg-f8fa795b6e48e1a2c1779a7b423c5c08.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Assets/Icons/Palette.svg"
14+
dest_files=["res://.godot/imported/Palette.svg-f8fa795b6e48e1a2c1779a7b423c5c08.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false

‎Assets/Icons/Start.svg‎

Lines changed: 58 additions & 0 deletions
Loading

‎Assets/Icons/Start.svg.import‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://vd7d7oic38j0"
6+
path="res://.godot/imported/Start.svg-5b041cb1864a7d366831816a68205b19.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Assets/Icons/Start.svg"
14+
dest_files=["res://.godot/imported/Start.svg-5b041cb1864a7d366831816a68205b19.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false

0 commit comments

Comments
 (0)