Skip to content

Commit

Permalink
- Fixes of release builds
Browse files Browse the repository at this point in the history
  • Loading branch information
Difint committed Jun 18, 2022
1 parent 2e3954f commit 9297fb2
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 19 deletions.
3 changes: 3 additions & 0 deletions game/autoload/autoload.gd
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
extends Node

var lnSpaceSystem = load("res://lunco-core/space-system.gd")


func _ready():
print("Autoload ready")

Expand Down
3 changes: 2 additions & 1 deletion game/lunco-core/map.gd
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
class_name lnMap
extends lnSpaceSystem

extends "res://lunco-core/space-system.gd"

4 changes: 2 additions & 2 deletions game/lunco-core/matrix.gd
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This is basically the simulation world
# Check terms for more information
class_name lnMatrix
extends lnSpaceSystem
extends "res://lunco-core/space-system.gd"

#TODO: Introduce GravitaionField class that describes gravitation field in 4D space e.g. gravitation = F(time, x, y, z)
var GravitationField := lnGravitationField.new()
# var GravitationField := lnGravitationField.new()
var LocalTime

onready var player = $Player
Expand Down
6 changes: 5 additions & 1 deletion game/lunco-core/nodes/avatar.gd
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
extends lnSpaceSystem
extends "res://lunco-core/space-system.gd"

onready var lnMatrix = preload("res://lunco-core/matrix.gd")

onready var lnOperator = preload("res://controllers/operator/operator.gd")

#-------------------------------
const MOUSE_SENSITIVITY = 0.1
Expand Down
2 changes: 1 addition & 1 deletion game/lunco-core/processor.gd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#The one which processes commands
class_name lnProcessor
extends lnSpaceSystem
extends "res://lunco-core/space-system.gd"
3 changes: 2 additions & 1 deletion game/lunco-core/space-system.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
class_name lnSpaceSystem
extends Node #TODO: Check if should be node, maybe something else?


#Basic parameters inspired by XTCE
export var Commands = {}
export var Telemetry = {}
Expand All @@ -12,5 +13,5 @@ export var State = {} # Hierarchical state machine
export var Behaviour = {} # Behaviour tree

#----------------
func process_command(command: lnCommand) -> bool:
func process_command(command) -> bool:
return true
6 changes: 3 additions & 3 deletions game/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,12 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://lunco-core/gravitation-field.gd"
}, {
"base": "lnSpaceSystem",
"base": "Node",
"class": "lnMap",
"language": "GDScript",
"path": "res://lunco-core/map.gd"
}, {
"base": "lnSpaceSystem",
"base": "Node",
"class": "lnMatrix",
"language": "GDScript",
"path": "res://lunco-core/matrix.gd"
Expand All @@ -514,7 +514,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://controllers/player/player.gd"
}, {
"base": "lnSpaceSystem",
"base": "Node",
"class": "lnProcessor",
"language": "GDScript",
"path": "res://lunco-core/processor.gd"
Expand Down
19 changes: 10 additions & 9 deletions game/ui/spacecraft-ui.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource path="res://ui/spacecraft-ui.gd" type="Script" id=1]
[ext_resource path="res://assets/fonts/ui_font_outline.tres" type="DynamicFont" id=2]
[ext_resource path="res://ui/widgets/Stopwatch.tscn" type="PackedScene" id=3]
[ext_resource path="res://ui/widgets/stopwatch.tscn" type="PackedScene" id=3]

[node name="SpacecraftUI" type="Control"]
anchor_right = 1.0
Expand Down Expand Up @@ -116,21 +116,22 @@ margin_top = 410.0
margin_right = 167.0
margin_bottom = 494.0

[node name="Stopwatch_Label" type="Label" parent="MET"]
[node name="Stopwatch" parent="MET" instance=ExtResource( 3 )]
margin_left = 0.0
margin_top = 0.0
margin_right = 128.0
margin_bottom = 40.0
text = "00:00:00"

[node name="Stopwatch_Label" type="Label" parent="MET"]
margin_top = 44.0
margin_right = 128.0
margin_bottom = 84.0
custom_fonts/font = ExtResource( 2 )
text = "MET: "
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Stopwatch" parent="MET" instance=ExtResource( 3 )]
margin_left = 0.0
margin_top = 44.0
margin_right = 128.0
margin_bottom = 84.0
text = "00:00:00"

[connection signal="timeout" from="UpdateUI" to="." method="_on_UpdateUI_timeout"]
[connection signal="timeout" from="HideControls" to="." method="_on_HideControls_timeout"]
2 changes: 1 addition & 1 deletion game/ui/widgets/stopwatch.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://ui/widgets/Stopwatch.gd" type="Script" id=1]
[ext_resource path="res://ui/widgets/stopwatch.gd" type="Script" id=1]
[ext_resource path="res://assets/fonts/ui_font_outline.tres" type="DynamicFont" id=2]

[node name="Label" type="Label"]
Expand Down

0 comments on commit 9297fb2

Please sign in to comment.