diff --git a/.vs/JellyEditor3/v16/.suo b/.vs/JellyEditor3/v16/.suo
index 271051f..81a3558 100644
Binary files a/.vs/JellyEditor3/v16/.suo and b/.vs/JellyEditor3/v16/.suo differ
diff --git a/JelloEditor/Form1.Designer.cs b/JelloEditor/Form1.Designer.cs
index 89cf05b..3bf8704 100644
--- a/JelloEditor/Form1.Designer.cs
+++ b/JelloEditor/Form1.Designer.cs
@@ -41,9 +41,9 @@ private void InitializeComponent()
this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripShowGrid = new System.Windows.Forms.ToolStripMenuItem();
- this.snapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toggleEditorThemeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.drawPolysInSceneEditModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.snapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aToolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.gridSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sceneSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -69,101 +69,103 @@ private void InitializeComponent()
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar();
this.toolStripMainStatus = new System.Windows.Forms.ToolStripStatusLabel();
- this.tabControl1 = new System.Windows.Forms.TabControl();
- this.tabScene = new System.Windows.Forms.TabPage();
- this.groupBoxTransformation = new System.Windows.Forms.GroupBox();
- this.label8 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.textSceneScaleX = new System.Windows.Forms.TextBox();
- this.textSceneScaleY = new System.Windows.Forms.TextBox();
- this.textSceneAngle = new System.Windows.Forms.TextBox();
- this.trackSceneAngle = new System.Windows.Forms.TrackBar();
- this.textScenePosX = new System.Windows.Forms.TextBox();
- this.textScenePosY = new System.Windows.Forms.TextBox();
- this.tabControlSceneObjectSettings = new System.Windows.Forms.TabControl();
- this.tabPage1 = new System.Windows.Forms.TabPage();
- this.groupBoxSettings = new System.Windows.Forms.GroupBox();
- this.checkBoxTriggerNoCam = new System.Windows.Forms.CheckBox();
- this.buttonTriggerTarget = new System.Windows.Forms.Button();
- this.checkBoxIsTrigger = new System.Windows.Forms.CheckBox();
- this.checkBoxOverrideColor = new System.Windows.Forms.CheckBox();
- this.pictureBoxSceneColor = new System.Windows.Forms.PictureBox();
- this.buttonSceneColor = new System.Windows.Forms.Button();
- this.groupBoxMaterial = new System.Windows.Forms.GroupBox();
- this.labelMaterial = new System.Windows.Forms.Label();
- this.numericMaterial = new System.Windows.Forms.NumericUpDown();
- this.tabPage2 = new System.Windows.Forms.TabPage();
- this.buttonClearPathObjects = new System.Windows.Forms.Button();
- this.buttonAttachObjectToPath = new System.Windows.Forms.Button();
- this.checkBoxClosedPath = new System.Windows.Forms.CheckBox();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.radioButton2 = new System.Windows.Forms.RadioButton();
- this.radioButton1 = new System.Windows.Forms.RadioButton();
- this.butSceneCloneObject = new System.Windows.Forms.Button();
- this.butSceneNewObject = new System.Windows.Forms.Button();
- this.butSceneRemoveObject = new System.Windows.Forms.Button();
- this.butSceneAddObject = new System.Windows.Forms.Button();
- this.treeView1 = new System.Windows.Forms.TreeView();
- this.tabObject = new System.Windows.Forms.TabPage();
- this.textObjectPressure = new System.Windows.Forms.TextBox();
- this.checkBoxPressureBody = new System.Windows.Forms.CheckBox();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.label11 = new System.Windows.Forms.Label();
- this.label10 = new System.Windows.Forms.Label();
- this.textObjectShapeDamping = new System.Windows.Forms.TextBox();
- this.textObjectShapeK = new System.Windows.Forms.TextBox();
- this.checkBoxObjectShapeMatching = new System.Windows.Forms.CheckBox();
- this.pictureBoxObjectColor = new System.Windows.Forms.PictureBox();
- this.butObjectColor = new System.Windows.Forms.Button();
- this.checkBoxObjectKinematic = new System.Windows.Forms.CheckBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.label9 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.textEdgeDamping = new System.Windows.Forms.TextBox();
- this.textEdgeK = new System.Windows.Forms.TextBox();
- this.textObjectName = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
- this.groupSprings = new System.Windows.Forms.GroupBox();
- this.butObjectSpringSetAll = new System.Windows.Forms.Button();
- this.textObjectSpringDamping = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.textObjectSpringK = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.groupPoints = new System.Windows.Forms.GroupBox();
- this.textObjectPointMass = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.groupObjectMode = new System.Windows.Forms.GroupBox();
- this.radioObjectPolygons = new System.Windows.Forms.RadioButton();
- this.radioObjectSprings = new System.Windows.Forms.RadioButton();
- this.radioObjectEditPoints = new System.Windows.Forms.RadioButton();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog();
+ this.tabObject = new System.Windows.Forms.TabPage();
+ this.groupObjectMode = new System.Windows.Forms.GroupBox();
+ this.radioObjectEditPoints = new System.Windows.Forms.RadioButton();
+ this.radioObjectSprings = new System.Windows.Forms.RadioButton();
+ this.radioObjectPolygons = new System.Windows.Forms.RadioButton();
+ this.groupPoints = new System.Windows.Forms.GroupBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.textObjectPointMass = new System.Windows.Forms.TextBox();
+ this.groupSprings = new System.Windows.Forms.GroupBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.textObjectSpringK = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.textObjectSpringDamping = new System.Windows.Forms.TextBox();
+ this.butObjectSpringSetAll = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.textObjectName = new System.Windows.Forms.TextBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.textEdgeK = new System.Windows.Forms.TextBox();
+ this.textEdgeDamping = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.checkBoxObjectKinematic = new System.Windows.Forms.CheckBox();
+ this.butObjectColor = new System.Windows.Forms.Button();
+ this.pictureBoxObjectColor = new System.Windows.Forms.PictureBox();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.checkBoxObjectShapeMatching = new System.Windows.Forms.CheckBox();
+ this.textObjectShapeK = new System.Windows.Forms.TextBox();
+ this.textObjectShapeDamping = new System.Windows.Forms.TextBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.checkBoxPressureBody = new System.Windows.Forms.CheckBox();
+ this.textObjectPressure = new System.Windows.Forms.TextBox();
+ this.tabScene = new System.Windows.Forms.TabPage();
+ this.treeView1 = new System.Windows.Forms.TreeView();
+ this.butSceneAddObject = new System.Windows.Forms.Button();
+ this.butSceneRemoveObject = new System.Windows.Forms.Button();
+ this.butSceneNewObject = new System.Windows.Forms.Button();
+ this.butSceneCloneObject = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.radioButton1 = new System.Windows.Forms.RadioButton();
+ this.radioButton2 = new System.Windows.Forms.RadioButton();
+ this.tabControlSceneObjectSettings = new System.Windows.Forms.TabControl();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.checkBoxClosedPath = new System.Windows.Forms.CheckBox();
+ this.buttonAttachObjectToPath = new System.Windows.Forms.Button();
+ this.buttonClearPathObjects = new System.Windows.Forms.Button();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.groupBoxMaterial = new System.Windows.Forms.GroupBox();
+ this.numericMaterial = new System.Windows.Forms.NumericUpDown();
+ this.labelMaterial = new System.Windows.Forms.Label();
+ this.groupBoxSettings = new System.Windows.Forms.GroupBox();
+ this.buttonSceneColor = new System.Windows.Forms.Button();
+ this.pictureBoxSceneColor = new System.Windows.Forms.PictureBox();
+ this.checkBoxOverrideColor = new System.Windows.Forms.CheckBox();
+ this.checkBoxIsTrigger = new System.Windows.Forms.CheckBox();
+ this.buttonTriggerTarget = new System.Windows.Forms.Button();
+ this.checkBoxTriggerNoCam = new System.Windows.Forms.CheckBox();
+ this.groupBoxTransformation = new System.Windows.Forms.GroupBox();
+ this.textScenePosY = new System.Windows.Forms.TextBox();
+ this.textScenePosX = new System.Windows.Forms.TextBox();
+ this.trackSceneAngle = new System.Windows.Forms.TrackBar();
+ this.textSceneAngle = new System.Windows.Forms.TextBox();
+ this.textSceneScaleY = new System.Windows.Forms.TextBox();
+ this.textSceneScaleX = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.moveUpButton = new System.Windows.Forms.Button();
+ this.moveDownButton = new System.Windows.Forms.Button();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
this.menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.statusStrip1.SuspendLayout();
- this.tabControl1.SuspendLayout();
+ this.tabObject.SuspendLayout();
+ this.groupObjectMode.SuspendLayout();
+ this.groupPoints.SuspendLayout();
+ this.groupSprings.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObjectColor)).BeginInit();
+ this.groupBox3.SuspendLayout();
this.tabScene.SuspendLayout();
- this.groupBoxTransformation.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.trackSceneAngle)).BeginInit();
+ this.groupBox1.SuspendLayout();
this.tabControlSceneObjectSettings.SuspendLayout();
+ this.tabPage2.SuspendLayout();
this.tabPage1.SuspendLayout();
- this.groupBoxSettings.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSceneColor)).BeginInit();
this.groupBoxMaterial.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericMaterial)).BeginInit();
- this.tabPage2.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.tabObject.SuspendLayout();
- this.groupBox3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObjectColor)).BeginInit();
- this.groupBox2.SuspendLayout();
- this.groupSprings.SuspendLayout();
- this.groupPoints.SuspendLayout();
- this.groupObjectMode.SuspendLayout();
+ this.groupBoxSettings.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSceneColor)).BeginInit();
+ this.groupBoxTransformation.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackSceneAngle)).BeginInit();
+ this.tabControl1.SuspendLayout();
this.SuspendLayout();
//
// menuStrip1
@@ -288,22 +290,14 @@ private void InitializeComponent()
this.toolStripShowGrid.CheckState = System.Windows.Forms.CheckState.Checked;
this.toolStripShowGrid.Name = "toolStripShowGrid";
this.toolStripShowGrid.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
- this.toolStripShowGrid.Size = new System.Drawing.Size(316, 22);
+ this.toolStripShowGrid.Size = new System.Drawing.Size(192, 22);
this.toolStripShowGrid.Text = "Show grid";
this.toolStripShowGrid.Click += new System.EventHandler(this.toolStripShowGrid_Click);
//
- // snapToolStripMenuItem
- //
- this.snapToolStripMenuItem.CheckOnClick = true;
- this.snapToolStripMenuItem.Name = "snapToolStripMenuItem";
- this.snapToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
- this.snapToolStripMenuItem.Text = "Snap to grid";
- this.snapToolStripMenuItem.Visible = false;
- //
// toggleEditorThemeToolStripMenuItem
//
this.toggleEditorThemeToolStripMenuItem.Name = "toggleEditorThemeToolStripMenuItem";
- this.toggleEditorThemeToolStripMenuItem.Size = new System.Drawing.Size(316, 22);
+ this.toggleEditorThemeToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.toggleEditorThemeToolStripMenuItem.Text = "Toggle editor theme";
this.toggleEditorThemeToolStripMenuItem.Click += new System.EventHandler(this.toggleEditorThemeToolStripMenuItem_Click);
//
@@ -311,26 +305,34 @@ private void InitializeComponent()
//
this.drawPolysInSceneEditModeToolStripMenuItem.CheckOnClick = true;
this.drawPolysInSceneEditModeToolStripMenuItem.Name = "drawPolysInSceneEditModeToolStripMenuItem";
- this.drawPolysInSceneEditModeToolStripMenuItem.Size = new System.Drawing.Size(316, 22);
+ this.drawPolysInSceneEditModeToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.drawPolysInSceneEditModeToolStripMenuItem.Text = "Always draw polygons";
this.drawPolysInSceneEditModeToolStripMenuItem.Click += new System.EventHandler(this.drawPolysInSceneEditModeToolStripMenuItem_Click);
//
+ // snapToolStripMenuItem
+ //
+ this.snapToolStripMenuItem.CheckOnClick = true;
+ this.snapToolStripMenuItem.Name = "snapToolStripMenuItem";
+ this.snapToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+ this.snapToolStripMenuItem.Text = "Snap to grid";
+ this.snapToolStripMenuItem.Visible = false;
+ //
// aToolStripMenuItem1
//
this.aToolStripMenuItem1.Name = "aToolStripMenuItem1";
- this.aToolStripMenuItem1.Size = new System.Drawing.Size(313, 6);
+ this.aToolStripMenuItem1.Size = new System.Drawing.Size(189, 6);
//
// gridSetupToolStripMenuItem
//
this.gridSetupToolStripMenuItem.Name = "gridSetupToolStripMenuItem";
- this.gridSetupToolStripMenuItem.Size = new System.Drawing.Size(316, 22);
+ this.gridSetupToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.gridSetupToolStripMenuItem.Text = "Grid settings...";
this.gridSetupToolStripMenuItem.Click += new System.EventHandler(this.gridSetupToolStripMenuItem_Click);
//
// sceneSettingsToolStripMenuItem
//
this.sceneSettingsToolStripMenuItem.Name = "sceneSettingsToolStripMenuItem";
- this.sceneSettingsToolStripMenuItem.Size = new System.Drawing.Size(316, 22);
+ this.sceneSettingsToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.sceneSettingsToolStripMenuItem.Text = "Scene settings...";
this.sceneSettingsToolStripMenuItem.Click += new System.EventHandler(this.sceneSettingsToolStripMenuItem_Click);
//
@@ -523,436 +525,270 @@ private void InitializeComponent()
this.toolStripMainStatus.Text = "Welcome to JellyEditor 3, the JellyCar 3 compatible level editor";
this.toolStripMainStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // tabControl1
+ // openFileDialog1
//
- this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.tabControl1.Controls.Add(this.tabScene);
- this.tabControl1.Controls.Add(this.tabObject);
- this.tabControl1.Location = new System.Drawing.Point(700, 30);
- this.tabControl1.Name = "tabControl1";
- this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(185, 619);
- this.tabControl1.TabIndex = 3;
- this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
+ this.openFileDialog1.FileName = "openFileDialog1";
//
- // tabScene
+ // openFileDialog2
//
- this.tabScene.Controls.Add(this.groupBoxTransformation);
- this.tabScene.Controls.Add(this.tabControlSceneObjectSettings);
- this.tabScene.Controls.Add(this.groupBox1);
- this.tabScene.Controls.Add(this.butSceneCloneObject);
- this.tabScene.Controls.Add(this.butSceneNewObject);
- this.tabScene.Controls.Add(this.butSceneRemoveObject);
- this.tabScene.Controls.Add(this.butSceneAddObject);
- this.tabScene.Controls.Add(this.treeView1);
- this.tabScene.Location = new System.Drawing.Point(4, 22);
- this.tabScene.Name = "tabScene";
- this.tabScene.Padding = new System.Windows.Forms.Padding(3);
- this.tabScene.Size = new System.Drawing.Size(177, 593);
- this.tabScene.TabIndex = 0;
- this.tabScene.Text = "Scene";
- this.tabScene.UseVisualStyleBackColor = true;
+ this.openFileDialog2.FileName = "openFileDialog1";
+ this.openFileDialog2.Multiselect = true;
//
- // groupBoxTransformation
+ // tabObject
//
- this.groupBoxTransformation.Controls.Add(this.label8);
- this.groupBoxTransformation.Controls.Add(this.label7);
- this.groupBoxTransformation.Controls.Add(this.label6);
- this.groupBoxTransformation.Controls.Add(this.textSceneScaleX);
- this.groupBoxTransformation.Controls.Add(this.textSceneScaleY);
- this.groupBoxTransformation.Controls.Add(this.textSceneAngle);
- this.groupBoxTransformation.Controls.Add(this.trackSceneAngle);
- this.groupBoxTransformation.Controls.Add(this.textScenePosX);
- this.groupBoxTransformation.Controls.Add(this.textScenePosY);
- this.groupBoxTransformation.Location = new System.Drawing.Point(0, 470);
- this.groupBoxTransformation.Name = "groupBoxTransformation";
- this.groupBoxTransformation.Size = new System.Drawing.Size(177, 124);
- this.groupBoxTransformation.TabIndex = 10;
- this.groupBoxTransformation.TabStop = false;
- this.groupBoxTransformation.Text = "Transformation";
+ this.tabObject.Controls.Add(this.textObjectPressure);
+ this.tabObject.Controls.Add(this.textObjectName);
+ this.tabObject.Controls.Add(this.checkBoxPressureBody);
+ this.tabObject.Controls.Add(this.groupBox3);
+ this.tabObject.Controls.Add(this.pictureBoxObjectColor);
+ this.tabObject.Controls.Add(this.butObjectColor);
+ this.tabObject.Controls.Add(this.checkBoxObjectKinematic);
+ this.tabObject.Controls.Add(this.groupBox2);
+ this.tabObject.Controls.Add(this.label5);
+ this.tabObject.Controls.Add(this.groupSprings);
+ this.tabObject.Controls.Add(this.groupPoints);
+ this.tabObject.Controls.Add(this.groupObjectMode);
+ this.tabObject.Location = new System.Drawing.Point(4, 22);
+ this.tabObject.Name = "tabObject";
+ this.tabObject.Padding = new System.Windows.Forms.Padding(3);
+ this.tabObject.Size = new System.Drawing.Size(177, 593);
+ this.tabObject.TabIndex = 1;
+ this.tabObject.Text = "Object";
+ this.tabObject.UseVisualStyleBackColor = true;
//
- // label8
+ // groupObjectMode
//
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(26, 61);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(34, 13);
- this.label8.TabIndex = 9;
- this.label8.Text = "Angle";
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(27, 98);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(34, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Scale";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(14, 22);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(44, 13);
- this.label6.TabIndex = 7;
- this.label6.Text = "Position";
- //
- // textSceneScaleX
- //
- this.textSceneScaleX.Location = new System.Drawing.Point(66, 95);
- this.textSceneScaleX.Name = "textSceneScaleX";
- this.textSceneScaleX.Size = new System.Drawing.Size(38, 20);
- this.textSceneScaleX.TabIndex = 4;
- this.textSceneScaleX.TextChanged += new System.EventHandler(this.textScene_TextChanged);
- //
- // textSceneScaleY
- //
- this.textSceneScaleY.Location = new System.Drawing.Point(110, 95);
- this.textSceneScaleY.Name = "textSceneScaleY";
- this.textSceneScaleY.Size = new System.Drawing.Size(38, 20);
- this.textSceneScaleY.TabIndex = 5;
- this.textSceneScaleY.TextChanged += new System.EventHandler(this.textScene_TextChanged);
- //
- // textSceneAngle
- //
- this.textSceneAngle.Location = new System.Drawing.Point(110, 46);
- this.textSceneAngle.Name = "textSceneAngle";
- this.textSceneAngle.Size = new System.Drawing.Size(38, 20);
- this.textSceneAngle.TabIndex = 3;
- this.textSceneAngle.TextChanged += new System.EventHandler(this.textScene_TextChanged);
- //
- // trackSceneAngle
- //
- this.trackSceneAngle.AutoSize = false;
- this.trackSceneAngle.Location = new System.Drawing.Point(66, 69);
- this.trackSceneAngle.Maximum = 360;
- this.trackSceneAngle.Name = "trackSceneAngle";
- this.trackSceneAngle.Size = new System.Drawing.Size(82, 20);
- this.trackSceneAngle.TabIndex = 3;
- this.trackSceneAngle.TabStop = false;
- this.trackSceneAngle.TickFrequency = 45;
- this.trackSceneAngle.TickStyle = System.Windows.Forms.TickStyle.None;
- this.trackSceneAngle.ValueChanged += new System.EventHandler(this.trackSceneAngle_ValueChanged);
- //
- // textScenePosX
- //
- this.textScenePosX.Location = new System.Drawing.Point(66, 19);
- this.textScenePosX.Name = "textScenePosX";
- this.textScenePosX.Size = new System.Drawing.Size(38, 20);
- this.textScenePosX.TabIndex = 1;
- this.textScenePosX.TextChanged += new System.EventHandler(this.textScene_TextChanged);
- //
- // textScenePosY
- //
- this.textScenePosY.Location = new System.Drawing.Point(110, 19);
- this.textScenePosY.Name = "textScenePosY";
- this.textScenePosY.Size = new System.Drawing.Size(38, 20);
- this.textScenePosY.TabIndex = 2;
- this.textScenePosY.TextChanged += new System.EventHandler(this.textScene_TextChanged);
- //
- // tabControlSceneObjectSettings
- //
- this.tabControlSceneObjectSettings.Controls.Add(this.tabPage1);
- this.tabControlSceneObjectSettings.Controls.Add(this.tabPage2);
- this.tabControlSceneObjectSettings.Location = new System.Drawing.Point(0, 269);
- this.tabControlSceneObjectSettings.Name = "tabControlSceneObjectSettings";
- this.tabControlSceneObjectSettings.SelectedIndex = 0;
- this.tabControlSceneObjectSettings.Size = new System.Drawing.Size(177, 200);
- this.tabControlSceneObjectSettings.TabIndex = 9;
- //
- // tabPage1
- //
- this.tabPage1.Controls.Add(this.groupBoxSettings);
- this.tabPage1.Controls.Add(this.groupBoxMaterial);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
- this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(169, 174);
- this.tabPage1.TabIndex = 0;
- this.tabPage1.Text = "Scene Object";
- this.tabPage1.UseVisualStyleBackColor = true;
- //
- // groupBoxSettings
- //
- this.groupBoxSettings.Controls.Add(this.checkBoxTriggerNoCam);
- this.groupBoxSettings.Controls.Add(this.buttonTriggerTarget);
- this.groupBoxSettings.Controls.Add(this.checkBoxIsTrigger);
- this.groupBoxSettings.Controls.Add(this.checkBoxOverrideColor);
- this.groupBoxSettings.Controls.Add(this.pictureBoxSceneColor);
- this.groupBoxSettings.Controls.Add(this.buttonSceneColor);
- this.groupBoxSettings.Location = new System.Drawing.Point(6, 50);
- this.groupBoxSettings.Name = "groupBoxSettings";
- this.groupBoxSettings.Size = new System.Drawing.Size(154, 121);
- this.groupBoxSettings.TabIndex = 9;
- this.groupBoxSettings.TabStop = false;
- this.groupBoxSettings.Text = "Settings";
- //
- // checkBoxTriggerNoCam
- //
- this.checkBoxTriggerNoCam.AutoSize = true;
- this.checkBoxTriggerNoCam.Location = new System.Drawing.Point(78, 19);
- this.checkBoxTriggerNoCam.Name = "checkBoxTriggerNoCam";
- this.checkBoxTriggerNoCam.Size = new System.Drawing.Size(79, 17);
- this.checkBoxTriggerNoCam.TabIndex = 14;
- this.checkBoxTriggerNoCam.Text = "No Camera";
- this.checkBoxTriggerNoCam.UseVisualStyleBackColor = true;
- this.checkBoxTriggerNoCam.CheckedChanged += new System.EventHandler(this.checkBoxTriggerNoCam_CheckedChanged);
- //
- // buttonTriggerTarget
- //
- this.buttonTriggerTarget.Location = new System.Drawing.Point(5, 35);
- this.buttonTriggerTarget.Name = "buttonTriggerTarget";
- this.buttonTriggerTarget.Size = new System.Drawing.Size(140, 27);
- this.buttonTriggerTarget.TabIndex = 13;
- this.buttonTriggerTarget.Text = "Target Object...";
- this.buttonTriggerTarget.UseVisualStyleBackColor = true;
- this.buttonTriggerTarget.Click += new System.EventHandler(this.buttonTriggerTarget_Click);
+ this.groupObjectMode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.groupObjectMode.Controls.Add(this.radioObjectPolygons);
+ this.groupObjectMode.Controls.Add(this.radioObjectSprings);
+ this.groupObjectMode.Controls.Add(this.radioObjectEditPoints);
+ this.groupObjectMode.Location = new System.Drawing.Point(5, 34);
+ this.groupObjectMode.Name = "groupObjectMode";
+ this.groupObjectMode.Size = new System.Drawing.Size(147, 92);
+ this.groupObjectMode.TabIndex = 0;
+ this.groupObjectMode.TabStop = false;
+ this.groupObjectMode.Text = "Object Edit Mode";
//
- // checkBoxIsTrigger
+ // radioObjectEditPoints
//
- this.checkBoxIsTrigger.AutoSize = true;
- this.checkBoxIsTrigger.Location = new System.Drawing.Point(6, 19);
- this.checkBoxIsTrigger.Name = "checkBoxIsTrigger";
- this.checkBoxIsTrigger.Size = new System.Drawing.Size(70, 17);
- this.checkBoxIsTrigger.TabIndex = 12;
- this.checkBoxIsTrigger.Text = "Is Trigger";
- this.checkBoxIsTrigger.UseVisualStyleBackColor = true;
- this.checkBoxIsTrigger.CheckedChanged += new System.EventHandler(this.checkBoxIsTrigger_CheckedChanged);
+ this.radioObjectEditPoints.AutoSize = true;
+ this.radioObjectEditPoints.Checked = true;
+ this.radioObjectEditPoints.Location = new System.Drawing.Point(12, 21);
+ this.radioObjectEditPoints.Name = "radioObjectEditPoints";
+ this.radioObjectEditPoints.Size = new System.Drawing.Size(54, 17);
+ this.radioObjectEditPoints.TabIndex = 0;
+ this.radioObjectEditPoints.TabStop = true;
+ this.radioObjectEditPoints.Text = "Points";
+ this.radioObjectEditPoints.UseVisualStyleBackColor = true;
+ this.radioObjectEditPoints.CheckedChanged += new System.EventHandler(this.radioObject_CheckedChanged);
//
- // checkBoxOverrideColor
+ // radioObjectSprings
//
- this.checkBoxOverrideColor.AutoSize = true;
- this.checkBoxOverrideColor.Location = new System.Drawing.Point(6, 72);
- this.checkBoxOverrideColor.Name = "checkBoxOverrideColor";
- this.checkBoxOverrideColor.Size = new System.Drawing.Size(93, 17);
- this.checkBoxOverrideColor.TabIndex = 11;
- this.checkBoxOverrideColor.Text = "Override Color";
- this.checkBoxOverrideColor.UseVisualStyleBackColor = true;
- this.checkBoxOverrideColor.CheckedChanged += new System.EventHandler(this.checkBoxOverrideColor_CheckedChanged);
+ this.radioObjectSprings.AutoSize = true;
+ this.radioObjectSprings.Location = new System.Drawing.Point(12, 43);
+ this.radioObjectSprings.Name = "radioObjectSprings";
+ this.radioObjectSprings.Size = new System.Drawing.Size(98, 17);
+ this.radioObjectSprings.TabIndex = 1;
+ this.radioObjectSprings.TabStop = true;
+ this.radioObjectSprings.Text = "Internal Springs";
+ this.radioObjectSprings.UseVisualStyleBackColor = true;
+ this.radioObjectSprings.CheckedChanged += new System.EventHandler(this.radioObject_CheckedChanged);
//
- // pictureBoxSceneColor
+ // radioObjectPolygons
//
- this.pictureBoxSceneColor.BackColor = System.Drawing.Color.YellowGreen;
- this.pictureBoxSceneColor.Location = new System.Drawing.Point(6, 89);
- this.pictureBoxSceneColor.Name = "pictureBoxSceneColor";
- this.pictureBoxSceneColor.Size = new System.Drawing.Size(48, 26);
- this.pictureBoxSceneColor.TabIndex = 10;
- this.pictureBoxSceneColor.TabStop = false;
+ this.radioObjectPolygons.AutoSize = true;
+ this.radioObjectPolygons.Location = new System.Drawing.Point(12, 64);
+ this.radioObjectPolygons.Name = "radioObjectPolygons";
+ this.radioObjectPolygons.Size = new System.Drawing.Size(68, 17);
+ this.radioObjectPolygons.TabIndex = 2;
+ this.radioObjectPolygons.TabStop = true;
+ this.radioObjectPolygons.Text = "Polygons";
+ this.radioObjectPolygons.UseVisualStyleBackColor = true;
+ this.radioObjectPolygons.CheckedChanged += new System.EventHandler(this.radioObject_CheckedChanged);
//
- // buttonSceneColor
+ // groupPoints
//
- this.buttonSceneColor.Location = new System.Drawing.Point(58, 89);
- this.buttonSceneColor.Name = "buttonSceneColor";
- this.buttonSceneColor.Size = new System.Drawing.Size(88, 27);
- this.buttonSceneColor.TabIndex = 9;
- this.buttonSceneColor.Text = "Color...";
- this.buttonSceneColor.UseVisualStyleBackColor = true;
- this.buttonSceneColor.Click += new System.EventHandler(this.buttonSceneColor_Click);
+ this.groupPoints.Controls.Add(this.textObjectPointMass);
+ this.groupPoints.Controls.Add(this.label2);
+ this.groupPoints.Location = new System.Drawing.Point(6, 131);
+ this.groupPoints.Name = "groupPoints";
+ this.groupPoints.Size = new System.Drawing.Size(145, 49);
+ this.groupPoints.TabIndex = 1;
+ this.groupPoints.TabStop = false;
+ this.groupPoints.Text = "Point Settings";
//
- // groupBoxMaterial
+ // label2
//
- this.groupBoxMaterial.Controls.Add(this.labelMaterial);
- this.groupBoxMaterial.Controls.Add(this.numericMaterial);
- this.groupBoxMaterial.Location = new System.Drawing.Point(6, 6);
- this.groupBoxMaterial.Name = "groupBoxMaterial";
- this.groupBoxMaterial.Size = new System.Drawing.Size(154, 45);
- this.groupBoxMaterial.TabIndex = 7;
- this.groupBoxMaterial.TabStop = false;
- this.groupBoxMaterial.Text = "Material";
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(9, 23);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(78, 13);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "Mass Per Point";
//
- // labelMaterial
+ // textObjectPointMass
//
- this.labelMaterial.AutoSize = true;
- this.labelMaterial.Location = new System.Drawing.Point(55, 22);
- this.labelMaterial.Name = "labelMaterial";
- this.labelMaterial.Size = new System.Drawing.Size(96, 13);
- this.labelMaterial.TabIndex = 9;
- this.labelMaterial.Text = "No object selected";
+ this.textObjectPointMass.Location = new System.Drawing.Point(95, 18);
+ this.textObjectPointMass.Name = "textObjectPointMass";
+ this.textObjectPointMass.Size = new System.Drawing.Size(45, 20);
+ this.textObjectPointMass.TabIndex = 3;
+ this.textObjectPointMass.TextChanged += new System.EventHandler(this.textObjectPointMass_TextChanged);
//
- // numericMaterial
+ // groupSprings
//
- this.numericMaterial.Location = new System.Drawing.Point(6, 18);
- this.numericMaterial.Maximum = new decimal(new int[] {
- 7,
- 0,
- 0,
- 0});
- this.numericMaterial.Name = "numericMaterial";
- this.numericMaterial.Size = new System.Drawing.Size(43, 20);
- this.numericMaterial.TabIndex = 8;
- this.numericMaterial.ValueChanged += new System.EventHandler(this.numericMaterial_ValueChanged);
+ this.groupSprings.Controls.Add(this.butObjectSpringSetAll);
+ this.groupSprings.Controls.Add(this.textObjectSpringDamping);
+ this.groupSprings.Controls.Add(this.label4);
+ this.groupSprings.Controls.Add(this.textObjectSpringK);
+ this.groupSprings.Controls.Add(this.label3);
+ this.groupSprings.Location = new System.Drawing.Point(6, 182);
+ this.groupSprings.Name = "groupSprings";
+ this.groupSprings.Size = new System.Drawing.Size(145, 111);
+ this.groupSprings.TabIndex = 2;
+ this.groupSprings.TabStop = false;
+ this.groupSprings.Text = "Spring Settings";
//
- // tabPage2
+ // label3
//
- this.tabPage2.Controls.Add(this.buttonClearPathObjects);
- this.tabPage2.Controls.Add(this.buttonAttachObjectToPath);
- this.tabPage2.Controls.Add(this.checkBoxClosedPath);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(169, 174);
- this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "Path";
- this.tabPage2.UseVisualStyleBackColor = true;
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(7, 24);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(47, 13);
+ this.label3.TabIndex = 0;
+ this.label3.Text = "Spring K";
//
- // buttonClearPathObjects
+ // textObjectSpringK
//
- this.buttonClearPathObjects.Location = new System.Drawing.Point(11, 90);
- this.buttonClearPathObjects.Name = "buttonClearPathObjects";
- this.buttonClearPathObjects.Size = new System.Drawing.Size(142, 23);
- this.buttonClearPathObjects.TabIndex = 2;
- this.buttonClearPathObjects.Text = "Clear Objects";
- this.buttonClearPathObjects.UseVisualStyleBackColor = true;
- this.buttonClearPathObjects.Click += new System.EventHandler(this.buttonClearPathObjects_Click);
+ this.textObjectSpringK.Location = new System.Drawing.Point(64, 20);
+ this.textObjectSpringK.Name = "textObjectSpringK";
+ this.textObjectSpringK.Size = new System.Drawing.Size(72, 20);
+ this.textObjectSpringK.TabIndex = 1;
+ this.textObjectSpringK.Text = "100";
+ this.textObjectSpringK.TextChanged += new System.EventHandler(this.textObjectSpring_TextChanged);
//
- // buttonAttachObjectToPath
+ // label4
//
- this.buttonAttachObjectToPath.Location = new System.Drawing.Point(11, 46);
- this.buttonAttachObjectToPath.Name = "buttonAttachObjectToPath";
- this.buttonAttachObjectToPath.Size = new System.Drawing.Size(142, 23);
- this.buttonAttachObjectToPath.TabIndex = 1;
- this.buttonAttachObjectToPath.Text = "Attach Object...";
- this.buttonAttachObjectToPath.UseVisualStyleBackColor = true;
- this.buttonAttachObjectToPath.Click += new System.EventHandler(this.button1_Click);
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(7, 52);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(49, 13);
+ this.label4.TabIndex = 2;
+ this.label4.Text = "Damping";
//
- // checkBoxClosedPath
+ // textObjectSpringDamping
//
- this.checkBoxClosedPath.AutoSize = true;
- this.checkBoxClosedPath.Location = new System.Drawing.Point(6, 6);
- this.checkBoxClosedPath.Name = "checkBoxClosedPath";
- this.checkBoxClosedPath.Size = new System.Drawing.Size(83, 17);
- this.checkBoxClosedPath.TabIndex = 0;
- this.checkBoxClosedPath.Text = "Closed Path";
- this.checkBoxClosedPath.UseVisualStyleBackColor = true;
- this.checkBoxClosedPath.CheckedChanged += new System.EventHandler(this.checkBoxClosedPath_CheckedChanged);
+ this.textObjectSpringDamping.Location = new System.Drawing.Point(64, 48);
+ this.textObjectSpringDamping.Name = "textObjectSpringDamping";
+ this.textObjectSpringDamping.Size = new System.Drawing.Size(72, 20);
+ this.textObjectSpringDamping.TabIndex = 3;
+ this.textObjectSpringDamping.Text = "10";
+ this.textObjectSpringDamping.TextChanged += new System.EventHandler(this.textObjectSpring_TextChanged);
//
- // groupBox1
+ // butObjectSpringSetAll
//
- this.groupBox1.Controls.Add(this.radioButton2);
- this.groupBox1.Controls.Add(this.radioButton1);
- this.groupBox1.Location = new System.Drawing.Point(0, 228);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(177, 43);
- this.groupBox1.TabIndex = 8;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Object Type";
+ this.butObjectSpringSetAll.Location = new System.Drawing.Point(11, 75);
+ this.butObjectSpringSetAll.Name = "butObjectSpringSetAll";
+ this.butObjectSpringSetAll.Size = new System.Drawing.Size(125, 27);
+ this.butObjectSpringSetAll.TabIndex = 5;
+ this.butObjectSpringSetAll.Text = "Set All";
+ this.butObjectSpringSetAll.UseVisualStyleBackColor = true;
+ this.butObjectSpringSetAll.Click += new System.EventHandler(this.butObjectSpringSetAll_Click);
//
- // radioButton2
+ // label5
//
- this.radioButton2.AutoSize = true;
- this.radioButton2.Location = new System.Drawing.Point(74, 18);
- this.radioButton2.Name = "radioButton2";
- this.radioButton2.Size = new System.Drawing.Size(47, 17);
- this.radioButton2.TabIndex = 1;
- this.radioButton2.TabStop = true;
- this.radioButton2.Text = "Path";
- this.radioButton2.UseVisualStyleBackColor = true;
- this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(6, 13);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(35, 13);
+ this.label5.TabIndex = 3;
+ this.label5.Text = "Name";
//
- // radioButton1
+ // textObjectName
//
- this.radioButton1.AutoSize = true;
- this.radioButton1.Location = new System.Drawing.Point(12, 18);
- this.radioButton1.Name = "radioButton1";
- this.radioButton1.Size = new System.Drawing.Size(56, 17);
- this.radioButton1.TabIndex = 0;
- this.radioButton1.TabStop = true;
- this.radioButton1.Text = "Object";
- this.radioButton1.UseVisualStyleBackColor = true;
- this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+ this.textObjectName.Location = new System.Drawing.Point(45, 9);
+ this.textObjectName.Name = "textObjectName";
+ this.textObjectName.Size = new System.Drawing.Size(105, 20);
+ this.textObjectName.TabIndex = 4;
+ this.textObjectName.Leave += new System.EventHandler(this.textObjectName_Leave);
//
- // butSceneCloneObject
+ // groupBox2
//
- this.butSceneCloneObject.Location = new System.Drawing.Point(6, 197);
- this.butSceneCloneObject.Name = "butSceneCloneObject";
- this.butSceneCloneObject.Size = new System.Drawing.Size(82, 25);
- this.butSceneCloneObject.TabIndex = 4;
- this.butSceneCloneObject.Text = "Clone Object";
- this.butSceneCloneObject.UseVisualStyleBackColor = true;
- this.butSceneCloneObject.Click += new System.EventHandler(this.butSceneCloneObject_Click);
+ this.groupBox2.Controls.Add(this.label9);
+ this.groupBox2.Controls.Add(this.label1);
+ this.groupBox2.Controls.Add(this.textEdgeDamping);
+ this.groupBox2.Controls.Add(this.textEdgeK);
+ this.groupBox2.Location = new System.Drawing.Point(6, 296);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(144, 78);
+ this.groupBox2.TabIndex = 5;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Edge Settings";
//
- // butSceneNewObject
+ // textEdgeK
//
- this.butSceneNewObject.Location = new System.Drawing.Point(6, 169);
- this.butSceneNewObject.Name = "butSceneNewObject";
- this.butSceneNewObject.Size = new System.Drawing.Size(82, 25);
- this.butSceneNewObject.TabIndex = 3;
- this.butSceneNewObject.Text = "New Object";
- this.butSceneNewObject.UseVisualStyleBackColor = true;
- this.butSceneNewObject.Click += new System.EventHandler(this.butSceneNewObject_Click);
+ this.textEdgeK.Location = new System.Drawing.Point(64, 21);
+ this.textEdgeK.Name = "textEdgeK";
+ this.textEdgeK.Size = new System.Drawing.Size(71, 20);
+ this.textEdgeK.TabIndex = 0;
+ this.textEdgeK.Text = "100";
+ this.textEdgeK.TextChanged += new System.EventHandler(this.textEdgeK_TextChanged);
//
- // butSceneRemoveObject
+ // textEdgeDamping
//
- this.butSceneRemoveObject.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.butSceneRemoveObject.Location = new System.Drawing.Point(91, 197);
- this.butSceneRemoveObject.Name = "butSceneRemoveObject";
- this.butSceneRemoveObject.Size = new System.Drawing.Size(82, 25);
- this.butSceneRemoveObject.TabIndex = 4;
- this.butSceneRemoveObject.Text = "Remove Obj.";
- this.butSceneRemoveObject.UseVisualStyleBackColor = true;
- this.butSceneRemoveObject.Click += new System.EventHandler(this.butSceneRemoveObject_Click);
+ this.textEdgeDamping.Location = new System.Drawing.Point(63, 49);
+ this.textEdgeDamping.Name = "textEdgeDamping";
+ this.textEdgeDamping.Size = new System.Drawing.Size(72, 20);
+ this.textEdgeDamping.TabIndex = 1;
+ this.textEdgeDamping.Text = "1";
+ this.textEdgeDamping.TextChanged += new System.EventHandler(this.textEdgeDamping_TextChanged);
//
- // butSceneAddObject
+ // label1
//
- this.butSceneAddObject.Location = new System.Drawing.Point(91, 169);
- this.butSceneAddObject.Name = "butSceneAddObject";
- this.butSceneAddObject.Size = new System.Drawing.Size(82, 25);
- this.butSceneAddObject.TabIndex = 1;
- this.butSceneAddObject.Text = "Import Object";
- this.butSceneAddObject.UseVisualStyleBackColor = true;
- this.butSceneAddObject.Click += new System.EventHandler(this.butSceneAddObject_Click);
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(11, 24);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(47, 13);
+ this.label1.TabIndex = 2;
+ this.label1.Text = "Spring K";
//
- // treeView1
+ // label9
//
- this.treeView1.HideSelection = false;
- this.treeView1.Location = new System.Drawing.Point(2, 1);
- this.treeView1.Name = "treeView1";
- this.treeView1.Size = new System.Drawing.Size(173, 166);
- this.treeView1.TabIndex = 0;
- this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(12, 52);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(49, 13);
+ this.label9.TabIndex = 3;
+ this.label9.Text = "Damping";
//
- // tabObject
+ // checkBoxObjectKinematic
//
- this.tabObject.Controls.Add(this.textObjectPressure);
- this.tabObject.Controls.Add(this.checkBoxPressureBody);
- this.tabObject.Controls.Add(this.groupBox3);
- this.tabObject.Controls.Add(this.pictureBoxObjectColor);
- this.tabObject.Controls.Add(this.butObjectColor);
- this.tabObject.Controls.Add(this.checkBoxObjectKinematic);
- this.tabObject.Controls.Add(this.groupBox2);
- this.tabObject.Controls.Add(this.textObjectName);
- this.tabObject.Controls.Add(this.label5);
- this.tabObject.Controls.Add(this.groupSprings);
- this.tabObject.Controls.Add(this.groupPoints);
- this.tabObject.Controls.Add(this.groupObjectMode);
- this.tabObject.Location = new System.Drawing.Point(4, 22);
- this.tabObject.Name = "tabObject";
- this.tabObject.Padding = new System.Windows.Forms.Padding(3);
- this.tabObject.Size = new System.Drawing.Size(177, 593);
- this.tabObject.TabIndex = 1;
- this.tabObject.Text = "Object";
- this.tabObject.UseVisualStyleBackColor = true;
+ this.checkBoxObjectKinematic.AutoSize = true;
+ this.checkBoxObjectKinematic.Location = new System.Drawing.Point(14, 490);
+ this.checkBoxObjectKinematic.Name = "checkBoxObjectKinematic";
+ this.checkBoxObjectKinematic.Size = new System.Drawing.Size(123, 17);
+ this.checkBoxObjectKinematic.TabIndex = 6;
+ this.checkBoxObjectKinematic.Text = "Kinematic - fixed pos";
+ this.checkBoxObjectKinematic.UseVisualStyleBackColor = true;
+ this.checkBoxObjectKinematic.CheckedChanged += new System.EventHandler(this.checkBoxObjectKinematic_CheckedChanged);
//
- // textObjectPressure
+ // butObjectColor
//
- this.textObjectPressure.Location = new System.Drawing.Point(101, 547);
- this.textObjectPressure.Name = "textObjectPressure";
- this.textObjectPressure.Size = new System.Drawing.Size(49, 20);
- this.textObjectPressure.TabIndex = 11;
- this.textObjectPressure.TextChanged += new System.EventHandler(this.textObjectPressure_TextChanged);
+ this.butObjectColor.Location = new System.Drawing.Point(63, 513);
+ this.butObjectColor.Name = "butObjectColor";
+ this.butObjectColor.Size = new System.Drawing.Size(88, 27);
+ this.butObjectColor.TabIndex = 7;
+ this.butObjectColor.Text = "Color...";
+ this.butObjectColor.UseVisualStyleBackColor = true;
+ this.butObjectColor.Click += new System.EventHandler(this.butObjectColor_Click);
//
- // checkBoxPressureBody
+ // pictureBoxObjectColor
//
- this.checkBoxPressureBody.AutoSize = true;
- this.checkBoxPressureBody.Location = new System.Drawing.Point(11, 551);
- this.checkBoxPressureBody.Name = "checkBoxPressureBody";
- this.checkBoxPressureBody.Size = new System.Drawing.Size(91, 17);
- this.checkBoxPressureBody.TabIndex = 10;
- this.checkBoxPressureBody.Text = "PressureBody";
- this.checkBoxPressureBody.UseVisualStyleBackColor = true;
- this.checkBoxPressureBody.CheckedChanged += new System.EventHandler(this.checkBoxPressureBody_CheckedChanged);
+ this.pictureBoxObjectColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+ this.pictureBoxObjectColor.Location = new System.Drawing.Point(11, 513);
+ this.pictureBoxObjectColor.Name = "pictureBoxObjectColor";
+ this.pictureBoxObjectColor.Size = new System.Drawing.Size(48, 26);
+ this.pictureBoxObjectColor.TabIndex = 8;
+ this.pictureBoxObjectColor.TabStop = false;
//
// groupBox3
//
@@ -968,14 +804,32 @@ private void InitializeComponent()
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Shape Matching";
//
- // label11
+ // checkBoxObjectShapeMatching
//
- this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(18, 79);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(49, 13);
- this.label11.TabIndex = 4;
- this.label11.Text = "Damping";
+ this.checkBoxObjectShapeMatching.AutoSize = true;
+ this.checkBoxObjectShapeMatching.Location = new System.Drawing.Point(11, 20);
+ this.checkBoxObjectShapeMatching.Name = "checkBoxObjectShapeMatching";
+ this.checkBoxObjectShapeMatching.Size = new System.Drawing.Size(123, 17);
+ this.checkBoxObjectShapeMatching.TabIndex = 0;
+ this.checkBoxObjectShapeMatching.Text = "Shape Matching ON";
+ this.checkBoxObjectShapeMatching.UseVisualStyleBackColor = true;
+ this.checkBoxObjectShapeMatching.CheckedChanged += new System.EventHandler(this.checkBoxObjectShapeMatching_CheckedChanged);
+ //
+ // textObjectShapeK
+ //
+ this.textObjectShapeK.Location = new System.Drawing.Point(69, 45);
+ this.textObjectShapeK.Name = "textObjectShapeK";
+ this.textObjectShapeK.Size = new System.Drawing.Size(66, 20);
+ this.textObjectShapeK.TabIndex = 1;
+ this.textObjectShapeK.TextChanged += new System.EventHandler(this.textObjectShapeK_TextChanged);
+ //
+ // textObjectShapeDamping
+ //
+ this.textObjectShapeDamping.Location = new System.Drawing.Point(70, 76);
+ this.textObjectShapeDamping.Name = "textObjectShapeDamping";
+ this.textObjectShapeDamping.Size = new System.Drawing.Size(66, 20);
+ this.textObjectShapeDamping.TabIndex = 2;
+ this.textObjectShapeDamping.TextChanged += new System.EventHandler(this.textObjectShapeDamping_TextChanged);
//
// label10
//
@@ -987,275 +841,454 @@ private void InitializeComponent()
this.label10.TabIndex = 3;
this.label10.Text = "Spring K";
//
- // textObjectShapeDamping
+ // label11
//
- this.textObjectShapeDamping.Location = new System.Drawing.Point(70, 76);
- this.textObjectShapeDamping.Name = "textObjectShapeDamping";
- this.textObjectShapeDamping.Size = new System.Drawing.Size(66, 20);
- this.textObjectShapeDamping.TabIndex = 2;
- this.textObjectShapeDamping.TextChanged += new System.EventHandler(this.textObjectShapeDamping_TextChanged);
+ this.label11.AutoSize = true;
+ this.label11.Location = new System.Drawing.Point(18, 79);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(49, 13);
+ this.label11.TabIndex = 4;
+ this.label11.Text = "Damping";
//
- // textObjectShapeK
+ // checkBoxPressureBody
//
- this.textObjectShapeK.Location = new System.Drawing.Point(69, 45);
- this.textObjectShapeK.Name = "textObjectShapeK";
- this.textObjectShapeK.Size = new System.Drawing.Size(66, 20);
- this.textObjectShapeK.TabIndex = 1;
- this.textObjectShapeK.TextChanged += new System.EventHandler(this.textObjectShapeK_TextChanged);
+ this.checkBoxPressureBody.AutoSize = true;
+ this.checkBoxPressureBody.Location = new System.Drawing.Point(11, 551);
+ this.checkBoxPressureBody.Name = "checkBoxPressureBody";
+ this.checkBoxPressureBody.Size = new System.Drawing.Size(91, 17);
+ this.checkBoxPressureBody.TabIndex = 10;
+ this.checkBoxPressureBody.Text = "PressureBody";
+ this.checkBoxPressureBody.UseVisualStyleBackColor = true;
+ this.checkBoxPressureBody.CheckedChanged += new System.EventHandler(this.checkBoxPressureBody_CheckedChanged);
//
- // checkBoxObjectShapeMatching
+ // textObjectPressure
//
- this.checkBoxObjectShapeMatching.AutoSize = true;
- this.checkBoxObjectShapeMatching.Location = new System.Drawing.Point(11, 20);
- this.checkBoxObjectShapeMatching.Name = "checkBoxObjectShapeMatching";
- this.checkBoxObjectShapeMatching.Size = new System.Drawing.Size(123, 17);
- this.checkBoxObjectShapeMatching.TabIndex = 0;
- this.checkBoxObjectShapeMatching.Text = "Shape Matching ON";
- this.checkBoxObjectShapeMatching.UseVisualStyleBackColor = true;
- this.checkBoxObjectShapeMatching.CheckedChanged += new System.EventHandler(this.checkBoxObjectShapeMatching_CheckedChanged);
+ this.textObjectPressure.Location = new System.Drawing.Point(101, 547);
+ this.textObjectPressure.Name = "textObjectPressure";
+ this.textObjectPressure.Size = new System.Drawing.Size(49, 20);
+ this.textObjectPressure.TabIndex = 11;
+ this.textObjectPressure.TextChanged += new System.EventHandler(this.textObjectPressure_TextChanged);
//
- // pictureBoxObjectColor
+ // tabScene
//
- this.pictureBoxObjectColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
- this.pictureBoxObjectColor.Location = new System.Drawing.Point(11, 513);
- this.pictureBoxObjectColor.Name = "pictureBoxObjectColor";
- this.pictureBoxObjectColor.Size = new System.Drawing.Size(48, 26);
- this.pictureBoxObjectColor.TabIndex = 8;
- this.pictureBoxObjectColor.TabStop = false;
+ this.tabScene.Controls.Add(this.moveDownButton);
+ this.tabScene.Controls.Add(this.moveUpButton);
+ this.tabScene.Controls.Add(this.groupBoxTransformation);
+ this.tabScene.Controls.Add(this.tabControlSceneObjectSettings);
+ this.tabScene.Controls.Add(this.groupBox1);
+ this.tabScene.Controls.Add(this.butSceneCloneObject);
+ this.tabScene.Controls.Add(this.butSceneNewObject);
+ this.tabScene.Controls.Add(this.butSceneRemoveObject);
+ this.tabScene.Controls.Add(this.butSceneAddObject);
+ this.tabScene.Controls.Add(this.treeView1);
+ this.tabScene.Location = new System.Drawing.Point(4, 22);
+ this.tabScene.Name = "tabScene";
+ this.tabScene.Padding = new System.Windows.Forms.Padding(3);
+ this.tabScene.Size = new System.Drawing.Size(177, 593);
+ this.tabScene.TabIndex = 0;
+ this.tabScene.Text = "Scene";
+ this.tabScene.UseVisualStyleBackColor = true;
+ //
+ // treeView1
+ //
+ this.treeView1.HideSelection = false;
+ this.treeView1.Location = new System.Drawing.Point(2, 1);
+ this.treeView1.Name = "treeView1";
+ this.treeView1.Size = new System.Drawing.Size(154, 166);
+ this.treeView1.TabIndex = 0;
+ this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
+ //
+ // butSceneAddObject
+ //
+ this.butSceneAddObject.Location = new System.Drawing.Point(91, 169);
+ this.butSceneAddObject.Name = "butSceneAddObject";
+ this.butSceneAddObject.Size = new System.Drawing.Size(82, 25);
+ this.butSceneAddObject.TabIndex = 1;
+ this.butSceneAddObject.Text = "Import Object";
+ this.butSceneAddObject.UseVisualStyleBackColor = true;
+ this.butSceneAddObject.Click += new System.EventHandler(this.butSceneAddObject_Click);
+ //
+ // butSceneRemoveObject
+ //
+ this.butSceneRemoveObject.Enabled = false;
+ this.butSceneRemoveObject.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.butSceneRemoveObject.Location = new System.Drawing.Point(91, 197);
+ this.butSceneRemoveObject.Name = "butSceneRemoveObject";
+ this.butSceneRemoveObject.Size = new System.Drawing.Size(82, 25);
+ this.butSceneRemoveObject.TabIndex = 4;
+ this.butSceneRemoveObject.Text = "Delete Object";
+ this.butSceneRemoveObject.UseVisualStyleBackColor = true;
+ this.butSceneRemoveObject.Click += new System.EventHandler(this.butSceneRemoveObject_Click);
+ //
+ // butSceneNewObject
+ //
+ this.butSceneNewObject.Location = new System.Drawing.Point(6, 169);
+ this.butSceneNewObject.Name = "butSceneNewObject";
+ this.butSceneNewObject.Size = new System.Drawing.Size(82, 25);
+ this.butSceneNewObject.TabIndex = 3;
+ this.butSceneNewObject.Text = "New Object";
+ this.butSceneNewObject.UseVisualStyleBackColor = true;
+ this.butSceneNewObject.Click += new System.EventHandler(this.butSceneNewObject_Click);
+ //
+ // butSceneCloneObject
+ //
+ this.butSceneCloneObject.Enabled = false;
+ this.butSceneCloneObject.Location = new System.Drawing.Point(6, 197);
+ this.butSceneCloneObject.Name = "butSceneCloneObject";
+ this.butSceneCloneObject.Size = new System.Drawing.Size(82, 25);
+ this.butSceneCloneObject.TabIndex = 4;
+ this.butSceneCloneObject.Text = "Clone Object";
+ this.butSceneCloneObject.UseVisualStyleBackColor = true;
+ this.butSceneCloneObject.Click += new System.EventHandler(this.butSceneCloneObject_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.radioButton2);
+ this.groupBox1.Controls.Add(this.radioButton1);
+ this.groupBox1.Enabled = false;
+ this.groupBox1.Location = new System.Drawing.Point(0, 224);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(177, 43);
+ this.groupBox1.TabIndex = 8;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Object Type";
+ //
+ // radioButton1
+ //
+ this.radioButton1.AutoSize = true;
+ this.radioButton1.Location = new System.Drawing.Point(12, 18);
+ this.radioButton1.Name = "radioButton1";
+ this.radioButton1.Size = new System.Drawing.Size(56, 17);
+ this.radioButton1.TabIndex = 0;
+ this.radioButton1.TabStop = true;
+ this.radioButton1.Text = "Object";
+ this.radioButton1.UseVisualStyleBackColor = true;
+ this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+ //
+ // radioButton2
+ //
+ this.radioButton2.AutoSize = true;
+ this.radioButton2.Location = new System.Drawing.Point(74, 18);
+ this.radioButton2.Name = "radioButton2";
+ this.radioButton2.Size = new System.Drawing.Size(47, 17);
+ this.radioButton2.TabIndex = 1;
+ this.radioButton2.TabStop = true;
+ this.radioButton2.Text = "Path";
+ this.radioButton2.UseVisualStyleBackColor = true;
+ this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
+ //
+ // tabControlSceneObjectSettings
+ //
+ this.tabControlSceneObjectSettings.Controls.Add(this.tabPage1);
+ this.tabControlSceneObjectSettings.Controls.Add(this.tabPage2);
+ this.tabControlSceneObjectSettings.Enabled = false;
+ this.tabControlSceneObjectSettings.Location = new System.Drawing.Point(0, 269);
+ this.tabControlSceneObjectSettings.Name = "tabControlSceneObjectSettings";
+ this.tabControlSceneObjectSettings.SelectedIndex = 0;
+ this.tabControlSceneObjectSettings.Size = new System.Drawing.Size(177, 200);
+ this.tabControlSceneObjectSettings.TabIndex = 9;
+ this.tabControlSceneObjectSettings.SelectedIndexChanged += new System.EventHandler(this.tabControlSceneObjectSettings_SelectedIndexChanged);
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.buttonClearPathObjects);
+ this.tabPage2.Controls.Add(this.buttonAttachObjectToPath);
+ this.tabPage2.Controls.Add(this.checkBoxClosedPath);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(169, 174);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "Path";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // checkBoxClosedPath
+ //
+ this.checkBoxClosedPath.AutoSize = true;
+ this.checkBoxClosedPath.Location = new System.Drawing.Point(43, 23);
+ this.checkBoxClosedPath.Name = "checkBoxClosedPath";
+ this.checkBoxClosedPath.Size = new System.Drawing.Size(83, 17);
+ this.checkBoxClosedPath.TabIndex = 0;
+ this.checkBoxClosedPath.Text = "Closed Path";
+ this.checkBoxClosedPath.UseVisualStyleBackColor = true;
+ this.checkBoxClosedPath.CheckedChanged += new System.EventHandler(this.checkBoxClosedPath_CheckedChanged);
+ //
+ // buttonAttachObjectToPath
+ //
+ this.buttonAttachObjectToPath.Location = new System.Drawing.Point(10, 58);
+ this.buttonAttachObjectToPath.Name = "buttonAttachObjectToPath";
+ this.buttonAttachObjectToPath.Size = new System.Drawing.Size(142, 23);
+ this.buttonAttachObjectToPath.TabIndex = 1;
+ this.buttonAttachObjectToPath.Text = "Attach Object...";
+ this.buttonAttachObjectToPath.UseVisualStyleBackColor = true;
+ this.buttonAttachObjectToPath.Click += new System.EventHandler(this.button1_Click);
//
- // butObjectColor
+ // buttonClearPathObjects
//
- this.butObjectColor.Location = new System.Drawing.Point(63, 513);
- this.butObjectColor.Name = "butObjectColor";
- this.butObjectColor.Size = new System.Drawing.Size(88, 27);
- this.butObjectColor.TabIndex = 7;
- this.butObjectColor.Text = "Color...";
- this.butObjectColor.UseVisualStyleBackColor = true;
- this.butObjectColor.Click += new System.EventHandler(this.butObjectColor_Click);
+ this.buttonClearPathObjects.Location = new System.Drawing.Point(10, 102);
+ this.buttonClearPathObjects.Name = "buttonClearPathObjects";
+ this.buttonClearPathObjects.Size = new System.Drawing.Size(142, 23);
+ this.buttonClearPathObjects.TabIndex = 2;
+ this.buttonClearPathObjects.Text = "Clear Objects";
+ this.buttonClearPathObjects.UseVisualStyleBackColor = true;
+ this.buttonClearPathObjects.Click += new System.EventHandler(this.buttonClearPathObjects_Click);
//
- // checkBoxObjectKinematic
+ // tabPage1
//
- this.checkBoxObjectKinematic.AutoSize = true;
- this.checkBoxObjectKinematic.Location = new System.Drawing.Point(14, 490);
- this.checkBoxObjectKinematic.Name = "checkBoxObjectKinematic";
- this.checkBoxObjectKinematic.Size = new System.Drawing.Size(123, 17);
- this.checkBoxObjectKinematic.TabIndex = 6;
- this.checkBoxObjectKinematic.Text = "Kinematic - fixed pos";
- this.checkBoxObjectKinematic.UseVisualStyleBackColor = true;
- this.checkBoxObjectKinematic.CheckedChanged += new System.EventHandler(this.checkBoxObjectKinematic_CheckedChanged);
+ this.tabPage1.Controls.Add(this.groupBoxSettings);
+ this.tabPage1.Controls.Add(this.groupBoxMaterial);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(169, 174);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "Scene Object";
+ this.tabPage1.UseVisualStyleBackColor = true;
//
- // groupBox2
+ // groupBoxMaterial
//
- this.groupBox2.Controls.Add(this.label9);
- this.groupBox2.Controls.Add(this.label1);
- this.groupBox2.Controls.Add(this.textEdgeDamping);
- this.groupBox2.Controls.Add(this.textEdgeK);
- this.groupBox2.Location = new System.Drawing.Point(6, 296);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(144, 78);
- this.groupBox2.TabIndex = 5;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Edge Settings";
+ this.groupBoxMaterial.Controls.Add(this.labelMaterial);
+ this.groupBoxMaterial.Controls.Add(this.numericMaterial);
+ this.groupBoxMaterial.Location = new System.Drawing.Point(6, 6);
+ this.groupBoxMaterial.Name = "groupBoxMaterial";
+ this.groupBoxMaterial.Size = new System.Drawing.Size(154, 45);
+ this.groupBoxMaterial.TabIndex = 7;
+ this.groupBoxMaterial.TabStop = false;
+ this.groupBoxMaterial.Text = "Material";
//
- // label9
+ // numericMaterial
//
- this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(12, 52);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(49, 13);
- this.label9.TabIndex = 3;
- this.label9.Text = "Damping";
+ this.numericMaterial.Location = new System.Drawing.Point(6, 18);
+ this.numericMaterial.Maximum = new decimal(new int[] {
+ 7,
+ 0,
+ 0,
+ 0});
+ this.numericMaterial.Name = "numericMaterial";
+ this.numericMaterial.Size = new System.Drawing.Size(43, 20);
+ this.numericMaterial.TabIndex = 8;
+ this.numericMaterial.ValueChanged += new System.EventHandler(this.numericMaterial_ValueChanged);
//
- // label1
+ // labelMaterial
//
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(11, 24);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(47, 13);
- this.label1.TabIndex = 2;
- this.label1.Text = "Spring K";
+ this.labelMaterial.AutoSize = true;
+ this.labelMaterial.Location = new System.Drawing.Point(55, 22);
+ this.labelMaterial.Name = "labelMaterial";
+ this.labelMaterial.Size = new System.Drawing.Size(96, 13);
+ this.labelMaterial.TabIndex = 9;
+ this.labelMaterial.Text = "No object selected";
//
- // textEdgeDamping
+ // groupBoxSettings
//
- this.textEdgeDamping.Location = new System.Drawing.Point(63, 49);
- this.textEdgeDamping.Name = "textEdgeDamping";
- this.textEdgeDamping.Size = new System.Drawing.Size(72, 20);
- this.textEdgeDamping.TabIndex = 1;
- this.textEdgeDamping.Text = "1";
- this.textEdgeDamping.TextChanged += new System.EventHandler(this.textEdgeDamping_TextChanged);
+ this.groupBoxSettings.Controls.Add(this.checkBoxTriggerNoCam);
+ this.groupBoxSettings.Controls.Add(this.buttonTriggerTarget);
+ this.groupBoxSettings.Controls.Add(this.checkBoxIsTrigger);
+ this.groupBoxSettings.Controls.Add(this.checkBoxOverrideColor);
+ this.groupBoxSettings.Controls.Add(this.pictureBoxSceneColor);
+ this.groupBoxSettings.Controls.Add(this.buttonSceneColor);
+ this.groupBoxSettings.Location = new System.Drawing.Point(6, 50);
+ this.groupBoxSettings.Name = "groupBoxSettings";
+ this.groupBoxSettings.Size = new System.Drawing.Size(154, 121);
+ this.groupBoxSettings.TabIndex = 9;
+ this.groupBoxSettings.TabStop = false;
+ this.groupBoxSettings.Text = "Settings";
//
- // textEdgeK
+ // buttonSceneColor
//
- this.textEdgeK.Location = new System.Drawing.Point(64, 21);
- this.textEdgeK.Name = "textEdgeK";
- this.textEdgeK.Size = new System.Drawing.Size(71, 20);
- this.textEdgeK.TabIndex = 0;
- this.textEdgeK.Text = "100";
- this.textEdgeK.TextChanged += new System.EventHandler(this.textEdgeK_TextChanged);
+ this.buttonSceneColor.Location = new System.Drawing.Point(58, 89);
+ this.buttonSceneColor.Name = "buttonSceneColor";
+ this.buttonSceneColor.Size = new System.Drawing.Size(88, 27);
+ this.buttonSceneColor.TabIndex = 9;
+ this.buttonSceneColor.Text = "Color...";
+ this.buttonSceneColor.UseVisualStyleBackColor = true;
+ this.buttonSceneColor.Click += new System.EventHandler(this.buttonSceneColor_Click);
//
- // textObjectName
+ // pictureBoxSceneColor
//
- this.textObjectName.Location = new System.Drawing.Point(45, 9);
- this.textObjectName.Name = "textObjectName";
- this.textObjectName.Size = new System.Drawing.Size(105, 20);
- this.textObjectName.TabIndex = 4;
- this.textObjectName.Leave += new System.EventHandler(this.textObjectName_Leave);
+ this.pictureBoxSceneColor.BackColor = System.Drawing.Color.YellowGreen;
+ this.pictureBoxSceneColor.Location = new System.Drawing.Point(6, 89);
+ this.pictureBoxSceneColor.Name = "pictureBoxSceneColor";
+ this.pictureBoxSceneColor.Size = new System.Drawing.Size(48, 26);
+ this.pictureBoxSceneColor.TabIndex = 10;
+ this.pictureBoxSceneColor.TabStop = false;
//
- // label5
+ // checkBoxOverrideColor
//
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(6, 13);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(35, 13);
- this.label5.TabIndex = 3;
- this.label5.Text = "Name";
+ this.checkBoxOverrideColor.AutoSize = true;
+ this.checkBoxOverrideColor.Location = new System.Drawing.Point(6, 72);
+ this.checkBoxOverrideColor.Name = "checkBoxOverrideColor";
+ this.checkBoxOverrideColor.Size = new System.Drawing.Size(93, 17);
+ this.checkBoxOverrideColor.TabIndex = 11;
+ this.checkBoxOverrideColor.Text = "Override Color";
+ this.checkBoxOverrideColor.UseVisualStyleBackColor = true;
+ this.checkBoxOverrideColor.CheckedChanged += new System.EventHandler(this.checkBoxOverrideColor_CheckedChanged);
//
- // groupSprings
+ // checkBoxIsTrigger
//
- this.groupSprings.Controls.Add(this.butObjectSpringSetAll);
- this.groupSprings.Controls.Add(this.textObjectSpringDamping);
- this.groupSprings.Controls.Add(this.label4);
- this.groupSprings.Controls.Add(this.textObjectSpringK);
- this.groupSprings.Controls.Add(this.label3);
- this.groupSprings.Location = new System.Drawing.Point(6, 182);
- this.groupSprings.Name = "groupSprings";
- this.groupSprings.Size = new System.Drawing.Size(145, 111);
- this.groupSprings.TabIndex = 2;
- this.groupSprings.TabStop = false;
- this.groupSprings.Text = "Spring Settings";
+ this.checkBoxIsTrigger.AutoSize = true;
+ this.checkBoxIsTrigger.Location = new System.Drawing.Point(6, 19);
+ this.checkBoxIsTrigger.Name = "checkBoxIsTrigger";
+ this.checkBoxIsTrigger.Size = new System.Drawing.Size(70, 17);
+ this.checkBoxIsTrigger.TabIndex = 12;
+ this.checkBoxIsTrigger.Text = "Is Trigger";
+ this.checkBoxIsTrigger.UseVisualStyleBackColor = true;
+ this.checkBoxIsTrigger.CheckedChanged += new System.EventHandler(this.checkBoxIsTrigger_CheckedChanged);
//
- // butObjectSpringSetAll
+ // buttonTriggerTarget
//
- this.butObjectSpringSetAll.Location = new System.Drawing.Point(11, 75);
- this.butObjectSpringSetAll.Name = "butObjectSpringSetAll";
- this.butObjectSpringSetAll.Size = new System.Drawing.Size(125, 27);
- this.butObjectSpringSetAll.TabIndex = 5;
- this.butObjectSpringSetAll.Text = "Set All";
- this.butObjectSpringSetAll.UseVisualStyleBackColor = true;
- this.butObjectSpringSetAll.Click += new System.EventHandler(this.butObjectSpringSetAll_Click);
+ this.buttonTriggerTarget.Location = new System.Drawing.Point(5, 35);
+ this.buttonTriggerTarget.Name = "buttonTriggerTarget";
+ this.buttonTriggerTarget.Size = new System.Drawing.Size(140, 27);
+ this.buttonTriggerTarget.TabIndex = 13;
+ this.buttonTriggerTarget.Text = "Target Object...";
+ this.buttonTriggerTarget.UseVisualStyleBackColor = true;
+ this.buttonTriggerTarget.Click += new System.EventHandler(this.buttonTriggerTarget_Click);
//
- // textObjectSpringDamping
+ // checkBoxTriggerNoCam
//
- this.textObjectSpringDamping.Location = new System.Drawing.Point(64, 48);
- this.textObjectSpringDamping.Name = "textObjectSpringDamping";
- this.textObjectSpringDamping.Size = new System.Drawing.Size(72, 20);
- this.textObjectSpringDamping.TabIndex = 3;
- this.textObjectSpringDamping.Text = "10";
- this.textObjectSpringDamping.TextChanged += new System.EventHandler(this.textObjectSpring_TextChanged);
+ this.checkBoxTriggerNoCam.AutoSize = true;
+ this.checkBoxTriggerNoCam.Location = new System.Drawing.Point(78, 19);
+ this.checkBoxTriggerNoCam.Name = "checkBoxTriggerNoCam";
+ this.checkBoxTriggerNoCam.Size = new System.Drawing.Size(79, 17);
+ this.checkBoxTriggerNoCam.TabIndex = 14;
+ this.checkBoxTriggerNoCam.Text = "No Camera";
+ this.checkBoxTriggerNoCam.UseVisualStyleBackColor = true;
+ this.checkBoxTriggerNoCam.CheckedChanged += new System.EventHandler(this.checkBoxTriggerNoCam_CheckedChanged);
//
- // label4
+ // groupBoxTransformation
//
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(7, 52);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(49, 13);
- this.label4.TabIndex = 2;
- this.label4.Text = "Damping";
+ this.groupBoxTransformation.Controls.Add(this.label8);
+ this.groupBoxTransformation.Controls.Add(this.label7);
+ this.groupBoxTransformation.Controls.Add(this.label6);
+ this.groupBoxTransformation.Controls.Add(this.textSceneScaleX);
+ this.groupBoxTransformation.Controls.Add(this.textSceneScaleY);
+ this.groupBoxTransformation.Controls.Add(this.textSceneAngle);
+ this.groupBoxTransformation.Controls.Add(this.trackSceneAngle);
+ this.groupBoxTransformation.Controls.Add(this.textScenePosX);
+ this.groupBoxTransformation.Controls.Add(this.textScenePosY);
+ this.groupBoxTransformation.Enabled = false;
+ this.groupBoxTransformation.Location = new System.Drawing.Point(0, 470);
+ this.groupBoxTransformation.Name = "groupBoxTransformation";
+ this.groupBoxTransformation.Size = new System.Drawing.Size(177, 124);
+ this.groupBoxTransformation.TabIndex = 10;
+ this.groupBoxTransformation.TabStop = false;
+ this.groupBoxTransformation.Text = "Transformation";
//
- // textObjectSpringK
+ // textScenePosY
//
- this.textObjectSpringK.Location = new System.Drawing.Point(64, 20);
- this.textObjectSpringK.Name = "textObjectSpringK";
- this.textObjectSpringK.Size = new System.Drawing.Size(72, 20);
- this.textObjectSpringK.TabIndex = 1;
- this.textObjectSpringK.Text = "100";
- this.textObjectSpringK.TextChanged += new System.EventHandler(this.textObjectSpring_TextChanged);
+ this.textScenePosY.Location = new System.Drawing.Point(110, 19);
+ this.textScenePosY.Name = "textScenePosY";
+ this.textScenePosY.Size = new System.Drawing.Size(38, 20);
+ this.textScenePosY.TabIndex = 2;
+ this.textScenePosY.TextChanged += new System.EventHandler(this.textScene_TextChanged);
//
- // label3
+ // textScenePosX
//
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(7, 24);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(47, 13);
- this.label3.TabIndex = 0;
- this.label3.Text = "Spring K";
+ this.textScenePosX.Location = new System.Drawing.Point(66, 19);
+ this.textScenePosX.Name = "textScenePosX";
+ this.textScenePosX.Size = new System.Drawing.Size(38, 20);
+ this.textScenePosX.TabIndex = 1;
+ this.textScenePosX.TextChanged += new System.EventHandler(this.textScene_TextChanged);
+ //
+ // trackSceneAngle
//
- // groupPoints
+ this.trackSceneAngle.AutoSize = false;
+ this.trackSceneAngle.BackColor = System.Drawing.Color.White;
+ this.trackSceneAngle.Location = new System.Drawing.Point(66, 69);
+ this.trackSceneAngle.Maximum = 360;
+ this.trackSceneAngle.Name = "trackSceneAngle";
+ this.trackSceneAngle.Size = new System.Drawing.Size(82, 20);
+ this.trackSceneAngle.TabIndex = 3;
+ this.trackSceneAngle.TabStop = false;
+ this.trackSceneAngle.TickFrequency = 45;
+ this.trackSceneAngle.TickStyle = System.Windows.Forms.TickStyle.None;
+ this.trackSceneAngle.ValueChanged += new System.EventHandler(this.trackSceneAngle_ValueChanged);
//
- this.groupPoints.Controls.Add(this.textObjectPointMass);
- this.groupPoints.Controls.Add(this.label2);
- this.groupPoints.Location = new System.Drawing.Point(6, 131);
- this.groupPoints.Name = "groupPoints";
- this.groupPoints.Size = new System.Drawing.Size(145, 49);
- this.groupPoints.TabIndex = 1;
- this.groupPoints.TabStop = false;
- this.groupPoints.Text = "Point Settings";
+ // textSceneAngle
//
- // textObjectPointMass
+ this.textSceneAngle.Location = new System.Drawing.Point(110, 46);
+ this.textSceneAngle.Name = "textSceneAngle";
+ this.textSceneAngle.Size = new System.Drawing.Size(38, 20);
+ this.textSceneAngle.TabIndex = 3;
+ this.textSceneAngle.TextChanged += new System.EventHandler(this.textScene_TextChanged);
//
- this.textObjectPointMass.Location = new System.Drawing.Point(95, 18);
- this.textObjectPointMass.Name = "textObjectPointMass";
- this.textObjectPointMass.Size = new System.Drawing.Size(45, 20);
- this.textObjectPointMass.TabIndex = 3;
- this.textObjectPointMass.TextChanged += new System.EventHandler(this.textObjectPointMass_TextChanged);
+ // textSceneScaleY
//
- // label2
+ this.textSceneScaleY.Location = new System.Drawing.Point(110, 95);
+ this.textSceneScaleY.Name = "textSceneScaleY";
+ this.textSceneScaleY.Size = new System.Drawing.Size(38, 20);
+ this.textSceneScaleY.TabIndex = 5;
+ this.textSceneScaleY.TextChanged += new System.EventHandler(this.textScene_TextChanged);
//
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(9, 23);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(78, 13);
- this.label2.TabIndex = 2;
- this.label2.Text = "Mass Per Point";
+ // textSceneScaleX
//
- // groupObjectMode
+ this.textSceneScaleX.Location = new System.Drawing.Point(66, 95);
+ this.textSceneScaleX.Name = "textSceneScaleX";
+ this.textSceneScaleX.Size = new System.Drawing.Size(38, 20);
+ this.textSceneScaleX.TabIndex = 4;
+ this.textSceneScaleX.TextChanged += new System.EventHandler(this.textScene_TextChanged);
//
- this.groupObjectMode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.groupObjectMode.Controls.Add(this.radioObjectPolygons);
- this.groupObjectMode.Controls.Add(this.radioObjectSprings);
- this.groupObjectMode.Controls.Add(this.radioObjectEditPoints);
- this.groupObjectMode.Location = new System.Drawing.Point(5, 34);
- this.groupObjectMode.Name = "groupObjectMode";
- this.groupObjectMode.Size = new System.Drawing.Size(147, 92);
- this.groupObjectMode.TabIndex = 0;
- this.groupObjectMode.TabStop = false;
- this.groupObjectMode.Text = "Object Edit Mode";
+ // label6
//
- // radioObjectPolygons
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(14, 22);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(44, 13);
+ this.label6.TabIndex = 7;
+ this.label6.Text = "Position";
//
- this.radioObjectPolygons.AutoSize = true;
- this.radioObjectPolygons.Location = new System.Drawing.Point(12, 64);
- this.radioObjectPolygons.Name = "radioObjectPolygons";
- this.radioObjectPolygons.Size = new System.Drawing.Size(68, 17);
- this.radioObjectPolygons.TabIndex = 2;
- this.radioObjectPolygons.TabStop = true;
- this.radioObjectPolygons.Text = "Polygons";
- this.radioObjectPolygons.UseVisualStyleBackColor = true;
- this.radioObjectPolygons.CheckedChanged += new System.EventHandler(this.radioObject_CheckedChanged);
+ // label7
//
- // radioObjectSprings
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(27, 98);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(34, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Scale";
//
- this.radioObjectSprings.AutoSize = true;
- this.radioObjectSprings.Location = new System.Drawing.Point(12, 43);
- this.radioObjectSprings.Name = "radioObjectSprings";
- this.radioObjectSprings.Size = new System.Drawing.Size(98, 17);
- this.radioObjectSprings.TabIndex = 1;
- this.radioObjectSprings.TabStop = true;
- this.radioObjectSprings.Text = "Internal Springs";
- this.radioObjectSprings.UseVisualStyleBackColor = true;
- this.radioObjectSprings.CheckedChanged += new System.EventHandler(this.radioObject_CheckedChanged);
+ // label8
//
- // radioObjectEditPoints
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(26, 61);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(34, 13);
+ this.label8.TabIndex = 9;
+ this.label8.Text = "Angle";
//
- this.radioObjectEditPoints.AutoSize = true;
- this.radioObjectEditPoints.Checked = true;
- this.radioObjectEditPoints.Location = new System.Drawing.Point(12, 21);
- this.radioObjectEditPoints.Name = "radioObjectEditPoints";
- this.radioObjectEditPoints.Size = new System.Drawing.Size(54, 17);
- this.radioObjectEditPoints.TabIndex = 0;
- this.radioObjectEditPoints.TabStop = true;
- this.radioObjectEditPoints.Text = "Points";
- this.radioObjectEditPoints.UseVisualStyleBackColor = true;
- this.radioObjectEditPoints.CheckedChanged += new System.EventHandler(this.radioObject_CheckedChanged);
+ // moveUpButton
//
- // openFileDialog1
+ this.moveUpButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.moveUpButton.Location = new System.Drawing.Point(156, 0);
+ this.moveUpButton.Name = "moveUpButton";
+ this.moveUpButton.Size = new System.Drawing.Size(20, 85);
+ this.moveUpButton.TabIndex = 11;
+ this.moveUpButton.Text = "𝝠";
+ this.moveUpButton.UseVisualStyleBackColor = true;
+ this.moveUpButton.Click += new System.EventHandler(this.moveUpButton_Click);
//
- this.openFileDialog1.FileName = "openFileDialog1";
+ // moveDownButton
//
- // openFileDialog2
+ this.moveDownButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.moveDownButton.Location = new System.Drawing.Point(156, 84);
+ this.moveDownButton.Name = "moveDownButton";
+ this.moveDownButton.Size = new System.Drawing.Size(20, 84);
+ this.moveDownButton.TabIndex = 12;
+ this.moveDownButton.Text = "𝗩";
+ this.moveDownButton.UseVisualStyleBackColor = true;
+ this.moveDownButton.Click += new System.EventHandler(this.moveDownButton_Click);
//
- this.openFileDialog2.FileName = "openFileDialog1";
- this.openFileDialog2.Multiselect = true;
+ // tabControl1
+ //
+ this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControl1.Controls.Add(this.tabScene);
+ this.tabControl1.Controls.Add(this.tabObject);
+ this.tabControl1.Location = new System.Drawing.Point(700, 30);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(185, 619);
+ this.tabControl1.TabIndex = 3;
+ this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// Form1
//
@@ -1279,36 +1312,36 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
- this.tabControl1.ResumeLayout(false);
+ this.tabObject.ResumeLayout(false);
+ this.tabObject.PerformLayout();
+ this.groupObjectMode.ResumeLayout(false);
+ this.groupObjectMode.PerformLayout();
+ this.groupPoints.ResumeLayout(false);
+ this.groupPoints.PerformLayout();
+ this.groupSprings.ResumeLayout(false);
+ this.groupSprings.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObjectColor)).EndInit();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
this.tabScene.ResumeLayout(false);
- this.groupBoxTransformation.ResumeLayout(false);
- this.groupBoxTransformation.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.trackSceneAngle)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.tabControlSceneObjectSettings.ResumeLayout(false);
+ this.tabPage2.ResumeLayout(false);
+ this.tabPage2.PerformLayout();
this.tabPage1.ResumeLayout(false);
- this.groupBoxSettings.ResumeLayout(false);
- this.groupBoxSettings.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSceneColor)).EndInit();
this.groupBoxMaterial.ResumeLayout(false);
this.groupBoxMaterial.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericMaterial)).EndInit();
- this.tabPage2.ResumeLayout(false);
- this.tabPage2.PerformLayout();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.tabObject.ResumeLayout(false);
- this.tabObject.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObjectColor)).EndInit();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupSprings.ResumeLayout(false);
- this.groupSprings.PerformLayout();
- this.groupPoints.ResumeLayout(false);
- this.groupPoints.PerformLayout();
- this.groupObjectMode.ResumeLayout(false);
- this.groupObjectMode.PerformLayout();
+ this.groupBoxSettings.ResumeLayout(false);
+ this.groupBoxSettings.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSceneColor)).EndInit();
+ this.groupBoxTransformation.ResumeLayout(false);
+ this.groupBoxTransformation.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackSceneAngle)).EndInit();
+ this.tabControl1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1328,47 +1361,14 @@ private void InitializeComponent()
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripMainStatus;
private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar1;
- private System.Windows.Forms.TabControl tabControl1;
- private System.Windows.Forms.TabPage tabObject;
- private System.Windows.Forms.GroupBox groupObjectMode;
- private System.Windows.Forms.RadioButton radioObjectPolygons;
- private System.Windows.Forms.RadioButton radioObjectSprings;
- private System.Windows.Forms.RadioButton radioObjectEditPoints;
- private System.Windows.Forms.GroupBox groupPoints;
- private System.Windows.Forms.TextBox textObjectPointMass;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.GroupBox groupSprings;
- private System.Windows.Forms.TextBox textObjectSpringDamping;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.TextBox textObjectSpringK;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Button butObjectSpringSetAll;
- private System.Windows.Forms.TextBox textObjectName;
- private System.Windows.Forms.Label label5;
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
private System.Windows.Forms.ToolStripMenuItem saveAllstripMenuItem;
private System.Windows.Forms.ToolStripMenuItem snapToolStripMenuItem;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Label label9;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TextBox textEdgeDamping;
- private System.Windows.Forms.TextBox textEdgeK;
private System.Windows.Forms.ColorDialog colorDialog1;
- private System.Windows.Forms.PictureBox pictureBoxObjectColor;
- private System.Windows.Forms.Button butObjectColor;
- private System.Windows.Forms.CheckBox checkBoxObjectKinematic;
- private System.Windows.Forms.GroupBox groupBox3;
- private System.Windows.Forms.Label label11;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.TextBox textObjectShapeDamping;
- private System.Windows.Forms.TextBox textObjectShapeK;
- private System.Windows.Forms.CheckBox checkBoxObjectShapeMatching;
private System.Windows.Forms.ToolStripMenuItem toolStripShowGrid;
private System.Windows.Forms.ToolStripMenuItem specialToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem addNewCircleToolStripMenuItem;
- private System.Windows.Forms.TextBox textObjectPressure;
- private System.Windows.Forms.CheckBox checkBoxPressureBody;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
private System.Windows.Forms.ToolStripMenuItem saveAndCompileToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator aToolStripMenuItem1;
@@ -1387,7 +1387,47 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem balloonToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripMenuItem drawPolysInSceneEditModeToolStripMenuItem;
+ private System.Windows.Forms.OpenFileDialog openFileDialog2;
+ private System.Windows.Forms.ToolStripMenuItem decompileAndOpenToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem pointToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem editSpecialMassToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem toggleEditorThemeToolStripMenuItem;
+ private System.Windows.Forms.TabPage tabObject;
+ private System.Windows.Forms.TextBox textObjectPressure;
+ private System.Windows.Forms.TextBox textObjectName;
+ private System.Windows.Forms.CheckBox checkBoxPressureBody;
+ private System.Windows.Forms.GroupBox groupBox3;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TextBox textObjectShapeDamping;
+ private System.Windows.Forms.TextBox textObjectShapeK;
+ private System.Windows.Forms.CheckBox checkBoxObjectShapeMatching;
+ private System.Windows.Forms.PictureBox pictureBoxObjectColor;
+ private System.Windows.Forms.Button butObjectColor;
+ private System.Windows.Forms.CheckBox checkBoxObjectKinematic;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox textEdgeDamping;
+ private System.Windows.Forms.TextBox textEdgeK;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.GroupBox groupSprings;
+ private System.Windows.Forms.Button butObjectSpringSetAll;
+ private System.Windows.Forms.TextBox textObjectSpringDamping;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox textObjectSpringK;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.GroupBox groupPoints;
+ private System.Windows.Forms.TextBox textObjectPointMass;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.GroupBox groupObjectMode;
+ private System.Windows.Forms.RadioButton radioObjectPolygons;
+ private System.Windows.Forms.RadioButton radioObjectSprings;
+ private System.Windows.Forms.RadioButton radioObjectEditPoints;
private System.Windows.Forms.TabPage tabScene;
+ private System.Windows.Forms.Button moveDownButton;
+ private System.Windows.Forms.Button moveUpButton;
private System.Windows.Forms.GroupBox groupBoxTransformation;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label7;
@@ -1422,12 +1462,7 @@ private void InitializeComponent()
private System.Windows.Forms.Button butSceneRemoveObject;
private System.Windows.Forms.Button butSceneAddObject;
private System.Windows.Forms.TreeView treeView1;
- private System.Windows.Forms.ToolStripMenuItem drawPolysInSceneEditModeToolStripMenuItem;
- private System.Windows.Forms.OpenFileDialog openFileDialog2;
- private System.Windows.Forms.ToolStripMenuItem decompileAndOpenToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem pointToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem editSpecialMassToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem toggleEditorThemeToolStripMenuItem;
+ private System.Windows.Forms.TabControl tabControl1;
}
}
diff --git a/JelloEditor/Form1.cs b/JelloEditor/Form1.cs
index 7df1591..43108b3 100644
--- a/JelloEditor/Form1.cs
+++ b/JelloEditor/Form1.cs
@@ -243,10 +243,6 @@ public Form1()
updateSceneTree();
redrawImage();
- groupBoxMaterial.Enabled = false;
- groupBoxTransformation.Enabled = false;
- groupBoxSettings.Enabled = false;
-
// check for command-line argument to load a file.
if (Environment.GetCommandLineArgs().Length > 1)
openScene(Environment.GetCommandLineArgs()[1]);
@@ -2200,7 +2196,7 @@ private void butSceneRemoveObject_Click(object sender, EventArgs e)
if (count == 0)
{
- // no more references to this game body, it can be removed from ths list.
+ // no more references to this game body, it can be removed from the list.
mSceneBodies.Remove(b);
if (b.Name == "goal")
{
@@ -2773,10 +2769,23 @@ private void selectObject(int i, bool updateTree)
mSelectedObject = i;
if (mSelectedObject != -1)
{
- groupBoxMaterial.Enabled = true;
groupBoxTransformation.Enabled = true;
- groupBoxSettings.Enabled = true;
+ tabControlSceneObjectSettings.Enabled = true;
+ groupBox1.Enabled = true;
+ butSceneCloneObject.Enabled = true;
+ butSceneRemoveObject.Enabled = true;
objectToolStripMenuItem.Visible = true;
+ moveUpButton.Enabled = true;
+ moveDownButton.Enabled = true;
+
+ if (mSelectedObject == 0)
+ {
+ moveUpButton.Enabled = false;
+ }
+ else if (mSelectedObject + 1 == mSceneObjects.Count)
+ {
+ moveDownButton.Enabled = false;
+ }
checkBoxIsTrigger.Checked = mSceneObjects[mSelectedObject].isTrigger;
checkBoxTriggerNoCam.Checked = mSceneObjects[mSelectedObject].triggerNoCam;
@@ -2807,9 +2816,11 @@ private void selectObject(int i, bool updateTree)
}
else
{
- groupBoxMaterial.Enabled = false;
groupBoxTransformation.Enabled = false;
- groupBoxSettings.Enabled = false;
+ tabControlSceneObjectSettings.Enabled = false;
+ groupBox1.Enabled = false;
+ butSceneCloneObject.Enabled = false;
+ butSceneRemoveObject.Enabled = false;
objectToolStripMenuItem.Visible = false;
labelMaterial.Text = "No object selected";
}
@@ -3858,18 +3869,18 @@ private void buttonTriggerTarget_Click(object sender, EventArgs e)
private void radioButton2_CheckedChanged(object sender, EventArgs e)
{
- tabControlSceneObjectSettings.SelectedIndex = 1;
if (mSelectedObject != -1)
mSceneObjects[mSelectedObject].isPath = true;
+ tabControlSceneObjectSettings.SelectedIndex = 1;
redrawImage();
}
private void radioButton1_CheckedChanged(object sender, EventArgs e)
{
- tabControlSceneObjectSettings.SelectedIndex = 0;
if (mSelectedObject != -1)
mSceneObjects[mSelectedObject].isPath = false;
+ tabControlSceneObjectSettings.SelectedIndex = 0;
redrawImage();
}
@@ -4303,6 +4314,45 @@ private void toggleEditorThemeToolStripMenuItem_Click(object sender, EventArgs e
}
redrawImage();
}
+
+ private void tabControlSceneObjectSettings_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (tabControlSceneObjectSettings.SelectedIndex)
+ {
+ case 0:
+ if (mSceneObjects[mSelectedObject].isPath)
+ {
+ MessageBox.Show("Selected object is a path, must use \"Path\" tab!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ tabControlSceneObjectSettings.SelectedIndex = 1;
+ }
+ break;
+ case 1:
+ if (!mSceneObjects[mSelectedObject].isPath)
+ {
+ MessageBox.Show("Selected object is not a path, must use \"Scene Object\" tab!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ tabControlSceneObjectSettings.SelectedIndex = 0;
+ }
+ break;
+ }
+ }
+
+ private void moveUpButton_Click(object sender, EventArgs e)
+ {
+ SceneObject obj = mSceneObjects[mSelectedObject];
+ int newIndex = mSelectedObject - 1;
+ mSceneObjects.RemoveAt(mSelectedObject);
+ mSceneObjects.Insert(newIndex, obj);
+ selectObject(newIndex);
+ }
+
+ private void moveDownButton_Click(object sender, EventArgs e)
+ {
+ SceneObject obj = mSceneObjects[mSelectedObject];
+ int newIndex = mSelectedObject + 1;
+ mSceneObjects.RemoveAt(mSelectedObject);
+ mSceneObjects.Insert(newIndex, obj);
+ selectObject(newIndex);
+ }
}
}
#endregion
\ No newline at end of file
diff --git a/JelloEditor/MotionSettings.Designer.cs b/JelloEditor/MotionSettings.Designer.cs
index 8e801f7..1aead00 100644
--- a/JelloEditor/MotionSettings.Designer.cs
+++ b/JelloEditor/MotionSettings.Designer.cs
@@ -269,7 +269,6 @@ private void InitializeComponent()
this.help.SetShowHelp(this.comboBoxMotorTriggerBehavior, true);
this.comboBoxMotorTriggerBehavior.Size = new System.Drawing.Size(121, 21);
this.comboBoxMotorTriggerBehavior.TabIndex = 14;
- this.comboBoxMotorTriggerBehavior.SelectedIndexChanged += new System.EventHandler(this.comboBoxMotorTriggerBehavior_SelectedIndexChanged);
//
// dataGridViewMotorCommands
//
diff --git a/JelloEditor/MotionSettings.cs b/JelloEditor/MotionSettings.cs
index 997cd55..bccad5d 100644
--- a/JelloEditor/MotionSettings.cs
+++ b/JelloEditor/MotionSettings.cs
@@ -137,10 +137,5 @@ private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
noRope = checkBox1.Checked;
}
-
- private void comboBoxMotorTriggerBehavior_SelectedIndexChanged(object sender, EventArgs e)
- {
-
- }
}
}
\ No newline at end of file
diff --git a/JelloEditor/MotionSettings.resx b/JelloEditor/MotionSettings.resx
index 7dc637c..e4bdcea 100644
--- a/JelloEditor/MotionSettings.resx
+++ b/JelloEditor/MotionSettings.resx
@@ -120,9 +120,6 @@
17, 17
-
- 17, 17
-
This option decides how long to wait (in seconds) before looping back to the start when done with motion. It is HIGHLY recommended to set this option to something other than 0 for moving platforms that you jump onto. *cough cough* johark *cough cough*
diff --git a/JelloEditor/bin/Release/JellyEditor3.exe b/JelloEditor/bin/Release/JellyEditor3.exe
index ba5d176..ab3089d 100644
Binary files a/JelloEditor/bin/Release/JellyEditor3.exe and b/JelloEditor/bin/Release/JellyEditor3.exe differ
diff --git a/JelloEditor/bin/Release/JellyEditor3.pdb b/JelloEditor/bin/Release/JellyEditor3.pdb
index 1abcf88..1782208 100644
Binary files a/JelloEditor/bin/Release/JellyEditor3.pdb and b/JelloEditor/bin/Release/JellyEditor3.pdb differ
diff --git a/JelloEditor/bin/Release/JellyPhysics_Small.dll b/JelloEditor/bin/Release/JellyPhysics_Small.dll
index 3679fab..46c2d6c 100644
Binary files a/JelloEditor/bin/Release/JellyPhysics_Small.dll and b/JelloEditor/bin/Release/JellyPhysics_Small.dll differ
diff --git a/JelloEditor/bin/Release/JellyPhysics_Small.pdb b/JelloEditor/bin/Release/JellyPhysics_Small.pdb
index fa353d1..0dc7db8 100644
Binary files a/JelloEditor/bin/Release/JellyPhysics_Small.pdb and b/JelloEditor/bin/Release/JellyPhysics_Small.pdb differ
diff --git a/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferences.cache b/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferences.cache
new file mode 100644
index 0000000..61a93e5
Binary files /dev/null and b/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..ed2cb1d
Binary files /dev/null and b/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.AssemblyReference.cache b/JelloEditor/obj/Release/JellyEditor3.csproj.AssemblyReference.cache
index 694b877..1c56a78 100644
Binary files a/JelloEditor/obj/Release/JellyEditor3.csproj.AssemblyReference.cache and b/JelloEditor/obj/Release/JellyEditor3.csproj.AssemblyReference.cache differ
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.CoreCompileInputs.cache b/JelloEditor/obj/Release/JellyEditor3.csproj.CoreCompileInputs.cache
index ecb561a..0a8de6c 100644
--- a/JelloEditor/obj/Release/JellyEditor3.csproj.CoreCompileInputs.cache
+++ b/JelloEditor/obj/Release/JellyEditor3.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f6370c12932fbdbf730288d9c16c04c7cf2e3c3f
+757dce4f1d7cf164bb15b817ee60f8dd1a8cba20
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.FileListAbsolute.txt b/JelloEditor/obj/Release/JellyEditor3.csproj.FileListAbsolute.txt
index d90391a..ec6cbd1 100644
--- a/JelloEditor/obj/Release/JellyEditor3.csproj.FileListAbsolute.txt
+++ b/JelloEditor/obj/Release/JellyEditor3.csproj.FileListAbsolute.txt
@@ -16,3 +16,21 @@ C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.Cor
C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.CopyComplete
C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.exe
C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyEditor3.exe
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyEditor3.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyPhysics_Small.dll
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyPhysics_Small.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.AssemblyReference.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.About.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.CreateCircle.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.Form1.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.GridSettings.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.MotionSettings.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.PointSpecialMass.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.Properties.Resources.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.SceneSettings.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.GenerateResource.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.CoreCompileInputs.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.CopyComplete
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.exe
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.pdb
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.GenerateResource.cache b/JelloEditor/obj/Release/JellyEditor3.csproj.GenerateResource.cache
index 305025c..a2a471d 100644
Binary files a/JelloEditor/obj/Release/JellyEditor3.csproj.GenerateResource.cache and b/JelloEditor/obj/Release/JellyEditor3.csproj.GenerateResource.cache differ
diff --git a/JelloEditor/obj/Release/JellyEditor3.exe b/JelloEditor/obj/Release/JellyEditor3.exe
index ba5d176..ab3089d 100644
Binary files a/JelloEditor/obj/Release/JellyEditor3.exe and b/JelloEditor/obj/Release/JellyEditor3.exe differ
diff --git a/JelloEditor/obj/Release/JellyEditor3.pdb b/JelloEditor/obj/Release/JellyEditor3.pdb
index 1abcf88..1782208 100644
Binary files a/JelloEditor/obj/Release/JellyEditor3.pdb and b/JelloEditor/obj/Release/JellyEditor3.pdb differ
diff --git a/JelloEditor/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/JelloEditor/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
new file mode 100644
index 0000000..b845681
Binary files /dev/null and b/JelloEditor/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ
diff --git a/JellyPhysics_Small/bin/Release/JellyPhysics_Small.dll b/JellyPhysics_Small/bin/Release/JellyPhysics_Small.dll
index 3679fab..46c2d6c 100644
Binary files a/JellyPhysics_Small/bin/Release/JellyPhysics_Small.dll and b/JellyPhysics_Small/bin/Release/JellyPhysics_Small.dll differ
diff --git a/JellyPhysics_Small/bin/Release/JellyPhysics_Small.pdb b/JellyPhysics_Small/bin/Release/JellyPhysics_Small.pdb
index fa353d1..0dc7db8 100644
Binary files a/JellyPhysics_Small/bin/Release/JellyPhysics_Small.pdb and b/JellyPhysics_Small/bin/Release/JellyPhysics_Small.pdb differ
diff --git a/JellyPhysics_Small/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/JellyPhysics_Small/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index a3908ca..90b3acf 100644
Binary files a/JellyPhysics_Small/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/JellyPhysics_Small/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.AssemblyReference.cache b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.AssemblyReference.cache
index 95e76bc..f5e894a 100644
Binary files a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.AssemblyReference.cache and b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.AssemblyReference.cache differ
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.FileListAbsolute.txt b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.FileListAbsolute.txt
index ec46684..7036859 100644
--- a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.FileListAbsolute.txt
+++ b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.FileListAbsolute.txt
@@ -3,3 +3,9 @@ C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\bin\Rele
C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\obj\Release\JellyPhysics_Small.csproj.CoreCompileInputs.cache
C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\obj\Release\JellyPhysics_Small.dll
C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\obj\Release\JellyPhysics_Small.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\bin\Release\JellyPhysics_Small.dll
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\bin\Release\JellyPhysics_Small.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.csproj.AssemblyReference.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.csproj.CoreCompileInputs.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.dll
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.pdb
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.dll b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.dll
index 3679fab..46c2d6c 100644
Binary files a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.dll and b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.dll differ
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.pdb b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.pdb
index fa353d1..0dc7db8 100644
Binary files a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.pdb and b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.pdb differ