1
0
mirror of synced 2025-03-02 00:20:37 +01:00

Add choice to reset camera by model or default camera position

This commit is contained in:
KillzXGaming 2019-05-21 18:29:12 -04:00
parent 6d7579e6e0
commit a921e46a8f
11 changed files with 58 additions and 24 deletions

Binary file not shown.

View File

@ -48,6 +48,8 @@
this.resetPoseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetPoseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.reloadShadersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.reloadShadersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toOriginToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toActiveModelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.stContextMenuStrip1.SuspendLayout(); this.stContextMenuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -97,7 +99,7 @@
this.modeToolStripMenuItem, this.modeToolStripMenuItem,
this.orientationToolStripMenuItem}); this.orientationToolStripMenuItem});
this.cameraToolStripMenuItem.Name = "cameraToolStripMenuItem"; this.cameraToolStripMenuItem.Name = "cameraToolStripMenuItem";
this.cameraToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.cameraToolStripMenuItem.Size = new System.Drawing.Size(115, 22);
this.cameraToolStripMenuItem.Text = "Camera"; this.cameraToolStripMenuItem.Text = "Camera";
// //
// modeToolStripMenuItem // modeToolStripMenuItem
@ -106,7 +108,7 @@
this.perspectiveToolStripMenuItem, this.perspectiveToolStripMenuItem,
this.orthographicToolStripMenuItem}); this.orthographicToolStripMenuItem});
this.modeToolStripMenuItem.Name = "modeToolStripMenuItem"; this.modeToolStripMenuItem.Name = "modeToolStripMenuItem";
this.modeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.modeToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
this.modeToolStripMenuItem.Text = "Mode"; this.modeToolStripMenuItem.Text = "Mode";
// //
// perspectiveToolStripMenuItem // perspectiveToolStripMenuItem
@ -133,48 +135,48 @@
this.rightToolStripMenuItem, this.rightToolStripMenuItem,
this.leftToolStripMenuItem}); this.leftToolStripMenuItem});
this.orientationToolStripMenuItem.Name = "orientationToolStripMenuItem"; this.orientationToolStripMenuItem.Name = "orientationToolStripMenuItem";
this.orientationToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.orientationToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
this.orientationToolStripMenuItem.Text = "Orientation"; this.orientationToolStripMenuItem.Text = "Orientation";
// //
// frontToolStripMenuItem // frontToolStripMenuItem
// //
this.frontToolStripMenuItem.Name = "frontToolStripMenuItem"; this.frontToolStripMenuItem.Name = "frontToolStripMenuItem";
this.frontToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.frontToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.frontToolStripMenuItem.Text = "Front"; this.frontToolStripMenuItem.Text = "Front";
this.frontToolStripMenuItem.Click += new System.EventHandler(this.frontToolStripMenuItem_Click); this.frontToolStripMenuItem.Click += new System.EventHandler(this.frontToolStripMenuItem_Click);
// //
// backToolStripMenuItem // backToolStripMenuItem
// //
this.backToolStripMenuItem.Name = "backToolStripMenuItem"; this.backToolStripMenuItem.Name = "backToolStripMenuItem";
this.backToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.backToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.backToolStripMenuItem.Text = "Back"; this.backToolStripMenuItem.Text = "Back";
this.backToolStripMenuItem.Click += new System.EventHandler(this.backToolStripMenuItem_Click); this.backToolStripMenuItem.Click += new System.EventHandler(this.backToolStripMenuItem_Click);
// //
// topToolStripMenuItem // topToolStripMenuItem
// //
this.topToolStripMenuItem.Name = "topToolStripMenuItem"; this.topToolStripMenuItem.Name = "topToolStripMenuItem";
this.topToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.topToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.topToolStripMenuItem.Text = "Top"; this.topToolStripMenuItem.Text = "Top";
this.topToolStripMenuItem.Click += new System.EventHandler(this.topToolStripMenuItem_Click); this.topToolStripMenuItem.Click += new System.EventHandler(this.topToolStripMenuItem_Click);
// //
// bottomToolStripMenuItem // bottomToolStripMenuItem
// //
this.bottomToolStripMenuItem.Name = "bottomToolStripMenuItem"; this.bottomToolStripMenuItem.Name = "bottomToolStripMenuItem";
this.bottomToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.bottomToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.bottomToolStripMenuItem.Text = "Bottom"; this.bottomToolStripMenuItem.Text = "Bottom";
this.bottomToolStripMenuItem.Click += new System.EventHandler(this.bottomToolStripMenuItem_Click); this.bottomToolStripMenuItem.Click += new System.EventHandler(this.bottomToolStripMenuItem_Click);
// //
// rightToolStripMenuItem // rightToolStripMenuItem
// //
this.rightToolStripMenuItem.Name = "rightToolStripMenuItem"; this.rightToolStripMenuItem.Name = "rightToolStripMenuItem";
this.rightToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.rightToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.rightToolStripMenuItem.Text = "Right"; this.rightToolStripMenuItem.Text = "Right";
this.rightToolStripMenuItem.Click += new System.EventHandler(this.rightToolStripMenuItem_Click); this.rightToolStripMenuItem.Click += new System.EventHandler(this.rightToolStripMenuItem_Click);
// //
// leftToolStripMenuItem // leftToolStripMenuItem
// //
this.leftToolStripMenuItem.Name = "leftToolStripMenuItem"; this.leftToolStripMenuItem.Name = "leftToolStripMenuItem";
this.leftToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.leftToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.leftToolStripMenuItem.Text = "Left"; this.leftToolStripMenuItem.Text = "Left";
this.leftToolStripMenuItem.Click += new System.EventHandler(this.leftToolStripMenuItem_Click); this.leftToolStripMenuItem.Click += new System.EventHandler(this.leftToolStripMenuItem_Click);
// //
@ -187,10 +189,12 @@
// //
// resetCameraToolStripMenuItem // resetCameraToolStripMenuItem
// //
this.resetCameraToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toOriginToolStripMenuItem,
this.toActiveModelToolStripMenuItem});
this.resetCameraToolStripMenuItem.Name = "resetCameraToolStripMenuItem"; this.resetCameraToolStripMenuItem.Name = "resetCameraToolStripMenuItem";
this.resetCameraToolStripMenuItem.Size = new System.Drawing.Size(91, 20); this.resetCameraToolStripMenuItem.Size = new System.Drawing.Size(91, 20);
this.resetCameraToolStripMenuItem.Text = "Reset Camera"; this.resetCameraToolStripMenuItem.Text = "Reset Camera";
this.resetCameraToolStripMenuItem.Click += new System.EventHandler(this.resetCameraToolStripMenuItem_Click);
// //
// resetPoseToolStripMenuItem // resetPoseToolStripMenuItem
// //
@ -214,6 +218,20 @@
this.reloadShadersToolStripMenuItem.Text = "Reload Shaders"; this.reloadShadersToolStripMenuItem.Text = "Reload Shaders";
this.reloadShadersToolStripMenuItem.Click += new System.EventHandler(this.reloadShadersToolStripMenuItem_Click); this.reloadShadersToolStripMenuItem.Click += new System.EventHandler(this.reloadShadersToolStripMenuItem_Click);
// //
// toOriginToolStripMenuItem
//
this.toOriginToolStripMenuItem.Name = "toOriginToolStripMenuItem";
this.toOriginToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.toOriginToolStripMenuItem.Text = "To Origin";
this.toOriginToolStripMenuItem.Click += new System.EventHandler(this.toOriginToolStripMenuItem_Click);
//
// toActiveModelToolStripMenuItem
//
this.toActiveModelToolStripMenuItem.Name = "toActiveModelToolStripMenuItem";
this.toActiveModelToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.toActiveModelToolStripMenuItem.Text = "To Active Model";
this.toActiveModelToolStripMenuItem.Click += new System.EventHandler(this.toActiveModelToolStripMenuItem_Click);
//
// Viewport // Viewport
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -251,5 +269,7 @@
private System.Windows.Forms.ToolStripMenuItem bottomToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem bottomToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem rightToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rightToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem leftToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem leftToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toOriginToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toActiveModelToolStripMenuItem;
} }
} }

View File

@ -281,20 +281,6 @@ namespace Switch_Toolbox.Library
{ {
} }
private void resetCameraToolStripMenuItem_Click(object sender, EventArgs e)
{
if (GL_ControlLegacy != null)
{
GL_ControlLegacy.ResetCamera();
GL_ControlLegacy.Refresh();
}
else
{
GL_ControlModern.ResetCamera();
GL_ControlModern.Refresh();
}
}
private void animationLoaderToolStripMenuItem_Click(object sender, EventArgs e) private void animationLoaderToolStripMenuItem_Click(object sender, EventArgs e)
{ {
@ -408,5 +394,33 @@ namespace Switch_Toolbox.Library
UpdateViewport(); UpdateViewport();
} }
private void toOriginToolStripMenuItem_Click(object sender, EventArgs e)
{
if (GL_ControlLegacy != null)
{
GL_ControlLegacy.ResetCamera(false);
GL_ControlLegacy.Refresh();
}
else
{
GL_ControlModern.ResetCamera(false);
GL_ControlModern.Refresh();
}
}
private void toActiveModelToolStripMenuItem_Click(object sender, EventArgs e)
{
if (GL_ControlLegacy != null)
{
GL_ControlLegacy.ResetCamera(true);
GL_ControlLegacy.Refresh();
}
else
{
GL_ControlModern.ResetCamera(true);
GL_ControlModern.Refresh();
}
}
} }
} }

Binary file not shown.

Binary file not shown.