Changeset 488

Timestamp:

12/06/07 11:36:21 (1 year ago)

Author:

phill

Message:

o Viewer WIP stuff.

Files:

• trunk/x42view.net/Gui/ModelWindow.Preview.Topology.cs (modified) (3 diffs)
• trunk/x42view.net/Gui/PreviewOptions.Designer.cs (modified) (12 diffs)
• trunk/x42view.net/Gui/PreviewOptions.cs (modified) (4 diffs)
• trunk/x42view.net/Gui/PreviewOptions.resx (modified) (1 diff)
• trunk/x42view.net/x42view.net.csproj (modified) (1 diff)

trunk/x42view.net/Gui/ModelWindow.Preview.Topology.cs

@@ -278 +278 @@
-                        UploadTopoData();
-
-
+Strip
-                }
-
@@ -300 +300 @@
-                }
-
-
-
-
-
-
+
+
+
+
+
+
-                        {
-                                GenGroupTopology();
-                                UploadTopoData();
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -319 +331 @@
-                                return;
-
-
+Strip
-
-                        Device dev = pn3D.Device;

trunk/x42view.net/Gui/PreviewOptions.Designer.cs

@@ -40 +40 @@
-                        this.pnOpts = new System.Windows.Forms.Panel();
-                        this.gbShaded = new System.Windows.Forms.GroupBox();
+                        this.tbBumpDepth = new System.Windows.Forms.TrackBar();
+                        this.label3 = new System.Windows.Forms.Label();
-                        this.cbShadedUseNMap = new System.Windows.Forms.CheckBox();
-                        this.gbShadedLights = new System.Windows.Forms.GroupBox();
@@ -71 +73 @@
-                        this.cbLighting = new System.Windows.Forms.CheckBox();
-                        this.colorDialog = new System.Windows.Forms.ColorDialog();
-
-
+
+
+
+
+
+
+
+
-                        this.pnOpts.SuspendLayout();
-                        this.gbShaded.SuspendLayout();
+                        ((System.ComponentModel.ISupportInitialize)(this.tbBumpDepth)).BeginInit();
-                        this.gbShadedLights.SuspendLayout();
-                        ((System.ComponentModel.ISupportInitialize)(this.tbKeySpec)).BeginInit();
@@ -82 +91 @@
-                        this.gbGeneral.SuspendLayout();
-                        this.gbFillMode.SuspendLayout();
-
+
+
+
-                        this.SuspendLayout();
-                        // 
@@ -89 +100 @@
-                        this.pnOpts.AutoScroll = true;
-                        this.pnOpts.Controls.Add( this.gbShaded );
+                        this.pnOpts.Controls.Add( this.gbTopology );
-                        this.pnOpts.Controls.Add( this.gbSkel );
-                        this.pnOpts.Controls.Add( this.gbGeneral );
@@ -94 +106 @@
-                        this.pnOpts.Location = new System.Drawing.Point( 0, 25 );
-                        this.pnOpts.Name = "pnOpts";
-593
+779
-                        this.pnOpts.TabIndex = 2;
-                        // 
-                        // gbShaded
-                        // 
+                        this.gbShaded.Controls.Add( this.gbShadedLights );
-                        this.gbShaded.Controls.Add( this.tbBumpDepth );
-                        this.gbShaded.Controls.Add( this.label3 );
-                        this.gbShaded.Controls.Add( this.cbShadedUseNMap );
-                        this.gbShaded.Controls.Add( this.gbShadedLights );
-                        this.gbShaded.Dock = System.Windows.Forms.DockStyle.Top;
-256
+444
-                        this.gbShaded.Name = "gbShaded";
-                        this.gbShaded.Size = new System.Drawing.Size( 307, 334 );
@@ -110 +122 @@
-                        this.gbShaded.TabStop = false;
-                        this.gbShaded.Text = "Shaded View";
+                        // 
+                        // tbBumpDepth
+                        // 
+                        this.tbBumpDepth.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                                                | System.Windows.Forms.AnchorStyles.Right)));
+                        this.tbBumpDepth.AutoSize = false;
+                        this.tbBumpDepth.Location = new System.Drawing.Point( 152, 42 );
+                        this.tbBumpDepth.Maximum = 100;
+                        this.tbBumpDepth.Name = "tbBumpDepth";
+                        this.tbBumpDepth.Size = new System.Drawing.Size( 149, 24 );
+                        this.tbBumpDepth.TabIndex = 2;
+                        this.tbBumpDepth.TickFrequency = 2;
+                        this.tbBumpDepth.TickStyle = System.Windows.Forms.TickStyle.None;
+                        this.tbBumpDepth.Value = 50;
+                        this.tbBumpDepth.ValueChanged += new System.EventHandler( this.tbBumpDepth_ValueChanged );
+                        // 
+                        // label3
+                        // 
+                        this.label3.AutoSize = true;
+                        this.label3.Location = new System.Drawing.Point( 25, 39 );
+                        this.label3.Name = "label3";
+                        this.label3.Size = new System.Drawing.Size( 66, 13 );
+                        this.label3.TabIndex = 6;
+                        this.label3.Text = "Bump Depth";
-                        // 
-                        // cbShadedUseNMap
@@ -370 +406 @@
-                        this.tbBoneSize.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                                                | System.Windows.Forms.AnchorStyles.Right)));
-67
+152
-                        this.tbBoneSize.Name = "tbBoneSize";
-234
+149
-                        this.tbBoneSize.TabIndex = 1;
-                        this.tbBoneSize.TickFrequency = 2;
+                        this.tbBoneSize.TickStyle = System.Windows.Forms.TickStyle.None;
-                        this.tbBoneSize.Value = 5;
-                        this.tbBoneSize.ValueChanged += new System.EventHandler( this.option_ValueChanged );
@@ -494 +531 @@
-                        this.colorDialog.FullOpen = true;
-                        // 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                | System.Windows.Forms.AnchorStyles.Right)));
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        // 
-                        // PreviewOptions
@@ -525 +634 @@
-                        this.Controls.Add( this.pnOpts );
-                        this.Name = "PreviewOptions";
-628
+814
-                        this.ToolImage = global::x42view.Properties.Resources.camera;
-                        this.Controls.SetChildIndex( this.pnOpts, 0 );
@@ -531 +640 @@
-                        this.gbShaded.ResumeLayout( false );
-                        this.gbShaded.PerformLayout();
+                        ((System.ComponentModel.ISupportInitialize)(this.tbBumpDepth)).EndInit();
-                        this.gbShadedLights.ResumeLayout( false );
-                        this.gbShadedLights.PerformLayout();
@@ -542 +652 @@
-                        this.gbFillMode.ResumeLayout( false );
-                        this.gbFillMode.PerformLayout();
-
+
+
+
+
+
-                        this.ResumeLayout( false );
-                        this.PerformLayout();
@@ -585 +699 @@
-                private System.Windows.Forms.TrackBar tbBumpDepth;
-                private System.Windows.Forms.Label label3;
+                private System.Windows.Forms.GroupBox gbTopology;
+                private System.Windows.Forms.GroupBox gbTanBasis;
+                private System.Windows.Forms.CheckBox cbTopoTanBin;
+                private System.Windows.Forms.CheckBox cbTopoNorm;
+                private System.Windows.Forms.GroupBox gbTopoShading;
+                private System.Windows.Forms.RadioButton rbTopoShadeUVs;
+                private System.Windows.Forms.RadioButton rbTopoShadeNone;
+                private System.Windows.Forms.RadioButton rbTopoShadeStrips;
-        }
-}

trunk/x42view.net/Gui/PreviewOptions.cs

@@ -66 +66 @@
-                }
-
+                #region General Options
-                public Color BackgroundColor
-                {
@@ -79 +80 @@
-                {
-                        get { return cbLighting.Checked && cbSpecular.Checked; }
-                }
-
-                public int BoneSize
-                {
-                        get { return tbBoneSize.Value; }
-                }
-
@@ -100 +96 @@
-                        }
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                public Vector3 AmbientLightColor
-                {
@@ -153 +185 @@
-                        }
-                }
+                #endregion
-
-                public event EventHandler OptionChanged;

trunk/x42view.net/Gui/PreviewOptions.resx

@@ -119 +119 @@
-  </resheader>
-  <metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-2
+5
-  </metadata>
-</root>

trunk/x42view.net/x42view.net.csproj

@@ -173 +173 @@
-    </Compile>
-    <Compile Include="Gui\Options.cs">
-Component
+Form
-    </Compile>
-    <Compile Include="Gui\Options.Designer.cs">