Skip to content

Commit c2ef1fa

Browse files
charliewhitfieldcharliewhitfield
committed
Merge branch 'develop'
2 parents b306381 + 355eb23 commit c2ef1fa

20 files changed

+448
-139
lines changed

‎CHANGELOG.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@ File format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77
See cloning and downloading instructions [here](https://www.ivoyager.dev/developers/).
88

9-
## [v0.0.14] - Not Released
9+
## [v0.0.14] - 2023-03-15
1010

11-
Under development using Godot 3.5.2.rc2.
11+
Developed for Godot 3.5.2.
1212

13-
New develpment assets! Find link in core changelog [here](https://github.com/ivoyager/ivoyager/blob/master/CHANGELOG.md).
13+
Requires non-Git-tracked **ivoyager_assets-0.0.14**; find in [ivoyager releases](https://github.com/ivoyager/ivoyager/releases).
1414

1515
### Changed
16-
* Overhauled Planetarium GUI to show off new spacecraft and asteroid assets in core!
16+
* Overhauled GUI to interact with new content and systems in core ivoyager.
17+
* Updated submodule 'ivoyager' to v0.0.14.
1718

1819
### Fixed
1920
* Excessive calls to _resize() causing info_panel.gd crash (visible as info display corruption)
2021

2122
## [v0.0.13] - 2022-09-28
2223

23-
Developed using Godot 3.5.1.stable.
24+
Developed for Godot 3.5.1.
2425

2526
Requires non-Git-tracked **ivoyager_assets-0.0.10**; find in [ivoyager releases](https://github.com/ivoyager/ivoyager/releases).
2627

@@ -79,7 +80,7 @@ Requires non-Git-tracked **ivoyager_assets-0.0.10**; find in [ivoyager releases]
7980

8081
##
8182

82-
[v0.0.14]: https://github.com/ivoyager/planetarium/compare/v0.0.13...HEAD
83+
[v0.0.14]: https://github.com/ivoyager/planetarium/compare/v0.0.13...v0.0.14
8384
[v0.0.13]: https://github.com/ivoyager/planetarium/compare/v0.0.12...v0.0.13
8485
[v0.0.12]: https://github.com/ivoyager/planetarium/compare/v0.0.11...v0.0.12
8586
[v0.0.11]: https://github.com/ivoyager/planetarium/compare/v0.0.10...v0.0.11

‎export_presets.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ platform="Windows Desktop"
55
runnable=true
66
custom_features=""
77
export_filter="all_resources"
8-
include_filter="*.tsv, *.vbinary, *ivbinary"
8+
include_filter="*.tsv, *ivbinary"
99
exclude_filter=""
1010
export_path="export/Planetarium-dev.exe"
1111
script_export_mode=1
@@ -48,7 +48,7 @@ platform="HTML5"
4848
runnable=true
4949
custom_features=""
5050
export_filter="all_resources"
51-
include_filter="*.tsv, *.vbinary, *ivbinary"
51+
include_filter="*.tsv, *ivbinary"
5252
exclude_filter=""
5353
export_path="export/planetarium.html"
5454
script_export_mode=1

‎planetarium/gui/control_panel.gd

+9-6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ var reserved_view_names := [
3434

3535
func _ready():
3636
$ControlDraggable.max_default_screen_proportions = Vector2(0.55, 0.45)
37+
$ControlDraggable.default_sizes = [
38+
Vector2(435.0, 0.0), # GUI_SMALL
39+
Vector2(575.0, 0.0), # GUI_MEDIUM
40+
Vector2(712.0, 0.0), # GUI_LARGE
41+
]
3742

3843
# widget mods
3944
$"%DateTimeLabel".clock_hms_format = " %02d:%02d:%02d UT"
@@ -44,11 +49,9 @@ func _ready():
4449

4550
$"%ViewSaveFlow".init($"%ViewSaveButton", "LABEL_VIEW1", "PL", true,
4651
IVView.ALL, IVView.ALL_CAMERA, reserved_view_names)
47-
48-
$ControlDraggable.default_sizes = [
49-
Vector2(435.0, 0.0), # , 139.0), # GUI_SMALL
50-
Vector2(575.0, 0.0), # , 168.0), # GUI_MEDIUM
51-
Vector2(712.0, 0.0), # , 200.0), # GUI_LARGE
52-
]
52+
$"%ViewSaveFlow".connect("resized", self, "_reset_size")
53+
5354

55+
func _reset_size() -> void:
56+
rect_size = Vector2.ZERO
5457

‎planetarium/gui/control_panel.tscn

+55-69
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
[ext_resource path="res://ivoyager/gui_widgets/now_ckbx.tscn" type="PackedScene" id=3]
66
[ext_resource path="res://ivoyager/gui_widgets/selection_label.tscn" type="PackedScene" id=4]
77
[ext_resource path="res://ivoyager/gui_widgets/range_label.tscn" type="PackedScene" id=5]
8-
[ext_resource path="res://ivoyager/gui_mods/panel_lock_visible_ckbx.tscn" type="PackedScene" id=6]
8+
[ext_resource path="res://planetarium/gui/lock_visible_ckbx.tscn" type="PackedScene" id=6]
99
[ext_resource path="res://ivoyager/gui_widgets/selection_buttons.tscn" type="PackedScene" id=7]
1010
[ext_resource path="res://ivoyager/gui_mods/control_draggable.tscn" type="PackedScene" id=8]
1111
[ext_resource path="res://ivoyager/gui_widgets/speed_buttons.tscn" type="PackedScene" id=9]
1212
[ext_resource path="res://ivoyager/gui_widgets/lat_long_label.tscn" type="PackedScene" id=10]
13-
[ext_resource path="res://ivoyager/gui_widgets/view_buttons.tscn" type="PackedScene" id=11]
1413
[ext_resource path="res://ivoyager/gui_widgets/up_lock_ckbx.tscn" type="PackedScene" id=12]
1514
[ext_resource path="res://ivoyager/gui_widgets/focal_length_buttons.tscn" type="PackedScene" id=13]
1615
[ext_resource path="res://ivoyager/gui_widgets/focal_length_label.tscn" type="PackedScene" id=14]
1716
[ext_resource path="res://ivoyager/gui_widgets/track_ckbxs.tscn" type="PackedScene" id=15]
1817
[ext_resource path="res://ivoyager/gui_widgets/time_set_button.tscn" type="PackedScene" id=16]
1918
[ext_resource path="res://ivoyager/gui_widgets/view_save_button.tscn" type="PackedScene" id=17]
2019
[ext_resource path="res://ivoyager/gui_widgets/view_save_flow.tscn" type="PackedScene" id=18]
20+
[ext_resource path="res://ivoyager/gui_widgets/view_button.tscn" type="PackedScene" id=19]
2121

2222
[node name="ControlPanel" type="PanelContainer"]
2323
anchor_left = 0.5
@@ -32,17 +32,17 @@ script = ExtResource( 1 )
3232
[node name="VBox" type="VBoxContainer" parent="."]
3333
margin_left = 7.0
3434
margin_top = 7.0
35-
margin_right = 1002.0
35+
margin_right = 878.0
3636
margin_bottom = 331.0
3737

3838
[node name="SelectionLabel" parent="VBox" instance=ExtResource( 4 )]
39-
margin_right = 995.0
39+
margin_right = 871.0
4040
align = 1
4141

4242
[node name="HBox1" type="HBoxContainer" parent="VBox"]
43-
margin_left = 423.0
43+
margin_left = 361.0
4444
margin_top = 18.0
45-
margin_right = 571.0
45+
margin_right = 509.0
4646
margin_bottom = 32.0
4747
size_flags_horizontal = 4
4848

@@ -64,41 +64,37 @@ size_flags_horizontal = 0
6464

6565
[node name="HBox2" type="HBoxContainer" parent="VBox"]
6666
margin_top = 36.0
67-
margin_right = 995.0
67+
margin_right = 871.0
6868
margin_bottom = 60.0
6969

70-
[node name="SpeedButtons" parent="VBox/HBox2" instance=ExtResource( 9 )]
71-
margin_top = 2.0
72-
margin_right = 426.0
73-
margin_bottom = 22.0
70+
[node name="NowCkbx" parent="VBox/HBox2" instance=ExtResource( 3 )]
71+
margin_right = 364.0
7472
size_flags_horizontal = 3
7573

7674
[node name="DateTimeLabel" parent="VBox/HBox2" instance=ExtResource( 2 )]
7775
unique_name_in_owner = true
78-
margin_left = 430.0
76+
margin_left = 368.0
7977
margin_top = 5.0
80-
margin_right = 564.0
78+
margin_right = 502.0
8179
margin_bottom = 19.0
8280
align = 1
8381

84-
[node name="HBox" type="HBoxContainer" parent="VBox/HBox2"]
85-
margin_left = 568.0
86-
margin_right = 995.0
87-
margin_bottom = 24.0
82+
[node name="SpeedButtons" parent="VBox/HBox2" instance=ExtResource( 9 )]
83+
margin_left = 506.0
84+
margin_top = 2.0
85+
margin_right = 871.0
86+
margin_bottom = 22.0
8887
size_flags_horizontal = 3
8988
alignment = 2
9089

91-
[node name="NowCkbx" parent="VBox/HBox2/HBox" instance=ExtResource( 3 )]
92-
margin_left = 229.0
93-
margin_right = 330.0
94-
95-
[node name="TimeSetButton" parent="VBox/HBox2/HBox" instance=ExtResource( 16 )]
96-
margin_left = 334.0
97-
margin_right = 427.0
90+
[node name="TimeSetButton" parent="VBox/HBox2/SpeedButtons" instance=ExtResource( 16 )]
91+
margin_left = 272.0
92+
margin_right = 365.0
93+
margin_bottom = 20.0
9894

9995
[node name="HBox3" type="HBoxContainer" parent="VBox"]
10096
margin_top = 64.0
101-
margin_right = 995.0
97+
margin_right = 871.0
10298
margin_bottom = 88.0
10399

104100
[node name="UpLockCkbx" parent="VBox/HBox3" instance=ExtResource( 12 )]
@@ -107,42 +103,15 @@ text = "CKBX_LOCK_UP"
107103

108104
[node name="TrackCkbxs" parent="VBox/HBox3" instance=ExtResource( 15 )]
109105
margin_left = 129.0
110-
margin_right = 555.0
106+
margin_right = 776.0
111107
margin_bottom = 24.0
112108
grow_horizontal = 2
113109
size_flags_horizontal = 3
114110
alignment = 1
115111

116-
[node name="ViewButtons" parent="VBox/HBox3" instance=ExtResource( 11 )]
117-
margin_left = 559.0
118-
margin_top = 0.0
119-
margin_right = 900.0
120-
margin_bottom = 24.0
121-
grow_horizontal = 2
122-
grow_vertical = 2
123-
size_flags_horizontal = 3
124-
alignment = 1
125-
126-
[node name="Zoom" type="Button" parent="VBox/HBox3/ViewButtons"]
127-
margin_right = 114.0
128-
margin_bottom = 24.0
129-
text = "BUTTON_ZOOM"
130-
131-
[node name="Fortyfive" type="Button" parent="VBox/HBox3/ViewButtons"]
132-
margin_left = 118.0
133-
margin_right = 239.0
134-
margin_bottom = 24.0
135-
text = "BUTTON_45_DEG"
136-
137-
[node name="Top" type="Button" parent="VBox/HBox3/ViewButtons"]
138-
margin_left = 243.0
139-
margin_right = 341.0
140-
margin_bottom = 24.0
141-
text = "BUTTON_TOP"
142-
143112
[node name="HBox" type="HBoxContainer" parent="VBox/HBox3"]
144-
margin_left = 904.0
145-
margin_right = 995.0
113+
margin_left = 780.0
114+
margin_right = 871.0
146115
margin_bottom = 24.0
147116
alignment = 2
148117

@@ -157,38 +126,55 @@ margin_top = 2.0
157126
margin_right = 91.0
158127
margin_bottom = 22.0
159128

160-
[node name="ViewButtons" parent="VBox" instance=ExtResource( 11 )]
129+
[node name="HBox" type="HBoxContainer" parent="VBox"]
161130
margin_top = 92.0
162-
margin_right = 995.0
131+
margin_right = 871.0
163132
margin_bottom = 112.0
164133

165-
[node name="Home" type="Button" parent="VBox/ViewButtons"]
134+
[node name="Home" parent="VBox/HBox" instance=ExtResource( 19 )]
166135
margin_right = 112.0
167-
margin_bottom = 20.0
168136
text = "BUTTON_HOME"
169137

170-
[node name="Cislunar" type="Button" parent="VBox/ViewButtons"]
138+
[node name="Cislunar" parent="VBox/HBox" instance=ExtResource( 19 )]
171139
margin_left = 116.0
172140
margin_right = 252.0
173-
margin_bottom = 20.0
174141
text = "BUTTON_CISLUNAR"
175142

176-
[node name="System" type="Button" parent="VBox/ViewButtons"]
143+
[node name="System" parent="VBox/HBox" instance=ExtResource( 19 )]
177144
margin_left = 256.0
178145
margin_right = 375.0
179-
margin_bottom = 20.0
180146
text = "BUTTON_SYSTEM"
181147

182-
[node name="Asteroids" type="Button" parent="VBox/ViewButtons"]
148+
[node name="Asteroids" parent="VBox/HBox" instance=ExtResource( 19 )]
183149
margin_left = 379.0
184150
margin_right = 522.0
185-
margin_bottom = 20.0
186151
text = "BUTTON_ASTEROIDS"
187152

153+
[node name="Spacer" type="Control" parent="VBox/HBox"]
154+
margin_left = 526.0
155+
margin_right = 526.0
156+
margin_bottom = 20.0
157+
size_flags_horizontal = 3
158+
159+
[node name="Zoom" parent="VBox/HBox" instance=ExtResource( 19 )]
160+
margin_left = 530.0
161+
margin_right = 644.0
162+
text = "BUTTON_ZOOM"
163+
164+
[node name="Fortyfive" parent="VBox/HBox" instance=ExtResource( 19 )]
165+
margin_left = 648.0
166+
margin_right = 769.0
167+
text = "BUTTON_45_DEG"
168+
169+
[node name="Top" parent="VBox/HBox" instance=ExtResource( 19 )]
170+
margin_left = 773.0
171+
margin_right = 871.0
172+
text = "BUTTON_TOP"
173+
188174
[node name="ViewSaveFlow" parent="VBox" instance=ExtResource( 18 )]
189175
unique_name_in_owner = true
190176
margin_top = 116.0
191-
margin_right = 995.0
177+
margin_right = 871.0
192178
margin_bottom = 136.0
193179

194180
[node name="ViewSaveButton" parent="VBox/ViewSaveFlow" instance=ExtResource( 17 )]
@@ -203,10 +189,10 @@ margin_top = 7.0
203189
margin_right = 74.0
204190
margin_bottom = 27.0
205191

206-
[node name="PanelLockVisibleCkbx" parent="." instance=ExtResource( 6 )]
207-
margin_left = 978.0
192+
[node name="LockVisibleCkbx" parent="." instance=ExtResource( 6 )]
193+
margin_left = 854.0
208194
margin_top = 7.0
209-
margin_right = 1002.0
195+
margin_right = 878.0
210196
margin_bottom = 31.0
211197

212198
[node name="ControlDraggable" parent="." instance=ExtResource( 8 )]

‎planetarium/gui/huds_panel.gd

+8-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ class_name HUDsPanel
2121
extends PanelContainer
2222

2323

24+
2425
func _ready():
25-
$ControlDraggable.default_sizes = [
26-
# shrink to content
27-
Vector2.ZERO, # GUI_SMALL
28-
Vector2.ZERO, # GUI_MEDIUM
29-
Vector2.ZERO, # GUI_LARGE
30-
]
31-
$ControlDraggable.max_default_screen_proportions = Vector2(0.55, 0.45)
26+
$ControlDraggable.set_size_to_content()
27+
var view_save_flow: IVViewSaveFlow = find_node("ViewSaveFlow")
28+
view_save_flow.connect("resized", self, "_reset_size")
29+
30+
31+
func _reset_size() -> void:
32+
rect_size = Vector2.ZERO
3233

‎planetarium/gui/huds_panel.tscn

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[ext_resource path="res://planetarium/gui/huds_panel.gd" type="Script" id=1]
44
[ext_resource path="res://ivoyager/gui_widgets/all_huds.tscn" type="PackedScene" id=2]
5-
[ext_resource path="res://ivoyager/gui_mods/panel_lock_visible_ckbx.tscn" type="PackedScene" id=6]
5+
[ext_resource path="res://planetarium/gui/lock_visible_ckbx.tscn" type="PackedScene" id=6]
66
[ext_resource path="res://ivoyager/gui_mods/control_draggable.tscn" type="PackedScene" id=8]
77

88
[node name="HUDsPanel" type="PanelContainer"]
@@ -17,8 +17,8 @@ script = ExtResource( 1 )
1717
[node name="MarginContainer" type="MarginContainer" parent="."]
1818
margin_left = 7.0
1919
margin_top = 7.0
20-
margin_right = 42.0
21-
margin_bottom = 47.0
20+
margin_right = 605.0
21+
margin_bottom = 91.0
2222
mouse_filter = 2
2323
size_flags_horizontal = 0
2424
size_flags_vertical = 0
@@ -28,13 +28,13 @@ custom_constants/margin_left = 10
2828
custom_constants/margin_bottom = 10
2929

3030
[node name="AllHUDs" parent="MarginContainer" instance=ExtResource( 2 )]
31-
margin_right = 10.0
32-
margin_bottom = 30.0
31+
margin_right = 573.0
32+
margin_bottom = 74.0
3333

34-
[node name="PanelLockVisibleCkbx" parent="." instance=ExtResource( 6 )]
35-
margin_left = 350.0
34+
[node name="LockVisibleCkbx" parent="." instance=ExtResource( 6 )]
35+
margin_left = 581.0
3636
margin_top = 7.0
37-
margin_right = 374.0
37+
margin_right = 605.0
3838
margin_bottom = 31.0
3939

4040
[node name="ControlDraggable" parent="." instance=ExtResource( 8 )]

‎planetarium/gui/info_panel.gd

-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ func _resize_vertical() -> void:
7979
var rect := get_rect()
8080
var bottom_limit: float = _world_targeting[1] # Viewport height
8181
for control in _other_panels:
82-
if !control.visible:
83-
continue
8482
var other_rect: Rect2 = control.get_rect()
8583
if rect.end.x < other_rect.position.x:
8684
continue

‎planetarium/gui/info_panel.tscn

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=6 format=2]
22

3-
[ext_resource path="res://ivoyager/gui_mods/panel_lock_visible_ckbx.tscn" type="PackedScene" id=1]
3+
[ext_resource path="res://planetarium/gui/lock_visible_ckbx.tscn" type="PackedScene" id=1]
44
[ext_resource path="res://ivoyager/gui_mods/control_draggable.tscn" type="PackedScene" id=2]
55
[ext_resource path="res://planetarium/gui/info_panel.gd" type="Script" id=5]
66
[ext_resource path="res://ivoyager/gui_widgets/selection_wiki_link.tscn" type="PackedScene" id=10]
@@ -53,7 +53,7 @@ scroll_horizontal_enabled = false
5353
margin_right = 285.0
5454
margin_bottom = 0.0
5555

56-
[node name="PanelLockVisibleCkbx" parent="." instance=ExtResource( 1 )]
56+
[node name="LockVisibleCkbx" parent="." instance=ExtResource( 1 )]
5757
margin_left = 303.0
5858
margin_top = 7.0
5959
margin_right = 327.0

0 commit comments

Comments
 (0)