Redirected paths to new assets

AdvDemos/AdvDemos.groupproj

@@ -3,6 +3,12 @@
         <ProjectGuid>{02A55F1F-28A9-4F0B-BC74-BAC6D4030B89}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
+        <Projects Include="ActorMS3D\Actorms3dD.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="ActorMS3D\ActorMS3dC.cbproj">
+            <Dependencies/>
+        </Projects>
         <Projects Include="Archipelago\Splitter\SplitterD.dproj">
             <Dependencies/>
         </Projects>
@@ -48,12 +54,6 @@
         <Projects Include="Quake3Demo\Q3DemoC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="ActorMS3D\Actorms3dD.dproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="ActorMS3D\ActorMS3dC.cbproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -62,6 +62,24 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
+    <Target Name="Actorms3dD">
+        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj"/>
+    </Target>
+    <Target Name="Actorms3dD:Clean">
+        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="Actorms3dD:Make">
+        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="ActorMS3dC">
+        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj"/>
+    </Target>
+    <Target Name="ActorMS3dC:Clean">
+        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="ActorMS3dC:Make">
+        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Make"/>
+    </Target>
     <Target Name="SplitterD">
         <MSBuild Projects="Archipelago\Splitter\SplitterD.dproj"/>
     </Target>
@@ -197,32 +215,14 @@
     <Target Name="Q3DemoC:Make">
         <MSBuild Projects="Quake3Demo\Q3DemoC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="Actorms3dD">
-        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj"/>
-    </Target>
-    <Target Name="Actorms3dD:Clean">
-        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="Actorms3dD:Make">
-        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Make"/>
-    </Target>
-    <Target Name="ActorMS3dC">
-        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj"/>
-    </Target>
-    <Target Name="ActorMS3dC:Clean">
-        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="ActorMS3dC:Make">
-        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="SplitterD;SplitterC;ArchipelagoD;ArchipelagoC;ChristmasD;ChristmasC;ForestD;GLSViewerD;IntensityMeshD;IntensityMeshC;PanoViewerD;PanoViewerC;TtbD;Q3DemoD;Q3DemoC;Actorms3dD;ActorMS3dC"/>
+        <CallTarget Targets="Actorms3dD;ActorMS3dC;SplitterD;SplitterC;ArchipelagoD;ArchipelagoC;ChristmasD;ChristmasC;ForestD;GLSViewerD;IntensityMeshD;IntensityMeshC;PanoViewerD;PanoViewerC;TtbD;Q3DemoD;Q3DemoC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="SplitterD:Clean;SplitterC:Clean;ArchipelagoD:Clean;ArchipelagoC:Clean;ChristmasD:Clean;ChristmasC:Clean;ForestD:Clean;GLSViewerD:Clean;IntensityMeshD:Clean;IntensityMeshC:Clean;PanoViewerD:Clean;PanoViewerC:Clean;TtbD:Clean;Q3DemoD:Clean;Q3DemoC:Clean;Actorms3dD:Clean;ActorMS3dC:Clean"/>
+        <CallTarget Targets="Actorms3dD:Clean;ActorMS3dC:Clean;SplitterD:Clean;SplitterC:Clean;ArchipelagoD:Clean;ArchipelagoC:Clean;ChristmasD:Clean;ChristmasC:Clean;ForestD:Clean;GLSViewerD:Clean;IntensityMeshD:Clean;IntensityMeshC:Clean;PanoViewerD:Clean;PanoViewerC:Clean;TtbD:Clean;Q3DemoD:Clean;Q3DemoC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="SplitterD:Make;SplitterC:Make;ArchipelagoD:Make;ArchipelagoC:Make;ChristmasD:Make;ChristmasC:Make;ForestD:Make;GLSViewerD:Make;IntensityMeshD:Make;IntensityMeshC:Make;PanoViewerD:Make;PanoViewerC:Make;TtbD:Make;Q3DemoD:Make;Q3DemoC:Make;Actorms3dD:Make;ActorMS3dC:Make"/>
+        <CallTarget Targets="Actorms3dD:Make;ActorMS3dC:Make;SplitterD:Make;SplitterC:Make;ArchipelagoD:Make;ArchipelagoC:Make;ChristmasD:Make;ChristmasC:Make;ForestD:Make;GLSViewerD:Make;IntensityMeshD:Make;IntensityMeshC:Make;PanoViewerD:Make;PanoViewerC:Make;TtbD:Make;Q3DemoD:Make;Q3DemoC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

AdvDemos/PanoramViewer/fPanoViewerC.cpp

@@ -24,7 +24,9 @@ __fastcall TForm1::TForm1(TComponent* Owner) : TForm(Owner) {}
 //---------------------------------------------------------------------------
 void __fastcall TForm1::BtnLoadClick(TObject* Sender)
 {
-	OpenPictureDialog1->InitialDir = ExtractFilePath(ParamStr(0));
+	TFileName Path = GetCurrentAssetPath();
+//	OpenPictureDialog1->InitialDir = ExtractFilePath(ParamStr(0));
+	OpenPictureDialog1->InitialDir = Path + "\\Panorama";
 	OpenPictureDialog1->FileName = "sejourstmathieu2048.jpg";
     if (OpenPictureDialog1->Execute())
         GLMaterialLibrary1->Materials->Items[0]

AdvDemos/PanoramViewer/fPanoViewerC.dfm

@@ -2,12 +2,12 @@ object Form1: TForm1
   Left = 201
   Top = 129
   Caption = 'Simple Spherical Pano Viewer - Use mouse or arrow keys to pan'
-  ClientHeight = 431
-  ClientWidth = 793
+  ClientHeight = 267
+  ClientWidth = 504
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -14
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   KeyPreview = True
@@ -15,87 +15,121 @@ object Form1: TForm1
   WindowState = wsMaximized
   OnKeyDown = FormKeyDown
   OnMouseWheel = FormMouseWheel
-  PixelsPerInch = 120
-  TextHeight = 16
+  TextHeight = 13
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 58
-    Width = 793
-    Height = 373
+    Top = 46
+    Width = 504
+    Height = 221
     Cursor = crHandPoint
+    Margins.Left = 2
+    Margins.Top = 2
+    Margins.Right = 2
+    Margins.Bottom = 2
     Camera = GLCamera1
     Buffer.FaceCulling = False
     Buffer.Lighting = False
-    FieldOfView = 155.789505004882800000
+    FieldOfView = 140.200408935546900000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove
     TabOrder = 0
+    ExplicitWidth = 634
+    ExplicitHeight = 299
   end
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 793
-    Height = 58
+    Width = 504
+    Height = 46
+    Margins.Left = 2
+    Margins.Top = 2
+    Margins.Right = 2
+    Margins.Bottom = 2
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
-    Font.Height = -15
+    Font.Height = -12
     Font.Name = 'Arial'
     Font.Style = []
     ParentFont = False
     TabOrder = 1
+    ExplicitWidth = 634
     object LabelYaw: TLabel
-      Left = 311
-      Top = 10
-      Width = 43
-      Height = 17
+      Left = 249
+      Top = 8
+      Width = 35
+      Height = 15
+      Margins.Left = 2
+      Margins.Top = 2
+      Margins.Right = 2
+      Margins.Bottom = 2
       Caption = 'Yaw: 0'
     end
     object LabelPitch: TLabel
-      Left = 311
-      Top = 30
-      Width = 49
-      Height = 17
+      Left = 249
+      Top = 24
+      Width = 40
+      Height = 15
+      Margins.Left = 2
+      Margins.Top = 2
+      Margins.Right = 2
+      Margins.Bottom = 2
       Caption = 'Pitch: 0'
     end
     object Label1: TLabel
-      Left = 141
-      Top = 10
-      Width = 84
-      Height = 17
+      Left = 113
+      Top = 8
+      Width = 71
+      Height = 15
+      Margins.Left = 2
+      Margins.Top = 2
+      Margins.Right = 2
+      Margins.Bottom = 2
       Caption = 'Focal Length'
     end
     object Label2: TLabel
-      Left = 411
-      Top = 10
-      Width = 221
-      Height = 34
+      Left = 329
+      Top = 8
+      Width = 188
+      Height = 30
+      Margins.Left = 2
+      Margins.Top = 2
+      Margins.Right = 2
+      Margins.Bottom = 2
       Caption = 'Hold left mouse button to pan'#13#10'Zoom in/out with the mouse wheel'
     end
     object BtnLoad: TButton
-      Left = 10
-      Top = 10
-      Width = 111
-      Height = 38
+      Left = 8
+      Top = 8
+      Width = 89
+      Height = 30
+      Margins.Left = 2
+      Margins.Top = 2
+      Margins.Right = 2
+      Margins.Bottom = 2
       Caption = 'Load Image...'
       TabOrder = 0
       OnClick = BtnLoadClick
     end
     object TrackBar1: TTrackBar
-      Left = 135
-      Top = 29
-      Width = 158
-      Height = 20
+      Left = 108
+      Top = 23
+      Width = 126
+      Height = 16
+      Margins.Left = 2
+      Margins.Top = 2
+      Margins.Right = 2
+      Margins.Bottom = 2
       Max = 100
       Min = 10
       Frequency = 10
       Position = 40
       TabOrder = 1
-      ThumbLength = 13
+      ThumbLength = 10
       TickMarks = tmBoth
       TickStyle = tsNone
       OnChange = TrackBar1Change

AdvDemos/PanoramViewer/fPanoViewerD.dfm

@@ -2,34 +2,29 @@ object Form1: TForm1
   Left = 201
   Top = 129
   Caption = 'Simple Spherical Pano Viewer'
-  ClientHeight = 431
-  ClientWidth = 663
+  ClientHeight = 345
+  ClientWidth = 530
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -14
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   KeyPreview = True
   OnCreate = FormCreate
   OnKeyDown = FormKeyDown
   OnMouseWheel = FormMouseWheel
-  PixelsPerInch = 120
-  TextHeight = 16
+  TextHeight = 13
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 58
-    Width = 663
-    Height = 373
+    Top = 46
+    Width = 530
+    Height = 299
     Cursor = crHandPoint
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
     Camera = GLCamera1
     Buffer.FaceCulling = False
     Buffer.Lighting = False
-    FieldOfView = 155.789505004882800000
+    FieldOfView = 150.041778564453100000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
@@ -39,94 +34,66 @@ object Form1: TForm1
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 663
-    Height = 58
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Width = 530
+    Height = 46
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
-    Font.Height = -14
+    Font.Height = -11
     Font.Name = 'Arial'
     Font.Style = []
     ParentFont = False
     TabOrder = 1
     object LabelYaw: TLabel
-      Left = 311
-      Top = 10
-      Width = 41
-      Height = 16
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 249
+      Top = 8
+      Width = 35
+      Height = 14
       Caption = 'Yaw: 0'
     end
     object LabelPitch: TLabel
-      Left = 311
-      Top = 30
-      Width = 47
-      Height = 16
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 249
+      Top = 24
+      Width = 35
+      Height = 14
       Caption = 'Pitch: 0'
     end
     object Label1: TLabel
-      Left = 141
-      Top = 10
-      Width = 83
-      Height = 16
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 113
+      Top = 8
+      Width = 62
+      Height = 14
       Caption = 'Focal Length'
     end
     object Label2: TLabel
-      Left = 411
-      Top = 10
-      Width = 212
-      Height = 32
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 329
+      Top = 8
+      Width = 166
+      Height = 28
       Caption = 'Hold left mouse button to pan'#13#10'Zoom in/out with the mouse wheel'
     end
     object BtnLoad: TButton
-      Left = 10
-      Top = 10
-      Width = 111
-      Height = 38
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 8
+      Top = 8
+      Width = 89
+      Height = 30
       Caption = 'Load Image...'
       TabOrder = 0
       OnClick = BtnLoadClick
     end
     object TrackBar1: TTrackBar
-      Left = 135
-      Top = 29
-      Width = 158
-      Height = 20
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 108
+      Top = 23
+      Width = 126
+      Height = 16
       Max = 100
       Min = 10
       Frequency = 10
       Position = 40
       TabOrder = 1
-      ThumbLength = 13
+      ThumbLength = 10
       TickMarks = tmBoth
       TickStyle = tsNone
       OnChange = TrackBar1Change

AdvDemos/PanoramViewer/fPanoViewerD.pas

@@ -28,8 +28,8 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLS.BaseClasses,
-  GLS.Utils,
-  GLS.VectorGeometry;
+  GLS.VectorGeometry,
+  GLS.Utils;
 
 type
   TForm1 = class(TForm)
@@ -60,7 +60,7 @@ type
       const deltaTime, newTime: Double);
     procedure FormCreate(Sender: TObject);
   private
-     
+
     mx, my: Integer;
     pitch, yaw: single; // in degree
     procedure PanCameraAround(dx, dy: single);
@@ -100,6 +100,8 @@ end;
 
 procedure TForm1.BtnLoadClick(Sender: TObject);
 begin
+  var Path: TFileName := GetCurrentAssetPath();
+  OpenPictureDialog1.InitialDir := Path + '\Panorama';
   with OpenPictureDialog1 do
     if Execute then
       GLMaterialLibrary1.Materials[0].Material.Texture.Image.LoadFromFile

Demos/cgshaders/texturing/fCgTextureC.cpp

@@ -41,7 +41,7 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
   GLMatLib->Materials->Items[0]->Material->Texture->Image->LoadFromFile("moon.bmp");
   GLMatLib->Materials->Items[1]->Material->Texture->Image->LoadFromFile("clover.jpg");
   GLMatLib->Materials->Items[2]->Material->Texture->Image->LoadFromFile("marbletiles.jpg");
-  GLMatLib->Materials->Items[3]->Material->Texture->Image->LoadFromFile("earth.png");
+  GLMatLib->Materials->Items[3]->Material->Texture->Image->LoadFromFile("earth.jpg");
 }
 //---------------------------------------------------------------------------
 void __fastcall TForm1::CgShader1Initialize(TCustomCgShader *CgShader)

Demos/cgshaders/texturing/fCgTextureD.pas

@@ -167,7 +167,7 @@ begin
     Materials[0].Material.Texture.Image.LoadFromFile('moon.bmp');
     Materials[1].Material.Texture.Image.LoadFromFile('clover.jpg');
     Materials[2].Material.Texture.Image.LoadFromFile('marbletiles.jpg');
-    Materials[3].Material.Texture.Image.LoadFromFile('earth.png');
+    Materials[3].Material.Texture.Image.LoadFromFile('earth.jpg');
   end;
 end;