Skip to content

Commit

Permalink
IMPROVEMENT: flight mechanics, camera mechanics, some fixes, some env…
Browse files Browse the repository at this point in the history
…ironment objects added, debug tweaked.
  • Loading branch information
roalyr committed Jul 25, 2021
1 parent 3bca3ee commit 78a48b1
Show file tree
Hide file tree
Showing 15 changed files with 189 additions and 160 deletions.
2 changes: 2 additions & 0 deletions Assets/Materials/Engine_exhaust/Engine_exhaust_glow_cyan.tres
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ params_specular_mode = 4
params_blend_mode = 1
params_cull_mode = 2
albedo_color = Color( 0.0392157, 0.780392, 0.643137, 1 )
proximity_fade_enable = true
proximity_fade_distance = 1.0
16 changes: 5 additions & 11 deletions Assets/Materials/Metal/Metalic_1.tres
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
[gd_resource type="SpatialMaterial" format=2]

[resource]
albedo_color = Color( 0.152941, 0.152941, 0.152941, 1 )
metallic = 0.5
roughness = 0.27
rim_enabled = true
rim = 0.05
rim_tint = 0.5
clearcoat_enabled = true
clearcoat = 0.2
clearcoat_gloss = 0.5
anisotropy_enabled = true
anisotropy = -0.87
render_priority = 1
albedo_color = Color( 0.313726, 0.152941, 0.141176, 1 )
metallic = 0.78
metallic_specular = 0.24
roughness = 0.25
7 changes: 3 additions & 4 deletions Environment/Default_env.tres
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@

[sub_resource type="ProceduralSky" id=1]
sky_top_color = Color( 0.0470588, 0.054902, 0.0588235, 1 )
sky_horizon_color = Color( 0.0627451, 0.0313726, 0.0431373, 1 )
sky_horizon_color = Color( 0.145098, 0.0431373, 0.0823529, 1 )
sky_curve = 0.79889
sky_energy = 0.48
ground_bottom_color = Color( 0, 0, 0, 1 )
ground_horizon_color = Color( 0.0862745, 0, 0.0313726, 1 )
ground_bottom_color = Color( 0.0823529, 0.0235294, 0.0235294, 1 )
ground_horizon_color = Color( 0, 0, 0, 1 )
ground_curve = 0.0772747
sun_color = Color( 0.223529, 0.00784314, 0.00784314, 1 )
sun_curve = 0.772749

[resource]
background_mode = 2
background_sky = SubResource( 1 )
background_sky_custom_fov = 60.0
background_sky_orientation = Basis( 0.406737, 0.645974, 0.645974, 0, 0.707107, -0.707107, -0.913545, 0.287606, 0.287606 )
background_energy = 0.65
fog_color = Color( 0, 0, 0, 1 )
Expand Down
Binary file modified Images/Progress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ This is a Godot 3 project source files and assets.
[Progress]: Images/Progress.png "Progress"

## How to
Currently the binaries are not being published. If you want to give
this project a go - please download Godot Engine (https://godotengine.org/download), download the code of this project in .zip archive, launch the
You can download one of the pre-compiled binary in the releases section.

You can download Godot Engine (https://godotengine.org/download), download the code of this project in .zip archive, launch the
engine and import the project, after which you will be able to play it
inside of the editor.
1 change: 1 addition & 0 deletions Scenes/FX/Engine_exhaust_blue.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ surfaces/0 = {

[node name="Engine_exhaust_light" type="OmniLight" parent="."]
light_color = Color( 0, 0.976471, 1, 1 )
omni_range = 2.0

[node name="Engine_exhaust_shapes" type="Spatial" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 0.295, 0, 0, 0 )
Expand Down
67 changes: 36 additions & 31 deletions Scenes/Ships/Rogue_fighter.tscn

Large diffs are not rendered by default.

49 changes: 48 additions & 1 deletion Scenes/Systems/System_1.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=9 format=2]

[sub_resource type="CubeMesh" id=1]

Expand All @@ -9,6 +9,29 @@ roughness = 0.25

[sub_resource type="BoxShape" id=3]

[sub_resource type="SphereMesh" id=4]
radius = 1000.0
height = 2000.0

[sub_resource type="SphereShape" id=5]
radius = 1000.0

[sub_resource type="SphereMesh" id=6]
radius = 100.0
height = 200.0

[sub_resource type="SpatialMaterial" id=8]
flags_do_not_receive_shadows = true
params_specular_mode = 4
emission_enabled = true
emission = Color( 0.705882, 0, 0, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false

[sub_resource type="SphereShape" id=7]
radius = 100.0

[node name="System_1" type="Spatial"]

[node name="Light_2" type="DirectionalLight" parent="."]
Expand All @@ -30,3 +53,27 @@ material/0 = SubResource( 2 )

[node name="CollisionShape" type="CollisionShape" parent="Monolith"]
shape = SubResource( 3 )

[node name="Sphere" type="StaticBody" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1774.31, 522.41, -903.324 )

[node name="MeshInstance" type="MeshInstance" parent="Sphere"]
mesh = SubResource( 4 )
material/0 = null

[node name="CollisionShape" type="CollisionShape" parent="Sphere"]
shape = SubResource( 5 )

[node name="Sphere2" type="StaticBody" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1016.77, 1135.81, -1974.36 )

[node name="MeshInstance" type="MeshInstance" parent="Sphere2"]
mesh = SubResource( 6 )
material/0 = SubResource( 8 )

[node name="CollisionShape" type="CollisionShape" parent="Sphere2"]
shape = SubResource( 7 )

[node name="OmniLight" type="OmniLight" parent="Sphere2"]
light_color = Color( 0.737255, 0.0509804, 0, 1 )
omni_range = 1079.04
104 changes: 37 additions & 67 deletions Scenes/UI/UI.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,6 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="Camera_x" type="Label" parent="Main3D/Debug"]
margin_right = 75.0
margin_bottom = 14.0
text = "Camera x: 0"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Camera_y" type="Label" parent="Main3D/Debug"]
margin_top = 16.0
margin_right = 75.0
margin_bottom = 30.0
text = "Camera y: 0"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Current_zoom" type="Label" parent="Main3D/Debug"]
margin_top = 32.0
margin_right = 103.0
Expand Down Expand Up @@ -97,6 +80,22 @@ points = PoolVector2Array( 0, 0, 0, 0 )
width = 1.0
default_color = Color( 0.596078, 0, 0, 1 )

[node name="Marker" type="Label" parent="Main3D/Debug"]
margin_right = 40.0
margin_bottom = 14.0
text = "Origin"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Marker2" type="Label" parent="Main3D/Debug"]
margin_right = 57.0
margin_bottom = 14.0
text = "Monolith"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Text_panel" type="Control" parent="Main3D"]
anchor_left = 1.0
anchor_right = 1.0
Expand All @@ -121,12 +120,14 @@ __meta__ = {
[node name="Text" type="Label" parent="Main3D/Text_panel"]
anchor_right = 1.0
anchor_bottom = 1.0
text = "Left click and drag - rotate.
Mouse wheel - zoom in/out.
text = "Left - turret rotate / steer.
Mouse wheel - zoom in / out.
Escape - quit.
Space - WIP.
H - switch turret mode
Space - mouse flight."
Space - mouse flight.
H - switch turret mode.
Space - mouse flight.
UP / DOWN - engine control.
Z - drag anchor."
autowrap = true
__meta__ = {
"_edit_use_anchors_": false
Expand All @@ -141,40 +142,28 @@ margin_top = -80.0
mouse_filter = 1
mouse_default_cursor_shape = 2
__meta__ = {
"_edit_group_": true,
"_edit_use_anchors_": false
}

[node name="ColorRect" type="ColorRect" parent="Controls"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 2
color = Color( 0.109804, 0.109804, 0.109804, 1 )
color = Color( 0, 0, 0, 0.113725 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Button_turret" type="Button" parent="Controls"]
margin_left = 16.0
margin_top = 24.0
margin_top = 8.0
margin_right = 72.0
margin_bottom = 44.0
focus_mode = 0
toggle_mode = true
keep_pressed_outside = true
text = "Turret view"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Button_" type="Button" parent="Controls"]
margin_left = 16.0
margin_top = 56.0
margin_right = 72.0
margin_bottom = 76.0
margin_bottom = 28.0
focus_mode = 0
toggle_mode = true
keep_pressed_outside = true
text = "Turret"
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -183,9 +172,9 @@ __meta__ = {
anchor_left = 1.0
anchor_right = 1.0
margin_left = -72.0
margin_top = 24.0
margin_top = 8.0
margin_right = -16.0
margin_bottom = 44.0
margin_bottom = 28.0
focus_mode = 0
toggle_mode = true
keep_pressed_outside = true
Expand All @@ -198,24 +187,22 @@ __meta__ = {
anchor_left = 1.0
anchor_right = 1.0
margin_left = -72.0
margin_top = 56.0
margin_top = 40.0
margin_right = -16.0
margin_bottom = 76.0
margin_bottom = 60.0
focus_mode = 0
toggle_mode = true
keep_pressed_outside = true
text = "Text"
text = "Info"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Button_quit" type="Button" parent="Controls"]
anchor_left = 1.0
anchor_right = 1.0
margin_left = -144.0
margin_top = 56.0
margin_right = -88.0
margin_bottom = 76.0
margin_left = 16.0
margin_top = 40.0
margin_right = 72.0
margin_bottom = 60.0
focus_mode = 0
custom_styles/hover = ExtResource( 2 )
custom_styles/pressed = ExtResource( 4 )
Expand All @@ -226,27 +213,10 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="Marker" type="Label" parent="."]
margin_right = 40.0
margin_bottom = 14.0
text = "Origin"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Marker2" type="Label" parent="."]
margin_right = 40.0
margin_bottom = 14.0
text = "Monolith"
__meta__ = {
"_edit_use_anchors_": false
}

[connection signal="mouse_entered" from="Main3D" to="." method="_on_Viewport_main_mouse_entered"]
[connection signal="mouse_exited" from="Main3D" to="." method="_on_Viewport_main_mouse_exited"]
[connection signal="resized" from="Main3D" to="." method="_on_Viewport_main_resized"]
[connection signal="toggled" from="Controls/Button_turret" to="." method="_on_Button_turret_toggled"]
[connection signal="toggled" from="Controls/Button_" to="." method="_on_Button_engine_toggled"]
[connection signal="toggled" from="Controls/Button_debug" to="." method="_on_Button_debug_toggled"]
[connection signal="toggled" from="Controls/Button_text_panel" to="." method="_on_Button_text_panel_toggled"]
[connection signal="pressed" from="Controls/Button_quit" to="." method="_on_Button_quit_pressed"]
Loading

0 comments on commit 78a48b1

Please sign in to comment.