Merge pull request #7 from Kersoph/p2_develop

Merge features and fixes from the P2 develop

Author: Kersoph

data/core/Startup.cs

@@ -0,0 +1,34 @@
+using Godot;
+using System;
+
+namespace Osls
+{
+    public class Startup : Node
+    {
+        #region ==================== Fields / Properties ====================
+        [Export] private PackedScene _mainScene;
+        private int _initialisationStep;
+        #endregion
+        
+        
+        #region ==================== Public Methods ====================
+        /// <summary>
+        /// Add initialisation steps to the loading scene util GetTree().ChangeSceneTo() is called.
+        /// If it takes some time create a loading bar.
+        /// </summary>
+        public override void _Process(float delta)
+        {
+            switch (_initialisationStep)
+            {
+                case 0:
+                    OS.WindowMaximized = true;
+                    _initialisationStep++;
+                    break;
+                case 1:
+                    GetTree().ChangeSceneTo(_mainScene);
+                    break;
+            }
+        }
+        #endregion
+    }
+}

data/core/Startup.tscn

@@ -0,0 +1,17 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://data/core/Startup.cs" type="Script" id=1]
+[ext_resource path="res://data/core/scene_manager/Main.tscn" type="PackedScene" id=2]
+
+[node name="Startup" type="Node"]
+script = ExtResource( 1 )
+_mainScene = ExtResource( 2 )
+
+[node name="ColorRect" type="ColorRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+mouse_default_cursor_shape = 5
+color = Color( 0.12549, 0.145098, 0.192157, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}

data/core/landing_page/LandingPage.tscn

@@ -82,6 +82,7 @@ margin_bottom = 1016.0
 show_behind_parent = true
 anchor_right = 1.0
 anchor_bottom = 1.0
+mouse_filter = 2
 __meta__ = {
 "_edit_use_anchors_": false
 }

data/core/landing_page/LightButton.tscn

@@ -37,12 +37,12 @@ content_margin_left = 8.0
 content_margin_right = 8.0
 content_margin_top = 8.0
 content_margin_bottom = 8.0
-bg_color = Color( 1, 1, 1, 1 )
+bg_color = Color( 1, 0.866667, 0.866667, 1 )
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1
 border_width_bottom = 1
-border_color = Color( 0.627451, 0.627451, 0.627451, 1 )
+border_color = Color( 0.470588, 0.470588, 0.470588, 1 )
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id=5]

data/core/landing_page/lesson_source_controller/LessonControllerNode.cs

@@ -35,6 +35,11 @@ public void SetLessonInfo(ILessonEntity info, LessonSelectionGridNode gridContro
             _gridController = gridController;
             SetTitle(info.Title);
             SetStars(info.Stars);
+            if (string.IsNullOrEmpty(info.SimulationPath))
+            {
+                GetNode<Button>("LessonButton").Disabled = true;
+                GetNode<Button>("LessonButton").MouseDefaultCursorShape = CursorShape.Forbidden;
+            }
         }
         #endregion
 

data/core/lesson/viewer/LessonView.tscn

@@ -56,6 +56,8 @@ margin_left = 2.0
 margin_top = 2.0
 margin_right = -2.0
 margin_bottom = -2.0
+focus_mode = 2
+selection_enabled = true
 
 [node name="ColorRect" type="ColorRect" parent="LessonInfo"]
 anchor_top = 1.0

data/diagram_models/sfc/editor/2d_editor/Sfc2dEditorControl.cs

@@ -12,6 +12,12 @@ public class Sfc2dEditorControl
     {
         #region ==================== Fields Properties ====================
         private readonly Dictionary<int, SfcPatchControl> _controlMap = new Dictionary<int, SfcPatchControl>();
+        private bool _isEditable;
+        
+        /// <summary>
+        /// Returns the patch control map
+        /// </summary>
+        public IReadOnlyDictionary<int, SfcPatchControl> ControlMap { get { return _controlMap; } }
 
         /// <summary>
         /// Reference patch to hold the nodes
@@ -26,10 +32,11 @@ public class Sfc2dEditorControl
 
 
         #region ==================== Public ====================
-        public Sfc2dEditorControl(ReferenceRect referenceRect, ProcessingData data)
+        public Sfc2dEditorControl(ReferenceRect referenceRect, ProcessingData data, bool isEditable)
         {
             ReferenceRect = referenceRect;
             Data = data;
+            _isEditable = isEditable;
         }
 
         /// <summary>
@@ -111,7 +118,7 @@ private void InitialiseFromData()
             IReadOnlyCollection<PatchEntity> patches = Data.SfcEntity.Patches;
             foreach (PatchEntity entity in patches)
             {
-                SfcPatchControl control = new SfcPatchControl(entity, this);
+                SfcPatchControl control = new SfcPatchControl(entity, this, !_isEditable);
                 _controlMap.Add(entity.Key, control);
             }
             UpdateGrid();
@@ -122,13 +129,16 @@ private void InitialiseFromData()
         /// </summary>
         private void UpdateLogicalModel()
         {
-            // We want a copy because we will add empty forward patches to the dict
-            PatchEntity[] patches = Data.SfcEntity.Patches.ToArray();
-            foreach (PatchEntity patch in patches)
+            if (_isEditable)
             {
-                if (patch.ContainsRelevantData())
+                // We want a copy because we will add empty forward patches to the dict
+                PatchEntity[] patches = Data.SfcEntity.Patches.ToArray();
+                foreach (PatchEntity patch in patches)
                 {
-                    EnsureNeighbours(patch);
+                    if (patch.ContainsRelevantData())
+                    {
+                        EnsureNeighbours(patch);
+                    }
                 }
             }
             Data.StepMaster.UpdateStepNames(Data.SfcEntity);
@@ -155,7 +165,7 @@ private void EnsurePatchAt(int x, int y)
             {
                 Data.SfcEntity.CreatePatchAt((short)x, (short)y);
                 patch = Data.SfcEntity.Lookup(x, y);
-                SfcPatchControl control = new SfcPatchControl(patch, this);
+                SfcPatchControl control = new SfcPatchControl(patch, this, !_isEditable);
                 _controlMap.Add(patch.Key, control);
             }
         }

data/diagram_models/sfc/editor/2d_editor/Sfc2dEditorNode.cs

@@ -23,10 +23,10 @@ public class Sfc2dEditorNode : Control
         /// <summary>
         /// Creates a controller and initializes the patch fields.
         /// </summary>
-        public void InitializeEditor(ProcessingData data)
+        public void InitializeEditor(ProcessingData data, bool isEditable)
         {
             _renderViewportReferenceRect = GetNode<ReferenceRect>("RenderViewportReferenceRect");
-            Sfc2dEditorControl = new Sfc2dEditorControl(_renderViewportReferenceRect, data);
+            Sfc2dEditorControl = new Sfc2dEditorControl(_renderViewportReferenceRect, data, isEditable);
         }
 
         public override void _Process(float delta)
@@ -106,14 +106,30 @@ public override void _GuiInput(InputEvent @event)
         {
             if (@event.IsActionPressed("ui_translate_idle"))
             {
-                _lastDragPosition = GetViewport().GetMousePosition();
-                _isDragging = true;
+                StartDrag();
             }
             else if (@event.IsActionReleased("ui_translate_idle"))
             {
-                _isDragging = false;
+                StopDrag();
             }
         }
+        
+        /// <summary>
+        /// Called if the user wants to drag the editor
+        /// </summary>
+        public void StartDrag()
+        {
+            _lastDragPosition = GetViewport().GetMousePosition();
+            _isDragging = true;
+        }
+        
+        /// <summary>
+        /// Called if the user stops to drag the editor
+        /// </summary>
+        public void StopDrag()
+        {
+            _isDragging = false;
+        }
         #endregion
 
 

data/diagram_models/sfc/editor/2d_editor/sfc_patch/SfcPatch.tscn

@@ -73,3 +73,25 @@ margin_left = -10.0
 margin_top = 14.0
 margin_bottom = 16.0
 color = Color( 0.705882, 0.705882, 0.705882, 1 )
+
+[node name="MouseFilterEdit" type="Control" parent="."]
+visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+mouse_filter = 1
+mouse_default_cursor_shape = 8
+__meta__ = {
+"_edit_lock_": true,
+"_edit_use_anchors_": false
+}
+
+[node name="LineFilter" type="Control" parent="MouseFilterEdit"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_top = 70.0
+margin_right = 75.0
+mouse_filter = 1
+mouse_default_cursor_shape = 8
+__meta__ = {
+"_edit_lock_": true
+}

data/diagram_models/sfc/editor/2d_editor/sfc_patch/SfcPatchControl.cs

@@ -37,14 +37,14 @@ public class SfcPatchControl
         /// <summary>
         /// Constructor. It will add the patch to the 2d editor.
         /// </summary>
-        public SfcPatchControl(PatchEntity data, Sfc2dEditorControl control)
+        public SfcPatchControl(PatchEntity data, Sfc2dEditorControl control, bool setMouseFilter)
         {
             Data = data;
             Master = control;
             SfcPatchMeta = new SfcPatchMeta();
             Node node = ((PackedScene)GD.Load(_patchReferencePath)).Instance();
             SfcPatchNode = (SfcPatchNode)node;
-            SfcPatchNode.InitializeWith(this, data);
+            SfcPatchNode.InitializeWith(this, data, setMouseFilter);
             control.ReferenceRect.AddChild(SfcPatchNode);
         }