Changeset 494 for GraphicTest/Packages/bgrabitmap/part3d.inc

Timestamp:

Dec 22, 2016, 8:49:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/part3d.inc (modified) (13 diffs)

GraphicTest/Packages/bgrabitmap/part3d.inc

@@ -14 +14 @@
     FCoordPool: TBGRACoordPool3D;
     FNormalPool: TBGRANormalPool3D;
+    FObject3D: TBGRAObject3D;
   public
-    constructor Create(AContainer: IBGRAPart3D);
+    constructor Create(AObject3D: TBGRAObject3D; AContainer: IBGRAPart3D);
     destructor Destroy; override;
     procedure Clear(ARecursive: boolean);
@@ -214 +215 @@
 end;
 
-constructor TBGRAPart3D.Create(AContainer: IBGRAPart3D);
-begin
+constructor TBGRAPart3D.Create(AObject3D: TBGRAObject3D; AContainer: IBGRAPart3D);
+begin
+  FObject3D := AObject3D;
   FContainer := AContainer;
   FMatrix := MatrixIdentity3D;
@@ -229 +231 @@
   FVertexCount := 0;
   if FCoordPool.UsedCapacity > 0 then
-    raise Exception.Create('Coordinate pool still used');
+    raise Exception.Create('Coordinate pool still used. Please set vertex references to nil before destroying the scene.');
   FreeAndNil(FCoordPool);
   if Assigned(FNormalPool) then
@@ -258 +260 @@
 function TBGRAPart3D.Add(x, y, z: single): IBGRAVertex3D;
 begin
-  result := TBGRAVertex3D.Create(FCoordPool,Point3D(x,y,z));
+  result := TBGRAVertex3D.Create(FObject3D,FCoordPool,Point3D(x,y,z));
   Add(result);
 end;
@@ -264 +266 @@
 function TBGRAPart3D.Add(pt: TPoint3D): IBGRAVertex3D;
 begin
-  result := TBGRAVertex3D.Create(FCoordPool,pt);
+  result := TBGRAVertex3D.Create(FObject3D,FCoordPool,pt);
   Add(result);
 end;
@@ -270 +272 @@
 function TBGRAPart3D.Add(pt: TPoint3D; normal: TPoint3D): IBGRAVertex3D;
 begin
-  result := TBGRAVertex3D.Create(FCoordPool,pt);
+  result := TBGRAVertex3D.Create(FObject3D,FCoordPool,pt);
   result.CustomNormal := normal;
   Add(result);
@@ -277 +279 @@
 function TBGRAPart3D.Add(pt: TPoint3D_128): IBGRAVertex3D;
 begin
-  result := TBGRAVertex3D.Create(FCoordPool,pt);
+  result := TBGRAVertex3D.Create(FObject3D,FCoordPool,pt);
   Add(result);
 end;
@@ -283 +285 @@
 function TBGRAPart3D.Add(pt: TPoint3D_128; normal: TPoint3D_128): IBGRAVertex3D;
 begin
-  result := TBGRAVertex3D.Create(FCoordPool,pt);
+  result := TBGRAVertex3D.Create(FObject3D,FCoordPool,pt);
   result.CustomNormal := Point3D(normal);
   Add(result);
@@ -312 +314 @@
   setlength(result, length(pts));
   for i := 0 to high(pts) do
-    result[i] := TBGRAVertex3D.Create(FCoordPool,pts[i]);
+    result[i] := TBGRAVertex3D.Create(FObject3D,FCoordPool,pts[i]);
   Add(result);
 end;
@@ -323 +325 @@
   setlength(result, length(pts));
   for i := 0 to high(pts) do
-    result[i] := TBGRAVertex3D.Create(FCoordPool,pts[i]);
+    result[i] := TBGRAVertex3D.Create(FObject3D,FCoordPool,pts[i]);
   Add(result);
 end;
@@ -490 +492 @@
 end;
 
+{$PUSH}{$OPTIMIZATION OFF} //avoids Internal error 2012090607
 procedure TBGRAPart3D.ComputeWithMatrix(const AMatrix: TMatrix3D; const AProjection: TProjection3D);
 var
@@ -501 +504 @@
     FParts[i].ComputeWithMatrix(Composed,AProjection);
 end;
+{$POP}
 
 function TBGRAPart3D.ComputeCoordinate(var ASceneCoord: TPoint3D_128; const AProjection: TProjection3D): TPointF;
@@ -550 +554 @@
   if FPartCount = length(FParts) then
     setlength(FParts, FPartCount*2+1);
-  result := TBGRAPart3D.Create(self);
+  result := TBGRAPart3D.Create(FObject3D,self);
   FParts[FPartCount] := result;
   inc(FPartCount);