merlin/quro-animation-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Origin Preset Applier Implementer

Browse Source
This commit is contained in:
quinnvoker
2018-12-02 17:10:01 -08:00
parent c0c757650c
commit de9d120a23
6 changed files with 360 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpriteMapEditor/Form1.Designer.cs
Generated
+184 -116
View File
@@ -32,11 +32,11 @@
this.spriteList = new System.Windows.Forms.ListBox(); this.spriteList = new System.Windows.Forms.ListBox();
this.addSpriteButton = new System.Windows.Forms.Button(); this.addSpriteButton = new System.Windows.Forms.Button();
this.removeSpriteButton = new System.Windows.Forms.Button(); this.removeSpriteButton = new System.Windows.Forms.Button();
this.spriteListPanel = new System.Windows.Forms.Panel(); this.spriteListEditPanel = new System.Windows.Forms.Panel();
this.moveDownButton = new System.Windows.Forms.Button(); this.moveDownButton = new System.Windows.Forms.Button();
this.moveUpButton = new System.Windows.Forms.Button(); this.moveUpButton = new System.Windows.Forms.Button();
this.spritesLabel = new System.Windows.Forms.Label(); this.spritesLabel = new System.Windows.Forms.Label();
this.spritePanel = new System.Windows.Forms.Panel(); this.spriteEditPanel = new System.Windows.Forms.Panel();
this.editingOriginCheckBox = new System.Windows.Forms.CheckBox(); this.editingOriginCheckBox = new System.Windows.Forms.CheckBox();
this.originYPosBox = new System.Windows.Forms.NumericUpDown(); this.originYPosBox = new System.Windows.Forms.NumericUpDown();
this.originXPosBox = new System.Windows.Forms.NumericUpDown(); this.originXPosBox = new System.Windows.Forms.NumericUpDown();
@@ -67,14 +67,18 @@
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.saveSpriteMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveSpriteMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveSpriteMapAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveSpriteMapAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.highlightCheckBox = new System.Windows.Forms.CheckBox();
this.outlineTimer = new System.Windows.Forms.Timer(this.components);
this.spriteSheetViewer = new SpriteMapEditor.PictureBoxWithInterpolationMode();
this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.spriteListPanel.SuspendLayout(); this.highlightCheckBox = new System.Windows.Forms.CheckBox();
this.spritePanel.SuspendLayout(); this.outlineTimer = new System.Windows.Forms.Timer(this.components);
this.originPresetBox = new System.Windows.Forms.ComboBox();
this.originPresetLabel = new System.Windows.Forms.Label();
this.originEditPanel = new System.Windows.Forms.Panel();
this.viewEditPanel = new System.Windows.Forms.Panel();
this.spriteSheetViewer = new SpriteMapEditor.PictureBoxWithInterpolationMode();
this.spriteListEditPanel.SuspendLayout();
this.spriteEditPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.originYPosBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.originYPosBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.originXPosBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.originXPosBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.spriteHeightBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.spriteHeightBox)).BeginInit();
@@ -83,23 +87,30 @@
((System.ComponentModel.ISupportInitialize)(this.spriteXPosBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.spriteXPosBox)).BeginInit();
this.spriteViewerPanel.SuspendLayout(); this.spriteViewerPanel.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.originEditPanel.SuspendLayout();
this.viewEditPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.spriteSheetViewer)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.spriteSheetViewer)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// spriteList // spriteList
// //
this.spriteList.AllowDrop = true; this.spriteList.AllowDrop = true;
this.spriteList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.spriteList.FormattingEnabled = true; this.spriteList.FormattingEnabled = true;
this.spriteList.Location = new System.Drawing.Point(3, 32); this.spriteList.Location = new System.Drawing.Point(6, 32);
this.spriteList.MaximumSize = new System.Drawing.Size(185, 4000);
this.spriteList.MinimumSize = new System.Drawing.Size(4, 4);
this.spriteList.Name = "spriteList"; this.spriteList.Name = "spriteList";
this.spriteList.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; this.spriteList.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
this.spriteList.Size = new System.Drawing.Size(183, 199); this.spriteList.Size = new System.Drawing.Size(182, 121);
this.spriteList.TabIndex = 0; this.spriteList.TabIndex = 0;
this.spriteList.SelectedValueChanged += new System.EventHandler(this.spriteList_SelectedValueChanged); this.spriteList.SelectedValueChanged += new System.EventHandler(this.spriteList_SelectedValueChanged);
// //
// addSpriteButton // addSpriteButton
// //
this.addSpriteButton.Location = new System.Drawing.Point(126, 3); this.addSpriteButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.addSpriteButton.Location = new System.Drawing.Point(127, 3);
this.addSpriteButton.Name = "addSpriteButton"; this.addSpriteButton.Name = "addSpriteButton";
this.addSpriteButton.Size = new System.Drawing.Size(27, 23); this.addSpriteButton.Size = new System.Drawing.Size(27, 23);
this.addSpriteButton.TabIndex = 2; this.addSpriteButton.TabIndex = 2;
@@ -109,7 +120,8 @@
// //
// removeSpriteButton // removeSpriteButton
// //
this.removeSpriteButton.Location = new System.Drawing.Point(159, 3); this.removeSpriteButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.removeSpriteButton.Location = new System.Drawing.Point(160, 3);
this.removeSpriteButton.Name = "removeSpriteButton"; this.removeSpriteButton.Name = "removeSpriteButton";
this.removeSpriteButton.Size = new System.Drawing.Size(28, 23); this.removeSpriteButton.Size = new System.Drawing.Size(28, 23);
this.removeSpriteButton.TabIndex = 3; this.removeSpriteButton.TabIndex = 3;
@@ -117,28 +129,29 @@
this.removeSpriteButton.UseVisualStyleBackColor = true; this.removeSpriteButton.UseVisualStyleBackColor = true;
this.removeSpriteButton.Click += new System.EventHandler(this.removeSpriteButton_Click); this.removeSpriteButton.Click += new System.EventHandler(this.removeSpriteButton_Click);
// //
// spriteListPanel // spriteListEditPanel
// //
this.spriteListPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.spriteListEditPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)));
| System.Windows.Forms.AnchorStyles.Right))); this.spriteListEditPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.spriteListPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.spriteListEditPanel.Controls.Add(this.moveDownButton);
this.spriteListPanel.Controls.Add(this.moveDownButton); this.spriteListEditPanel.Controls.Add(this.moveUpButton);
this.spriteListPanel.Controls.Add(this.moveUpButton); this.spriteListEditPanel.Controls.Add(this.spritesLabel);
this.spriteListPanel.Controls.Add(this.spritesLabel); this.spriteListEditPanel.Controls.Add(this.spriteList);
this.spriteListPanel.Controls.Add(this.spriteList); this.spriteListEditPanel.Controls.Add(this.addSpriteButton);
this.spriteListPanel.Controls.Add(this.addSpriteButton); this.spriteListEditPanel.Controls.Add(this.removeSpriteButton);
this.spriteListPanel.Controls.Add(this.removeSpriteButton); this.spriteListEditPanel.Enabled = false;
this.spriteListPanel.Location = new System.Drawing.Point(2, 27); this.spriteListEditPanel.Location = new System.Drawing.Point(2, 27);
this.spriteListPanel.Name = "spriteListPanel"; this.spriteListEditPanel.Name = "spriteListEditPanel";
this.spriteListPanel.Size = new System.Drawing.Size(190, 258); this.spriteListEditPanel.Size = new System.Drawing.Size(191, 215);
this.spriteListPanel.TabIndex = 8; this.spriteListEditPanel.TabIndex = 8;
// //
// moveDownButton // moveDownButton
// //
this.moveDownButton.Location = new System.Drawing.Point(39, 233); this.moveDownButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.moveDownButton.Location = new System.Drawing.Point(41, 183);
this.moveDownButton.Name = "moveDownButton"; this.moveDownButton.Name = "moveDownButton";
this.moveDownButton.Size = new System.Drawing.Size(70, 18); this.moveDownButton.Size = new System.Drawing.Size(70, 20);
this.moveDownButton.TabIndex = 5; this.moveDownButton.TabIndex = 5;
this.moveDownButton.Text = "▼"; this.moveDownButton.Text = "▼";
this.moveDownButton.UseVisualStyleBackColor = true; this.moveDownButton.UseVisualStyleBackColor = true;
@@ -146,9 +159,10 @@
// //
// moveUpButton // moveUpButton
// //
this.moveUpButton.Location = new System.Drawing.Point(115, 233); this.moveUpButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.moveUpButton.Location = new System.Drawing.Point(117, 183);
this.moveUpButton.Name = "moveUpButton"; this.moveUpButton.Name = "moveUpButton";
this.moveUpButton.Size = new System.Drawing.Size(71, 18); this.moveUpButton.Size = new System.Drawing.Size(71, 20);
this.moveUpButton.TabIndex = 6; this.moveUpButton.TabIndex = 6;
this.moveUpButton.Text = "▲"; this.moveUpButton.Text = "▲";
this.moveUpButton.UseVisualStyleBackColor = true; this.moveUpButton.UseVisualStyleBackColor = true;
@@ -164,34 +178,32 @@
this.spritesLabel.TabIndex = 4; this.spritesLabel.TabIndex = 4;
this.spritesLabel.Text = "Sprites"; this.spritesLabel.Text = "Sprites";
// //
// spritePanel // spriteEditPanel
// //
this.spritePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.spriteEditPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.spritePanel.Controls.Add(this.editingOriginCheckBox); this.spriteEditPanel.Controls.Add(this.originEditPanel);
this.spritePanel.Controls.Add(this.originYPosBox); this.spriteEditPanel.Controls.Add(this.editingOriginCheckBox);
this.spritePanel.Controls.Add(this.originXPosBox); this.spriteEditPanel.Controls.Add(this.spriteHeightBox);
this.spritePanel.Controls.Add(this.originYPosLabel); this.spriteEditPanel.Controls.Add(this.spriteWidthBox);
this.spritePanel.Controls.Add(this.originXPosLabel); this.spriteEditPanel.Controls.Add(this.spriteYPosBox);
this.spritePanel.Controls.Add(this.spriteHeightBox); this.spriteEditPanel.Controls.Add(this.spriteXPosBox);
this.spritePanel.Controls.Add(this.spriteWidthBox); this.spriteEditPanel.Controls.Add(this.heightLabel);
this.spritePanel.Controls.Add(this.spriteYPosBox); this.spriteEditPanel.Controls.Add(this.widthLabel);
this.spritePanel.Controls.Add(this.spriteXPosBox); this.spriteEditPanel.Controls.Add(this.yPosLabel);
this.spritePanel.Controls.Add(this.heightLabel); this.spriteEditPanel.Controls.Add(this.xPosLabel);
this.spritePanel.Controls.Add(this.widthLabel); this.spriteEditPanel.Controls.Add(this.spriteNameLabel);
this.spritePanel.Controls.Add(this.yPosLabel); this.spriteEditPanel.Controls.Add(this.spriteSettingsLabel);
this.spritePanel.Controls.Add(this.xPosLabel); this.spriteEditPanel.Controls.Add(this.spriteNameBox);
this.spritePanel.Controls.Add(this.spriteNameLabel); this.spriteEditPanel.Enabled = false;
this.spritePanel.Controls.Add(this.spriteSettingsLabel); this.spriteEditPanel.Location = new System.Drawing.Point(2, 241);
this.spritePanel.Controls.Add(this.spriteNameBox); this.spriteEditPanel.Name = "spriteEditPanel";
this.spritePanel.Location = new System.Drawing.Point(2, 291); this.spriteEditPanel.Size = new System.Drawing.Size(191, 180);
this.spritePanel.Name = "spritePanel"; this.spriteEditPanel.TabIndex = 9;
this.spritePanel.Size = new System.Drawing.Size(190, 172);
this.spritePanel.TabIndex = 9;
// //
// editingOriginCheckBox // editingOriginCheckBox
// //
this.editingOriginCheckBox.AutoSize = true; this.editingOriginCheckBox.AutoSize = true;
this.editingOriginCheckBox.Location = new System.Drawing.Point(9, 108); this.editingOriginCheckBox.Location = new System.Drawing.Point(9, 103);
this.editingOriginCheckBox.Name = "editingOriginCheckBox"; this.editingOriginCheckBox.Name = "editingOriginCheckBox";
this.editingOriginCheckBox.Size = new System.Drawing.Size(107, 17); this.editingOriginCheckBox.Size = new System.Drawing.Size(107, 17);
this.editingOriginCheckBox.TabIndex = 23; this.editingOriginCheckBox.TabIndex = 23;
@@ -201,8 +213,7 @@
// //
// originYPosBox // originYPosBox
// //
this.originYPosBox.Enabled = false; this.originYPosBox.Location = new System.Drawing.Point(143, 4);
this.originYPosBox.Location = new System.Drawing.Point(143, 131);
this.originYPosBox.Maximum = new decimal(new int[] { this.originYPosBox.Maximum = new decimal(new int[] {
2147483647, 2147483647,
0, 0,
@@ -220,8 +231,7 @@
// //
// originXPosBox // originXPosBox
// //
this.originXPosBox.Enabled = false; this.originXPosBox.Location = new System.Drawing.Point(51, 4);
this.originXPosBox.Location = new System.Drawing.Point(51, 131);
this.originXPosBox.Maximum = new decimal(new int[] { this.originXPosBox.Maximum = new decimal(new int[] {
2147483647, 2147483647,
0, 0,
@@ -240,8 +250,7 @@
// originYPosLabel // originYPosLabel
// //
this.originYPosLabel.AutoSize = true; this.originYPosLabel.AutoSize = true;
this.originYPosLabel.Enabled = false; this.originYPosLabel.Location = new System.Drawing.Point(98, 7);
this.originYPosLabel.Location = new System.Drawing.Point(98, 134);
this.originYPosLabel.Name = "originYPosLabel"; this.originYPosLabel.Name = "originYPosLabel";
this.originYPosLabel.Size = new System.Drawing.Size(44, 13); this.originYPosLabel.Size = new System.Drawing.Size(44, 13);
this.originYPosLabel.TabIndex = 20; this.originYPosLabel.TabIndex = 20;
@@ -250,8 +259,7 @@
// originXPosLabel // originXPosLabel
// //
this.originXPosLabel.AutoSize = true; this.originXPosLabel.AutoSize = true;
this.originXPosLabel.Enabled = false; this.originXPosLabel.Location = new System.Drawing.Point(6, 7);
this.originXPosLabel.Location = new System.Drawing.Point(6, 134);
this.originXPosLabel.Name = "originXPosLabel"; this.originXPosLabel.Name = "originXPosLabel";
this.originXPosLabel.Size = new System.Drawing.Size(44, 13); this.originXPosLabel.Size = new System.Drawing.Size(44, 13);
this.originXPosLabel.TabIndex = 19; this.originXPosLabel.TabIndex = 19;
@@ -259,7 +267,7 @@
// //
// spriteHeightBox // spriteHeightBox
// //
this.spriteHeightBox.Location = new System.Drawing.Point(136, 82); this.spriteHeightBox.Location = new System.Drawing.Point(136, 77);
this.spriteHeightBox.Maximum = new decimal(new int[] { this.spriteHeightBox.Maximum = new decimal(new int[] {
2147483647, 2147483647,
0, 0,
@@ -272,7 +280,7 @@
// //
// spriteWidthBox // spriteWidthBox
// //
this.spriteWidthBox.Location = new System.Drawing.Point(44, 82); this.spriteWidthBox.Location = new System.Drawing.Point(44, 77);
this.spriteWidthBox.Maximum = new decimal(new int[] { this.spriteWidthBox.Maximum = new decimal(new int[] {
2147483647, 2147483647,
0, 0,
@@ -285,7 +293,7 @@
// //
// spriteYPosBox // spriteYPosBox
// //
this.spriteYPosBox.Location = new System.Drawing.Point(136, 56); this.spriteYPosBox.Location = new System.Drawing.Point(136, 51);
this.spriteYPosBox.Maximum = new decimal(new int[] { this.spriteYPosBox.Maximum = new decimal(new int[] {
2147483647, 2147483647,
0, 0,
@@ -298,7 +306,7 @@
// //
// spriteXPosBox // spriteXPosBox
// //
this.spriteXPosBox.Location = new System.Drawing.Point(44, 56); this.spriteXPosBox.Location = new System.Drawing.Point(44, 51);
this.spriteXPosBox.Maximum = new decimal(new int[] { this.spriteXPosBox.Maximum = new decimal(new int[] {
2147483647, 2147483647,
0, 0,
@@ -312,7 +320,7 @@
// heightLabel // heightLabel
// //
this.heightLabel.AutoSize = true; this.heightLabel.AutoSize = true;
this.heightLabel.Location = new System.Drawing.Point(98, 85); this.heightLabel.Location = new System.Drawing.Point(98, 80);
this.heightLabel.Name = "heightLabel"; this.heightLabel.Name = "heightLabel";
this.heightLabel.Size = new System.Drawing.Size(38, 13); this.heightLabel.Size = new System.Drawing.Size(38, 13);
this.heightLabel.TabIndex = 14; this.heightLabel.TabIndex = 14;
@@ -321,7 +329,7 @@
// widthLabel // widthLabel
// //
this.widthLabel.AutoSize = true; this.widthLabel.AutoSize = true;
this.widthLabel.Location = new System.Drawing.Point(6, 85); this.widthLabel.Location = new System.Drawing.Point(6, 80);
this.widthLabel.Name = "widthLabel"; this.widthLabel.Name = "widthLabel";
this.widthLabel.Size = new System.Drawing.Size(35, 13); this.widthLabel.Size = new System.Drawing.Size(35, 13);
this.widthLabel.TabIndex = 12; this.widthLabel.TabIndex = 12;
@@ -330,16 +338,16 @@
// yPosLabel // yPosLabel
// //
this.yPosLabel.AutoSize = true; this.yPosLabel.AutoSize = true;
this.yPosLabel.Location = new System.Drawing.Point(98, 59); this.yPosLabel.Location = new System.Drawing.Point(98, 54);
this.yPosLabel.Name = "yPosLabel"; this.yPosLabel.Name = "yPosLabel";
this.yPosLabel.Size = new System.Drawing.Size(35, 13); this.yPosLabel.Size = new System.Drawing.Size(38, 13);
this.yPosLabel.TabIndex = 10; this.yPosLabel.TabIndex = 10;
this.yPosLabel.Text = "Y Pos"; this.yPosLabel.Text = "Y Pos.";
// //
// xPosLabel // xPosLabel
// //
this.xPosLabel.AutoSize = true; this.xPosLabel.AutoSize = true;
this.xPosLabel.Location = new System.Drawing.Point(6, 59); this.xPosLabel.Location = new System.Drawing.Point(6, 54);
this.xPosLabel.Name = "xPosLabel"; this.xPosLabel.Name = "xPosLabel";
this.xPosLabel.Size = new System.Drawing.Size(38, 13); this.xPosLabel.Size = new System.Drawing.Size(38, 13);
this.xPosLabel.TabIndex = 8; this.xPosLabel.TabIndex = 8;
@@ -348,7 +356,7 @@
// spriteNameLabel // spriteNameLabel
// //
this.spriteNameLabel.AutoSize = true; this.spriteNameLabel.AutoSize = true;
this.spriteNameLabel.Location = new System.Drawing.Point(6, 30); this.spriteNameLabel.Location = new System.Drawing.Point(6, 25);
this.spriteNameLabel.Name = "spriteNameLabel"; this.spriteNameLabel.Name = "spriteNameLabel";
this.spriteNameLabel.Size = new System.Drawing.Size(38, 13); this.spriteNameLabel.Size = new System.Drawing.Size(38, 13);
this.spriteNameLabel.TabIndex = 6; this.spriteNameLabel.TabIndex = 6;
@@ -358,7 +366,7 @@
// //
this.spriteSettingsLabel.AutoSize = true; this.spriteSettingsLabel.AutoSize = true;
this.spriteSettingsLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold); this.spriteSettingsLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
this.spriteSettingsLabel.Location = new System.Drawing.Point(3, 8); this.spriteSettingsLabel.Location = new System.Drawing.Point(3, 3);
this.spriteSettingsLabel.Name = "spriteSettingsLabel"; this.spriteSettingsLabel.Name = "spriteSettingsLabel";
this.spriteSettingsLabel.Size = new System.Drawing.Size(90, 13); this.spriteSettingsLabel.Size = new System.Drawing.Size(90, 13);
this.spriteSettingsLabel.TabIndex = 5; this.spriteSettingsLabel.TabIndex = 5;
@@ -366,7 +374,7 @@
// //
// spriteNameBox // spriteNameBox
// //
this.spriteNameBox.Location = new System.Drawing.Point(44, 27); this.spriteNameBox.Location = new System.Drawing.Point(44, 22);
this.spriteNameBox.Name = "spriteNameBox"; this.spriteNameBox.Name = "spriteNameBox";
this.spriteNameBox.Size = new System.Drawing.Size(144, 20); this.spriteNameBox.Size = new System.Drawing.Size(144, 20);
this.spriteNameBox.TabIndex = 0; this.spriteNameBox.TabIndex = 0;
@@ -391,19 +399,24 @@
// //
// spriteViewerPanel // spriteViewerPanel
// //
this.spriteViewerPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.spriteViewerPanel.AutoScroll = true; this.spriteViewerPanel.AutoScroll = true;
this.spriteViewerPanel.BackColor = System.Drawing.SystemColors.ControlDark; this.spriteViewerPanel.BackColor = System.Drawing.SystemColors.ControlDark;
this.spriteViewerPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.spriteViewerPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.spriteViewerPanel.Controls.Add(this.spriteSheetViewer); this.spriteViewerPanel.Controls.Add(this.spriteSheetViewer);
this.spriteViewerPanel.Enabled = false;
this.spriteViewerPanel.Location = new System.Drawing.Point(198, 59); this.spriteViewerPanel.Location = new System.Drawing.Point(198, 59);
this.spriteViewerPanel.Name = "spriteViewerPanel"; this.spriteViewerPanel.Name = "spriteViewerPanel";
this.spriteViewerPanel.Size = new System.Drawing.Size(488, 404); this.spriteViewerPanel.Size = new System.Drawing.Size(599, 362);
this.spriteViewerPanel.TabIndex = 14; this.spriteViewerPanel.TabIndex = 14;
this.spriteViewerPanel.Scroll += new System.Windows.Forms.ScrollEventHandler(this.spriteViewerPanel_Scroll); this.spriteViewerPanel.Scroll += new System.Windows.Forms.ScrollEventHandler(this.spriteViewerPanel_Scroll);
// //
// zoomInButton // zoomInButton
// //
this.zoomInButton.Location = new System.Drawing.Point(659, 30); this.zoomInButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.zoomInButton.Location = new System.Drawing.Point(219, 3);
this.zoomInButton.Name = "zoomInButton"; this.zoomInButton.Name = "zoomInButton";
this.zoomInButton.Size = new System.Drawing.Size(27, 23); this.zoomInButton.Size = new System.Drawing.Size(27, 23);
this.zoomInButton.TabIndex = 5; this.zoomInButton.TabIndex = 5;
@@ -413,7 +426,8 @@
// //
// zoomOutButton // zoomOutButton
// //
this.zoomOutButton.Location = new System.Drawing.Point(566, 30); this.zoomOutButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.zoomOutButton.Location = new System.Drawing.Point(126, 3);
this.zoomOutButton.Name = "zoomOutButton"; this.zoomOutButton.Name = "zoomOutButton";
this.zoomOutButton.Size = new System.Drawing.Size(28, 23); this.zoomOutButton.Size = new System.Drawing.Size(28, 23);
this.zoomOutButton.TabIndex = 6; this.zoomOutButton.TabIndex = 6;
@@ -423,8 +437,9 @@
// //
// zoomLabel // zoomLabel
// //
this.zoomLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.zoomLabel.AutoSize = true; this.zoomLabel.AutoSize = true;
this.zoomLabel.Location = new System.Drawing.Point(600, 35); this.zoomLabel.Location = new System.Drawing.Point(160, 8);
this.zoomLabel.Name = "zoomLabel"; this.zoomLabel.Name = "zoomLabel";
this.zoomLabel.Size = new System.Drawing.Size(53, 13); this.zoomLabel.Size = new System.Drawing.Size(53, 13);
this.zoomLabel.TabIndex = 15; this.zoomLabel.TabIndex = 15;
@@ -437,7 +452,7 @@
this.editToolStripMenuItem}); this.editToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(691, 24); this.menuStrip1.Size = new System.Drawing.Size(800, 24);
this.menuStrip1.TabIndex = 16; this.menuStrip1.TabIndex = 16;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
@@ -489,12 +504,36 @@
this.saveSpriteMapAsToolStripMenuItem.Text = "Save Sprite Map As..."; this.saveSpriteMapAsToolStripMenuItem.Text = "Save Sprite Map As...";
this.saveSpriteMapAsToolStripMenuItem.Click += new System.EventHandler(this.saveMapAsToolStripMenuItem_Click); this.saveSpriteMapAsToolStripMenuItem.Click += new System.EventHandler(this.saveMapAsToolStripMenuItem_Click);
// //
// editToolStripMenuItem
//
this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.undoToolStripMenuItem,
this.redoToolStripMenuItem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Text = "Edit";
//
// undoToolStripMenuItem
//
this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
this.undoToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
this.undoToolStripMenuItem.Text = "Undo";
this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click);
//
// redoToolStripMenuItem
//
this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
this.redoToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
this.redoToolStripMenuItem.Text = "Redo";
this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click);
//
// highlightCheckBox // highlightCheckBox
// //
this.highlightCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.highlightCheckBox.AutoSize = true; this.highlightCheckBox.AutoSize = true;
this.highlightCheckBox.Checked = true; this.highlightCheckBox.Checked = true;
this.highlightCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; this.highlightCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.highlightCheckBox.Location = new System.Drawing.Point(446, 34); this.highlightCheckBox.Location = new System.Drawing.Point(6, 7);
this.highlightCheckBox.Name = "highlightCheckBox"; this.highlightCheckBox.Name = "highlightCheckBox";
this.highlightCheckBox.Size = new System.Drawing.Size(114, 17); this.highlightCheckBox.Size = new System.Drawing.Size(114, 17);
this.highlightCheckBox.TabIndex = 17; this.highlightCheckBox.TabIndex = 17;
@@ -508,6 +547,52 @@
this.outlineTimer.Interval = 66; this.outlineTimer.Interval = 66;
this.outlineTimer.Tick += new System.EventHandler(this.outlineTimer_Tick); this.outlineTimer.Tick += new System.EventHandler(this.outlineTimer_Tick);
// //
// originPresetBox
//
this.originPresetBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.originPresetBox.FormattingEnabled = true;
this.originPresetBox.Location = new System.Drawing.Point(78, 30);
this.originPresetBox.Name = "originPresetBox";
this.originPresetBox.Size = new System.Drawing.Size(110, 21);
this.originPresetBox.TabIndex = 24;
this.originPresetBox.SelectedIndexChanged += new System.EventHandler(this.originPresetBox_SelectedIndexChanged);
//
// originPresetLabel
//
this.originPresetLabel.AutoSize = true;
this.originPresetLabel.Location = new System.Drawing.Point(6, 33);
this.originPresetLabel.Name = "originPresetLabel";
this.originPresetLabel.Size = new System.Drawing.Size(70, 13);
this.originPresetLabel.TabIndex = 25;
this.originPresetLabel.Text = "Origin Preset:";
//
// originEditPanel
//
this.originEditPanel.Controls.Add(this.originPresetLabel);
this.originEditPanel.Controls.Add(this.originPresetBox);
this.originEditPanel.Controls.Add(this.originXPosLabel);
this.originEditPanel.Controls.Add(this.originYPosLabel);
this.originEditPanel.Controls.Add(this.originYPosBox);
this.originEditPanel.Controls.Add(this.originXPosBox);
this.originEditPanel.Enabled = false;
this.originEditPanel.Location = new System.Drawing.Point(0, 123);
this.originEditPanel.Name = "originEditPanel";
this.originEditPanel.Size = new System.Drawing.Size(191, 54);
this.originEditPanel.TabIndex = 18;
//
// viewEditPanel
//
this.viewEditPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.viewEditPanel.Controls.Add(this.zoomLabel);
this.viewEditPanel.Controls.Add(this.highlightCheckBox);
this.viewEditPanel.Controls.Add(this.zoomOutButton);
this.viewEditPanel.Controls.Add(this.zoomInButton);
this.viewEditPanel.Enabled = false;
this.viewEditPanel.Location = new System.Drawing.Point(551, 27);
this.viewEditPanel.Name = "viewEditPanel";
this.viewEditPanel.Size = new System.Drawing.Size(246, 29);
this.viewEditPanel.TabIndex = 18;
//
// spriteSheetViewer // spriteSheetViewer
// //
this.spriteSheetViewer.BackgroundImage = global::SpriteMapEditor.Properties.Resources.transparentUI; this.spriteSheetViewer.BackgroundImage = global::SpriteMapEditor.Properties.Resources.transparentUI;
@@ -525,52 +610,27 @@
this.spriteSheetViewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.spriteSheetViewer_MouseMove); this.spriteSheetViewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.spriteSheetViewer_MouseMove);
this.spriteSheetViewer.MouseUp += new System.Windows.Forms.MouseEventHandler(this.spriteSheetViewer_MouseUp); this.spriteSheetViewer.MouseUp += new System.Windows.Forms.MouseEventHandler(this.spriteSheetViewer_MouseUp);
// //
// editToolStripMenuItem
//
this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.undoToolStripMenuItem,
this.redoToolStripMenuItem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Text = "Edit";
//
// undoToolStripMenuItem
//
this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
this.undoToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.undoToolStripMenuItem.Text = "Undo";
this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click);
//
// redoToolStripMenuItem
//
this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
this.redoToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.redoToolStripMenuItem.Text = "Redo";
this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click);
//
// Form1 // Form1
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control; this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(691, 465); this.ClientSize = new System.Drawing.Size(800, 424);
this.Controls.Add(this.highlightCheckBox); this.Controls.Add(this.viewEditPanel);
this.Controls.Add(this.zoomLabel);
this.Controls.Add(this.zoomInButton);
this.Controls.Add(this.spriteViewerPanel); this.Controls.Add(this.spriteViewerPanel);
this.Controls.Add(this.zoomOutButton); this.Controls.Add(this.spriteEditPanel);
this.Controls.Add(this.spritePanel); this.Controls.Add(this.spriteListEditPanel);
this.Controls.Add(this.spriteListPanel);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.KeyPreview = true; this.KeyPreview = true;
this.MinimumSize = new System.Drawing.Size(460, 382);
this.Name = "Form1"; this.Name = "Form1";
this.Text = "QUROGames Sprite Map Editor"; this.Text = "QUROGames Sprite Map Editor";
this.Click += new System.EventHandler(this.Form1_Click); this.Click += new System.EventHandler(this.Form1_Click);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
this.spriteListPanel.ResumeLayout(false); this.spriteListEditPanel.ResumeLayout(false);
this.spriteListPanel.PerformLayout(); this.spriteListEditPanel.PerformLayout();
this.spritePanel.ResumeLayout(false); this.spriteEditPanel.ResumeLayout(false);
this.spritePanel.PerformLayout(); this.spriteEditPanel.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.originYPosBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.originYPosBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.originXPosBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.originXPosBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.spriteHeightBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.spriteHeightBox)).EndInit();
@@ -580,6 +640,10 @@
this.spriteViewerPanel.ResumeLayout(false); this.spriteViewerPanel.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.originEditPanel.ResumeLayout(false);
this.originEditPanel.PerformLayout();
this.viewEditPanel.ResumeLayout(false);
this.viewEditPanel.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.spriteSheetViewer)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.spriteSheetViewer)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@@ -591,9 +655,9 @@
private System.Windows.Forms.ListBox spriteList; private System.Windows.Forms.ListBox spriteList;
private System.Windows.Forms.Button addSpriteButton; private System.Windows.Forms.Button addSpriteButton;
private System.Windows.Forms.Button removeSpriteButton; private System.Windows.Forms.Button removeSpriteButton;
private System.Windows.Forms.Panel spriteListPanel; private System.Windows.Forms.Panel spriteListEditPanel;
private System.Windows.Forms.Label spritesLabel; private System.Windows.Forms.Label spritesLabel;
private System.Windows.Forms.Panel spritePanel; private System.Windows.Forms.Panel spriteEditPanel;
private System.Windows.Forms.Label spriteSettingsLabel; private System.Windows.Forms.Label spriteSettingsLabel;
private System.Windows.Forms.TextBox spriteNameBox; private System.Windows.Forms.TextBox spriteNameBox;
private System.Windows.Forms.Label spriteNameLabel; private System.Windows.Forms.Label spriteNameLabel;
@@ -632,6 +696,10 @@
private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem redoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem redoToolStripMenuItem;
private System.Windows.Forms.Label originPresetLabel;
private System.Windows.Forms.ComboBox originPresetBox;
private System.Windows.Forms.Panel originEditPanel;
private System.Windows.Forms.Panel viewEditPanel;
} }
} }
SpriteMapEditor/Form1.cs
+49 -44
View File
@@ -13,13 +13,14 @@ using Microsoft.Xna;
using System.IO; using System.IO;
using QURO; using QURO;
using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Intermediate; using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Intermediate;
using SpriteMapEditor.SpriteMapModifications;
namespace SpriteMapEditor namespace SpriteMapEditor
{ {
public partial class Form1 : Form public partial class Form1 : Form
{ {
private SpriteMapModifications.History undoHistory; private History undoHistory;
private BindingList<SpriteMapRegion> sprites; private BindingList<SpriteMapRegion> sprites;
private List<SpriteMapRegion> selectedSprites; private List<SpriteMapRegion> selectedSprites;
@@ -73,10 +74,12 @@ namespace SpriteMapEditor
public Form1() public Form1()
{ {
InitializeComponent(); InitializeComponent();
FormBorderStyle = FormBorderStyle.FixedSingle; FormBorderStyle = FormBorderStyle.Sizable;
undoHistory = new SpriteMapModifications.History(); undoHistory = new SpriteMapModifications.History();
originPresetBox.DataSource = Enum.GetValues(typeof(OriginPreset));
spriteSheetViewer.Width = 1; spriteSheetViewer.Width = 1;
spriteSheetViewer.Height = 1; spriteSheetViewer.Height = 1;
@@ -105,16 +108,19 @@ namespace SpriteMapEditor
{ {
spriteSheet = Image.FromFile(loadSpriteSheetDialog.FileName); spriteSheet = Image.FromFile(loadSpriteSheetDialog.FileName);
spriteSheetViewer.Image = spriteSheet; spriteSheetViewer.Image = spriteSheet;
}
EnableLoadAndSaveAsSpriteMap();
InitializeMask(); InitializeMask();
EnableEditing();
}
} }
private void EnableLoadAndSaveAsSpriteMap() private void EnableEditing()
{ {
loadSpriteMapToolStripMenuItem.Enabled = true; loadSpriteMapToolStripMenuItem.Enabled = true;
saveSpriteMapAsToolStripMenuItem.Enabled = true; saveSpriteMapAsToolStripMenuItem.Enabled = true;
spriteListEditPanel.Enabled = true;
spriteEditPanel.Enabled = true;
viewEditPanel.Enabled = true;
spriteViewerPanel.Enabled = true;
} }
private void spriteSheetViewer_Paint(object sender, PaintEventArgs e) private void spriteSheetViewer_Paint(object sender, PaintEventArgs e)
@@ -170,6 +176,7 @@ namespace SpriteMapEditor
originYPosBox.Value = (int)currentSprite.Origin.Y; originYPosBox.Value = (int)currentSprite.Origin.Y;
originYPosBox.Text = ((int)currentSprite.Origin.Y).ToString(); originYPosBox.Text = ((int)currentSprite.Origin.Y).ToString();
} }
originPresetBox.SelectedIndex = 0;
loadingSprite = false; loadingSprite = false;
} }
@@ -296,8 +303,8 @@ namespace SpriteMapEditor
{ {
if (loadingSprite) if (loadingSprite)
return; return;
var modification = new SpriteMapModifications.ModifyBounds(selectedSprites, x: (int)spriteXPosBox.Value); var modification = new ModifyBounds(selectedSprites, x: (int)spriteXPosBox.Value);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
UpdateHighlightMask(); UpdateHighlightMask();
spriteSheetViewer.Refresh(); spriteSheetViewer.Refresh();
@@ -307,8 +314,8 @@ namespace SpriteMapEditor
{ {
if (loadingSprite) if (loadingSprite)
return; return;
var modification = new SpriteMapModifications.ModifyBounds(selectedSprites, y: (int)spriteYPosBox.Value); var modification = new ModifyBounds(selectedSprites, y: (int)spriteYPosBox.Value);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
UpdateHighlightMask(); UpdateHighlightMask();
spriteSheetViewer.Refresh(); spriteSheetViewer.Refresh();
@@ -318,8 +325,8 @@ namespace SpriteMapEditor
{ {
if (loadingSprite) if (loadingSprite)
return; return;
var modification = new SpriteMapModifications.ModifyBounds(selectedSprites, width: (int)spriteWidthBox.Value); var modification = new ModifyBounds(selectedSprites, width: (int)spriteWidthBox.Value);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
UpdateHighlightMask(); UpdateHighlightMask();
spriteSheetViewer.Refresh(); spriteSheetViewer.Refresh();
@@ -329,8 +336,8 @@ namespace SpriteMapEditor
{ {
if (loadingSprite) if (loadingSprite)
return; return;
var modification = new SpriteMapModifications.ModifyBounds(selectedSprites, height: (int)spriteHeightBox.Value); var modification = new ModifyBounds(selectedSprites, height: (int)spriteHeightBox.Value);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
UpdateHighlightMask(); UpdateHighlightMask();
spriteSheetViewer.Refresh(); spriteSheetViewer.Refresh();
@@ -338,8 +345,8 @@ namespace SpriteMapEditor
private void addSpriteButton_Click(object sender, EventArgs e) private void addSpriteButton_Click(object sender, EventArgs e)
{ {
var modification = new SpriteMapModifications.AddSprite(sprites, selectedSprites[0]); var modification = new AddSprite(sprites, selectedSprites[0]);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
} }
@@ -354,8 +361,8 @@ namespace SpriteMapEditor
if (indexToRemove > -1 && indexToRemove < sprites.Count) if (indexToRemove > -1 && indexToRemove < sprites.Count)
{ {
var modification = new SpriteMapModifications.RemoveSprite(sprites, indexToRemove); var modification = new RemoveSprite(sprites, indexToRemove);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
} }
} }
@@ -589,9 +596,9 @@ namespace SpriteMapEditor
var totalDragY = selectedSprites[0].Bounds.Y - preDragBounds[0].Y; var totalDragY = selectedSprites[0].Bounds.Y - preDragBounds[0].Y;
if (totalDragX != 0 || totalDragY != 0) if (totalDragX != 0 || totalDragY != 0)
{ {
var modification = new SpriteMapModifications.MoveBounds(selectedSprites, totalDragX, totalDragY, preDragBounds); var modification = new MoveBounds(selectedSprites, totalDragX, totalDragY, preDragBounds);
modification.Undo(); modification.Undo();
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
} }
} }
@@ -601,8 +608,8 @@ namespace SpriteMapEditor
{ {
if (loadingSprite) if (loadingSprite)
return; return;
var modification = new SpriteMapModifications.ModifyOrigin(selectedSprites, x: (int)originXPosBox.Value); var modification = new ModifyOrigin(selectedSprites, x: (int)originXPosBox.Value);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
spriteSheetViewer.Refresh(); spriteSheetViewer.Refresh();
} }
@@ -611,8 +618,8 @@ namespace SpriteMapEditor
{ {
if (loadingSprite) if (loadingSprite)
return; return;
var modification = new SpriteMapModifications.ModifyOrigin(selectedSprites, y: (int)originYPosBox.Value); var modification = new ModifyOrigin(selectedSprites, y: (int)originYPosBox.Value);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
spriteSheetViewer.Refresh(); spriteSheetViewer.Refresh();
} }
@@ -621,8 +628,8 @@ namespace SpriteMapEditor
{ {
if(spriteList.SelectedIndex < sprites.Count - 1) if(spriteList.SelectedIndex < sprites.Count - 1)
{ {
var modification = new SpriteMapModifications.MoveSpriteListEntry(sprites, spriteList.SelectedIndex, 1); var modification = new MoveSpriteListEntry(sprites, spriteList.SelectedIndex, 1);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
int newPosition = spriteList.SelectedIndex + 1; int newPosition = spriteList.SelectedIndex + 1;
spriteList.SelectedIndices.Clear(); spriteList.SelectedIndices.Clear();
@@ -634,8 +641,8 @@ namespace SpriteMapEditor
{ {
if(spriteList.SelectedIndex > 0) if(spriteList.SelectedIndex > 0)
{ {
var modification = new SpriteMapModifications.MoveSpriteListEntry(sprites, spriteList.SelectedIndex, -1); var modification = new MoveSpriteListEntry(sprites, spriteList.SelectedIndex, -1);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
int newPosition = spriteList.SelectedIndex - 1; int newPosition = spriteList.SelectedIndex - 1;
spriteList.SelectedIndices.Clear(); spriteList.SelectedIndices.Clear();
@@ -647,20 +654,7 @@ namespace SpriteMapEditor
{ {
editingOrigin = editingOriginCheckBox.Checked; editingOrigin = editingOriginCheckBox.Checked;
if (editingOrigin) originEditPanel.Enabled = editingOrigin;
{
originXPosLabel.Enabled = true;
originXPosBox.Enabled = true;
originYPosLabel.Enabled = true;
originYPosBox.Enabled = true;
}
else
{
originXPosLabel.Enabled = false;
originXPosBox.Enabled = false;
originYPosLabel.Enabled = false;
originYPosBox.Enabled = false;
}
spriteViewerPanel.Refresh(); spriteViewerPanel.Refresh();
} }
@@ -686,8 +680,8 @@ namespace SpriteMapEditor
private void UpdateSpriteName() private void UpdateSpriteName()
{ {
var modification = new SpriteMapModifications.RenameSprite(selectedSprites[0], spriteNameBox.Text); var modification = new RenameSprite(selectedSprites[0], spriteNameBox.Text);
SpriteMapModifications.ModHelper.DoModificationWithSelectionTracking(modification, spriteList); ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification); undoHistory.Add(modification);
sprites.ResetBindings(); sprites.ResetBindings();
} }
@@ -742,5 +736,16 @@ namespace SpriteMapEditor
{ {
undoHistory.Redo(spriteList); undoHistory.Redo(spriteList);
} }
private void originPresetBox_SelectedIndexChanged(object sender, EventArgs e)
{
if ((OriginPreset)originPresetBox.SelectedIndex == OriginPreset.None)
return;
var modification = new ApplyOriginPreset(selectedSprites,
(OriginPreset)originPresetBox.SelectedIndex);
ModHelper.DoModificationWithSelectionTracking(modification, spriteList);
undoHistory.Add(modification);
spriteSheetViewer.Refresh();
}
} }
} }
SpriteMapEditor/SpriteMapEditor.csproj
+2
View File
@@ -58,6 +58,7 @@
<Compile Include="Form1.Designer.cs"> <Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="SpriteMapModifications\ApplyOriginPreset.cs" />
<Compile Include="SpriteMapModifications\ModHelper.cs" /> <Compile Include="SpriteMapModifications\ModHelper.cs" />
<Compile Include="SpriteMapModifications\AddSprite.cs" /> <Compile Include="SpriteMapModifications\AddSprite.cs" />
<Compile Include="SpriteMapModifications\History.cs" /> <Compile Include="SpriteMapModifications\History.cs" />
@@ -74,6 +75,7 @@
<Compile Include="SpriteMapModifications\OriginPreset.cs" /> <Compile Include="SpriteMapModifications\OriginPreset.cs" />
<Compile Include="SpriteMapModifications\RemoveSprite.cs" /> <Compile Include="SpriteMapModifications\RemoveSprite.cs" />
<Compile Include="SpriteMapModifications\RenameSprite.cs" /> <Compile Include="SpriteMapModifications\RenameSprite.cs" />
<Compile Include="SpriteMapProject.cs" />
<EmbeddedResource Include="Form1.resx"> <EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
SpriteMapEditor/SpriteMapModifications/ApplyOriginPreset.cs
+107
View File
@@ -0,0 +1,107 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using QURO;
using Microsoft.Xna.Framework;
namespace SpriteMapEditor.SpriteMapModifications
{
class ApplyOriginPreset : ISpriteMapModification
{
private readonly List<SpriteMapRegion> sprites;
private readonly OriginPreset preset;
private readonly List<Vector2> oldOrigins;
private List<int> preChangeSelection;
private List<int> postChangeSelection;
public ApplyOriginPreset(List<SpriteMapRegion> spritesToEditOrigin, OriginPreset presetToApply)
{
sprites = spritesToEditOrigin.ToList();
preset = presetToApply;
oldOrigins = new List<Vector2>();
for (int index = 0; index < sprites.Count; index++)
{
oldOrigins.Add(sprites[index].Origin);
}
}
public void Do()
{
foreach(SpriteMapRegion sprite in sprites)
{
Vector2 newOrigin = sprite.Origin;
switch (preset)
{
case OriginPreset.TopLeft:
newOrigin = Vector2.Zero;
break;
case OriginPreset.Top:
newOrigin = new Vector2(sprite.Bounds.Width / 2, 0);
break;
case OriginPreset.TopRight:
newOrigin = new Vector2(sprite.Bounds.Width, 0);
break;
case OriginPreset.Left:
newOrigin = new Vector2(0, sprite.Bounds.Height / 2);
break;
case OriginPreset.Center:
newOrigin = new Vector2(sprite.Bounds.Width / 2, sprite.Bounds.Height / 2);
break;
case OriginPreset.Right:
newOrigin = new Vector2(sprite.Bounds.Width, sprite.Bounds.Height / 2);
break;
case OriginPreset.BottomLeft:
newOrigin = new Vector2(0, sprite.Bounds.Height);
break;
case OriginPreset.Bottom:
newOrigin = new Vector2(sprite.Bounds.Width / 2, sprite.Bounds.Height);
break;
case OriginPreset.BottomRight:
newOrigin = new Vector2(sprite.Bounds.Width, sprite.Bounds.Height);
break;
default:
break;
}
sprite.Origin = newOrigin;
}
}
public void Undo()
{
for (int index = 0; index < sprites.Count; index++)
{
sprites[index].Origin = oldOrigins[index];
}
}
public List<int> GetPreChangeSelection()
{
return preChangeSelection;
}
public void SetPreChangeSelection(List<int> currentSelection)
{
preChangeSelection = currentSelection;
}
public List<int> GetPostChangeSelection()
{
return postChangeSelection;
}
public void SetPostChangeSelection(List<int> currentSelection)
{
postChangeSelection = currentSelection;
}
public override string ToString()
{
return "Set Origin to " + preset;
}
}
}
SpriteMapEditor/SpriteMapModifications/OriginPreset.cs
+2 -1
View File
@@ -8,6 +8,7 @@ namespace SpriteMapEditor.SpriteMapModifications
{ {
public enum OriginPreset public enum OriginPreset
{ {
None,
TopLeft, TopLeft,
Top, Top,
TopRight, TopRight,
@@ -16,6 +17,6 @@ namespace SpriteMapEditor.SpriteMapModifications
Right, Right,
BottomLeft, BottomLeft,
Bottom, Bottom,
BottomRight BottomRight,
} }
} }
SpriteMapEditor/SpriteMapProject.cs
+16
View File
@@ -0,0 +1,16 @@
using System.Collections.Generic;
using System.Drawing;
using QURO;
namespace SpriteMapEditor
{
public class SpriteMapProject
{
public Image SpriteSheet { get; set; }
public List<SpriteMapRegion> SpriteMap { get; set; }
public SpriteMapProject()
{
}
}
}