Changed layout of 3D object preview.

git-svn-id: https://radegast.googlecode.com/svn/trunk@832 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/GUI/Dialogs/PrimWorkshop.Designer.cs b/Radegast/GUI/Dialogs/PrimWorkshop.Designer.cs
index 6d01c10..e130ef0 100644 (file)
--- a/Radegast/GUI/Dialogs/PrimWorkshop.Designer.cs
+++ b/Radegast/GUI/Dialogs/PrimWorkshop.Designer.cs
@@ -60,47 +60,17 @@ namespace Radegast
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPrimWorkshop));
-            this.splitContainer = new System.Windows.Forms.SplitContainer();
             this.glControl = new Tao.Platform.Windows.SimpleOpenGlControl();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
-            this.cboFace = new System.Windows.Forms.ComboBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label1 = new System.Windows.Forms.Label();
-            this.cboPrim = new System.Windows.Forms.ComboBox();
             this.scrollRoll = new System.Windows.Forms.HScrollBar();
             this.scrollPitch = new System.Windows.Forms.HScrollBar();
             this.scrollYaw = new System.Windows.Forms.HScrollBar();
-            this.picTexture = new System.Windows.Forms.PictureBox();
             this.scrollZoom = new System.Windows.Forms.HScrollBar();
+            this.gbZoom = new System.Windows.Forms.GroupBox();
             this.chkWireFrame = new System.Windows.Forms.CheckBox();
-            this.splitContainer.Panel1.SuspendLayout();
-            this.splitContainer.Panel2.SuspendLayout();
-            this.splitContainer.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.panel2.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.picTexture)).BeginInit();
+            this.label1 = new System.Windows.Forms.Label();
+            this.gbZoom.SuspendLayout();
             this.SuspendLayout();
             // 
-            // splitContainer
-            // 
-            this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer.Name = "splitContainer";
-            // 
-            // splitContainer.Panel1
-            // 
-            this.splitContainer.Panel1.Controls.Add(this.glControl);
-            // 
-            // splitContainer.Panel2
-            // 
-            this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel1);
-            this.splitContainer.Size = new System.Drawing.Size(996, 536);
-            this.splitContainer.SplitterDistance = 550;
-            this.splitContainer.TabIndex = 6;
-            // 
             // glControl
             // 
             this.glControl.AccumBits = ((byte)(0));
@@ -108,219 +78,121 @@ namespace Radegast
             this.glControl.AutoFinish = false;
             this.glControl.AutoMakeCurrent = true;
             this.glControl.AutoSwapBuffers = true;
-            this.glControl.BackColor = System.Drawing.Color.Black;
+            this.glControl.BackColor = System.Drawing.SystemColors.Control;
             this.glControl.ColorBits = ((byte)(32));
             this.glControl.DepthBits = ((byte)(16));
             this.glControl.Dock = System.Windows.Forms.DockStyle.Fill;
             this.glControl.Location = new System.Drawing.Point(0, 0);
             this.glControl.Name = "glControl";
-            this.glControl.Size = new System.Drawing.Size(550, 536);
+            this.glControl.Size = new System.Drawing.Size(644, 549);
             this.glControl.StencilBits = ((byte)(0));
             this.glControl.TabIndex = 5;
             this.glControl.Paint += new System.Windows.Forms.PaintEventHandler(this.glControl_Paint);
+            this.glControl.MouseMove += new System.Windows.Forms.MouseEventHandler(this.glControl_MouseMove);
+            this.glControl.MouseDown += new System.Windows.Forms.MouseEventHandler(this.glControl_MouseDown);
             this.glControl.Resize += new System.EventHandler(this.glControl_Resize);
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel1.ColumnCount = 1;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 5);
-            this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 4);
-            this.tableLayoutPanel1.Controls.Add(this.scrollRoll, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.scrollPitch, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.scrollYaw, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.picTexture, 0, 6);
-            this.tableLayoutPanel1.Controls.Add(this.scrollZoom, 0, 3);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 7;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 24F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(442, 536);
-            this.tableLayoutPanel1.TabIndex = 9;
-            // 
-            // panel2
-            // 
-            this.panel2.Controls.Add(this.label2);
-            this.panel2.Controls.Add(this.cboFace);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(3, 117);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(436, 24);
-            this.panel2.TabIndex = 16;
-            // 
-            // label2
-            // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)));
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(4, 5);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(34, 13);
-            this.label2.TabIndex = 16;
-            this.label2.Text = "Face:";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // cboFace
-            // 
-            this.cboFace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cboFace.FormattingEnabled = true;
-            this.cboFace.Location = new System.Drawing.Point(40, 2);
-            this.cboFace.Name = "cboFace";
-            this.cboFace.Size = new System.Drawing.Size(174, 21);
-            this.cboFace.TabIndex = 15;
-            this.cboFace.SelectedIndexChanged += new System.EventHandler(this.cboFace_SelectedIndexChanged);
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.chkWireFrame);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.cboPrim);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(3, 87);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(436, 24);
-            this.panel1.TabIndex = 15;
-            // 
-            // label1
-            // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)));
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(4, 5);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(30, 13);
-            this.label1.TabIndex = 16;
-            this.label1.Text = "Prim:";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // cboPrim
-            // 
-            this.cboPrim.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cboPrim.FormattingEnabled = true;
-            this.cboPrim.Location = new System.Drawing.Point(40, 2);
-            this.cboPrim.Name = "cboPrim";
-            this.cboPrim.Size = new System.Drawing.Size(174, 21);
-            this.cboPrim.TabIndex = 15;
-            this.cboPrim.SelectedIndexChanged += new System.EventHandler(this.cboPrim_SelectedIndexChanged);
+            this.glControl.MouseUp += new System.Windows.Forms.MouseEventHandler(this.glControl_MouseUp);
             // 
             // scrollRoll
             // 
-            this.scrollRoll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.scrollRoll.Location = new System.Drawing.Point(0, 2);
+            this.scrollRoll.Location = new System.Drawing.Point(9, 13);
             this.scrollRoll.Maximum = 360;
             this.scrollRoll.Name = "scrollRoll";
-            this.scrollRoll.Size = new System.Drawing.Size(442, 16);
+            this.scrollRoll.Size = new System.Drawing.Size(200, 16);
             this.scrollRoll.TabIndex = 9;
             this.scrollRoll.ValueChanged += new System.EventHandler(this.scroll_ValueChanged);
             // 
             // scrollPitch
             // 
-            this.scrollPitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.scrollPitch.Location = new System.Drawing.Point(0, 22);
+            this.scrollPitch.Location = new System.Drawing.Point(219, 13);
             this.scrollPitch.Maximum = 360;
             this.scrollPitch.Name = "scrollPitch";
-            this.scrollPitch.Size = new System.Drawing.Size(442, 16);
+            this.scrollPitch.Size = new System.Drawing.Size(200, 16);
             this.scrollPitch.TabIndex = 10;
             this.scrollPitch.ValueChanged += new System.EventHandler(this.scroll_ValueChanged);
             // 
             // scrollYaw
             // 
-            this.scrollYaw.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.scrollYaw.Location = new System.Drawing.Point(0, 42);
+            this.scrollYaw.Location = new System.Drawing.Point(428, 13);
             this.scrollYaw.Maximum = 360;
             this.scrollYaw.Name = "scrollYaw";
-            this.scrollYaw.Size = new System.Drawing.Size(442, 16);
+            this.scrollYaw.Size = new System.Drawing.Size(200, 16);
             this.scrollYaw.TabIndex = 11;
             this.scrollYaw.ValueChanged += new System.EventHandler(this.scroll_ValueChanged);
             // 
-            // picTexture
-            // 
-            this.picTexture.BackColor = System.Drawing.Color.Black;
-            this.picTexture.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.picTexture.Location = new System.Drawing.Point(3, 147);
-            this.picTexture.Name = "picTexture";
-            this.picTexture.Size = new System.Drawing.Size(436, 386);
-            this.picTexture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picTexture.TabIndex = 17;
-            this.picTexture.TabStop = false;
-            this.picTexture.MouseLeave += new System.EventHandler(this.picTexture_MouseLeave);
-            this.picTexture.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picTexture_MouseMove);
-            this.picTexture.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picTexture_MouseDown);
-            this.picTexture.Paint += new System.Windows.Forms.PaintEventHandler(this.picTexture_Paint);
-            this.picTexture.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picTexture_MouseUp);
-            // 
             // scrollZoom
             // 
-            this.scrollZoom.Dock = System.Windows.Forms.DockStyle.Fill;
             this.scrollZoom.LargeChange = 1;
-            this.scrollZoom.Location = new System.Drawing.Point(0, 60);
+            this.scrollZoom.Location = new System.Drawing.Point(428, 29);
             this.scrollZoom.Maximum = 0;
-            this.scrollZoom.Minimum = -200;
+            this.scrollZoom.Minimum = -300;
             this.scrollZoom.Name = "scrollZoom";
-            this.scrollZoom.Size = new System.Drawing.Size(442, 24);
+            this.scrollZoom.Size = new System.Drawing.Size(200, 16);
             this.scrollZoom.TabIndex = 19;
             this.scrollZoom.Value = -50;
             this.scrollZoom.ValueChanged += new System.EventHandler(this.scrollZoom_ValueChanged);
             // 
+            // gbZoom
+            // 
+            this.gbZoom.Controls.Add(this.chkWireFrame);
+            this.gbZoom.Controls.Add(this.label1);
+            this.gbZoom.Controls.Add(this.scrollZoom);
+            this.gbZoom.Controls.Add(this.scrollYaw);
+            this.gbZoom.Controls.Add(this.scrollPitch);
+            this.gbZoom.Controls.Add(this.scrollRoll);
+            this.gbZoom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.gbZoom.Location = new System.Drawing.Point(0, 549);
+            this.gbZoom.Name = "gbZoom";
+            this.gbZoom.Size = new System.Drawing.Size(644, 56);
+            this.gbZoom.TabIndex = 8;
+            this.gbZoom.TabStop = false;
+            // 
             // chkWireFrame
             // 
             this.chkWireFrame.AutoSize = true;
-            this.chkWireFrame.Location = new System.Drawing.Point(274, 4);
+            this.chkWireFrame.Location = new System.Drawing.Point(9, 31);
             this.chkWireFrame.Name = "chkWireFrame";
             this.chkWireFrame.Size = new System.Drawing.Size(74, 17);
-            this.chkWireFrame.TabIndex = 17;
+            this.chkWireFrame.TabIndex = 21;
             this.chkWireFrame.Text = "Wireframe";
             this.chkWireFrame.UseVisualStyleBackColor = true;
             this.chkWireFrame.CheckedChanged += new System.EventHandler(this.chkWireFrame_CheckedChanged);
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(293, 32);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(132, 13);
+            this.label1.TabIndex = 20;
+            this.label1.Text = "Zoom (mouse scroll wheel)";
+            // 
             // frmPrimWorkshop
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(996, 536);
-            this.Controls.Add(this.splitContainer);
+            this.ClientSize = new System.Drawing.Size(644, 605);
+            this.Controls.Add(this.glControl);
+            this.Controls.Add(this.gbZoom);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "frmPrimWorkshop";
             this.Text = "Prim Workshop";
-            this.splitContainer.Panel1.ResumeLayout(false);
-            this.splitContainer.Panel2.ResumeLayout(false);
-            this.splitContainer.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.panel2.ResumeLayout(false);
-            this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.picTexture)).EndInit();
+            this.gbZoom.ResumeLayout(false);
+            this.gbZoom.PerformLayout();
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        public System.Windows.Forms.SplitContainer splitContainer;
         public Tao.Platform.Windows.SimpleOpenGlControl glControl;
-        public System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         public System.Windows.Forms.HScrollBar scrollRoll;
         public System.Windows.Forms.HScrollBar scrollPitch;
         public System.Windows.Forms.HScrollBar scrollYaw;
-        public System.Windows.Forms.Panel panel2;
-        public System.Windows.Forms.Label label2;
-        public System.Windows.Forms.ComboBox cboFace;
-        public System.Windows.Forms.Panel panel1;
-        public System.Windows.Forms.Label label1;
-        public System.Windows.Forms.ComboBox cboPrim;
-        public System.Windows.Forms.PictureBox picTexture;
         public System.Windows.Forms.HScrollBar scrollZoom;
+        public System.Windows.Forms.GroupBox gbZoom;
         private System.Windows.Forms.CheckBox chkWireFrame;
+        private System.Windows.Forms.Label label1;
 
     }
 }

diff --git a/Radegast/GUI/Dialogs/PrimWorkshop.cs b/Radegast/GUI/Dialogs/PrimWorkshop.cs
index a217733..a387655 100644 (file)
--- a/Radegast/GUI/Dialogs/PrimWorkshop.cs
+++ b/Radegast/GUI/Dialogs/PrimWorkshop.cs
@@ -53,8 +53,6 @@ namespace Radegast
         #region Form Globals
 
         List<FacetedMesh> Prims = null;
-        FacetedMesh CurrentPrim = null;
-        ProfileFace? CurrentFace = null;
 
         bool DraggingTexture = false;
         bool Wireframe = false;
@@ -102,22 +100,23 @@ namespace Radegast
             Client.Objects.ObjectUpdate += new EventHandler<PrimEventArgs>(Objects_ObjectUpdate);
         }
 
-        void Objects_ObjectUpdate(object sender, PrimEventArgs e)
-        {
-            if (null != Prims.Find(fm => fm.Prim.LocalID == e.Prim.LocalID))
-            {
-                SafeInvalidate();
-            }
-        }
-
         void frmPrimWorkshop_Disposed(object sender, EventArgs e)
         {
             Client.Objects.TerseObjectUpdate -= new EventHandler<TerseObjectUpdateEventArgs>(Objects_TerseObjectUpdate);
+            Client.Objects.ObjectUpdate -= new EventHandler<PrimEventArgs>(Objects_ObjectUpdate);
         }
 
         void Objects_TerseObjectUpdate(object sender, TerseObjectUpdateEventArgs e)
         {
-            if (null != Prims.Find(fm => fm.Prim.LocalID == e.Update.LocalID))
+            if (Prims != null && null != Prims.Find(fm => fm.Prim.LocalID == e.Update.LocalID))
+            {
+                SafeInvalidate();
+            }
+        }
+
+        void Objects_ObjectUpdate(object sender, PrimEventArgs e)
+        {
+            if (Prims != null && null != Prims.Find(fm => fm.Prim.LocalID == e.Prim.LocalID))
             {
                 SafeInvalidate();
             }
@@ -292,14 +291,15 @@ namespace Radegast
 
         void glControl_MouseWheel(object sender, MouseEventArgs e)
         {
-            try
+            int newVal = scrollZoom.Value + e.Delta / 5;
+            if (newVal < scrollZoom.Minimum) newVal = scrollZoom.Minimum;
+            if (newVal > scrollZoom.Maximum) newVal = scrollZoom.Maximum;
+            if (scrollZoom.Value != newVal)
             {
-                scrollZoom.Value += e.Delta / 15;
+                scrollZoom.Value = newVal;
+                glControl_Resize(null, null);
+                glControl.Invalidate();
             }
-            catch (Exception) { }
-
-            glControl_Resize(null, null);
-            glControl.Invalidate();
         }
         #endregion GLControl Callbacks
 
@@ -435,7 +435,7 @@ namespace Radegast
             }
             catch (Exception ex)
             {
-                Logger.Log("Failed to decode mesh asset", Helpers.LogLevel.Warning, Client);
+                Logger.Log("Failed to decode mesh asset: " + ex.Message, Helpers.LogLevel.Warning, Client);
             }
             return ret;
         }
@@ -695,53 +695,59 @@ namespace Radegast
 
         #endregion PictureBox Callbacks
 
-        private void cboPrim_SelectedIndexChanged(object sender, EventArgs e)
+        private void chkWireFrame_CheckedChanged(object sender, EventArgs e)
         {
-            CurrentPrim = (FacetedMesh)cboPrim.Items[cboPrim.SelectedIndex];
-            PopulateFaceCombobox();
-
-            glControl.Invalidate();
+            Wireframe = chkWireFrame.Checked;
+            SafeInvalidate();
         }
 
-        private void cboFace_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            CurrentFace = (ProfileFace)cboFace.Items[cboFace.SelectedIndex];
-
-            glControl.Invalidate();
-        }
+        bool dragging = false;
+        int dragX, dragY, downX, downY;
 
-        private void PopulatePrimCombobox()
+        private void glControl_MouseDown(object sender, MouseEventArgs e)
         {
-            cboPrim.Items.Clear();
-
-            if (Prims != null)
+            if (e.Button == MouseButtons.Left)
             {
-                for (int i = 0; i < Prims.Count; i++)
-                    cboPrim.Items.Add(Prims[i]);
+                dragging = true;
+                downX = dragX = e.X;
+                downY = dragY = e.Y;
             }
 
-            if (cboPrim.Items.Count > 0)
-                cboPrim.SelectedIndex = 0;
         }
 
-        private void PopulateFaceCombobox()
+        private void glControl_MouseMove(object sender, MouseEventArgs e)
         {
-            cboFace.Items.Clear();
-
-            if (CurrentPrim != null)
+            if (dragging)
             {
-                for (int i = 0; i < CurrentPrim.Profile.Faces.Count; i++)
-                    cboFace.Items.Add(CurrentPrim.Profile.Faces[i]);
-            }
+                int deltaX = e.X - dragX;
+                int deltaY = e.Y - dragY;
+
+                int newRoll = scrollRoll.Value + deltaY;
+                if (newRoll < 0) newRoll += 360;
+                if (newRoll > 360) newRoll -= 360;
 
-            if (cboFace.Items.Count > 0)
-                cboFace.SelectedIndex = 0;
+                scrollRoll.Value = newRoll;
+
+
+                int newYaw = scrollYaw.Value + deltaX;
+                if (newYaw < 0) newYaw += 360;
+                if (newYaw > 360) newYaw -= 360;
+
+                scrollYaw.Value = newYaw;
+                
+                dragX = e.X;
+                dragY = e.Y;
+                SafeInvalidate();
+            }
         }
 
-        private void chkWireFrame_CheckedChanged(object sender, EventArgs e)
+        private void glControl_MouseUp(object sender, MouseEventArgs e)
         {
-            Wireframe = chkWireFrame.Checked;
-            SafeInvalidate();
+            if (e.Button == MouseButtons.Left)
+            {
+                dragging = false;
+                SafeInvalidate();
+            }
         }
 
     }