|
@@ -27,13 +27,13 @@ uses
|
|
Stage.VectorTypes,
|
|
Stage.VectorTypes,
|
|
Stage.VectorGeometry,
|
|
Stage.VectorGeometry,
|
|
Stage.OpenGLTokens,
|
|
Stage.OpenGLTokens,
|
|
- GLS.XCollection,
|
|
|
|
Stage.Strings,
|
|
Stage.Strings,
|
|
Stage.PipelineTransform,
|
|
Stage.PipelineTransform,
|
|
Stage.TextureFormat,
|
|
Stage.TextureFormat,
|
|
Stage.Utils,
|
|
Stage.Utils,
|
|
Stage.Logger,
|
|
Stage.Logger,
|
|
|
|
|
|
|
|
+ GLS.XCollection,
|
|
GLS.Context,
|
|
GLS.Context,
|
|
GLS.Silhouette,
|
|
GLS.Silhouette,
|
|
GLS.PersistentClasses,
|
|
GLS.PersistentClasses,
|
|
@@ -53,12 +53,6 @@ uses
|
|
GLS.ImageUtils;
|
|
GLS.ImageUtils;
|
|
|
|
|
|
type
|
|
type
|
|
-{$IF (CompilerVersion >= 36)}
|
|
|
|
- TListSize = NativeInt;
|
|
|
|
-{$ELSE}
|
|
|
|
- TListSize = Integer;
|
|
|
|
-{$ENDIF}
|
|
|
|
-
|
|
|
|
// Defines which features are taken from the master object.
|
|
// Defines which features are taken from the master object.
|
|
TGLProxyObjectOption = (pooEffects, pooObjects, pooTransformation);
|
|
TGLProxyObjectOption = (pooEffects, pooObjects, pooTransformation);
|
|
TGLProxyObjectOptions = set of TGLProxyObjectOption;
|
|
TGLProxyObjectOptions = set of TGLProxyObjectOption;
|
|
@@ -67,7 +61,7 @@ type
|
|
|
|
|
|
const
|
|
const
|
|
cDefaultProxyOptions = [pooEffects, pooObjects, pooTransformation];
|
|
cDefaultProxyOptions = [pooEffects, pooObjects, pooTransformation];
|
|
- GLSCENE_REVISION = '$Revision: 2024$';
|
|
|
|
|
|
+ GLSCENE_REVISION = '$Revision: 2025$';
|
|
GLSCENE_VERSION = 'v2.5 %s';
|
|
GLSCENE_VERSION = 'v2.5 %s';
|
|
|
|
|
|
type
|
|
type
|
|
@@ -144,11 +138,11 @@ type
|
|
// Just a list of objects that support IGLInitializable.
|
|
// Just a list of objects that support IGLInitializable.
|
|
TGLInitializableObjectList = class(TList)
|
|
TGLInitializableObjectList = class(TList)
|
|
private
|
|
private
|
|
- function GetItems(const Index: TListSize): IGLInitializable;
|
|
|
|
- procedure PutItems(const Index: TListSize; const Value: IGLInitializable);
|
|
|
|
|
|
+ function GetItems(const Index: NativeInt): IGLInitializable;
|
|
|
|
+ procedure PutItems(const Index: NativeInt; const Value: IGLInitializable);
|
|
public
|
|
public
|
|
function Add(const Item: IGLInitializable): Integer;
|
|
function Add(const Item: IGLInitializable): Integer;
|
|
- property Items[const Index: TListSize]: IGLInitializable read GetItems write PutItems; default;
|
|
|
|
|
|
+ property Items[const Index: NativeInt]: IGLInitializable read GetItems write PutItems; default;
|
|
end;
|
|
end;
|
|
|
|
|
|
PGLAxisInfo = ^TGLAxisInfo;
|
|
PGLAxisInfo = ^TGLAxisInfo;
|
|
@@ -8021,12 +8015,12 @@ begin
|
|
end;
|
|
end;
|
|
|
|
|
|
function TGLInitializableObjectList.GetItems(
|
|
function TGLInitializableObjectList.GetItems(
|
|
- const Index: TListSize): IGLInitializable;
|
|
|
|
|
|
+ const Index: NativeInt): IGLInitializable;
|
|
begin
|
|
begin
|
|
Result := IGLInitializable(inherited Get(Index));
|
|
Result := IGLInitializable(inherited Get(Index));
|
|
end;
|
|
end;
|
|
|
|
|
|
-procedure TGLInitializableObjectList.PutItems(const Index: TListSize;
|
|
|
|
|
|
+procedure TGLInitializableObjectList.PutItems(const Index: NativeInt;
|
|
const Value: IGLInitializable);
|
|
const Value: IGLInitializable);
|
|
begin
|
|
begin
|
|
inherited Put(Index, Pointer(Value));
|
|
inherited Put(Index, Pointer(Value));
|