Преглед на файлове

renamed clean to cleanofdebug

glscene преди 1 година
родител
ревизия
70fce0dfb4
променени са 3 файла, в които са добавени 34 реда и са изтрити 26 реда
  1. 25 25
      Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm
  2. 9 1
      Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas
  3. 0 0
      _cleanofdebug.cmd

+ 25 - 25
Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm

@@ -164,9 +164,9 @@ object FormGLSViewer: TFormGLSViewer
   end
   object snViewer: TGLSceneViewer
     Left = 267
-    Top = 97
+    Top = 94
     Width = 956
-    Height = 706
+    Height = 709
     Margins.Left = 5
     Margins.Top = 5
     Margins.Right = 5
@@ -177,7 +177,7 @@ object FormGLSViewer: TFormGLSViewer
     Buffer.BackgroundColor = clGray
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow, roTwoSideLighting]
     Buffer.FaceCulling = False
-    FieldOfView = 163.876159667968800000
+    FieldOfView = 163.943496704101600000
     PenAsTouch = False
     OnMouseLeave = snViewerMouseLeave
     Align = alClient
@@ -187,7 +187,7 @@ object FormGLSViewer: TFormGLSViewer
   end
   object ControlBar: TControlBar
     Left = 0
-    Top = 46
+    Top = 43
     Width = 1223
     Height = 51
     Margins.Left = 5
@@ -276,7 +276,7 @@ object FormGLSViewer: TFormGLSViewer
     Left = 0
     Top = 0
     Width = 1223
-    Height = 46
+    Height = 43
     Margins.Left = 5
     Margins.Top = 5
     Margins.Right = 5
@@ -298,9 +298,9 @@ object FormGLSViewer: TFormGLSViewer
   end
   object PanelLeft: TPanel
     Left = 0
-    Top = 97
+    Top = 94
     Width = 267
-    Height = 706
+    Height = 709
     Margins.Left = 5
     Margins.Top = 5
     Margins.Right = 5
@@ -311,7 +311,7 @@ object FormGLSViewer: TFormGLSViewer
       Left = 1
       Top = 1
       Width = 265
-      Height = 704
+      Height = 707
       Margins.Left = 5
       Margins.Top = 5
       Margins.Right = 5
@@ -326,26 +326,26 @@ object FormGLSViewer: TFormGLSViewer
       OnClick = tvSceneClick
       Items.NodeData = {
         071400000009540054007200650065004E006F00640065002B00000000000000
-        00000000FFFFFFFFFFFFFFFF000000000000000000000000000106430061006D
-        006500720061000000350000000100000001000000FFFFFFFFFFFFFFFF000000
+        0000000000000000FFFFFFFF000000000000000000000000000106430061006D
+        00650072006100000035000000010000000100000001000000FFFFFFFF000000
         00000000000000000000010B4C00690067006800740053006F00750072006300
-        65000000310000000200000002000000FFFFFFFFFFFFFFFF0000000000000000
+        6500000031000000020000000200000002000000FFFFFFFF0000000000000000
         00000000000109440075006D006D007900430075006200650000003900000060
         00000060000000FFFFFFFFFFFFFFFF00000000000000000012000000010D4200
         6100730069006300470065006F006D00650074007200790000002B0000000300
-        000003000000FFFFFFFFFFFFFFFF000000000000000000000000000106530070
-        00720069007400650000002B0000000400000004000000FFFFFFFFFFFFFFFF00
+        00000300000003000000FFFFFFFF000000000000000000000000000106530070
+        00720069007400650000002B000000040000000400000004000000FFFFFFFF00
         000000000000000000000000010650006F0069006E0074007300000029000000
-        0500000005000000FFFFFFFFFFFFFFFF0000000000000000000000000001054C
-        0069006E00650073000000290000000600000006000000FFFFFFFFFFFFFFFF00
+        050000000500000005000000FFFFFFFF0000000000000000000000000001054C
+        0069006E0065007300000029000000060000000600000006000000FFFFFFFF00
         000000000000000000000000010550006C0061006E00650000002D0000000700
-        000007000000FFFFFFFFFFFFFFFF00000000000000000000000000010750006F
-        006C00790067006F006E000000270000000800000008000000FFFFFFFFFFFFFF
+        00000700000007000000FFFFFFFF00000000000000000000000000010750006F
+        006C00790067006F006E00000027000000080000000800000008000000FFFFFF
         FF000000000000000000000000000104430075006200650000002D0000000900
-        000009000000FFFFFFFFFFFFFFFF000000000000000000000000000107460072
-        0075007300740075006D0000002B0000000A0000000A000000FFFFFFFFFFFFFF
+        00000900000009000000FFFFFFFF000000000000000000000000000107460072
+        0075007300740075006D0000002B0000000A0000000A0000000A000000FFFFFF
         FF00000000000000000000000000010653007000680065007200650000002700
-        00000B0000000B000000FFFFFFFFFFFFFFFF0000000000000000000000000001
+        00000B0000000B0000000B000000FFFFFFFF0000000000000000000000000001
         044400690073006B000000270000000C0000000C000000FFFFFFFFFFFFFFFF00
         000000000000000000000000010443006F006E00650000002F0000000D000000
         0D000000FFFFFFFFFFFFFFFF000000000000000000000000000108430079006C
@@ -370,7 +370,7 @@ object FormGLSViewer: TFormGLSViewer
         0000000000000000000000000001094100720072006F0077004C0069006E0065
         0000002F0000001700000017000000FFFFFFFFFFFFFFFF000000000000000000
         0000000001084100720072006F00770041007200630000002D00000018000000
-        18000000FFFFFFFFFFFFFFFF00000000000000000000000000010741006E006E
+        1800000018000000FFFFFFFF00000000000000000000000000010741006E006E
         0075006C007500730000003B0000001900000019000000FFFFFFFFFFFFFFFF00
         000000000000000000000000010E45007800740072007500730069006F006E00
         53006F006C00690064000000370000001A0000001A000000FFFFFFFFFFFFFFFF
@@ -521,8 +521,8 @@ object FormGLSViewer: TFormGLSViewer
     end
   end
   object Scene: TGLScene
-    Left = 24
-    Top = 96
+    Left = 518
+    Top = 182
     object Camera: TGLCamera
       DepthOfView = 10000.000000000000000000
       FocalLength = 50.000000000000000000
@@ -590,8 +590,8 @@ object FormGLSViewer: TFormGLSViewer
     Enabled = False
     Mode = cmApplicationIdle
     OnProgress = CadencerProgress
-    Left = 32
-    Top = 152
+    Left = 644
+    Top = 196
   end
   object Timer: TTimer
     Enabled = False

+ 9 - 1
Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -70,7 +70,8 @@ uses
   fGLOptions,
   fGLDialog,
   dImages,
-  dDialogs, GLS.GeomObjects;
+  dDialogs,
+  GLS.GeomObjects;
 
 type
   TFormGLSViewer = class(TGLForm)
@@ -229,6 +230,8 @@ type
     Tetrahedron: TGLTetrahedron;
     SuperEllipsoid: TGLSuperEllipsoid;
 
+    Annulus: TGLAnnulus;
+
     Torus: TGLTorus;
 
     procedure DoResetCamera;
@@ -1238,6 +1241,11 @@ begin
       SuperEllipsoid.Material.FrontProperties.Diffuse.Color := clrTeal;
     end;
     //21...
+    24: // Annulus
+    begin
+      Annulus := TGLAnnulus.CreateAsChild(dcObject);
+      Annulus.Material.FrontProperties.Diffuse.RandomColor();
+    end;
     29: // Torus
     begin
       Torus := TGLTorus.CreateAsChild(dcObject);

+ 0 - 0
_clean.cmd → _cleanofdebug.cmd