|
@@ -26,7 +26,7 @@ uses
|
|
GLS.Objects,
|
|
GLS.Objects,
|
|
GLS.Tree,
|
|
GLS.Tree,
|
|
GLS.Keyboard,
|
|
GLS.Keyboard,
|
|
- GLS.VectorLists,
|
|
|
|
|
|
+ GLScene.VectorLists,
|
|
GLS.BitmapFont,
|
|
GLS.BitmapFont,
|
|
GLS.Context,
|
|
GLS.Context,
|
|
GLS.WindowsFont,
|
|
GLS.WindowsFont,
|
|
@@ -35,10 +35,10 @@ uses
|
|
GLS.Imposter,
|
|
GLS.Imposter,
|
|
GLS.ParticleFX,
|
|
GLS.ParticleFX,
|
|
GLS.Graphics,
|
|
GLS.Graphics,
|
|
- GLS.PersistentClasses,
|
|
|
|
|
|
+ GLScene.PersistentClasses,
|
|
GLS.PipelineTransformation,
|
|
GLS.PipelineTransformation,
|
|
GLS.XOpenGL,
|
|
GLS.XOpenGL,
|
|
- GLS.BaseClasses,
|
|
|
|
|
|
+ GLScene.BaseClasses,
|
|
GLS.TextureCombiners,
|
|
GLS.TextureCombiners,
|
|
GLS.TextureFormat,
|
|
GLS.TextureFormat,
|
|
GLS.Material,
|
|
GLS.Material,
|
|
@@ -92,7 +92,7 @@ type
|
|
function SIBTreeLoadingImposter(Sender: TObject; impostoredObject: TGLBaseSceneObject;
|
|
function SIBTreeLoadingImposter(Sender: TObject; impostoredObject: TGLBaseSceneObject;
|
|
destImposter: TImposter): TGLBitmap32;
|
|
destImposter: TImposter): TGLBitmap32;
|
|
procedure Timer1Timer(Sender: TObject);
|
|
procedure Timer1Timer(Sender: TObject);
|
|
- procedure PFXTreesProgress(Sender: TObject; const progressTime: TGLProgressTimes;
|
|
|
|
|
|
+ procedure PFXTreesProgress(Sender: TObject; const progressTime: TGProgressTimes;
|
|
var defaultProgress: Boolean);
|
|
var defaultProgress: Boolean);
|
|
function PFXTreesGetParticleCountEvent(Sender: TObject): Integer;
|
|
function PFXTreesGetParticleCountEvent(Sender: TObject): Integer;
|
|
procedure FormResize(Sender: TObject);
|
|
procedure FormResize(Sender: TObject);
|
|
@@ -110,7 +110,7 @@ type
|
|
Path: TFileName;
|
|
Path: TFileName;
|
|
TestTree: TGLTree;
|
|
TestTree: TGLTree;
|
|
TreesShown: Integer;
|
|
TreesShown: Integer;
|
|
- nearTrees: TGLPersistentObjectList;
|
|
|
|
|
|
+ nearTrees: TGPersistentObjectList;
|
|
Imposter: TImposter;
|
|
Imposter: TImposter;
|
|
densityBitmap: TBitmap;
|
|
densityBitmap: TBitmap;
|
|
mirrorTexture: TGLTextureHandle;
|
|
mirrorTexture: TGLTextureHandle;
|
|
@@ -216,7 +216,7 @@ begin
|
|
SetCursorPos(lmp.X, lmp.Y);
|
|
SetCursorPos(lmp.X, lmp.Y);
|
|
ShowCursor(False);
|
|
ShowCursor(False);
|
|
|
|
|
|
- nearTrees := TGLPersistentObjectList.Create;
|
|
|
|
|
|
+ nearTrees := TGPersistentObjectList.Create;
|
|
|
|
|
|
camTurn := -60;
|
|
camTurn := -60;
|
|
enableRectReflection := False;
|
|
enableRectReflection := False;
|
|
@@ -489,7 +489,7 @@ begin
|
|
Result := TreesShown;
|
|
Result := TreesShown;
|
|
end;
|
|
end;
|
|
|
|
|
|
-procedure TForm1.PFXTreesProgress(Sender: TObject; const progressTime: TGLProgressTimes;
|
|
|
|
|
|
+procedure TForm1.PFXTreesProgress(Sender: TObject; const progressTime: TGProgressTimes;
|
|
var defaultProgress: Boolean);
|
|
var defaultProgress: Boolean);
|
|
begin
|
|
begin
|
|
defaultProgress := False;
|
|
defaultProgress := False;
|