Skip to content

Commit 2b82f2d

Browse files
KersophKersoph
authored
Merge pull request #8 from Kersoph/p2_develop
P2-Develop: Implemented Emergency System Lesson
2 parents 7354c5b + c22ffc7 commit 2b82f2d

File tree

80 files changed

+1887
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1887
-363
lines changed

‎data/core/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Godot;
2-
using System;
2+
33

44
namespace Osls
55
{

‎data/core/scene_manager/navigation_steps/NavigationSteps.cs‎

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Godot;
2+
using Godot.Collections;
23

34

45
namespace Osls.Navigation
@@ -25,15 +26,15 @@ public override void _Ready()
2526
{
2627
_mainNode = GetNode<MainNode>("..");
2728
_landingPageButton = GetNode<Button>("LandingPageButton");
28-
_landingPageButton.Connect("toggled", this, nameof(LandingPageButtonToggled));
29+
_landingPageButton.Connect("toggled", this, nameof(UpdateButtonState), new Array { PageCategory.LandingPage });
2930
_sfcStepButton = GetNode<Button>("SfcStepButton");
30-
_sfcStepButton.Connect("toggled", this, nameof(SfcStepButtonToggled));
31+
_sfcStepButton.Connect("toggled", this, nameof(UpdateButtonState), new Array { PageCategory.LogicEditor });
3132
_simulationStepButton = GetNode<Button>("SimulationStepButton");
32-
_simulationStepButton.Connect("toggled", this, nameof(SimulationStepButtonToggled));
33+
_simulationStepButton.Connect("toggled", this, nameof(UpdateButtonState), new Array { PageCategory.Simulation });
3334
_examinationStepButton = GetNode<Button>("ExaminationStepButton");
34-
_examinationStepButton.Connect("toggled", this, nameof(ExaminationStepButtonToggled));
35+
_examinationStepButton.Connect("toggled", this, nameof(UpdateButtonState), new Array { PageCategory.Examination });
3536
_exitButton = GetNode<Button>("ExitButton");
36-
_exitButton.Connect("toggled", this, nameof(ExitButtonToggled));
37+
_exitButton.Connect("toggled", this, nameof(UpdateButtonState), new Array { PageCategory.Exit });
3738
}
3839

3940
/// <summary>
@@ -55,32 +56,7 @@ public void VisibleViewIs(PageCategory view)
5556

5657

5758
#region ==================== Helpers ====================
58-
private void LandingPageButtonToggled(bool pressed)
59-
{
60-
UpdateButtonState(_landingPageButton, PageCategory.LandingPage, pressed);
61-
}
62-
63-
private void SfcStepButtonToggled(bool pressed)
64-
{
65-
UpdateButtonState(_sfcStepButton, PageCategory.LogicEditor, pressed);
66-
}
67-
68-
private void SimulationStepButtonToggled(bool pressed)
69-
{
70-
UpdateButtonState(_simulationStepButton, PageCategory.Simulation, pressed);
71-
}
72-
73-
private void ExaminationStepButtonToggled(bool pressed)
74-
{
75-
UpdateButtonState(_examinationStepButton, PageCategory.Examination, pressed);
76-
}
77-
78-
private void ExitButtonToggled(bool pressed)
79-
{
80-
UpdateButtonState(_exitButton, PageCategory.Exit, pressed);
81-
}
82-
83-
private void UpdateButtonState(Button button, PageCategory pages, bool pressed)
59+
private void UpdateButtonState(bool pressed, PageCategory pages)
8460
{
8561
if (pressed)
8662
{

‎data/diagram_models/sfc/data/ActionEntity.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ public class ActionEntity
2424
/// </summary>
2525
public static ActionEntity CreateFrom(System.IO.BinaryReader reader)
2626
{
27-
ActionEntity entity = new ActionEntity();
28-
entity.Qualifier = (ActionQualifier)reader.ReadInt32();
29-
entity.Action = reader.ReadString();
27+
ActionEntity entity = new ActionEntity
28+
{
29+
Qualifier = (ActionQualifier)reader.ReadInt32(),
30+
Action = reader.ReadString()
31+
};
3032
return entity;
3133
}
3234

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class Sfc2dEditorControl
1212
{
1313
#region ==================== Fields Properties ====================
1414
private readonly Dictionary<int, SfcPatchControl> _controlMap = new Dictionary<int, SfcPatchControl>();
15-
private bool _isEditable;
15+
private readonly bool _isEditable;
1616

1717
/// <summary>
1818
/// Returns the patch control map
@@ -118,7 +118,7 @@ private void InitialiseFromData()
118118
IReadOnlyCollection<PatchEntity> patches = Data.SfcEntity.Patches;
119119
foreach (PatchEntity entity in patches)
120120
{
121-
SfcPatchControl control = new SfcPatchControl(entity, this, !_isEditable);
121+
SfcPatchControl control = new SfcPatchControl(entity, this, _isEditable);
122122
_controlMap.Add(entity.Key, control);
123123
}
124124
UpdateGrid();
@@ -150,9 +150,13 @@ private void UpdateLogicalModel()
150150
private void EnsureNeighbours(PatchEntity patchData)
151151
{
152152
EnsurePatchAt(patchData.X + 1, patchData.Y);
153+
EnsurePatchAt(patchData.X + 1, patchData.Y + 1);
153154
EnsurePatchAt(patchData.X, patchData.Y + 1);
155+
EnsurePatchAt(patchData.X - 1, patchData.Y + 1);
154156
EnsurePatchAt(patchData.X - 1, patchData.Y);
157+
EnsurePatchAt(patchData.X - 1, patchData.Y - 1);
155158
EnsurePatchAt(patchData.X, patchData.Y - 1);
159+
EnsurePatchAt(patchData.X + 1, patchData.Y - 1);
156160
}
157161

158162
/// <summary>
@@ -165,7 +169,7 @@ private void EnsurePatchAt(int x, int y)
165169
{
166170
Data.SfcEntity.CreatePatchAt((short)x, (short)y);
167171
patch = Data.SfcEntity.Lookup(x, y);
168-
SfcPatchControl control = new SfcPatchControl(patch, this, !_isEditable);
172+
SfcPatchControl control = new SfcPatchControl(patch, this, _isEditable);
169173
_controlMap.Add(patch.Key, control);
170174
}
171175
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public class Sfc2dEditorNode : Control
1010
{
1111
#region ==================== Fields Properties ====================
1212
private ReferenceRect _renderViewportReferenceRect;
13-
private int _zoomLevel = 2;
14-
private static readonly float[] zoomLevels = new float[] { 0.5f, 0.7f, 1f, 1.5f, 2f, 3f };
13+
private int _zoomLevel = 1;
14+
private static readonly float[] zoomLevels = new float[] { 0.5f, 1f, 1.5f, 2f, 3f };
1515
private bool _isDragging;
1616
private Vector2 _lastDragPosition;
1717

@@ -136,12 +136,15 @@ public void StopDrag()
136136
#region ==================== Helpers ====================
137137
private void ApplyDiagramScale(Vector2 scale)
138138
{
139+
Vector2 oldPosition = _renderViewportReferenceRect.RectPosition;
140+
Vector2 oldScale = _renderViewportReferenceRect.RectScale;
139141
_renderViewportReferenceRect.RectScale = scale;
142+
ApplyDiagramOffset(new Vector2((oldPosition.x * scale.x) / oldScale.x, (oldPosition.y * scale.y) / oldScale.y));
140143
}
141144

142145
private void ApplyDiagramOffset(Vector2 position)
143146
{
144-
_renderViewportReferenceRect.SetPosition(position);
147+
_renderViewportReferenceRect.RectPosition = position;
145148
}
146149
#endregion
147150
}

‎data/diagram_models/sfc/editor/2d_editor/sfc_patch/ActionEditorBox.cs‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,22 @@ namespace Osls.SfcEditor
77
public class ActionEditorBox : Control
88
{
99
#region ==================== Fields / Properties ====================
10-
private const string _editorScenePath = "res://data/diagram_models/sfc/editor/2d_editor/sfc_patch/elements/ActionEditor.tscn";
10+
private const string EditorScenePath = "res://data/diagram_models/sfc/editor/2d_editor/sfc_patch/elements/ActionEditor.tscn";
1111

1212
private SfcPatchControl _patchController;
1313
private readonly List<ActionEditor> _actionEditors = new List<ActionEditor>();
14+
private bool _isEditable;
1415
#endregion
1516

1617

1718
#region ==================== Public Methods ====================
18-
public override void _Ready()
19+
/// <summary>
20+
/// Called only once when the node is created by the patch node.
21+
/// </summary>
22+
public void InitializeWith(SfcPatchControl sfcPatchControl, bool isEditable)
1923
{
20-
_patchController = GetNode<SfcPatchNode>("..").SfcPatchControl;
24+
_patchController = sfcPatchControl;
25+
_isEditable = isEditable;
2126
}
2227

2328
/// <summary>
@@ -31,13 +36,14 @@ public void UpdateActions(PatchEntity entity, IProcessingData context)
3136
if (i >= _actionEditors.Count) AddActionEditor(context);
3237
_actionEditors[i].UpdateAction(entity.ActionEntries[i], context);
3338
}
34-
35-
if (entity.ActionEntries.Count >= _actionEditors.Count) AddActionEditor(context);
36-
_actionEditors[entity.ActionEntries.Count].ResetAction();
37-
38-
for (int i = entity.ActionEntries.Count + 1; i < _actionEditors.Count; i++)
39+
if (_isEditable)
3940
{
40-
RemoveActionEditor(_actionEditors[i]);
41+
if (entity.ActionEntries.Count >= _actionEditors.Count) AddActionEditor(context);
42+
_actionEditors[entity.ActionEntries.Count].ResetAction();
43+
for (int i = entity.ActionEntries.Count + 1; i < _actionEditors.Count; i++)
44+
{
45+
RemoveActionEditor(_actionEditors[i]);
46+
}
4147
}
4248
}
4349

@@ -88,7 +94,7 @@ private void UpdateVisibility(PatchEntity entity)
8894

8995
private void AddActionEditor(IProcessingData data)
9096
{
91-
Node node = ((PackedScene)GD.Load(_editorScenePath)).Instance();
97+
Node node = ((PackedScene)GD.Load(EditorScenePath)).Instance();
9298
ActionEditor actionEditor = (ActionEditor)node;
9399
_actionEditors.Add(actionEditor);
94100
GetNode<BoxContainer>("ScrollContainer/VerticalBoxContainer").AddChild(actionEditor);

‎data/diagram_models/sfc/editor/2d_editor/sfc_patch/SfcActionEntity.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ public class SfcActionEntity
2323
/// </summary>
2424
public static SfcActionEntity CreateFrom(System.IO.BinaryReader reader)
2525
{
26-
SfcActionEntity entity = new SfcActionEntity();
27-
entity.Qualifier = (ActionQualifier)reader.ReadInt32();
28-
entity.Action = reader.ReadString();
26+
SfcActionEntity entity = new SfcActionEntity
27+
{
28+
Qualifier = (ActionQualifier)reader.ReadInt32(),
29+
Action = reader.ReadString()
30+
};
2931
return entity;
3032
}
3133

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public class SfcPatchControl
3737
/// <summary>
3838
/// Constructor. It will add the patch to the 2d editor.
3939
/// </summary>
40-
public SfcPatchControl(PatchEntity data, Sfc2dEditorControl control, bool setMouseFilter)
40+
public SfcPatchControl(PatchEntity data, Sfc2dEditorControl control, bool isEditable)
4141
{
4242
Data = data;
4343
Master = control;
4444
SfcPatchMeta = new SfcPatchMeta();
4545
Node node = ((PackedScene)GD.Load(_patchReferencePath)).Instance();
4646
SfcPatchNode = (SfcPatchNode)node;
47-
SfcPatchNode.InitializeWith(this, data, setMouseFilter);
47+
SfcPatchNode.InitializeWith(this, data, isEditable);
4848
control.ReferenceRect.AddChild(SfcPatchNode);
4949
}
5050

‎data/diagram_models/sfc/editor/2d_editor/sfc_patch/SfcPatchEntity.cs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace Osls.SfcEditor
55
{
66
/// <summary>
7-
/// Entity calss to store the informations for a SFC patch
7+
/// Entity class to store the informations for a SFC patch
88
/// </summary>
99
public class SfcPatchEntity
1010
{
@@ -37,14 +37,14 @@ public class SfcPatchEntity
3737
public SfcBranchLineType LowerBranch { get; set; }
3838
/// <summary>
3939
/// The raw condition text when the transition should fire.
40-
/// It is interpreted and formed to a logical model. (Can be invaild)
40+
/// It is interpreted and formed to a logical model. (Can be invalid)
4141
/// </summary>
4242
public string TransitionText { get; set; }
4343
/// <summary>
4444
/// Contains the action entries for the step in this patch.
4545
/// </summary>
4646
public List<SfcActionEntity> ActionEntries { get; private set; }
47-
#endregion;
47+
#endregion
4848

4949

5050
#region ==================== Public ====================
@@ -94,12 +94,14 @@ public static SfcPatchEntity CreateFrom(System.IO.BinaryReader reader)
9494
{
9595
int x = reader.ReadInt32();
9696
int y = reader.ReadInt32();
97-
SfcPatchEntity entity = new SfcPatchEntity(x, y);
98-
entity.SfcStepType = (SfcStepType)reader.ReadInt32();
99-
entity.StepName = reader.ReadString();
100-
entity.UpperBranch = (SfcBranchLineType)reader.ReadInt32();
101-
entity.LowerBranch = (SfcBranchLineType)reader.ReadInt32();
102-
entity.TransitionText = reader.ReadString();
97+
SfcPatchEntity entity = new SfcPatchEntity(x, y)
98+
{
99+
SfcStepType = (SfcStepType)reader.ReadInt32(),
100+
StepName = reader.ReadString(),
101+
UpperBranch = (SfcBranchLineType)reader.ReadInt32(),
102+
LowerBranch = (SfcBranchLineType)reader.ReadInt32(),
103+
TransitionText = reader.ReadString()
104+
};
103105
int entryCount = reader.ReadInt32();
104106
for (int i = 0; i < entryCount; i++)
105107
{
@@ -149,7 +151,7 @@ public enum SfcStepType
149151
/// </summary>
150152
StartingStep,
151153
/// <summary>
152-
/// This step cell is a jump, connectiong it to another cell.
154+
/// This step cell is a jump, connecting it to another cell.
153155
/// </summary>
154156
Jump
155157
}
@@ -165,7 +167,7 @@ public enum SfcBranchLineType
165167
/// </summary>
166168
Single,
167169
/// <summary>
168-
/// This branch line is used as a aprallel branch/merge
170+
/// This branch line is used as a parallel branch/merge
169171
/// </summary>
170172
Double,
171173
}

‎data/diagram_models/sfc/editor/2d_editor/sfc_patch/SfcPatchNode.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ public class SfcPatchNode : ReferenceRect
2121
/// <summary>
2222
/// Called only once when the node is created by the patch control.
2323
/// </summary>
24-
public void InitializeWith(SfcPatchControl sfcPatchControl, PatchEntity data, bool setMouseFilter)
24+
public void InitializeWith(SfcPatchControl sfcPatchControl, PatchEntity data, bool isEditable)
2525
{
2626
SfcPatchControl = sfcPatchControl;
2727
SetCellPosition(data.X, data.Y);
2828
GetNode<SfcTransitionNode>("SfcTransition").Initialise();
29+
GetNode<ActionEditorBox>("ActionEditorBox").InitializeWith(SfcPatchControl, isEditable);
2930
Connect("mouse_entered", this, nameof(OnMouseEntered));
3031
Connect("mouse_exited", this, nameof(OnMouseExited));
31-
GetNode<Control>("MouseFilterEdit").Visible = setMouseFilter;
32+
GetNode<Control>("MouseFilterEdit").Visible = !isEditable;
3233
}
3334

3435
/// <summary>

0 commit comments

Comments
 (0)