cobular
/
NodeEditor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: cobular:bb392ba72dcc81f620c76b3b0d302d4192d1718f
Branches Tags
cobular:main
cobular:core_test
cobular:NodesAndConnections
..
compare: cobular:9b644359061151911bcbd97bcd0b937fe9c461cd
Branches Tags
cobular:main
cobular:core_test
cobular:NodesAndConnections

No commits in common. 'bb392ba72dcc81f620c76b3b0d302d4192d1718f' and '9b644359061151911bcbd97bcd0b937fe9c461cd' have entirely different histories.
bb392ba72d ... 9b64435906

6 changed files with 54 additions and 95 deletions
Show Stats

47
.idea/.idea.NodeEditor/.idea/workspace.xml
Unescape Escape View File

@ -30,8 +30,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="Updated Paths with a direction enum, and added seaskipper costs enum"> <list default="true" id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="Updated Paths with a direction enum, and added seaskipper costs enum">
<change beforePath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Controls/Node.xaml" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/Node.xaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Controls/Node.xaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/Node.xaml.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Controls/Node.xaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/Node.xaml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/NodeEditor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/NodeEditor.csproj" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -47,8 +47,7 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/Controls/Node.xaml.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="mock://C:/Users/Liam/NodeEditor/Controls/Path.xaml.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Extensions/Modes.cs" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
@ -58,11 +57,8 @@
<option value="$PROJECT_DIR$/Extensions/SeaskipperCosts.cs" /> <option value="$PROJECT_DIR$/Extensions/SeaskipperCosts.cs" />
<option value="$PROJECT_DIR$/Extensions/Direction.cs" /> <option value="$PROJECT_DIR$/Extensions/Direction.cs" />
<option value="$PROJECT_DIR$/Controls/Path.xaml.cs" /> <option value="$PROJECT_DIR$/Controls/Path.xaml.cs" />
<option value="$PROJECT_DIR$/NodeEditor.csproj" />
<option value="$PROJECT_DIR$/Controls/EditorCanvas.xaml.cs" />
<option value="$PROJECT_DIR$/Controls/EditorCanvas.xaml" />
<option value="$PROJECT_DIR$/Controls/Node.xaml" />
<option value="$PROJECT_DIR$/Controls/Node.xaml.cs" /> <option value="$PROJECT_DIR$/Controls/Node.xaml.cs" />
<option value="$PROJECT_DIR$/NodeEditor.csproj" />
</list> </list>
</option> </option>
</component> </component>
@ -121,7 +117,6 @@
<workItem from="1608418548513" duration="1911000" /> <workItem from="1608418548513" duration="1911000" />
<workItem from="1608578473230" duration="1904000" /> <workItem from="1608578473230" duration="1904000" />
<workItem from="1608581445298" duration="4238000" /> <workItem from="1608581445298" duration="4238000" />
<workItem from="1608585736986" duration="1797000" />
</task> </task>
<task id="LOCAL-00001" summary="Added custom Node control"> <task id="LOCAL-00001" summary="Added custom Node control">
<created>1608580007149</created> <created>1608580007149</created>
@ -144,14 +139,7 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1608584795551</updated> <updated>1608584795551</updated>
</task> </task>
<task id="LOCAL-00004" summary="Hopefully fixed runtime identifiers stopping the program from running."> <option name="localTasksCounter" value="4" />
<created>1608585937903</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1608585937903</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -203,37 +191,20 @@
<MESSAGE value="Added custom Node control" /> <MESSAGE value="Added custom Node control" />
<MESSAGE value="Added Paths custom control and Modes enum." /> <MESSAGE value="Added Paths custom control and Modes enum." />
<MESSAGE value="Updated Paths with a direction enum, and added seaskipper costs enum" /> <MESSAGE value="Updated Paths with a direction enum, and added seaskipper costs enum" />
<MESSAGE value="Hopefully fixed runtime identifiers stopping the program from running." /> <option name="LAST_COMMIT_MESSAGE" value="Updated Paths with a direction enum, and added seaskipper costs enum" />
<option name="LAST_COMMIT_MESSAGE" value="Hopefully fixed runtime identifiers stopping the program from running." />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state width="1877" height="320" key="GridCell.Tab.0.bottom" timestamp="1608598829102"> <state x="0" y="228" key="SettingsEditor" timestamp="1608583242732">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="320" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
<state width="1877" height="320" key="GridCell.Tab.0.center" timestamp="1608598829102">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="320" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
<state width="1877" height="320" key="GridCell.Tab.0.left" timestamp="1608598829102">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="320" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
<state width="1877" height="320" key="GridCell.Tab.0.right" timestamp="1608598829102">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="320" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
<state x="0" y="228" key="SettingsEditor" timestamp="1608586092924">
<screen x="0" y="0" width="1920" height="1160" /> <screen x="0" y="0" width="1920" height="1160" />
</state> </state>
<state x="0" y="228" key="SettingsEditor/0.0.1920.1160@0.0.1920.1160" timestamp="1608586092924" /> <state x="0" y="228" key="SettingsEditor/0.0.1920.1160@0.0.1920.1160" timestamp="1608583242732" />
<state x="92" y="92" width="1736" height="976" key="VCS.FileHistoryDialog" timestamp="1608585366848"> <state x="92" y="92" width="1736" height="976" key="VCS.FileHistoryDialog" timestamp="1608585366848">
<screen x="0" y="0" width="1920" height="1160" /> <screen x="0" y="0" width="1920" height="1160" />
</state> </state>
<state x="92" y="92" width="1736" height="976" key="VCS.FileHistoryDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1608585366848" /> <state x="92" y="92" width="1736" height="976" key="VCS.FileHistoryDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1608585366848" />
<state x="552" y="313" key="Vcs.Push.Dialog.v2" timestamp="1608585941128"> <state x="552" y="313" key="Vcs.Push.Dialog.v2" timestamp="1608582676704">
<screen x="0" y="0" width="1920" height="1160" /> <screen x="0" y="0" width="1920" height="1160" />
</state> </state>
<state x="552" y="313" key="Vcs.Push.Dialog.v2/0.0.1920.1160@0.0.1920.1160" timestamp="1608585941128" /> <state x="552" y="313" key="Vcs.Push.Dialog.v2/0.0.1920.1160@0.0.1920.1160" timestamp="1608582676704" />
</component> </component>
</project> </project>

18
Controls/EditorCanvas.xaml
Unescape Escape View File

@ -1,20 +1,18 @@
<UserControl x:Class="NodeEditor.Controls.EditorCanvas" <UserControl x:Class="NodeEditor.EditorCanvas"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:controls="clr-namespace:NodeEditor.Controls"
xmlns:local="clr-namespace:NodeEditor" xmlns:local="clr-namespace:NodeEditor"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<Canvas Name="m_EditorCanvas" Background="Green"> <Canvas Name="m_EditorCanvas" Background="Green">
<Canvas Name="mapCanvas" Background="Blue"> <Canvas Name="mapCanvas" Background="Blue">
<Canvas.RenderTransform> <Canvas.RenderTransform>
<MatrixTransform /> <MatrixTransform/>
</Canvas.RenderTransform> </Canvas.RenderTransform>
<Image Name="map" Source="../main-map.png" /> <Image Name="map" Source="../main-map.png"></Image>
<controls:Node />
</Canvas> </Canvas>
<TextBox Name="test" /> <TextBox Name="test"></TextBox>
</Canvas> </Canvas>
</UserControl> </UserControl>

38
Controls/EditorCanvas.xaml.cs
Unescape Escape View File

@ -1,16 +1,29 @@
using System.Windows; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.WebSockets;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using MahApps.Metro.Controls;
using NodeEditor.Extensions;
namespace NodeEditor.Controls namespace NodeEditor
{ {
/// <summary> /// <summary>
/// Interaction logic for EditorCanvas.xaml /// Interaction logic for EditorCanvas.xaml
/// </summary> /// </summary>
public partial class EditorCanvas : UserControl public partial class EditorCanvas : UserControl
{ {
private Point? _dragStart = null; Point? dragStart = null;
public EditorCanvas() public EditorCanvas()
{ {
@ -25,25 +38,26 @@ namespace NodeEditor.Controls
{ {
var element = (UIElement) sender; var element = (UIElement) sender;
// dragStart = new Point(e.GetPosition(mapCanvas).X * st.ScaleX, e.GetPosition(mapCanvas).Y * st.ScaleY); // dragStart = new Point(e.GetPosition(mapCanvas).X * st.ScaleX, e.GetPosition(mapCanvas).Y * st.ScaleY);
if (mapCanvas.RenderTransform is MatrixTransform transform) var transform = mapCanvas.RenderTransform as MatrixTransform;
_dragStart = new Point(e.GetPosition(mapCanvas).X * transform.Value.M11, dragStart = new Point(e.GetPosition(mapCanvas).X * transform.Value.M11, e.GetPosition(mapCanvas).Y * transform.Value.M22);
e.GetPosition(mapCanvas).Y * transform.Value.M22);
element.CaptureMouse(); element.CaptureMouse();
} }
private void MapCanvas_StopDrag(object sender, MouseEventArgs e) private void MapCanvas_StopDrag(object sender, MouseEventArgs e)
{ {
var element = (UIElement)sender; var element = (UIElement)sender;
_dragStart = null; dragStart = null;
element.ReleaseMouseCapture(); element.ReleaseMouseCapture();
} }
private void MapCanvas_Drag(object sender, MouseEventArgs e) private void MapCanvas_Drag(object sender, MouseEventArgs e)
{ {
if (_dragStart == null || e.LeftButton != MouseButtonState.Pressed) return; if (dragStart != null && e.LeftButton == MouseButtonState.Pressed)
var newPoint = e.GetPosition(m_EditorCanvas); {
var newPoint = e.GetPosition(m_EditorCanvas);
Canvas.SetLeft(mapCanvas, newPoint.X - _dragStart.Value.X); Canvas.SetLeft(mapCanvas, newPoint.X - dragStart.Value.X);
Canvas.SetTop(mapCanvas, newPoint.Y - _dragStart.Value.Y); Canvas.SetTop(mapCanvas, newPoint.Y - dragStart.Value.Y);
}
} }
private void MapCanvas_OnScroll(object sender, MouseWheelEventArgs e) private void MapCanvas_OnScroll(object sender, MouseWheelEventArgs e)
@ -60,7 +74,7 @@ namespace NodeEditor.Controls
// } // }
var element = sender as UIElement; var element = sender as UIElement;
var position = e.GetPosition(element); var position = e.GetPosition(element);
if (!(mapCanvas.RenderTransform is MatrixTransform transform)) return; var transform = mapCanvas.RenderTransform as MatrixTransform;
var matrix = transform.Matrix; var matrix = transform.Matrix;
var scale = e.Delta >= 0 ? 1.1 : (1.0 / 1.1); // choose appropriate scaling factor var scale = e.Delta >= 0 ? 1.1 : (1.0 / 1.1); // choose appropriate scaling factor

38
Controls/Node.xaml
Unescape Escape View File

@ -1,36 +1,12 @@
<UserControl x:Class="NodeEditor.Controls.Node" <UserControl x:Class="NodeEditor.Controls.Node"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:NodeEditor.Controls" xmlns:local="clr-namespace:NodeEditor.Controls"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Button Height="7" Width="7"
HorizontalAlignment="Left" </Grid>
VerticalAlignment="Top"> </UserControl>
<Button.Template>
<ControlTemplate TargetType="Button">
<Grid>
<Ellipse Stroke="Black"
StrokeThickness="0">
<Ellipse.Fill>
<RadialGradientBrush>
<GradientStop Offset="0" Color="Red"/>
<GradientStop Offset="1" Color="Red"/>
<GradientStop Offset="1" Color="DarkRed"/>
<RadialGradientBrush.Transform>
<TransformGroup>
<ScaleTransform ScaleY="0.65"/>
</TransformGroup>
</RadialGradientBrush.Transform>
</RadialGradientBrush>
</Ellipse.Fill>
</Ellipse>
</Grid>
</ControlTemplate>
</Button.Template>
</Button>
</UserControl>

3
Controls/Node.xaml.cs
Unescape Escape View File

@ -15,7 +15,7 @@ namespace NodeEditor.Controls
public Node() public Node()
{ {
Nodes.Add(this); Nodes.Add(this);
//Name = GetIndexOf(this).ToString(); Name = GetIndexOf(this).ToString();
Desc = ""; Desc = "";
InitializeComponent(); InitializeComponent();
} }
@ -33,6 +33,7 @@ namespace NodeEditor.Controls
Desc = desc; Desc = desc;
InitializeComponent(); InitializeComponent();
} }
public static int GetIndexOf(Node node) public static int GetIndexOf(Node node)
{ {
if (node != null) if (node != null)

5
MainWindow.xaml
Unescape Escape View File

@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:NodeEditor" xmlns:local="clr-namespace:NodeEditor"
xmlns:controls="clr-namespace:NodeEditor.Controls"
mc:Ignorable="d" mc:Ignorable="d"
WindowStyle="ToolWindow" WindowStyle="ToolWindow"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
@ -65,8 +64,8 @@
<!-- ~1~ </Canvas> @1@ --> <!-- ~1~ </Canvas> @1@ -->
<!-- --> <!-- -->
<!-- </Grid> --> <!-- </Grid> -->
<controls:EditorCanvas Background="Black" Margin="20,20,20,20"> <local:EditorCanvas Background="Black" Margin="20,20,20,20">
</controls:EditorCanvas> </local:EditorCanvas>
</Window> </Window>

Write Preview
Loading…
Cancel
Save