Fixed glsviewer loader

Demos.groupproj

@@ -3,10 +3,67 @@
         <ProjectGuid>{47BA3ACE-A42B-4A10-B874-31EE04DA77DE}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
-        <Projects Include="Examples\Demos\DemosD.dproj">
+        <Projects Include="Examples\Demos\behaviours\pdBehaviours.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Examples\Demos\DemosC.cbproj">
+        <Projects Include="Examples\Demos\behaviours\pcBehaviours.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\bench\pdBench.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\bench\pcBench.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\cgshaders\pdCGshaders.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\collisions\pdCollision.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\extrusion\pdExtrusion.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\extrusion\pcExtrusion.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\glslshaders\pdGLSLshaders.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\graph\pdGraph.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\graph\pcGraph.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\interface\pdInterface.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\materials\pdMaterials.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\meshes\pdMeshes.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\movements\pdMovements.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\physics\pdPhysics.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\rendering\pdRendering.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\sound\pdSound.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\specialsFX\pdSpecialsFX.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\sprites\pdSprites.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Examples\Demos\utilities\pdUtilities.dproj">
             <Dependencies/>
         </Projects>
     </ItemGroup>
@@ -17,32 +74,203 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
-    <Target Name="DemosD">
-        <MSBuild Projects="Examples\Demos\DemosD.dproj"/>
+    <Target Name="pdBehaviours">
+        <MSBuild Projects="Examples\Demos\behaviours\pdBehaviours.dproj"/>
+    </Target>
+    <Target Name="pdBehaviours:Clean">
+        <MSBuild Projects="Examples\Demos\behaviours\pdBehaviours.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdBehaviours:Make">
+        <MSBuild Projects="Examples\Demos\behaviours\pdBehaviours.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pcBehaviours">
+        <MSBuild Projects="Examples\Demos\behaviours\pcBehaviours.cbproj"/>
+    </Target>
+    <Target Name="pcBehaviours:Clean">
+        <MSBuild Projects="Examples\Demos\behaviours\pcBehaviours.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pcBehaviours:Make">
+        <MSBuild Projects="Examples\Demos\behaviours\pcBehaviours.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdBench">
+        <MSBuild Projects="Examples\Demos\bench\pdBench.dproj"/>
+    </Target>
+    <Target Name="pdBench:Clean">
+        <MSBuild Projects="Examples\Demos\bench\pdBench.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdBench:Make">
+        <MSBuild Projects="Examples\Demos\bench\pdBench.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pcBench">
+        <MSBuild Projects="Examples\Demos\bench\pcBench.cbproj"/>
+    </Target>
+    <Target Name="pcBench:Clean">
+        <MSBuild Projects="Examples\Demos\bench\pcBench.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pcBench:Make">
+        <MSBuild Projects="Examples\Demos\bench\pcBench.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdCGshaders">
+        <MSBuild Projects="Examples\Demos\cgshaders\pdCGshaders.dproj"/>
+    </Target>
+    <Target Name="pdCGshaders:Clean">
+        <MSBuild Projects="Examples\Demos\cgshaders\pdCGshaders.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdCGshaders:Make">
+        <MSBuild Projects="Examples\Demos\cgshaders\pdCGshaders.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdCollision">
+        <MSBuild Projects="Examples\Demos\collisions\pdCollision.dproj"/>
+    </Target>
+    <Target Name="pdCollision:Clean">
+        <MSBuild Projects="Examples\Demos\collisions\pdCollision.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdCollision:Make">
+        <MSBuild Projects="Examples\Demos\collisions\pdCollision.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdExtrusion">
+        <MSBuild Projects="Examples\Demos\extrusion\pdExtrusion.dproj"/>
+    </Target>
+    <Target Name="pdExtrusion:Clean">
+        <MSBuild Projects="Examples\Demos\extrusion\pdExtrusion.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdExtrusion:Make">
+        <MSBuild Projects="Examples\Demos\extrusion\pdExtrusion.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pcExtrusion">
+        <MSBuild Projects="Examples\Demos\extrusion\pcExtrusion.cbproj"/>
+    </Target>
+    <Target Name="pcExtrusion:Clean">
+        <MSBuild Projects="Examples\Demos\extrusion\pcExtrusion.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pcExtrusion:Make">
+        <MSBuild Projects="Examples\Demos\extrusion\pcExtrusion.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdGLSLshaders">
+        <MSBuild Projects="Examples\Demos\glslshaders\pdGLSLshaders.dproj"/>
+    </Target>
+    <Target Name="pdGLSLshaders:Clean">
+        <MSBuild Projects="Examples\Demos\glslshaders\pdGLSLshaders.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdGLSLshaders:Make">
+        <MSBuild Projects="Examples\Demos\glslshaders\pdGLSLshaders.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdGraph">
+        <MSBuild Projects="Examples\Demos\graph\pdGraph.dproj"/>
+    </Target>
+    <Target Name="pdGraph:Clean">
+        <MSBuild Projects="Examples\Demos\graph\pdGraph.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdGraph:Make">
+        <MSBuild Projects="Examples\Demos\graph\pdGraph.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pcGraph">
+        <MSBuild Projects="Examples\Demos\graph\pcGraph.cbproj"/>
+    </Target>
+    <Target Name="pcGraph:Clean">
+        <MSBuild Projects="Examples\Demos\graph\pcGraph.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pcGraph:Make">
+        <MSBuild Projects="Examples\Demos\graph\pcGraph.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdInterface">
+        <MSBuild Projects="Examples\Demos\interface\pdInterface.dproj"/>
+    </Target>
+    <Target Name="pdInterface:Clean">
+        <MSBuild Projects="Examples\Demos\interface\pdInterface.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdInterface:Make">
+        <MSBuild Projects="Examples\Demos\interface\pdInterface.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdMaterials">
+        <MSBuild Projects="Examples\Demos\materials\pdMaterials.dproj"/>
+    </Target>
+    <Target Name="pdMaterials:Clean">
+        <MSBuild Projects="Examples\Demos\materials\pdMaterials.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdMaterials:Make">
+        <MSBuild Projects="Examples\Demos\materials\pdMaterials.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdMeshes">
+        <MSBuild Projects="Examples\Demos\meshes\pdMeshes.dproj"/>
+    </Target>
+    <Target Name="pdMeshes:Clean">
+        <MSBuild Projects="Examples\Demos\meshes\pdMeshes.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdMeshes:Make">
+        <MSBuild Projects="Examples\Demos\meshes\pdMeshes.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdMovements">
+        <MSBuild Projects="Examples\Demos\movements\pdMovements.dproj"/>
+    </Target>
+    <Target Name="pdMovements:Clean">
+        <MSBuild Projects="Examples\Demos\movements\pdMovements.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdMovements:Make">
+        <MSBuild Projects="Examples\Demos\movements\pdMovements.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdPhysics">
+        <MSBuild Projects="Examples\Demos\physics\pdPhysics.dproj"/>
+    </Target>
+    <Target Name="pdPhysics:Clean">
+        <MSBuild Projects="Examples\Demos\physics\pdPhysics.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdPhysics:Make">
+        <MSBuild Projects="Examples\Demos\physics\pdPhysics.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdRendering">
+        <MSBuild Projects="Examples\Demos\rendering\pdRendering.dproj"/>
+    </Target>
+    <Target Name="pdRendering:Clean">
+        <MSBuild Projects="Examples\Demos\rendering\pdRendering.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdRendering:Make">
+        <MSBuild Projects="Examples\Demos\rendering\pdRendering.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdSound">
+        <MSBuild Projects="Examples\Demos\sound\pdSound.dproj"/>
+    </Target>
+    <Target Name="pdSound:Clean">
+        <MSBuild Projects="Examples\Demos\sound\pdSound.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdSound:Make">
+        <MSBuild Projects="Examples\Demos\sound\pdSound.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdSpecialsFX">
+        <MSBuild Projects="Examples\Demos\specialsFX\pdSpecialsFX.dproj"/>
+    </Target>
+    <Target Name="pdSpecialsFX:Clean">
+        <MSBuild Projects="Examples\Demos\specialsFX\pdSpecialsFX.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="pdSpecialsFX:Make">
+        <MSBuild Projects="Examples\Demos\specialsFX\pdSpecialsFX.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="pdSprites">
+        <MSBuild Projects="Examples\Demos\sprites\pdSprites.dproj"/>
     </Target>
-    <Target Name="DemosD:Clean">
-        <MSBuild Projects="Examples\Demos\DemosD.dproj" Targets="Clean"/>
+    <Target Name="pdSprites:Clean">
+        <MSBuild Projects="Examples\Demos\sprites\pdSprites.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="DemosD:Make">
-        <MSBuild Projects="Examples\Demos\DemosD.dproj" Targets="Make"/>
+    <Target Name="pdSprites:Make">
+        <MSBuild Projects="Examples\Demos\sprites\pdSprites.dproj" Targets="Make"/>
     </Target>
-    <Target Name="DemosC">
-        <MSBuild Projects="Examples\Demos\DemosC.cbproj"/>
+    <Target Name="pdUtilities">
+        <MSBuild Projects="Examples\Demos\utilities\pdUtilities.dproj"/>
     </Target>
-    <Target Name="DemosC:Clean">
-        <MSBuild Projects="Examples\Demos\DemosC.cbproj" Targets="Clean"/>
+    <Target Name="pdUtilities:Clean">
+        <MSBuild Projects="Examples\Demos\utilities\pdUtilities.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="DemosC:Make">
-        <MSBuild Projects="Examples\Demos\DemosC.cbproj" Targets="Make"/>
+    <Target Name="pdUtilities:Make">
+        <MSBuild Projects="Examples\Demos\utilities\pdUtilities.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="DemosD;DemosC"/>
+        <CallTarget Targets="pdBehaviours;pcBehaviours;pdBench;pcBench;pdCGshaders;pdCollision;pdExtrusion;pcExtrusion;pdGLSLshaders;pdGraph;pcGraph;pdInterface;pdMaterials;pdMeshes;pdMovements;pdPhysics;pdRendering;pdSound;pdSpecialsFX;pdSprites;pdUtilities"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="DemosD:Clean;DemosC:Clean"/>
+        <CallTarget Targets="pdBehaviours:Clean;pcBehaviours:Clean;pdBench:Clean;pcBench:Clean;pdCGshaders:Clean;pdCollision:Clean;pdExtrusion:Clean;pcExtrusion:Clean;pdGLSLshaders:Clean;pdGraph:Clean;pcGraph:Clean;pdInterface:Clean;pdMaterials:Clean;pdMeshes:Clean;pdMovements:Clean;pdPhysics:Clean;pdRendering:Clean;pdSound:Clean;pdSpecialsFX:Clean;pdSprites:Clean;pdUtilities:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="DemosD:Make;DemosC:Make"/>
+        <CallTarget Targets="pdBehaviours:Make;pcBehaviours:Make;pdBench:Make;pcBench:Make;pdCGshaders:Make;pdCollision:Make;pdExtrusion:Make;pcExtrusion:Make;pdGLSLshaders:Make;pdGraph:Make;pcGraph:Make;pdInterface:Make;pdMaterials:Make;pdMeshes:Make;pdMovements:Make;pdPhysics:Make;pdRendering:Make;pdSound:Make;pdSpecialsFX:Make;pdSprites:Make;pdUtilities:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Examples/AdvDemos/GLSViewer/Source/fMain.dfm

@@ -1,13 +1,17 @@
 object MainForm: TMainForm
   Left = 188
   Top = 87
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'GLSViewer'
-  ClientHeight = 478
-  ClientWidth = 691
+  ClientHeight = 837
+  ClientWidth = 1223
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Icon.Data = {
@@ -129,42 +133,51 @@ object MainForm: TMainForm
   ShowHint = True
   OnCreate = FormCreate
   OnShow = FormShow
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object StatusBar: TStatusBar
     Left = 0
-    Top = 459
-    Width = 691
-    Height = 19
+    Top = 803
+    Width = 1223
+    Height = 34
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Panels = <
       item
         Text = 'X'
-        Width = 50
+        Width = 88
       end
       item
         Text = 'Y'
-        Width = 50
+        Width = 88
       end
       item
         Text = 'Z'
-        Width = 50
+        Width = 88
       end
       item
         Text = 'Model'
-        Width = 40
+        Width = 70
       end>
   end
   object snViewer: TGLSceneViewer
     Left = 0
-    Top = 59
-    Width = 691
-    Height = 400
+    Top = 97
+    Width = 1223
+    Height = 706
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = Camera
     BeforeRender = snViewerBeforeRender
     AfterRender = snViewerAfterRender
     Buffer.BackgroundColor = clGray
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow, roTwoSideLighting]
     Buffer.FaceCulling = False
-    FieldOfView = 151.927505493164100000
+    FieldOfView = 163.876159667968800000
     PenAsTouch = False
     OnMouseLeave = snViewerMouseLeave
     Align = alClient
@@ -174,16 +187,25 @@ object MainForm: TMainForm
   end
   object ControlBar: TControlBar
     Left = 0
-    Top = 30
-    Width = 691
-    Height = 29
+    Top = 46
+    Width = 1223
+    Height = 51
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alTop
+    RowSize = 46
     TabOrder = 2
     object atbTools: TActionToolBar
-      Left = 349
+      Left = 580
       Top = 2
-      Width = 76
-      Height = 22
+      Width = 113
+      Height = 42
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       ActionManager = ActionManager
       Caption = 'Tools'
       Color = clMenuBar
@@ -193,17 +215,21 @@ object MainForm: TMainForm
       ColorMap.UnusedColor = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
-      Font.Height = -11
+      Font.Height = -19
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
       Spacing = 0
     end
     object atbView: TActionToolBar
-      Left = 108
+      Left = 176
       Top = 2
-      Width = 219
-      Height = 48
+      Width = 383
+      Height = 68
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       ActionManager = ActionManager
       Caption = 'View'
       Color = clMenuBar
@@ -213,17 +239,21 @@ object MainForm: TMainForm
       ColorMap.UnusedColor = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
-      Font.Height = -11
+      Font.Height = -19
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
       Spacing = 0
     end
     object atbFile: TActionToolBar
-      Left = 14
+      Left = 19
       Top = 2
-      Width = 78
-      Height = 22
+      Width = 136
+      Height = 26
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       ActionManager = ActionManager
       Caption = 'File'
       Color = clMenuBar
@@ -233,7 +263,7 @@ object MainForm: TMainForm
       ColorMap.UnusedColor = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
-      Font.Height = -11
+      Font.Height = -19
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
@@ -245,8 +275,12 @@ object MainForm: TMainForm
   object amMenuBar: TActionMainMenuBar
     Left = 0
     Top = 0
-    Width = 691
-    Height = 30
+    Width = 1223
+    Height = 46
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     UseSystemFont = False
     ActionManager = ActionManager
     Caption = 'ActionMainMenuBar'
@@ -257,7 +291,7 @@ object MainForm: TMainForm
     ColorMap.UnusedColor = clWhite
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clBlack
-    Font.Height = -13
+    Font.Height = -23
     Font.Name = 'Segoe UI'
     Font.Style = []
     Spacing = 0

Examples/AdvDemos/GLSViewer/Source/fMain.pas

@@ -192,6 +192,7 @@ type
     procedure acToolsInfoExecute(Sender: TObject);
     procedure snViewerMouseLeave(Sender: TObject);
   private
+    AssetPath: TFileName;
     procedure DoResetCamera;
     procedure SetupFreeFormShading;
     procedure ApplyShadeModeToMaterial(aMaterial: TGLMaterial);
@@ -300,7 +301,7 @@ procedure TMainForm.FormCreate(Sender: TObject);
 begin
   inherited;
  // SetCurrentDir(ExtractFilePath(ParamStr(0)));
-  SetCurrentDirToAsset();
+  AssetPath := GetCurrentAssetPath();
 
   NaviCube := TGLNaviCube.CreateAsChild(Scene.Objects);
   NaviCube.SceneViewer := snViewer;
@@ -316,6 +317,7 @@ begin
   if not nthShow then
   begin
     // using formats supported by gls
+    dmGLSViewer.OpenDialog.InitialDir := AssetPath + '\model';;
     dmGLSViewer.OpenDialog.Filter := VectorFileFormatsFilter;
     dmGLSViewer.SaveDialog.Filter := VectorFileFormatsSaveFilter;
     ApplyFSAA;
@@ -327,11 +329,9 @@ begin
   end;
 end;
 
-procedure TMainForm.acFileExitExecute(Sender: TObject);
-begin
-  Close;
-end;
-
+//
+// OpenDialog
+//
 procedure TMainForm.acFileOpenExecute(Sender: TObject);
 begin
   NaviCube.ActiveMouse := False;
@@ -343,6 +343,7 @@ procedure TMainForm.acFileOpenTexLibExecute(Sender: TObject);
 var
   I: Integer;
 begin
+  dmGLSViewer.ODTextures.InitialDir := AssetPath + '\texture';;
   if dmGLSViewer.ODTextures.Execute then
     with MaterialLib do
     begin
@@ -357,6 +358,7 @@ end;
 
 procedure TMainForm.acFilePickExecute(Sender: TObject);
 begin
+  dmGLSViewer.ODTextures.InitialDir := AssetPath + '\texture';;
   if dmGLSViewer.opDialog.Execute then
   begin
     with MaterialLib.Materials do
@@ -1017,6 +1019,11 @@ begin
 end;
 *)
 
+procedure TMainForm.acFileExitExecute(Sender: TObject);
+begin
+  Close;
+end;
+
 procedure TMainForm.CadencerProgress(Sender: TObject;
   const deltaTime, newTime: Double);
 begin
@@ -1065,4 +1072,5 @@ begin
   inherited;
 end;
 
+
 end.