diff --git a/Assets/Shaders/Star.gdshader b/Assets/Shaders/Star.gdshader
index 933e0161..7c5a8e4c 100644
--- a/Assets/Shaders/Star.gdshader
+++ b/Assets/Shaders/Star.gdshader
@@ -1,32 +1,49 @@
shader_type spatial;
render_mode depth_draw_opaque, cull_front, unshaded;
+uniform vec4 halo_color : hint_color;
uniform vec4 corona_color : hint_color;
uniform vec4 core_color : hint_color;
-uniform float rim_strength = 0.05;
-uniform float rim_power = 9.0;
-uniform float core_strength = 0.05;
-uniform float core_power = 9.0;
-uniform float core_amount = 0.05;
+uniform float halo_strength = 0.2;
+uniform float halo_power = 1.0;
+uniform float halo_amount = 1.0;
-// For logarithmic depth buffer.
-const float c = 0.001;
-varying vec4 gl_Position;
+uniform float corona_strength = 10.0;
+uniform float corona_power = 10.0;
+uniform float corona_amount = 1.0;
-void vertex()
-{
- // For logarithmic depth buffer.
- gl_Position = MODELVIEW_MATRIX*vec4(VERTEX, 1.0);
+uniform float core_strength = 50.0;
+uniform float core_power = 50.0;
+uniform float core_amount = 50.0;
+
+uniform sampler2D displacement_texture;
+uniform float displacement_scale = 0.02;
+uniform float displacement_velocity = 0.01;
+
+
+void vertex() {
+ vec2 tex_position_x = VERTEX.yz / 1.0 - TIME*displacement_velocity;
+ vec2 tex_position_y = VERTEX.xz / 1.0 + TIME*displacement_velocity;
+ vec2 tex_position_z = VERTEX.xy / 1.0 - TIME*displacement_velocity;
+
+ float displacement_x = 2.0*texture(displacement_texture, tex_position_x).r-1.0;
+ float displacement_y = 2.0*texture(displacement_texture, tex_position_y).r-1.0;
+ float displacement_z = 2.0*texture(displacement_texture, tex_position_z).r-1.0;
+
+ VERTEX.z += displacement_z * displacement_scale;
+ VERTEX.x += displacement_x * displacement_scale;
+ VERTEX.y += displacement_y * displacement_scale;
}
void fragment()
{
- // Logarithmic depth buffer.
- // DEPTH = log2(max(1e-6, 1.0 -gl_Position.z)) * c;
-
- float rim = clamp(pow( dot( NORMAL, VIEW ), rim_power)*rim_strength, 0.0, 1.0);
+ float halo = clamp(pow( dot( NORMAL, VIEW ), halo_power)*halo_strength, 0.0, 1.0);
+ float corona = clamp(pow( dot( NORMAL, VIEW ), corona_power)*corona_strength, 0.0, 1.0);
float core = clamp(pow( dot( NORMAL, VIEW ), core_power)*core_strength, 0.0, 1.0);
- ALBEDO = corona_color.rgb + core*core_amount*core_color.rgb;
- ALPHA = rim;
+ ALBEDO =
+ halo*halo_amount*halo_color.rgb
+ + corona*corona_amount*corona_color.rgb
+ + core*core_amount*core_color.rgb;
+ ALPHA = halo;
}
diff --git a/Assets/UI_images/accel.png b/Assets/UI_images/png/buttons/accel.png
similarity index 100%
rename from Assets/UI_images/accel.png
rename to Assets/UI_images/png/buttons/accel.png
diff --git a/Assets/UI_images/accel.png.import b/Assets/UI_images/png/buttons/accel.png.import
similarity index 71%
rename from Assets/UI_images/accel.png.import
rename to Assets/UI_images/png/buttons/accel.png.import
index a2c9d5b8..f4a82646 100644
--- a/Assets/UI_images/accel.png.import
+++ b/Assets/UI_images/png/buttons/accel.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/accel.png-cf6ab6c82b65643b72a25f8d36af48e0.stex"
+path="res://.import/accel.png-4b3242445610598646306840d494575e.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/accel.png"
-dest_files=[ "res://.import/accel.png-cf6ab6c82b65643b72a25f8d36af48e0.stex" ]
+source_file="res://Assets/UI_images/png/buttons/accel.png"
+dest_files=[ "res://.import/accel.png-4b3242445610598646306840d494575e.stex" ]
[params]
diff --git a/Assets/UI_images/deccel.png b/Assets/UI_images/png/buttons/deccel.png
similarity index 100%
rename from Assets/UI_images/deccel.png
rename to Assets/UI_images/png/buttons/deccel.png
diff --git a/Assets/UI_images/png/buttons/deccel.png.import b/Assets/UI_images/png/buttons/deccel.png.import
new file mode 100644
index 00000000..92ce72b9
--- /dev/null
+++ b/Assets/UI_images/png/buttons/deccel.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/deccel.png-b6d5396ca46f31de70e8cda45673d78c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI_images/png/buttons/deccel.png"
+dest_files=[ "res://.import/deccel.png-b6d5396ca46f31de70e8cda45673d78c.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/UI_images/ekill.png b/Assets/UI_images/png/buttons/ekill.png
similarity index 100%
rename from Assets/UI_images/ekill.png
rename to Assets/UI_images/png/buttons/ekill.png
diff --git a/Assets/UI_images/ekill.png.import b/Assets/UI_images/png/buttons/ekill.png.import
similarity index 71%
rename from Assets/UI_images/ekill.png.import
rename to Assets/UI_images/png/buttons/ekill.png.import
index 5cf7067e..f1363f0b 100644
--- a/Assets/UI_images/ekill.png.import
+++ b/Assets/UI_images/png/buttons/ekill.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/ekill.png-e7c5212d77ed0647c7f08df143a0f9a9.stex"
+path="res://.import/ekill.png-93c7a2a533dc26faa97bc7f71ddb39fb.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/ekill.png"
-dest_files=[ "res://.import/ekill.png-e7c5212d77ed0647c7f08df143a0f9a9.stex" ]
+source_file="res://Assets/UI_images/png/buttons/ekill.png"
+dest_files=[ "res://.import/ekill.png-93c7a2a533dc26faa97bc7f71ddb39fb.stex" ]
[params]
diff --git a/Assets/UI_images/options.png b/Assets/UI_images/png/buttons/options.png
similarity index 100%
rename from Assets/UI_images/options.png
rename to Assets/UI_images/png/buttons/options.png
diff --git a/Assets/UI_images/png/buttons/options.png.import b/Assets/UI_images/png/buttons/options.png.import
new file mode 100644
index 00000000..3ac84a97
--- /dev/null
+++ b/Assets/UI_images/png/buttons/options.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/options.png-789ca28e3b2456756f3f62f3b8f9d7e1.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI_images/png/buttons/options.png"
+dest_files=[ "res://.import/options.png-789ca28e3b2456756f3f62f3b8f9d7e1.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/UI_images/stick.png b/Assets/UI_images/png/buttons/stick.png
similarity index 100%
rename from Assets/UI_images/stick.png
rename to Assets/UI_images/png/buttons/stick.png
diff --git a/Assets/UI_images/stick.png.import b/Assets/UI_images/png/buttons/stick.png.import
similarity index 71%
rename from Assets/UI_images/stick.png.import
rename to Assets/UI_images/png/buttons/stick.png.import
index 5a8737dc..70e658e3 100644
--- a/Assets/UI_images/stick.png.import
+++ b/Assets/UI_images/png/buttons/stick.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/stick.png-4571900ebdd1f5aca2de2c9971ec7b69.stex"
+path="res://.import/stick.png-7f2eaaa1577e63c951e92e367f88c5a1.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/stick.png"
-dest_files=[ "res://.import/stick.png-4571900ebdd1f5aca2de2c9971ec7b69.stex" ]
+source_file="res://Assets/UI_images/png/buttons/stick.png"
+dest_files=[ "res://.import/stick.png-7f2eaaa1577e63c951e92e367f88c5a1.stex" ]
[params]
diff --git a/Assets/UI_images/turret.png b/Assets/UI_images/png/buttons/turret.png
similarity index 100%
rename from Assets/UI_images/turret.png
rename to Assets/UI_images/png/buttons/turret.png
diff --git a/Assets/UI_images/png/buttons/turret.png.import b/Assets/UI_images/png/buttons/turret.png.import
new file mode 100644
index 00000000..fd6df80e
--- /dev/null
+++ b/Assets/UI_images/png/buttons/turret.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/turret.png-f112c7511134b36ec611a76cf878fe2e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI_images/png/buttons/turret.png"
+dest_files=[ "res://.import/turret.png-f112c7511134b36ec611a76cf878fe2e.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/UI_images/ui_opacity.png b/Assets/UI_images/png/buttons/ui_opacity.png
similarity index 100%
rename from Assets/UI_images/ui_opacity.png
rename to Assets/UI_images/png/buttons/ui_opacity.png
diff --git a/Assets/UI_images/ui_opacity.png.import b/Assets/UI_images/png/buttons/ui_opacity.png.import
similarity index 69%
rename from Assets/UI_images/ui_opacity.png.import
rename to Assets/UI_images/png/buttons/ui_opacity.png.import
index 92400d74..9c703a08 100644
--- a/Assets/UI_images/ui_opacity.png.import
+++ b/Assets/UI_images/png/buttons/ui_opacity.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/ui_opacity.png-5ab9c77aecd3b1dbb4ed901a96a715ca.stex"
+path="res://.import/ui_opacity.png-b8c52256ba84afa982cb23d07268c174.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/ui_opacity.png"
-dest_files=[ "res://.import/ui_opacity.png-5ab9c77aecd3b1dbb4ed901a96a715ca.stex" ]
+source_file="res://Assets/UI_images/png/buttons/ui_opacity.png"
+dest_files=[ "res://.import/ui_opacity.png-b8c52256ba84afa982cb23d07268c174.stex" ]
[params]
diff --git a/Assets/UI_images/Source files/.gdignore b/Assets/UI_images/source files/.gdignore
similarity index 100%
rename from Assets/UI_images/Source files/.gdignore
rename to Assets/UI_images/source files/.gdignore
diff --git a/Assets/UI_images/Source files/accel.dxf b/Assets/UI_images/source files/accel.dxf
similarity index 100%
rename from Assets/UI_images/Source files/accel.dxf
rename to Assets/UI_images/source files/accel.dxf
diff --git a/Assets/UI_images/Source files/deccel.dxf b/Assets/UI_images/source files/deccel.dxf
similarity index 100%
rename from Assets/UI_images/Source files/deccel.dxf
rename to Assets/UI_images/source files/deccel.dxf
diff --git a/Assets/UI_images/Source files/ekill.dxf b/Assets/UI_images/source files/ekill.dxf
similarity index 100%
rename from Assets/UI_images/Source files/ekill.dxf
rename to Assets/UI_images/source files/ekill.dxf
diff --git a/Assets/UI_images/source files/odg/_svg_page_template.odg b/Assets/UI_images/source files/odg/_svg_page_template.odg
new file mode 100644
index 00000000..382d2142
Binary files /dev/null and b/Assets/UI_images/source files/odg/_svg_page_template.odg differ
diff --git a/Assets/UI_images/source files/odg/galaxy.odg b/Assets/UI_images/source files/odg/galaxy.odg
new file mode 100644
index 00000000..57fa8271
Binary files /dev/null and b/Assets/UI_images/source files/odg/galaxy.odg differ
diff --git a/Assets/UI_images/source files/odg/planet_rings.odg b/Assets/UI_images/source files/odg/planet_rings.odg
new file mode 100644
index 00000000..6c0f1cb7
Binary files /dev/null and b/Assets/UI_images/source files/odg/planet_rings.odg differ
diff --git a/Assets/UI_images/source files/odg/star.odg b/Assets/UI_images/source files/odg/star.odg
new file mode 100644
index 00000000..982fbfc7
Binary files /dev/null and b/Assets/UI_images/source files/odg/star.odg differ
diff --git a/Assets/UI_images/source files/odg/system.odg b/Assets/UI_images/source files/odg/system.odg
new file mode 100644
index 00000000..cd073c8e
Binary files /dev/null and b/Assets/UI_images/source files/odg/system.odg differ
diff --git a/Assets/UI_images/Source files/options.dxf b/Assets/UI_images/source files/options.dxf
similarity index 100%
rename from Assets/UI_images/Source files/options.dxf
rename to Assets/UI_images/source files/options.dxf
diff --git a/Assets/UI_images/Source files/stick.dxf b/Assets/UI_images/source files/stick.dxf
similarity index 100%
rename from Assets/UI_images/Source files/stick.dxf
rename to Assets/UI_images/source files/stick.dxf
diff --git a/Assets/UI_images/Source files/turret.dxf b/Assets/UI_images/source files/turret.dxf
similarity index 100%
rename from Assets/UI_images/Source files/turret.dxf
rename to Assets/UI_images/source files/turret.dxf
diff --git a/Assets/UI_images/Source files/ui_opacity.dxf b/Assets/UI_images/source files/ui_opacity.dxf
similarity index 100%
rename from Assets/UI_images/Source files/ui_opacity.dxf
rename to Assets/UI_images/source files/ui_opacity.dxf
diff --git a/Assets/UI_images/svg/icons/galaxy.svg b/Assets/UI_images/svg/icons/galaxy.svg
new file mode 100644
index 00000000..18e7a738
--- /dev/null
+++ b/Assets/UI_images/svg/icons/galaxy.svg
@@ -0,0 +1,118 @@
+
+
+
\ No newline at end of file
diff --git a/Assets/UI_images/turret.png.import b/Assets/UI_images/svg/icons/galaxy.svg.import
similarity index 71%
rename from Assets/UI_images/turret.png.import
rename to Assets/UI_images/svg/icons/galaxy.svg.import
index f8e45510..112d023d 100644
--- a/Assets/UI_images/turret.png.import
+++ b/Assets/UI_images/svg/icons/galaxy.svg.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/turret.png-24a22203a1f645c150230772768eb3b5.stex"
+path="res://.import/galaxy.svg-d5390d451e67260a01468a33847bddc2.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/turret.png"
-dest_files=[ "res://.import/turret.png-24a22203a1f645c150230772768eb3b5.stex" ]
+source_file="res://Assets/UI_images/svg/icons/galaxy.svg"
+dest_files=[ "res://.import/galaxy.svg-d5390d451e67260a01468a33847bddc2.stex" ]
[params]
diff --git a/Assets/UI_images/svg/icons/planet_rings.svg b/Assets/UI_images/svg/icons/planet_rings.svg
new file mode 100644
index 00000000..c022abb5
--- /dev/null
+++ b/Assets/UI_images/svg/icons/planet_rings.svg
@@ -0,0 +1,82 @@
+
+
+
\ No newline at end of file
diff --git a/Assets/UI_images/svg/icons/planet_rings.svg.import b/Assets/UI_images/svg/icons/planet_rings.svg.import
new file mode 100644
index 00000000..54415175
--- /dev/null
+++ b/Assets/UI_images/svg/icons/planet_rings.svg.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/planet_rings.svg-519996d9f9194d640416abd5b1a0195d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI_images/svg/icons/planet_rings.svg"
+dest_files=[ "res://.import/planet_rings.svg-519996d9f9194d640416abd5b1a0195d.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/UI_images/svg/icons/star.svg b/Assets/UI_images/svg/icons/star.svg
new file mode 100644
index 00000000..c3f77039
--- /dev/null
+++ b/Assets/UI_images/svg/icons/star.svg
@@ -0,0 +1,70 @@
+
+
+
\ No newline at end of file
diff --git a/Assets/UI_images/options.png.import b/Assets/UI_images/svg/icons/star.svg.import
similarity index 71%
rename from Assets/UI_images/options.png.import
rename to Assets/UI_images/svg/icons/star.svg.import
index 99cc6b92..b0577be1 100644
--- a/Assets/UI_images/options.png.import
+++ b/Assets/UI_images/svg/icons/star.svg.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/options.png-460ae2263b446907863c87202f7eceea.stex"
+path="res://.import/star.svg-05abc95872bd3aabc808e2d85c7715f5.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/options.png"
-dest_files=[ "res://.import/options.png-460ae2263b446907863c87202f7eceea.stex" ]
+source_file="res://Assets/UI_images/svg/icons/star.svg"
+dest_files=[ "res://.import/star.svg-05abc95872bd3aabc808e2d85c7715f5.stex" ]
[params]
diff --git a/Assets/UI_images/svg/icons/system.svg b/Assets/UI_images/svg/icons/system.svg
new file mode 100644
index 00000000..1965f9af
--- /dev/null
+++ b/Assets/UI_images/svg/icons/system.svg
@@ -0,0 +1,83 @@
+
+
+
\ No newline at end of file
diff --git a/Assets/UI_images/deccel.png.import b/Assets/UI_images/svg/icons/system.svg.import
similarity index 71%
rename from Assets/UI_images/deccel.png.import
rename to Assets/UI_images/svg/icons/system.svg.import
index d6708c36..f0ce78db 100644
--- a/Assets/UI_images/deccel.png.import
+++ b/Assets/UI_images/svg/icons/system.svg.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/deccel.png-7c3dde92f2a46828c0696fcd1785d09f.stex"
+path="res://.import/system.svg-fcf2551aabb0fafbd3f7c8acbf77b60d.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/UI_images/deccel.png"
-dest_files=[ "res://.import/deccel.png-7c3dde92f2a46828c0696fcd1785d09f.stex" ]
+source_file="res://Assets/UI_images/svg/icons/system.svg"
+dest_files=[ "res://.import/system.svg-fcf2551aabb0fafbd3f7c8acbf77b60d.stex" ]
[params]
diff --git a/README.md b/README.md
index 1a0dffb1..adb2851f 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ accelerate rapidly.
- Fixed OmniLight and camera flickering (workarounds but robust).
- Removed unrelated files from within project scope.
- Removed Calinou's LOD plugin files.
+- New dynamic star shader. Stars are much less in polycount now.
+- Added icons for custom zone nodes.
## How to
diff --git a/Scenes/Environment/Stars/Star_blue.tscn b/Scenes/Environment/Stars/Star_blue.tscn
index 984362d4..5828087e 100644
--- a/Scenes/Environment/Stars/Star_blue.tscn
+++ b/Scenes/Environment/Stars/Star_blue.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=12 format=2]
[ext_resource path="res://Scripts/Marker.gd" type="Script" id=1]
-[ext_resource path="res://Assets/Shaders/Star_halo.gdshader" type="Shader" id=2]
[ext_resource path="res://Assets/Shaders/Star.gdshader" type="Shader" id=3]
[ext_resource path="res://Scripts/LOD_trigger_zone.gd" type="Script" id=5]
@@ -24,27 +23,28 @@ surfaces/0 = {
"vertex_count": 1876
}
+[sub_resource type="OpenSimplexNoise" id=82]
+
+[sub_resource type="NoiseTexture" id=83]
+noise = SubResource( 82 )
+
[sub_resource type="ShaderMaterial" id=42]
shader = ExtResource( 3 )
-shader_param/corona_color = Color( 0.137255, 0.827451, 0.988235, 1 )
-shader_param/core_color = Color( 0.235294, 0.8, 0.996078, 1 )
-shader_param/rim_strength = 8.693
-shader_param/rim_power = 4.518
-shader_param/core_strength = 5.342
-shader_param/core_power = 1.573
-shader_param/core_amount = 5.996
-
-[sub_resource type="ShaderMaterial" id=80]
-shader = ExtResource( 2 )
-shader_param/albedo = Color( 0.819608, 0.85098, 1, 1 )
-shader_param/rim_strength = 2.028
-shader_param/rim_power = 9.0
-
-[sub_resource type="ShaderMaterial" id=81]
-shader = ExtResource( 2 )
-shader_param/albedo = Color( 0.184314, 0.788235, 0.972549, 1 )
-shader_param/rim_strength = 0.05
-shader_param/rim_power = 20.0
+shader_param/halo_color = Color( 0, 0.905882, 1, 1 )
+shader_param/corona_color = Color( 0, 0.929412, 1, 1 )
+shader_param/core_color = Color( 0, 1, 0.929412, 1 )
+shader_param/halo_strength = 0.116
+shader_param/halo_power = 1.0
+shader_param/halo_amount = 1.0
+shader_param/corona_strength = 10.0
+shader_param/corona_power = 11.507
+shader_param/corona_amount = 1.0
+shader_param/core_strength = 50.0
+shader_param/core_power = 50.0
+shader_param/core_amount = 50.0
+shader_param/displacement_scale = 0.015
+shader_param/displacement_velocity = 0.02
+shader_param/displacement_texture = SubResource( 83 )
[sub_resource type="ArrayMesh" id=40]
resource_name = "Icosphere.002"
@@ -79,7 +79,7 @@ script = ExtResource( 1 )
marker_range = 2
[node name="OmniLight_1e15" type="OmniLight" parent="."]
-light_color = Color( 0.113725, 0.639216, 0.956863, 1 )
+light_color = Color( 0.52549, 0.823529, 1, 1 )
light_energy = 5.0
light_indirect_energy = 0.5
light_cull_mask = 4294443007
@@ -93,7 +93,7 @@ __meta__ = {
}
[node name="CollisionShape" type="CollisionShape" parent="Star_blue_1e10"]
-transform = Transform( 0.700234, 0, 0, 0, 0.700234, 0, 0, 0, 0.700234, 0, 0, 0 )
+transform = Transform( 0.503425, 0, 0, 0, 0.503425, 0, 0, 0, 0.503425, 0, 0, 0 )
shape = SubResource( 38 )
[node name="LOD_trigger_zone" type="Spatial" parent="Star_blue_1e10"]
@@ -119,16 +119,6 @@ shape = SubResource( 79 )
mesh = SubResource( 39 )
material/0 = SubResource( 42 )
-[node name="Halo" type="MeshInstance" parent="Star_blue_1e10/LOD_trigger_zone/LOD0/Scene_items"]
-transform = Transform( 1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, 0, 0, 0 )
-mesh = SubResource( 39 )
-material/0 = SubResource( 80 )
-
-[node name="Glow" type="MeshInstance" parent="Star_blue_1e10/LOD_trigger_zone/LOD0/Scene_items"]
-transform = Transform( 7, 0, 0, 0, 5, 0, 0, 0, 7, 0, 0, 0 )
-mesh = SubResource( 39 )
-material/0 = SubResource( 81 )
-
[node name="LOD1" type="Area" parent="Star_blue_1e10/LOD_trigger_zone"]
visible = false
input_ray_pickable = false
@@ -146,16 +136,6 @@ shape = SubResource( 79 )
mesh = SubResource( 40 )
material/0 = SubResource( 42 )
-[node name="Halo" type="MeshInstance" parent="Star_blue_1e10/LOD_trigger_zone/LOD1/Scene_items"]
-transform = Transform( 1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, 0, 0, 0 )
-mesh = SubResource( 40 )
-material/0 = SubResource( 80 )
-
-[node name="Glow" type="MeshInstance" parent="Star_blue_1e10/LOD_trigger_zone/LOD1/Scene_items"]
-transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0 )
-mesh = SubResource( 40 )
-material/0 = SubResource( 81 )
-
[node name="LOD2" type="Area" parent="Star_blue_1e10/LOD_trigger_zone"]
visible = false
input_ray_pickable = false
@@ -164,7 +144,7 @@ linear_damp = 0.0
angular_damp = 0.0
[node name="Shape" type="CollisionShape" parent="Star_blue_1e10/LOD_trigger_zone/LOD2"]
-transform = Transform( 3000, 0, 0, 0, 3000, 0, 0, 0, 3000, 0, 0, 0 )
+transform = Transform( 5000, 0, 0, 0, 5000, 0, 0, 0, 5000, 0, 0, 0 )
shape = SubResource( 79 )
[node name="Scene_items" type="Spatial" parent="Star_blue_1e10/LOD_trigger_zone/LOD2"]
@@ -173,16 +153,6 @@ shape = SubResource( 79 )
mesh = SubResource( 41 )
material/0 = SubResource( 42 )
-[node name="Halo" type="MeshInstance" parent="Star_blue_1e10/LOD_trigger_zone/LOD2/Scene_items"]
-transform = Transform( 1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, 0, 0, 0 )
-mesh = SubResource( 41 )
-material/0 = SubResource( 80 )
-
-[node name="Glow" type="MeshInstance" parent="Star_blue_1e10/LOD_trigger_zone/LOD2/Scene_items"]
-transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0 )
-mesh = SubResource( 41 )
-material/0 = SubResource( 81 )
-
[connection signal="body_entered" from="Star_blue_1e10/LOD_trigger_zone/LOD0" to="Star_blue_1e10/LOD_trigger_zone" method="_on_LOD0_body_entered"]
[connection signal="body_exited" from="Star_blue_1e10/LOD_trigger_zone/LOD0" to="Star_blue_1e10/LOD_trigger_zone" method="_on_LOD0_body_exited"]
[connection signal="body_entered" from="Star_blue_1e10/LOD_trigger_zone/LOD1" to="Star_blue_1e10/LOD_trigger_zone" method="_on_LOD1_body_entered"]
diff --git a/Scenes/Environment/Systems/Star_system.tscn b/Scenes/Environment/Systems/Star_system.tscn
index fe4a72f8..6c73d399 100644
--- a/Scenes/Environment/Systems/Star_system.tscn
+++ b/Scenes/Environment/Systems/Star_system.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=15 format=2]
[ext_resource path="res://Assets/Shaders/Solid.gdshader" type="Shader" id=1]
[ext_resource path="res://Scenes/Environment/Planets/Planet_blue.tscn" type="PackedScene" id=2]
[ext_resource path="res://Scenes/Environment/Stars/Star_blue.tscn" type="PackedScene" id=3]
-[ext_resource path="res://Scenes/Zones/Local_space_stellar.tscn" type="PackedScene" id=4]
+[ext_resource path="res://Scenes/Zones/Local_space_triggers/Local_space_stellar.tscn" type="PackedScene" id=4]
+[ext_resource path="res://Scenes/Zones/Local_space_triggers/Local_space_planetary.tscn" type="PackedScene" id=5]
[ext_resource path="res://Assets/Shaders/Cloud.gdshader" type="Shader" id=6]
[ext_resource path="res://Scripts/Marker.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Editor_object.gd" type="Script" id=8]
@@ -84,22 +85,16 @@ transform = Transform( 3.00568, 0, 0, 0, 1.22308, 0, 0, 0, 1.22308, -0.147841, -
mesh = SubResource( 29 )
material/0 = SubResource( 15 )
-[node name="Planet local" parent="." instance=ExtResource( 4 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.82763e+11, 0, 1.32519e+11 )
+[node name="Local_space_stellar" parent="." instance=ExtResource( 4 )]
-[node name="Shape (must be above all)" parent="Planet local" index="1"]
-transform = Transform( 1e+08, 0, 0, 0, 1e+08, 0, 0, 0, 1e+08, 0, 0, 0 )
+[node name="Blue star" parent="Local_space_stellar/Scenes" index="0" instance=ExtResource( 3 )]
-[node name="Planet blue" parent="Planet local/Scenes" index="0" instance=ExtResource( 2 )]
+[node name="Local_space_planetary" parent="." instance=ExtResource( 5 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.11887e+11, -5.12447e+10, 9.70431e+11 )
+
+[node name="Planet blue" parent="Local_space_planetary/Scenes" index="0" instance=ExtResource( 2 )]
script = ExtResource( 7 )
marker_range = 3
-[node name="Star local" parent="." instance=ExtResource( 4 )]
-
-[node name="Shape (must be above all)" parent="Star local" index="1"]
-transform = Transform( 1e+11, 0, 0, 0, 1e+11, 0, 0, 0, 1e+11, 0, 0, 0 )
-
-[node name="Blue star" parent="Star local/Scenes" index="0" instance=ExtResource( 3 )]
-
-[editable path="Planet local"]
-[editable path="Star local"]
+[editable path="Local_space_stellar"]
+[editable path="Local_space_planetary"]
diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn
index 7c175643..cf069377 100644
--- a/Scenes/Main.tscn
+++ b/Scenes/Main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=35 format=2]
+[gd_scene load_steps=36 format=2]
[ext_resource path="res://Scripts/Main.gd" type="Script" id=1]
[ext_resource path="res://Scenes/Ships/Phoenix_heavy.tscn" type="PackedScene" id=2]
@@ -17,11 +17,11 @@
[ext_resource path="res://Assets/Shaders/Starsphere_background.gdshader" type="Shader" id=15]
[ext_resource path="res://Scripts/Paths.gd" type="Script" id=16]
[ext_resource path="res://Scripts/Marker.gd" type="Script" id=17]
-[ext_resource path="res://Scenes/Zones/Local_space_galaxy.tscn" type="PackedScene" id=18]
+[ext_resource path="res://Scenes/Zones/Local_space_triggers/Local_space_galaxy.tscn" type="PackedScene" id=18]
[ext_resource path="res://Scenes/Environment/Galaxies/Galaxy.tscn" type="PackedScene" id=19]
[ext_resource path="res://Scripts/Origin_rebase/Rebase_local_galaxy.gd" type="Script" id=20]
[ext_resource path="res://Scripts/State/Space_state.gd" type="Script" id=21]
-[ext_resource path="res://Scenes/Zones/Local_space_system.tscn" type="PackedScene" id=22]
+[ext_resource path="res://Scenes/Zones/Local_space_triggers/Local_space_system.tscn" type="PackedScene" id=22]
[ext_resource path="res://Scripts/Input/Mouse.gd" type="Script" id=23]
[ext_resource path="res://Scripts/Input/Pad.gd" type="Script" id=24]
[ext_resource path="res://Scripts/Origin_rebase/Rebase_local_system.gd" type="Script" id=25]
@@ -30,6 +30,7 @@
[ext_resource path="res://Scripts/UI/Pad.gd" type="Script" id=28]
[ext_resource path="res://Scripts/UI/Windows.gd" type="Script" id=29]
[ext_resource path="res://Scripts/UI/Readouts.gd" type="Script" id=30]
+[ext_resource path="res://Scripts/Origin_rebase/Rebase_local_planetary.gd" type="Script" id=31]
[sub_resource type="ArrayMesh" id=34]
surfaces/0 = {
@@ -156,18 +157,15 @@ script = ExtResource( 5 )
[node name="Galaxy local" parent="Container/View/Global_space" instance=ExtResource( 18 )]
transform = Transform( 1, -3.07301e-08, 1.26253e-08, 3.07301e-08, 0.711168, -0.703022, 1.26253e-08, 0.703022, 0.711168, 0, 2.77657e+17, -3.17322e+17 )
-[node name="Shape (must be above all)" parent="Container/View/Global_space/Galaxy local" index="1"]
-transform = Transform( 1.20147e+18, 0, 0, 0, 2.00245e+17, 0, 0, 0, 1.20147e+18, 0, 0, 0 )
+[node name="Zone shape" parent="Container/View/Global_space/Galaxy local" index="1"]
+transform = Transform( 1.44e+18, 0, 0, 0, 2.88e+17, 0, 0, 0, 1.44e+18, 0, 0, 0 )
[node name="Galaxy" parent="Container/View/Global_space/Galaxy local/Scenes" index="0" instance=ExtResource( 19 )]
-[node name="System local" parent="Container/View/Global_space/Galaxy local" instance=ExtResource( 22 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.34936e+17, 1.26617e+17, -2.23928e+17 )
+[node name="System local" parent="Container/View/Global_space/Galaxy local/Scenes" index="1" instance=ExtResource( 22 )]
+transform = Transform( 1, 4.44089e-15, -1.77636e-15, -8.88178e-16, 1, 0, -8.88178e-16, 0, 1, -4.34936e+17, 1.26617e+17, -2.23928e+17 )
-[node name="Shape (must be above all)" parent="Container/View/Global_space/Galaxy local/System local" index="1"]
-transform = Transform( 1e+14, 0, 0, 0, 1e+14, 0, 0, 0, 1e+14, 0, 0, 0 )
-
-[node name="Star system" parent="Container/View/Global_space/Galaxy local/System local/Scenes" index="0" instance=ExtResource( 7 )]
+[node name="Star system" parent="Container/View/Global_space/Galaxy local/Scenes/System local/Scenes" index="0" instance=ExtResource( 7 )]
script = ExtResource( 17 )
marker_range = 1
@@ -192,6 +190,13 @@ script = ExtResource( 27 )
[node name="Do not remove" type="Node" parent="Container/View/Local_space_stellar"]
+[node name="Local_space_planetary" type="Position3D" parent="Container/View"]
+script = ExtResource( 31 )
+
+[node name="Do not translate" type="Node" parent="Container/View/Local_space_planetary"]
+
+[node name="Do not remove" type="Node" parent="Container/View/Local_space_planetary"]
+
[node name="Ship_space" type="Position3D" parent="Container/View"]
[node name="Camera_decorations" type="Spatial" parent="Container/View/Ship_space"]
@@ -216,4 +221,4 @@ omni_range = 9e+18
[node name="Ship" parent="Container/View/Ship_space" instance=ExtResource( 2 )]
[editable path="Container/View/Global_space/Galaxy local"]
-[editable path="Container/View/Global_space/Galaxy local/System local"]
+[editable path="Container/View/Global_space/Galaxy local/Scenes/System local"]
diff --git a/Scenes/UI/UI.tscn b/Scenes/UI/UI.tscn
index ab34edc2..ff883293 100644
--- a/Scenes/UI/UI.tscn
+++ b/Scenes/UI/UI.tscn
@@ -5,15 +5,15 @@
[ext_resource path="res://Assets/UI_styles/Button_red/Red_normal.tres" type="StyleBox" id=3]
[ext_resource path="res://Assets/UI_styles/Button_red/Red_ressed.tres" type="StyleBox" id=4]
[ext_resource path="res://Assets/Fonts/Ubuntu-Regular.ttf" type="DynamicFontData" id=5]
-[ext_resource path="res://Assets/UI_images/stick.png" type="Texture" id=6]
+[ext_resource path="res://Assets/UI_images/png/buttons/stick.png" type="Texture" id=6]
[ext_resource path="res://Assets/UI_styles/Themes/Touchscreen/Theme1/pad.tres" type="StyleBox" id=7]
-[ext_resource path="res://Assets/UI_images/accel.png" type="Texture" id=8]
-[ext_resource path="res://Assets/UI_images/ekill.png" type="Texture" id=9]
+[ext_resource path="res://Assets/UI_images/png/buttons/accel.png" type="Texture" id=8]
+[ext_resource path="res://Assets/UI_images/png/buttons/ekill.png" type="Texture" id=9]
[ext_resource path="res://Assets/UI_styles/Themes/Touchscreen/Theme1.tres" type="Theme" id=10]
-[ext_resource path="res://Assets/UI_images/turret.png" type="Texture" id=11]
-[ext_resource path="res://Assets/UI_images/deccel.png" type="Texture" id=12]
-[ext_resource path="res://Assets/UI_images/ui_opacity.png" type="Texture" id=13]
-[ext_resource path="res://Assets/UI_images/options.png" type="Texture" id=14]
+[ext_resource path="res://Assets/UI_images/png/buttons/turret.png" type="Texture" id=11]
+[ext_resource path="res://Assets/UI_images/png/buttons/deccel.png" type="Texture" id=12]
+[ext_resource path="res://Assets/UI_images/png/buttons/ui_opacity.png" type="Texture" id=13]
+[ext_resource path="res://Assets/UI_images/png/buttons/options.png" type="Texture" id=14]
[sub_resource type="ShaderMaterial" id=2]
diff --git a/Scenes/Zones/LOD_trigger_zone.tscn b/Scenes/Zones/LODs/LOD_trigger_zone.tscn
similarity index 100%
rename from Scenes/Zones/LOD_trigger_zone.tscn
rename to Scenes/Zones/LODs/LOD_trigger_zone.tscn
diff --git a/Scenes/Zones/Local_space_galaxy.tscn b/Scenes/Zones/Local_space_triggers/Local_space_galaxy.tscn
similarity index 83%
rename from Scenes/Zones/Local_space_galaxy.tscn
rename to Scenes/Zones/Local_space_triggers/Local_space_galaxy.tscn
index 4e6aff74..d8dc592b 100644
--- a/Scenes/Zones/Local_space_galaxy.tscn
+++ b/Scenes/Zones/Local_space_triggers/Local_space_galaxy.tscn
@@ -13,8 +13,8 @@ script = ExtResource( 1 )
[node name="Must not intersect with other zones of this magnitude" type="Node" parent="."]
-[node name="Shape (must be above all)" type="CollisionShape" parent="."]
-transform = Transform( 1e+17, 0, 0, 0, 1e+17, 0, 0, 0, 1e+17, 0, 0, 0 )
+[node name="Zone shape" type="CollisionShape" parent="."]
+transform = Transform( 1e+18, 0, 0, 0, 1e+18, 0, 0, 0, 1e+18, 0, 0, 0 )
shape = SubResource( 79 )
[node name="Scenes" type="Spatial" parent="."]
diff --git a/Scenes/Zones/Local_space_triggers/Local_space_planetary.tscn b/Scenes/Zones/Local_space_triggers/Local_space_planetary.tscn
new file mode 100644
index 00000000..dceb16ca
--- /dev/null
+++ b/Scenes/Zones/Local_space_triggers/Local_space_planetary.tscn
@@ -0,0 +1,23 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://Scripts/Local_space_triggers/Local_space_planetary.gd" type="Script" id=1]
+
+[sub_resource type="SphereShape" id=79]
+
+[node name="Local_space_planetary" type="Area"]
+input_ray_pickable = false
+gravity = 0.0
+linear_damp = 0.0
+angular_damp = 0.0
+script = ExtResource( 1 )
+
+[node name="Must not intersect with other zones of this magnitude" type="Node" parent="."]
+
+[node name="Zone shape" type="CollisionShape" parent="."]
+transform = Transform( 1e+08, 0, 0, 0, 1e+08, 0, 0, 0, 1e+08, 0, 0, 0 )
+shape = SubResource( 79 )
+
+[node name="Scenes" type="Spatial" parent="."]
+
+[connection signal="body_entered" from="." to="." method="_on_Local_space_trigger_zone_body_entered"]
+[connection signal="body_exited" from="." to="." method="_on_Local_space_trigger_zone_body_exited"]
diff --git a/Scenes/Zones/Local_space_stellar.tscn b/Scenes/Zones/Local_space_triggers/Local_space_stellar.tscn
similarity index 83%
rename from Scenes/Zones/Local_space_stellar.tscn
rename to Scenes/Zones/Local_space_triggers/Local_space_stellar.tscn
index 6988f134..4b13bb81 100644
--- a/Scenes/Zones/Local_space_stellar.tscn
+++ b/Scenes/Zones/Local_space_triggers/Local_space_stellar.tscn
@@ -13,8 +13,8 @@ script = ExtResource( 1 )
[node name="Must not intersect with other zones of this magnitude" type="Node" parent="."]
-[node name="Shape (must be above all)" type="CollisionShape" parent="."]
-transform = Transform( 1e+17, 0, 0, 0, 1e+17, 0, 0, 0, 1e+17, 0, 0, 0 )
+[node name="Zone shape" type="CollisionShape" parent="."]
+transform = Transform( 1e+12, 0, 0, 0, 1e+12, 0, 0, 0, 1e+12, 0, 0, 0 )
shape = SubResource( 79 )
[node name="Scenes" type="Spatial" parent="."]
diff --git a/Scenes/Zones/Local_space_system.tscn b/Scenes/Zones/Local_space_triggers/Local_space_system.tscn
similarity index 83%
rename from Scenes/Zones/Local_space_system.tscn
rename to Scenes/Zones/Local_space_triggers/Local_space_system.tscn
index 13d745de..4405a326 100644
--- a/Scenes/Zones/Local_space_system.tscn
+++ b/Scenes/Zones/Local_space_triggers/Local_space_system.tscn
@@ -13,8 +13,8 @@ script = ExtResource( 1 )
[node name="Must not intersect with other zones of this magnitude" type="Node" parent="."]
-[node name="Shape (must be above all)" type="CollisionShape" parent="."]
-transform = Transform( 1e+17, 0, 0, 0, 1e+17, 0, 0, 0, 1e+17, 0, 0, 0 )
+[node name="Zone shape" type="CollisionShape" parent="."]
+transform = Transform( 1e+14, 0, 0, 0, 1e+14, 0, 0, 0, 1e+14, 0, 0, 0 )
shape = SubResource( 79 )
[node name="Scenes" type="Spatial" parent="."]
diff --git a/Scripts/Local_space_triggers/Local_space_galaxy.gd b/Scripts/Local_space_triggers/Local_space_galaxy.gd
index f07364d6..6b4d177b 100644
--- a/Scripts/Local_space_triggers/Local_space_galaxy.gd
+++ b/Scripts/Local_space_triggers/Local_space_galaxy.gd
@@ -1,4 +1,5 @@
extends Area
+class_name GalaxyLocalSpace, "res://Assets/UI_images/svg/icons/galaxy.svg"
onready var p = get_tree().get_root().get_node("Main/Paths")
diff --git a/Scripts/Local_space_triggers/Local_space_planetary.gd b/Scripts/Local_space_triggers/Local_space_planetary.gd
new file mode 100644
index 00000000..c3e86bb5
--- /dev/null
+++ b/Scripts/Local_space_triggers/Local_space_planetary.gd
@@ -0,0 +1,15 @@
+extends Area
+class_name PlanetLocalSpace, "res://Assets/UI_images/svg/icons/planet_rings.svg"
+
+onready var p = get_tree().get_root().get_node("Main/Paths")
+
+
+# Monitor if player ship enters the local space. Pass the reference to scene
+# Which should be used later on.
+func _on_Local_space_trigger_zone_body_entered(_body):
+ if _body == p.ship:
+ p.signals.emit_signal("sig_entered_local_space_planetary", self)
+
+func _on_Local_space_trigger_zone_body_exited(_body):
+ if _body == p.ship:
+ p.signals.emit_signal("sig_exited_local_space_planetary", self)
diff --git a/Scripts/Local_space_triggers/Local_space_stellar.gd b/Scripts/Local_space_triggers/Local_space_stellar.gd
index 06263745..64a32e13 100644
--- a/Scripts/Local_space_triggers/Local_space_stellar.gd
+++ b/Scripts/Local_space_triggers/Local_space_stellar.gd
@@ -1,4 +1,5 @@
extends Area
+class_name StellarLocalSpace, "res://Assets/UI_images/svg/icons/star.svg"
onready var p = get_tree().get_root().get_node("Main/Paths")
diff --git a/Scripts/Local_space_triggers/Local_space_system.gd b/Scripts/Local_space_triggers/Local_space_system.gd
index b7872ac1..9ff1a81f 100644
--- a/Scripts/Local_space_triggers/Local_space_system.gd
+++ b/Scripts/Local_space_triggers/Local_space_system.gd
@@ -1,5 +1,5 @@
extends Area
-
+class_name SystemLocalSpace, "res://Assets/UI_images/svg/icons/system.svg"
onready var p = get_tree().get_root().get_node("Main/Paths")
diff --git a/Scripts/Origin_rebase/Rebase_local_planetary.gd b/Scripts/Origin_rebase/Rebase_local_planetary.gd
new file mode 100644
index 00000000..a5bcc31b
--- /dev/null
+++ b/Scripts/Origin_rebase/Rebase_local_planetary.gd
@@ -0,0 +1,34 @@
+extends Position3D
+
+onready var p = get_tree().get_root().get_node("Main/Paths")
+
+var scenes = Position3D
+
+func _ready():
+ # ============================= Connect signals ===========================
+ p.signals.connect("sig_exited_local_space_planetary", self, "is_exited_local_space_planetary")
+ p.signals.connect("sig_entered_local_space_planetary", self, "is_entered_local_space_planetary")
+ # =========================================================================
+
+# SIGNAL PROCESSING
+func is_entered_local_space_planetary(zone):
+
+ # Get a child scenes.
+ print("Entered zone: ", zone)
+ scenes = zone.get_node("Scenes")
+
+ # Recenter local space origin onto zone for best precision.
+ p.local_space_planetary.global_transform = zone.global_transform
+
+ # Reparent scenes from global to local space.
+ zone.remove_child(scenes)
+ p.local_space_planetary.add_child(scenes)
+
+func is_exited_local_space_planetary(zone):
+
+ print("Exited zone: ", zone)
+
+ # Reparent scenes from local to global space (back to zone).
+ p.local_space_planetary.remove_child(scenes)
+ zone.add_child(scenes)
+ scenes.global_transform = zone.global_transform
diff --git a/Scripts/Paths.gd b/Scripts/Paths.gd
index 57d0e644..b5fb3ed9 100644
--- a/Scripts/Paths.gd
+++ b/Scripts/Paths.gd
@@ -41,9 +41,12 @@ onready var ui_windows = get_node("/root/Main/Container/UI/Windows")
# VIEWPORT
onready var viewport = get_node("/root/Main/Container/View")
-# MISC
+# SHIP
onready var ship = get_node("/root/Main/Container/View/Ship_space/Ship")
+
+# SPACE
onready var global_space = get_node("/root/Main/Container/View/Global_space")
onready var local_space_galaxy = get_node("/root/Main/Container/View/Local_space_galaxy")
onready var local_space_system = get_node("/root/Main/Container/View/Local_space_system")
onready var local_space_stellar = get_node("/root/Main/Container/View/Local_space_stellar")
+onready var local_space_planetary = get_node("/root/Main/Container/View/Local_space_planetary")
diff --git a/Scripts/Rebase.gd b/Scripts/Rebase.gd
index c8904343..7a118207 100644
--- a/Scripts/Rebase.gd
+++ b/Scripts/Rebase.gd
@@ -21,6 +21,7 @@ func _physics_process(_delta):
p.local_space_galaxy.translation.x -= rebase_limit
p.local_space_system.translation.x -= rebase_limit
p.local_space_stellar.translation.x -= rebase_limit
+ p.local_space_planetary.translation.x -= rebase_limit
elif p.ship.translation.x < -rebase_limit:
p.ship.translation.x = 0
@@ -28,6 +29,7 @@ func _physics_process(_delta):
p.local_space_galaxy.translation.x += rebase_limit
p.local_space_system.translation.x += rebase_limit
p.local_space_stellar.translation.x += rebase_limit
+ p.local_space_planetary.translation.x += rebase_limit
if p.ship.translation.y > rebase_limit:
p.ship.translation.y = 0
@@ -35,6 +37,7 @@ func _physics_process(_delta):
p.local_space_galaxy.translation.y -= rebase_limit
p.local_space_system.translation.y -= rebase_limit
p.local_space_stellar.translation.y -= rebase_limit
+ p.local_space_planetary.translation.y -= rebase_limit
elif p.ship.translation.y < -rebase_limit:
p.ship.translation.y = 0
@@ -42,6 +45,7 @@ func _physics_process(_delta):
p.local_space_galaxy.translation.y += rebase_limit
p.local_space_system.translation.y += rebase_limit
p.local_space_stellar.translation.y += rebase_limit
+ p.local_space_planetary.translation.y += rebase_limit
if p.ship.translation.z > rebase_limit:
p.ship.translation.z = 0
@@ -49,6 +53,7 @@ func _physics_process(_delta):
p.local_space_galaxy.translation.z -= rebase_limit
p.local_space_system.translation.z -= rebase_limit
p.local_space_stellar.translation.z -= rebase_limit
+ p.local_space_planetary.translation.z -= rebase_limit
elif p.ship.translation.z < -rebase_limit:
p.ship.translation.z = 0
@@ -56,3 +61,4 @@ func _physics_process(_delta):
p.local_space_galaxy.translation.z += rebase_limit
p.local_space_system.translation.z += rebase_limit
p.local_space_stellar.translation.z += rebase_limit
+ p.local_space_planetary.translation.z += rebase_limit
diff --git a/Scripts/Signals.gd b/Scripts/Signals.gd
index 99b12920..20d6bfd1 100644
--- a/Scripts/Signals.gd
+++ b/Scripts/Signals.gd
@@ -32,3 +32,5 @@ signal sig_entered_local_space_system(zone)
signal sig_exited_local_space_system(zone)
signal sig_entered_local_space_stellar(zone)
signal sig_exited_local_space_stellar(zone)
+signal sig_entered_local_space_planetary(zone)
+signal sig_exited_local_space_planetary(zone)
diff --git a/project.godot b/project.godot
index 7320b030..6c0bc73d 100644
--- a/project.godot
+++ b/project.godot
@@ -8,6 +8,34 @@
config_version=4
+_global_script_classes=[ {
+"base": "Area",
+"class": "GalaxyLocalSpace",
+"language": "GDScript",
+"path": "res://Scripts/Local_space_triggers/Local_space_galaxy.gd"
+}, {
+"base": "Area",
+"class": "PlanetLocalSpace",
+"language": "GDScript",
+"path": "res://Scripts/Local_space_triggers/Local_space_planetary.gd"
+}, {
+"base": "Area",
+"class": "StellarLocalSpace",
+"language": "GDScript",
+"path": "res://Scripts/Local_space_triggers/Local_space_stellar.gd"
+}, {
+"base": "Area",
+"class": "SystemLocalSpace",
+"language": "GDScript",
+"path": "res://Scripts/Local_space_triggers/Local_space_system.gd"
+} ]
+_global_script_class_icons={
+"GalaxyLocalSpace": "res://Assets/UI_images/svg/icons/galaxy.svg",
+"PlanetLocalSpace": "res://Assets/UI_images/svg/icons/planet_rings.svg",
+"StellarLocalSpace": "res://Assets/UI_images/svg/icons/star.svg",
+"SystemLocalSpace": "res://Assets/UI_images/svg/icons/system.svg"
+}
+
[application]
config/name="GDTLancer"
@@ -41,7 +69,6 @@ common/enable_pause_aware_picking=true
[rendering]
-misc/lossless_compression/force_png=true
quality/directional_shadow/size=2048
quality/shadow_atlas/size=2048
quality/reflections/texture_array_reflections=false