[Glxtreem-commits] GLXtreem/Source GLXResource.pas,1.1,1.2 GLXTerrain.pas,1.2,1.3

[Andreas L. <an...@us...>]

Update of /cvsroot/glxtreem/GLXtreem/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10957/Source

Modified Files:
	GLXResource.pas GLXTerrain.pas 
Log Message:
Was a bug in glxRegister...
TGLXResourceSource is now abstract

Index: GLXTerrain.pas
===================================================================
RCS file: /cvsroot/glxtreem/GLXtreem/Source/GLXTerrain.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GLXTerrain.pas	29 Mar 2004 14:55:09 -0000	1.2
--- GLXTerrain.pas	1 Apr 2004 15:44:11 -0000	1.3
***************
*** 195,199 ****
  //  TNodeLoader
  //==============================================================================
! type TGLXNodeLoader = class(TThread)
    private
      { Private declarations }
--- 195,199 ----
  //  TNodeLoader
  //==============================================================================
! type TGLXTerrainNodeLoader = class(TThread)
    private
      { Private declarations }
***************
*** 268,272 ****
  
  
! var NodeLoader: TGLXNodeLoader;
  
  implementation
--- 268,272 ----
  
  
! var NodeLoader: TGLXTerrainNodeLoader;
  
  implementation
***************
*** 420,424 ****
  //Thread TGLXNodeLoader
  //==============================================================================
! constructor TGLXNodeLoader.Create;
  begin
    inherited Create(False);
--- 420,424 ----
  //Thread TGLXNodeLoader
  //==============================================================================
! constructor TGLXTerrainNodeLoader.Create;
  begin
    inherited Create(False);
***************
*** 430,434 ****
  
  //------------------------------------------------------------------------------
! destructor TGLXNodeLoader.Destroy;
  begin
    LoadList.Free;
--- 430,434 ----
  
  //------------------------------------------------------------------------------
! destructor TGLXTerrainNodeLoader.Destroy;
  begin
    LoadList.Free;
***************
*** 438,442 ****
  
  //------------------------------------------------------------------------------
! procedure TGLXNodeLoader.Execute;
  begin
    repeat
--- 438,442 ----
  
  //------------------------------------------------------------------------------
! procedure TGLXTerrainNodeLoader.Execute;
  begin
    repeat
***************
*** 455,459 ****
  
  //------------------------------------------------------------------------------
! procedure TGLXNodeLoader.LoadNode;
  var Stream : TFileStream;
  begin
--- 455,459 ----
  
  //------------------------------------------------------------------------------
! procedure TGLXTerrainNodeLoader.LoadNode;
  var Stream : TFileStream;
  begin
***************
*** 487,512 ****
    // Assign the node
    Synchronize(AssignNode);
- 
-        {
- 
-   Exit;
-   Stream.Read(FVertexData.numVertices  , SizeOf(FVertexData.numVertices));
-   Stream.Read(FVertexData.numNormals   , SizeOf(FVertexData.numNormals ));
-   Stream.Read(FVertexData.numTexCoordsA, SizeOf(FVertexData.numTexCoordsA));
-   Stream.Read(FVertexData.numTexCoordsB, SizeOf(FVertexData.numTexCoordsB));
- 
-   SetLength(FVertexData.theVertices  , FVertexData.numVertices  );
-   SetLength(FVertexData.theNormals   , FVertexData.numNormals   );
-   SetLength(FVertexData.theTexCoordsA, FVertexData.numTexCoordsA);
-   SetLength(FVertexData.theTexCoordsB, FVertexData.numTexCoordsB);
- 
-   Stream.Read(FVertexData.theVertices  [0], SizeOf(FVertexData.theVertices  [0]) * FVertexData.numVertices);
-   Stream.Read(FVertexData.theNormals   [0], SizeOf(FVertexData.theNormals   [0]) * FVertexData.numNormals);
-   Stream.Read(FVertexData.theTexCoordsA[0], SizeOf(FVertexData.theTexCoordsA[0]) * FVertexData.numTexCoordsA);
-   Stream.Read(FVertexData.theTexCoordsB[0], SizeOf(FVertexData.theTexCoordsB[0]) * FVertexData.numTexCoordsB);
- 
-   Stream.Free;
- 
-   Self.Synchronize(AssignNode);     }
  end;
  
--- 487,490 ----
***************
*** 515,519 ****
  
  //------------------------------------------------------------------------------
! procedure TGLXNodeLoader.BuildVertexData(Width, Height: Integer);
  var SwitchSides: Boolean;
  var X, Y       : Integer;
--- 493,497 ----
  
  //------------------------------------------------------------------------------
! procedure TGLXTerrainNodeLoader.BuildVertexData(Width, Height: Integer);
  var SwitchSides: Boolean;
  var X, Y       : Integer;
***************
*** 602,606 ****
  
  //------------------------------------------------------------------------------
! procedure TGLXNodeLoader.AssignNode;
  begin
    CurrentNode.FTexture   :=CreateTexture(TextureWidth, TextureHeight, GL_RGB, Addr(TextureData[0]));
--- 580,584 ----
  
  //------------------------------------------------------------------------------
! procedure TGLXTerrainNodeLoader.AssignNode;
  begin
    CurrentNode.FTexture   :=CreateTexture(TextureWidth, TextureHeight, GL_RGB, Addr(TextureData[0]));
***************
*** 907,911 ****
  //------------------------------------------------------------------------------
  initialization
!   NodeLoader:=TGLXNodeLoader.Create;
  finalization
    NodeLoader.Terminate;
--- 885,889 ----
  //------------------------------------------------------------------------------
  initialization
!   NodeLoader:=TGLXTerrainNodeLoader.Create;
  finalization
    NodeLoader.Terminate;

Index: GLXResource.pas
===================================================================
RCS file: /cvsroot/glxtreem/GLXtreem/Source/GLXResource.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GLXResource.pas	1 Apr 2004 01:10:58 -0000	1.1
--- GLXResource.pas	1 Apr 2004 15:44:11 -0000	1.2
***************
*** 185,193 ****
      procedure   LoadInventory;
  
!     function    LoadResourceTable(Stream:TStream):Boolean; virtual;
!     procedure   SaveResourceTable(Stream:TStream); virtual;
!     procedure   LoadResource(Ident:String; Stream:TStream); virtual;
!     procedure   SaveResource(Ident:String; Stream:TStream; Size:Integer); virtual;
!     procedure   DeleteResource(Ident:String); virtual;
  
    public
--- 185,193 ----
      procedure   LoadInventory;
  
!     function    LoadResourceTable(Stream:TStream):Boolean; virtual; abstract;
!     procedure   SaveResourceTable(Stream:TStream); virtual; abstract;
!     procedure   LoadResource(Ident:String; Stream:TStream); virtual;abstract;
!     procedure   SaveResource(Ident:String; Stream:TStream; Size:Integer); virtual; abstract;
!     procedure   DeleteResource(Ident:String); virtual;  abstract;
  
    public
***************
*** 639,643 ****
    end;
  end;
! 
  function TGLXResourceSource.LoadResourceTable(Stream:TStream):Boolean;
  begin
--- 639,643 ----
    end;
  end;
! {
  function TGLXResourceSource.LoadResourceTable(Stream:TStream):Boolean;
  begin
***************
*** 664,668 ****
    raise Exception.CreateFmt(NOTOVERWRITTEN,['DeleteResource',ClassName]);
  end;
! 
  
  //------------------------------------------------------------------------------
--- 664,668 ----
    raise Exception.CreateFmt(NOTOVERWRITTEN,['DeleteResource',ClassName]);
  end;
!       }
  
  //------------------------------------------------------------------------------