Merge pull request #9 from Kersoph/P2_UT_Fixes

Including P2 UT fixes

Author: Kersoph

data/core/landing_page/LandingPageNode.cs

@@ -1,6 +1,3 @@
-using Godot;
-
-
 namespace Osls.LandingPage
 {
     /// <summary>

data/core/landing_page/LessonSelectionGridNode.cs

@@ -32,6 +32,7 @@ public override void _Ready()
                 GD.PrintErr(e);
                 GD.PushError(e.Message);
             }
+            if (_lessonNodes != null && _lessonNodes.Length > 0) CallDeferred(nameof(SelectionChangedTo), _lessonNodes[0]);
         }
         #endregion
 

data/core/lesson/viewer/LessonView.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://data/core/lesson/viewer/LessonInfo.cs" type="Script" id=1]
 [ext_resource path="res://data/core/lesson/viewer/PlantView.cs" type="Script" id=2]
@@ -9,6 +9,8 @@
 [ext_resource path="res://data/core/landing_page/RichTextLabel.tscn" type="PackedScene" id=7]
 [ext_resource path="res://data/core/theme/font/RobotoBoldFont.tres" type="DynamicFont" id=8]
 
+[sub_resource type="StyleBoxEmpty" id=1]
+
 [node name="LessonView" type="Control"]
 anchor_left = 1.0
 anchor_right = 1.0
@@ -57,6 +59,8 @@ margin_top = 2.0
 margin_right = -2.0
 margin_bottom = -2.0
 focus_mode = 2
+custom_styles/focus = SubResource( 1 )
+custom_colors/selection_color = Color( 0, 0, 0, 0.196078 )
 selection_enabled = true
 
 [node name="ColorRect" type="ColorRect" parent="LessonInfo"]

data/core/scene_manager/navigation_steps/NavigationSteps.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://data/core/scene_manager/navigation_steps/NavigationSteps.cs" type="Script" id=1]
 [ext_resource path="res://data/core/scene_manager/navigation_steps/NavigationButton.tscn" type="PackedScene" id=2]
@@ -7,6 +7,7 @@
 [ext_resource path="res://data/core/scene_manager/navigation_steps/symbols/EditorStep.png" type="Texture" id=5]
 [ext_resource path="res://data/core/scene_manager/navigation_steps/symbols/MenuStep.png" type="Texture" id=6]
 [ext_resource path="res://data/core/theme/LightTheme.tres" type="Theme" id=7]
+[ext_resource path="res://data/core/theme/font/RobotoRegularFont.tres" type="DynamicFont" id=8]
 
 [node name="NavigationSteps" type="ReferenceRect"]
 anchor_bottom = 1.0
@@ -27,6 +28,19 @@ margin_bottom = -80.0
 disabled = true
 icon = null
 
+[node name="Version" type="Label" parent="FillerButton"]
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_top = -24.0
+custom_fonts/font = ExtResource( 8 )
+custom_colors/font_color = Color( 0.470588, 0.470588, 0.470588, 1 )
+text = "v0.9.0"
+align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="ExaminationStepButton" parent="." instance=ExtResource( 2 )]
 anchor_top = 0.0
 anchor_bottom = 0.0

data/core/scene_manager/navigation_steps/symbols/SimulationStep.blend

@@ -7,7 +7,7 @@
 [ext_resource path="res://data/core/theme/rect/LightHoverStyle.tres" type="StyleBox" id=5]
 
 [sub_resource type="StyleBoxFlat" id=1]
-bg_color = Color( 0.470588, 0.470588, 0.470588, 0.588235 )
+bg_color = Color( 0.627451, 0.627451, 0.627451, 1 )
 corner_detail = 5
 
 [sub_resource type="StyleBoxFlat" id=2]
@@ -18,7 +18,7 @@ bg_color = Color( 1, 1, 0.705882, 1 )
 
 [sub_resource type="StyleBoxFlat" id=4]
 content_margin_bottom = 5.0
-bg_color = Color( 0.313726, 0.313726, 0.313726, 1 )
+bg_color = Color( 0.235294, 0.235294, 0.235294, 1 )
 anti_aliasing = false
 
 [sub_resource type="StyleBoxEmpty" id=5]
@@ -56,7 +56,7 @@ border_width_bottom = 1
 border_color = Color( 0.470588, 0.470588, 0.470588, 1 )
 
 [sub_resource type="StyleBoxFlat" id=9]
-bg_color = Color( 0.470588, 0.470588, 0.470588, 0.588235 )
+bg_color = Color( 0.627451, 0.627451, 0.627451, 1 )
 
 [sub_resource type="StyleBoxFlat" id=10]
 bg_color = Color( 1, 1, 0.705882, 1 )
@@ -66,7 +66,7 @@ bg_color = Color( 1, 1, 0.705882, 1 )
 
 [sub_resource type="StyleBoxFlat" id=12]
 content_margin_left = 5.0
-bg_color = Color( 0.313726, 0.313726, 0.313726, 1 )
+bg_color = Color( 0.235294, 0.235294, 0.235294, 1 )
 
 [sub_resource type="StyleBoxEmpty" id=13]
 

data/core/scene_manager/navigation_steps/symbols/SimulationStep.png

@@ -0,0 +1,13 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://data/core/theme/font/RobotoRegularData.tres" type="DynamicFontData" id=1]
+
+[resource]
+size = 32
+outline_size = 3
+outline_color = Color( 0, 0, 0, 0.588235 )
+use_filter = true
+extra_spacing_top = -4
+extra_spacing_bottom = -4
+extra_spacing_char = -1
+font_data = ExtResource( 1 )

data/core/theme/LightTheme.tres

@@ -9,7 +9,7 @@ namespace Osls
     public class HscRelative : HSplitContainer
     {
         #region ==================== Fields / Properties ====================
-        [Export] public float RelativeOffst = 1320f/1840f;
+        [Export] public float RelativeOffset = 1320f/1840f;
         #endregion
 
 
@@ -22,7 +22,7 @@ public override void _Ready()
             {
                 minSizeOffset = control.RectMinSize.x;
             }
-            SplitOffset = Mathf.RoundToInt(RectSize.x * RelativeOffst - minSizeOffset);
+            SplitOffset = Mathf.RoundToInt(RectSize.x * RelativeOffset - minSizeOffset);
         }
         #endregion
     }

data/core/theme/font/RobotoT0FontShaded.tres

@@ -12,6 +12,8 @@ public class SfcEntity
     {
         #region ==================== Fields / Properties ====================
         public const int XKeyShift = 16;
+        public const int YKeyMask = 0b1111111111111111;
+        public const int KeyOffset = 1 << 15;
         private readonly Dictionary<int, PatchEntity> _patchMap = new Dictionary<int, PatchEntity>();
 
         /// <summary>
@@ -45,7 +47,9 @@ public void AddPatch(PatchEntity patch)
         /// </summary>
         public static int CalculateMapKey(int x, int y)
         {
-            return checked((x << XKeyShift) | y);
+            int xKey = (KeyOffset + x) << XKeyShift;
+            int yKey = (KeyOffset + y) & YKeyMask;
+            return checked(xKey | yKey);
         }
 
         /// <summary>