Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4ec72d4
- removed unused using statements
DragonirHD Dec 11, 2022
f118a3a
- added getters to Circle and Spiral
DragonirHD Dec 13, 2022
012f297
- Added functionality to Element Move Up / Down Buttons
DragonirHD Dec 14, 2022
6997fac
- improved functionality of "Element Get Settings" and "Element Apply…
DragonirHD Dec 18, 2022
d524237
- replaced FolderBrowserDialog with more intuitive CommonOpenFileDialog
DragonirHD Dec 18, 2022
cd84f5b
- added functionality for inserting chain elements after selected ele…
DragonirHD Dec 18, 2022
eb6c9cc
Merge pull request #1 from DragonirHD/chaining
DragonirHD Dec 21, 2022
6971595
- applied not yet merged changes from chaining branch
DragonirHD Dec 23, 2022
cc4abd3
- applied not yet merged changes from chaining branch
DragonirHD Dec 23, 2022
61a0ca3
- fixed an error of the repeat element
DragonirHD Dec 23, 2022
a2c6ab1
- added possibility to get element settings by double clicking
DragonirHD Dec 23, 2022
9bc6915
- Added functionality that after some Error-Messageboxes, the needed …
DragonirHD Dec 23, 2022
bdd507a
- removed unused code
DragonirHD Dec 23, 2022
2ef9428
- created user settings for easier use when closing and reopening the…
DragonirHD Dec 30, 2022
aff5712
- renamed menuStrip
DragonirHD Dec 30, 2022
21e3602
Revert "- renamed menuStrip"
DragonirHD Dec 30, 2022
63e514f
- renamed menuStrip
DragonirHD Dec 30, 2022
231d618
- fixed some naming mistakes on ChainElementControls
DragonirHD Dec 30, 2022
cd6c20b
- removed finished todo
DragonirHD Jan 3, 2023
77e0948
Merge pull request #2 from DragonirHD/saving
DragonirHD Jan 3, 2023
088b9e7
Added check for debug/release mode because the location of the ChainE…
DragonirHD Jan 3, 2023
129084d
updated assembly version to 2.0.0.0
DragonirHD Jan 3, 2023
0049620
- small tweaks for UI
DragonirHD Jan 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MovementScriptGenerator.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{779FE5F9-F0F3-4EF3-8D9A-E8D7AEA8D29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{779FE5F9-F0F3-4EF3-8D9A-E8D7AEA8D29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{779FE5F9-F0F3-4EF3-8D9A-E8D7AEA8D29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{779FE5F9-F0F3-4EF3-8D9A-E8D7AEA8D29D}.Release|Any CPU.Build.0 = Release|Any CPU
{779FE5F9-F0F3-4EF3-8D9A-E8D7AEA8D29D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{779FE5F9-F0F3-4EF3-8D9A-E8D7AEA8D29D}.Release|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
27 changes: 27 additions & 0 deletions MovementScriptGenerator/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="MovementScriptGenerator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<MovementScriptGenerator.Properties.Settings>
<setting name="GenerateScriptPath" serializeAs="String">
<value />
</setting>
<setting name="ChainFullName" serializeAs="String">
<value />
</setting>
<setting name="ChainDirectoryPath" serializeAs="String">
<value />
</setting>
<setting name="WindowLocation" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="WindowSize" serializeAs="String">
<value>923, 754</value>
</setting>
<setting name="WindowState" serializeAs="String">
<value>0</value>
</setting>
</MovementScriptGenerator.Properties.Settings>
</userSettings>
</configuration>
11 changes: 11 additions & 0 deletions MovementScriptGenerator/ChainElementsEnum.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

namespace MovementScriptGenerator
{
enum ChainElementsEnum
{
Circle,
Spiral,
JTurn,
Repeat
}
}
78 changes: 0 additions & 78 deletions MovementScriptGenerator/Circle.cs

This file was deleted.

61 changes: 31 additions & 30 deletions MovementScriptGenerator/CircleControl.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 35 additions & 20 deletions MovementScriptGenerator/CircleControl.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Windows.Forms;
using MovementScriptGenerator.Modules;

namespace MovementScriptGenerator
{
public partial class CircleControl : UserControl
{
private static Circle circle = new Circle();

List<string> rotationTypes = new List<string>()
{
Expand All @@ -27,34 +18,58 @@ public CircleControl()
initializeComboBoxes();
}

private void CircleControl_Load(object sender, System.EventArgs e)
{
ScrollEventDisable scrollEventDisable = new ScrollEventDisable();
scrollEventDisable.DisableScrollForChainElementControls(sender, e, Controls[0]);
}

private void initializeComboBoxes()
{
cbRotation.DataSource = rotationTypes;
cbRotation.SelectedIndex = 0;
}

public MovementScript CreateMovementScript()
public bool Populate(Circle original)
{
MovementScript movementScript = new MovementScript();
bool rotateClockwise = false;
if (cbRotation.SelectedIndex == 0)
try
{
rotateClockwise = true;
numFOV.Value = original.Fov;
numDuration.Value = (decimal)original.Duration;
numHeight.Value = (decimal)original.Height;
numRotX.Value = (decimal)original.RotX;
numRotZ.Value = (decimal)original.RotZ;
numDistance.Value = (decimal)original.Distance;
numStartingPoint.Value = (decimal)original.StartingPointDegree;
numSector.Value = (decimal)original.SectorDegrees;
numIterations.Value = original.Iterations;
cbRotation.SelectedIndex = original.RotateClockwise ? 0 : 1;
}
movementScript.frames = circle.GenerateFrames(
catch
{
return false;
}

return true;
}

public Circle CreateMove(string moveName)
{
Circle circle = new Circle(
moveName,
(int)numFOV.Value,
(float)numDuration.Value,
(float)numHeight.Value,
(float)numRotX.Value,
(float)numRotZ.Value,
(float)numDistance.Value,
(float)numStartingPoint.Value,
(float)numSector.Value,
(int)numIterations.Value,
(float)numHeight.Value,
rotateClockwise
);
cbRotation.SelectedIndex == 0
);

return movementScript;
return circle;
}
}
}
Loading