Added a lot of files and enabled LFS

main
Julie 5 years ago
parent edbdab97f5
commit 622ffcaeff
Signed by: cobular
GPG Key ID: 8CAB39FC9A8F13FB

1
.gitattributes vendored

@ -0,0 +1 @@
*.png filter=lfs diff=lfs merge=lfs -text

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Users\jdc10\AppData\Local\JetBrains\Rider2020.3\extResources" t="IncludeRecursive" />
<e p="C:\Users\jdc10\AppData\Local\JetBrains\Rider2020.3\resharper-host\Local\Transient\Rider\v203\SolutionCaches\_NodeEditor.784521688.00" t="ExcludeRecursive" />
<e p="C:\Users\jdc10\Downloads\NodeEditor" t="IncludeRecursive">
<e p=".gitignore" t="Include" />
<e p="App.config" t="Include" />
<e p="App.xaml" t="Include" />
<e p="App.xaml.cs" t="Include" />
<e p="bin" t="ExcludeRecursive" />
<e p="Controls" t="Include">
<e p="EditorCanvas.xaml" t="Include" />
<e p="EditorCanvas.xaml.cs" t="Include" />
</e>
<e p="Extensions" t="Include">
<e p="MathExtensions.cs" t="Include" />
<e p="MouseExtensions.cs" t="Include" />
<e p="ReadJSON.cs" t="Include" />
</e>
<e p="main-map.png" t="Include" />
<e p="MainWindow.xaml" t="Include" />
<e p="MainWindow.xaml.cs" t="Include" />
<e p="NodeEditor.csproj" t="IncludeRecursive" />
<e p="NodeEditor.sln" t="IncludeFlat" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="App.g.cs" t="Include" />
<e p="Controls" t="Include">
<e p="EditorCanvas.g.cs" t="Include" />
</e>
<e p="GeneratedInternalTypeHelper.g.cs" t="Include" />
<e p="MainWindow.g.cs" t="Include" />
</e>
</e>
<e p="packages" t="ExcludeRecursive" />
<e p="Properties" t="Include">
<e p="AssemblyInfo.cs" t="Include" />
<e p="Resources.Designer.cs" t="Include" />
<e p="Resources.resx" t="Include" />
<e p="Settings.Designer.cs" t="Include" />
<e p="Settings.settings" t="Include" />
</e>
<e p="Solution Items" t="Include" />
</e>
</component>
</project>

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelUserStore">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/riderModule.iml" />
</modules>
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="vcsConfiguration" value="2" />
</component>
</project>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../.." />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoGeneratedRunConfigurationManager">
<projectFile>NodeEditor.csproj</projectFile>
</component>
<component name="ChangeListManager">
<list default="true" id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/Controls/EditorCanvas.xaml" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/EditorCanvas.xaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Controls/EditorCanvas.xaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/EditorCanvas.xaml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main-map.png" beforeDir="false" afterPath="$PROJECT_DIR$/main-map.png" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="1ltZq4ji537vQS7B5Q2SkaWibqc" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="RunManager">
<configuration name="NodeEditor" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/NodeEditor.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
<option name="PROJECT_KIND" value="Console" />
<option name="PROJECT_TFM" value="" />
<method v="2">
<option name="Build" />
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="" />
<created>1608418540783</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1608418540783</updated>
<workItem from="1608418548513" duration="1911000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="null" />
<component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
</project>

@ -6,8 +6,11 @@
xmlns:local="clr-namespace:NodeEditor"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Canvas Name="m_EditorCanvas">
<Canvas Name="mapCanvas">
<Canvas Name="m_EditorCanvas" Background="Green">
<Canvas Name="mapCanvas" Background="Blue">
<Canvas.RenderTransform>
<MatrixTransform/>
</Canvas.RenderTransform>
<Image Name="map" Source="../main-map.png"></Image>
</Canvas>
<TextBox Name="test"></TextBox>

@ -3,6 +3,7 @@ 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.Data;
@ -12,6 +13,7 @@ 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
@ -21,67 +23,63 @@ namespace NodeEditor
/// </summary>
public partial class EditorCanvas : UserControl
{
Point dragStart = new Point();
MatrixTransform dragMatrixTransform = new MatrixTransform();
TranslateTransform dragTranslateTransform = new TranslateTransform();
Point? dragStart = null;
public EditorCanvas()
{
InitializeComponent();
m_EditorCanvas.MouseMove += MapCanvas_Drag;
m_EditorCanvas.MouseDown += MapCanvas_StartDrag;
m_EditorCanvas.MouseUp += MapCanvas_StopDrag;
m_EditorCanvas.MouseWheel += MapCanvas_OnScroll;
mapCanvas.RenderTransform = MathExtensions.applyMultiTransform(dragTranslateTransform, dragMatrixTransform);
}
private void MapCanvas_StartDrag(object sender, MouseEventArgs e)
{
dragStart = e.GetPosition(this);
var element = (UIElement) sender;
// dragStart = new Point(e.GetPosition(mapCanvas).X * st.ScaleX, e.GetPosition(mapCanvas).Y * st.ScaleY);
var transform = mapCanvas.RenderTransform as MatrixTransform;
dragStart = new Point(e.GetPosition(mapCanvas).X * transform.Value.M11, e.GetPosition(mapCanvas).Y * transform.Value.M22);
element.CaptureMouse();
}
private void MapCanvas_StopDrag(object sender, MouseEventArgs e)
{
var element = (UIElement)sender;
dragStart = null;
element.ReleaseMouseCapture();
}
private void MapCanvas_Drag(object sender, MouseEventArgs e)
{
if (e.LeftButton == MouseButtonState.Pressed)
if (dragStart != null && e.LeftButton == MouseButtonState.Pressed)
{
var element = sender as UIElement;
var newPoint = e.GetPosition(m_EditorCanvas);
var transform = dragTranslateTransform;
var old = element.TranslatePoint(new Point(0, 0), map);
var new_point = old + Point.Subtract(e.GetPosition(this), dragStart);
transform.X = new_point.X;
transform.Y = new_point.Y;
m_EditorCanvas.RenderTransform = MathExtensions.applyMultiTransform(dragTranslateTransform, dragMatrixTransform);
test.Text = Point.Subtract(e.GetPosition(this), dragStart).ToString();
Canvas.SetLeft(mapCanvas, newPoint.X - dragStart.Value.X);
Canvas.SetTop(mapCanvas, newPoint.Y - dragStart.Value.Y);
}
if (e.LeftButton == MouseButtonState.Released)
test.Text = "";
}
private void MapCanvas_EndDrag(object sender, MouseEventArgs e)
{
dragStart = new Point(0, 0);
}
private void MapCanvas_OnScroll(object sender, MouseWheelEventArgs e)
{
// if (e.Delta > 0)
// {
// st.ScaleX *= 1.1;
// st.ScaleY *= 1.1;
// }
// else
// {
// st.ScaleX /= 1.1;
// st.ScaleY /= 1.1;
// }
var element = sender as UIElement;
var position = e.GetPosition(element);
var transform = dragMatrixTransform;
var transform = mapCanvas.RenderTransform as MatrixTransform;
var matrix = transform.Matrix;
var scale = e.Delta >= 0 ? 1.1 : (1.0 / 1.1);
var scale = e.Delta >= 0 ? 1.1 : (1.0 / 1.1); // choose appropriate scaling factor
matrix.ScaleAtPrepend(scale, scale, position.X, position.Y);
transform.Matrix = matrix;
element.RenderTransform = MathExtensions.applyMultiTransform(dragTranslateTransform, dragMatrixTransform);
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 MiB

After

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 MiB

After

Width:  |  Height:  |  Size: 133 B

Loading…
Cancel
Save