Skip to content

Commit dd4de93

Browse files
dkollmanndkollmann
committed
Updated assetlib branch to v0.2
1 parent 42ca73c commit dd4de93

10 files changed

Lines changed: 101 additions & 70 deletions

‎addons/easycpp/plugin.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
name="Easy C++"
33
description="Makes using C++ code easier."
44
author="Daniel Kollmann"
5-
version="0.1"
5+
version="0.2"
66
script="plugin.gd"

‎addons/easycpp/plugin.gd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ func _enter_tree():
1616

1717
toolwindow = preload("res://addons/easycpp/scenes/tool_window.tscn").instance()
1818

19+
assert(toolwindow != null)
20+
1921
toolwindow.editorbase = get_editor_interface().get_base_control()
2022

2123
add_control_to_dock(DOCK_SLOT_LEFT_UL, toolwindow)

‎addons/easycpp/scenes/buildconfiguration.tscn‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,75 +10,88 @@ __meta__ = {
1010
"_edit_use_anchors_": false
1111
}
1212

13-
[node name="PropertiesContainer" type="GridContainer" parent="."]
13+
[node name="ScrollContainer" type="ScrollContainer" parent="."]
14+
anchor_right = 1.0
15+
anchor_bottom = 1.0
16+
scroll_horizontal_enabled = false
17+
__meta__ = {
18+
"_edit_use_anchors_": false
19+
}
20+
21+
[node name="PropertiesContainer" type="GridContainer" parent="ScrollContainer"]
1422
margin_right = 1024.0
15-
margin_bottom = 408.0
23+
margin_bottom = 600.0
24+
size_flags_horizontal = 3
25+
size_flags_vertical = 3
1626
custom_constants/vseparation = 4
1727
custom_constants/hseparation = 4
1828
columns = 2
29+
__meta__ = {
30+
"_edit_use_anchors_": false
31+
}
1932

20-
[node name="NameLabel" type="Label" parent="PropertiesContainer"]
33+
[node name="NameLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
2134
margin_top = 5.0
2235
margin_right = 165.0
2336
margin_bottom = 19.0
2437
text = "Name:"
2538

26-
[node name="NameLineEdit" type="LineEdit" parent="PropertiesContainer"]
39+
[node name="NameLineEdit" type="LineEdit" parent="ScrollContainer/PropertiesContainer"]
2740
margin_left = 169.0
2841
margin_right = 1024.0
2942
margin_bottom = 24.0
3043
size_flags_horizontal = 3
3144

32-
[node name="EnabledLabel" type="Label" parent="PropertiesContainer"]
45+
[node name="EnabledLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
3346
margin_top = 33.0
3447
margin_right = 165.0
3548
margin_bottom = 47.0
3649
text = "Enabled:"
3750

38-
[node name="EnabledCheckBox" type="CheckBox" parent="PropertiesContainer"]
51+
[node name="EnabledCheckBox" type="CheckBox" parent="ScrollContainer/PropertiesContainer"]
3952
margin_left = 169.0
4053
margin_top = 28.0
4154
margin_right = 193.0
4255
margin_bottom = 52.0
4356
size_flags_horizontal = 0
4457

45-
[node name="ArgumentsLabel" type="Label" parent="PropertiesContainer"]
58+
[node name="ArgumentsLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
4659
margin_top = 120.0
4760
margin_right = 165.0
4861
margin_bottom = 151.0
4962
text = "Arguments:
5063
(One argument per line.)"
5164

52-
[node name="ArgumentsEdit" type="TextEdit" parent="PropertiesContainer"]
65+
[node name="ArgumentsEdit" type="TextEdit" parent="ScrollContainer/PropertiesContainer"]
5366
margin_left = 169.0
5467
margin_top = 56.0
5568
margin_right = 1024.0
5669
margin_bottom = 216.0
5770
rect_min_size = Vector2( 0, 160 )
5871
size_flags_horizontal = 3
5972

60-
[node name="DefinesLabel" type="Label" parent="PropertiesContainer"]
73+
[node name="DefinesLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
6174
margin_top = 284.0
6275
margin_right = 165.0
6376
margin_bottom = 315.0
6477
text = "Defines:
6578
(One define per line.)"
6679

67-
[node name="DefinesEdit" type="TextEdit" parent="PropertiesContainer"]
80+
[node name="DefinesEdit" type="TextEdit" parent="ScrollContainer/PropertiesContainer"]
6881
margin_left = 169.0
6982
margin_top = 220.0
7083
margin_right = 1024.0
7184
margin_bottom = 380.0
7285
rect_min_size = Vector2( 0, 160 )
7386
size_flags_horizontal = 3
7487

75-
[node name="DebugLibLabel" type="Label" parent="PropertiesContainer"]
88+
[node name="DebugLibLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
7689
margin_top = 389.0
7790
margin_right = 165.0
7891
margin_bottom = 403.0
7992
text = "Use debug libraries:"
8093

81-
[node name="DebugLibCheckbox" type="CheckBox" parent="PropertiesContainer"]
94+
[node name="DebugLibCheckbox" type="CheckBox" parent="ScrollContainer/PropertiesContainer"]
8295
margin_left = 169.0
8396
margin_top = 384.0
8497
margin_right = 193.0

‎addons/easycpp/scenes/buildplatform.tscn‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,135 +10,145 @@ __meta__ = {
1010
"_edit_use_anchors_": false
1111
}
1212

13-
[node name="PropertiesContainer" type="GridContainer" parent="."]
13+
[node name="ScrollContainer" type="ScrollContainer" parent="."]
14+
anchor_right = 1.0
15+
anchor_bottom = 1.0
16+
scroll_horizontal_enabled = false
17+
__meta__ = {
18+
"_edit_use_anchors_": false
19+
}
20+
21+
[node name="PropertiesContainer" type="GridContainer" parent="ScrollContainer"]
1422
margin_right = 1024.0
15-
margin_bottom = 492.0
23+
margin_bottom = 600.0
24+
size_flags_horizontal = 3
25+
size_flags_vertical = 3
1626
custom_constants/vseparation = 4
1727
custom_constants/hseparation = 4
1828
columns = 2
1929

20-
[node name="NameLabel" type="Label" parent="PropertiesContainer"]
30+
[node name="NameLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
2131
margin_top = 5.0
2232
margin_right = 165.0
2333
margin_bottom = 19.0
2434
text = "Name:"
2535

26-
[node name="NameLineEdit" type="LineEdit" parent="PropertiesContainer"]
36+
[node name="NameLineEdit" type="LineEdit" parent="ScrollContainer/PropertiesContainer"]
2737
margin_left = 169.0
2838
margin_right = 1024.0
2939
margin_bottom = 24.0
3040
size_flags_horizontal = 3
3141

32-
[node name="EnabledLabel" type="Label" parent="PropertiesContainer"]
42+
[node name="EnabledLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
3343
margin_top = 33.0
3444
margin_right = 165.0
3545
margin_bottom = 47.0
3646
text = "Enabled:"
3747

38-
[node name="EnabledCheckBox" type="CheckBox" parent="PropertiesContainer"]
48+
[node name="EnabledCheckBox" type="CheckBox" parent="ScrollContainer/PropertiesContainer"]
3949
margin_left = 169.0
4050
margin_top = 28.0
4151
margin_right = 193.0
4252
margin_bottom = 52.0
4353
size_flags_horizontal = 0
4454

45-
[node name="AvailableOnLabel" type="Label" parent="PropertiesContainer"]
55+
[node name="AvailableOnLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
4656
margin_top = 61.0
4757
margin_right = 165.0
4858
margin_bottom = 75.0
4959
text = "Available on:"
5060

51-
[node name="AvailableOnContainer" type="HBoxContainer" parent="PropertiesContainer"]
61+
[node name="AvailableOnContainer" type="HBoxContainer" parent="ScrollContainer/PropertiesContainer"]
5262
margin_left = 169.0
5363
margin_top = 56.0
5464
margin_right = 1024.0
5565
margin_bottom = 80.0
5666
size_flags_horizontal = 3
5767

58-
[node name="WindowsCheckBox" type="CheckBox" parent="PropertiesContainer/AvailableOnContainer"]
68+
[node name="WindowsCheckBox" type="CheckBox" parent="ScrollContainer/PropertiesContainer/AvailableOnContainer"]
5969
margin_right = 86.0
6070
margin_bottom = 24.0
6171
text = "Windows"
6272

63-
[node name="LinuxCheckBox" type="CheckBox" parent="PropertiesContainer/AvailableOnContainer"]
73+
[node name="LinuxCheckBox" type="CheckBox" parent="ScrollContainer/PropertiesContainer/AvailableOnContainer"]
6474
margin_left = 90.0
6575
margin_right = 189.0
6676
margin_bottom = 24.0
6777
text = "Linux / X11"
6878

69-
[node name="MacOSCheckBox" type="CheckBox" parent="PropertiesContainer/AvailableOnContainer"]
79+
[node name="MacOSCheckBox" type="CheckBox" parent="ScrollContainer/PropertiesContainer/AvailableOnContainer"]
7080
margin_left = 193.0
7181
margin_right = 266.0
7282
margin_bottom = 24.0
7383
text = "macOS"
7484

75-
[node name="ArgumentsLabel" type="Label" parent="PropertiesContainer"]
85+
[node name="ArgumentsLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
7686
margin_top = 148.0
7787
margin_right = 165.0
7888
margin_bottom = 179.0
7989
text = "Arguments:
8090
(One argument per line.)"
8191

82-
[node name="ArgumentsEdit" type="TextEdit" parent="PropertiesContainer"]
92+
[node name="ArgumentsEdit" type="TextEdit" parent="ScrollContainer/PropertiesContainer"]
8393
margin_left = 169.0
8494
margin_top = 84.0
8595
margin_right = 1024.0
8696
margin_bottom = 244.0
8797
rect_min_size = Vector2( 0, 160 )
8898
size_flags_horizontal = 3
8999

90-
[node name="DefinesLabel" type="Label" parent="PropertiesContainer"]
100+
[node name="DefinesLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
91101
margin_top = 312.0
92102
margin_right = 165.0
93103
margin_bottom = 343.0
94104
text = "Defines:
95105
(One define per line.)"
96106

97-
[node name="DefinesEdit" type="TextEdit" parent="PropertiesContainer"]
107+
[node name="DefinesEdit" type="TextEdit" parent="ScrollContainer/PropertiesContainer"]
98108
margin_left = 169.0
99109
margin_top = 248.0
100110
margin_right = 1024.0
101111
margin_bottom = 408.0
102112
rect_min_size = Vector2( 0, 160 )
103113
size_flags_horizontal = 3
104114

105-
[node name="OutputLabel" type="Label" parent="PropertiesContainer"]
115+
[node name="OutputLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
106116
margin_top = 417.0
107117
margin_right = 165.0
108118
margin_bottom = 431.0
109119
text = "Output:"
110120

111-
[node name="OutputLineEdit" type="LineEdit" parent="PropertiesContainer"]
121+
[node name="OutputLineEdit" type="LineEdit" parent="ScrollContainer/PropertiesContainer"]
112122
margin_left = 169.0
113123
margin_top = 412.0
114124
margin_right = 1024.0
115125
margin_bottom = 436.0
116126
size_flags_horizontal = 3
117127

118-
[node name="GDNLIBLabel" type="Label" parent="PropertiesContainer"]
128+
[node name="GDNLIBLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
119129
margin_top = 445.0
120130
margin_right = 165.0
121131
margin_bottom = 459.0
122132
text = "GDNLIB Key:"
123133

124-
[node name="GDNLIBLineEdit" type="LineEdit" parent="PropertiesContainer"]
134+
[node name="GDNLIBLineEdit" type="LineEdit" parent="ScrollContainer/PropertiesContainer"]
125135
margin_left = 169.0
126136
margin_top = 440.0
127137
margin_right = 1024.0
128138
margin_bottom = 464.0
129139
size_flags_horizontal = 3
130140

131-
[node name="VSToolchainLabel" type="Label" parent="PropertiesContainer"]
141+
[node name="VSToolchainLabel" type="Label" parent="ScrollContainer/PropertiesContainer"]
132142
margin_top = 473.0
133143
margin_right = 165.0
134144
margin_bottom = 487.0
135145
text = "Visual Studio Toolchain:"
136146

137-
[node name="VSToolchainLineEdit" type="LineEdit" parent="PropertiesContainer"]
147+
[node name="VSToolchainLineEdit" type="LineEdit" parent="ScrollContainer/PropertiesContainer"]
138148
margin_left = 169.0
139149
margin_top = 468.0
140150
margin_right = 1024.0
141151
margin_bottom = 492.0
142152
size_flags_horizontal = 3
143153

144-
[connection signal="text_changed" from="PropertiesContainer/NameLineEdit" to="." method="_on_NameLineEdit_text_changed"]
154+
[connection signal="text_changed" from="ScrollContainer/PropertiesContainer/NameLineEdit" to="." method="_on_NameLineEdit_text_changed"]

‎addons/easycpp/scenes/settings.tscn‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ __meta__ = {
3333
}
3434

3535
[node name="HBoxContainer" type="HBoxContainer" parent="SettingsContainer"]
36+
visible = false
3637
margin_right = 784.0
3738
margin_bottom = 34.0
3839
alignment = 2
@@ -44,14 +45,12 @@ margin_bottom = 34.0
4445
text = "Show All Settings"
4546

4647
[node name="TabContainer" type="TabContainer" parent="SettingsContainer"]
47-
margin_top = 44.0
4848
margin_right = 784.0
4949
margin_bottom = 540.0
5050
size_flags_horizontal = 3
5151
size_flags_vertical = 3
5252

5353
[node name="Settings" type="Tabs" parent="SettingsContainer/TabContainer"]
54-
visible = false
5554
anchor_right = 1.0
5655
anchor_bottom = 1.0
5756
margin_left = 4.0
@@ -206,6 +205,7 @@ caret_blink = true
206205
caret_blink_speed = 0.5
207206

208207
[node name="Build Platforms" type="Tabs" parent="SettingsContainer/TabContainer"]
208+
visible = false
209209
anchor_right = 1.0
210210
anchor_bottom = 1.0
211211
margin_left = 4.0
@@ -217,6 +217,7 @@ margin_bottom = -4.0
217217
tabtype = ExtResource( 6 )
218218

219219
[node name="Build Configurations" type="Tabs" parent="SettingsContainer/TabContainer"]
220+
visible = false
220221
anchor_right = 1.0
221222
anchor_bottom = 1.0
222223
margin_left = 4.0

‎addons/easycpp/scenes/tabcontrol.tscn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ text = "Delete Selected"
4545
anchor_right = 1.0
4646
anchor_bottom = 1.0
4747
margin_top = 24.0
48+
size_flags_horizontal = 3
49+
size_flags_vertical = 3
4850

4951
[connection signal="pressed" from="VBoxContainer/HBoxContainer/AddButton" to="." method="_on_AddButton_pressed"]
5052
[connection signal="pressed" from="VBoxContainer/HBoxContainer/DuplicateButton" to="." method="_on_DuplicateButton_pressed"]

‎addons/easycpp/scripts/buildconfigurationsetting.gd‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
tool
2-
extends Tabs
2+
extends BuildSetting
33

44

55
func setobj(bld :BuildConfiguration) -> void:
66
name = bld.name
77

8-
$PropertiesContainer/NameLineEdit.text = bld.name
9-
$PropertiesContainer/EnabledCheckBox.pressed = bld.enabled
10-
$PropertiesContainer/ArgumentsEdit.text = PoolStringArray(bld.arguments).join("\n")
11-
$PropertiesContainer/DefinesEdit.text = PoolStringArray(bld.defines).join("\n")
12-
$PropertiesContainer/DebugLibCheckbox.pressed = bld.debuglibs
8+
$ScrollContainer/PropertiesContainer/NameLineEdit.text = bld.name
9+
$ScrollContainer/PropertiesContainer/EnabledCheckBox.pressed = bld.enabled
10+
$ScrollContainer/PropertiesContainer/ArgumentsEdit.text = PoolStringArray(bld.arguments).join("\n")
11+
$ScrollContainer/PropertiesContainer/DefinesEdit.text = PoolStringArray(bld.defines).join("\n")
12+
$ScrollContainer/PropertiesContainer/DebugLibCheckbox.pressed = bld.debuglibs
1313

1414

1515
func createobj() -> BuildConfiguration:
1616
var bld := BuildConfiguration.new()
1717

18-
bld.name = $PropertiesContainer/NameLineEdit.text.strip_edges()
19-
bld.enabled = $PropertiesContainer/EnabledCheckBox.pressed
20-
bld.arguments = Utils.split_clean($PropertiesContainer/ArgumentsEdit.text, "\n", false)
21-
bld.defines = Utils.split_clean($PropertiesContainer/DefinesEdit.text, "\n", false)
22-
bld.debuglibs = $PropertiesContainer/DebugLibCheckbox.pressed
18+
bld.name = $ScrollContainer/PropertiesContainer/NameLineEdit.text.strip_edges()
19+
bld.enabled = $ScrollContainer/PropertiesContainer/EnabledCheckBox.pressed
20+
bld.arguments = Utils.split_clean($ScrollContainer/PropertiesContainer/ArgumentsEdit.text, "\n", false)
21+
bld.defines = Utils.split_clean($ScrollContainer/PropertiesContainer/DefinesEdit.text, "\n", false)
22+
bld.debuglibs = $ScrollContainer/PropertiesContainer/DebugLibCheckbox.pressed
2323

2424
return bld
2525

0 commit comments

Comments
 (0)