From fd5f18250e6da98c47f23f49b7c4663c9a8bf7d3 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 20 Sep 2007 12:37:24 +0000 Subject: Adding new Resource compiler for lazarus projects.. (other one did not name resources correctly) this resource compiler could be expanded by someone to Parse Ultrastar.rc and compile the lrs file, rather than having it hardcoded in USDXResCompiler other changes, include ability to read the Resource String properly in code generated by lazarus. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@422 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UGraphic.pas | 43 ++++++++++++++++++++++++++---------------- Game/Code/Classes/UTexture.pas | 22 +++++++++++++-------- Game/Code/Menu/UMenu.pas | 3 ++- 3 files changed, 43 insertions(+), 25 deletions(-) (limited to 'Game') diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas index a8728fa7..3fbef8b1 100644 --- a/Game/Code/Classes/UGraphic.pas +++ b/Game/Code/Classes/UGraphic.pas @@ -245,6 +245,12 @@ uses UMain, {$ENDIF} Classes; +procedure LoadFontTextures; +begin + Log.LogStatus('Building Fonts', 'LoadTextures'); + BuildFont; +end; + procedure LoadTextures; @@ -261,6 +267,8 @@ begin Tex_Right[0] := Texture.LoadTexture(pchar(Skin.GetTextureFileName('GrayRight')), 'BMP', 'Transparent', 0); //brauch man die noch? // P1-6 + // TODO... do it once for each player... this is a bit crappy !! + // can we make it any better !? for P := 1 to 6 do begin LoadColor(R, G, B, 'P' + IntToStr(P) + 'Light'); @@ -307,8 +315,8 @@ begin //PhrasenBonus - Line Bonus Mod End // tworzenie czcionek - Log.LogStatus('Building Fonts', 'LoadTextures'); - BuildFont; +// Log.LogStatus('Building Fonts', 'LoadTextures'); +// BuildFont; end; procedure Initialize3D (Title: string); @@ -320,12 +328,13 @@ var I: Integer; begin Log.LogStatus('LoadOpenGL', 'Initialize3D'); - Log.BenchmarkStart(2); +// Log.BenchmarkStart(2); LoadOpenGL; Log.LogStatus('SDL_Init', 'Initialize3D'); - if ( SDL_Init(SDL_INIT_VIDEO or SDL_INIT_AUDIO)= -1 ) then begin + if ( SDL_Init(SDL_INIT_VIDEO or SDL_INIT_AUDIO)= -1 ) then + begin Log.LogError('SDL_Init Failed', 'Initialize3D'); exit; end; @@ -355,17 +364,17 @@ begin InitializeScreen; - Log.BenchmarkEnd(2); - Log.LogBenchmark('--> Setting Screen', 2); +// Log.BenchmarkEnd(2); +// Log.LogBenchmark('--> Setting Screen', 2); // ladowanie tekstur - Log.BenchmarkStart(2); +// Log.BenchmarkStart(2); Texture := TTextureUnit.Create; Texture.Limit := 1024*1024; - LoadTextures; - Log.BenchmarkEnd(2); - Log.LogBenchmark('--> Loading Textures', 2); +// LoadTextures; +// Log.BenchmarkEnd(2); +// Log.LogBenchmark('--> Loading Textures', 2); { Log.BenchmarkStart(2); Lyric:= TLyric.Create; @@ -373,21 +382,23 @@ begin Log.LogBenchmark('--> Loading Fonts', 2); } - Log.BenchmarkStart(2); +// Log.BenchmarkStart(2); Display := TDisplay.Create; SDL_EnableUnicode(1); - Log.BenchmarkEnd(2); Log.LogBenchmark('====> Creating Display', 2); +// Log.BenchmarkEnd(2); Log.LogBenchmark('====> Creating Display', 2); - Log.LogStatus('Loading Screens', 'Initialize3D'); - Log.BenchmarkStart(3); +// Log.LogStatus('Loading Screens', 'Initialize3D'); +// Log.BenchmarkStart(3); + + LoadFontTextures(); // Show the Loading Screen ------------- LoadLoadingScreen; Log.LogStatus('Loading Screens', 'Initialize3D'); -// LoadTextures; // jb -// Log.LogStatus(' Loading Textures', ''); + LoadTextures; // jb + Log.LogStatus(' Loading Textures', ''); diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas index f01cfd23..1c436f04 100644 --- a/Game/Code/Classes/UTexture.pas +++ b/Game/Code/Classes/UTexture.pas @@ -154,32 +154,36 @@ begin // find texture entry T := FindTexture(Name); - if T = -1 then begin + if T = -1 then + begin // create texture entry T := Length(TextureDatabase.Texture); SetLength(TextureDatabase.Texture, T+1); + TextureDatabase.Texture[T].Name := Name; - TextureDatabase.Texture[T].Typ := Typ; + TextureDatabase.Texture[T].Typ := Typ; // inform database that no textures have been loaded into memory - TextureDatabase.Texture[T].Texture.TexNum := -1; + TextureDatabase.Texture[T].Texture.TexNum := -1; TextureDatabase.Texture[T].TextureCache.TexNum := -1; end; // use preloaded texture - if (not FromCache) or (FromCache and not Covers.CoverExists(Name)) then begin + if (not FromCache) or (FromCache and not Covers.CoverExists(Name)) then + begin // use full texture - if TextureDatabase.Texture[T].Texture.TexNum = -1 then begin + if TextureDatabase.Texture[T].Texture.TexNum = -1 then + begin // load texture TextureDatabase.Texture[T].Texture := LoadTexture(false, pchar(Name), 'JPG', pchar(Typ), $0); end; // use texture Result := TextureDatabase.Texture[T].Texture; - end; - if FromCache and Covers.CoverExists(Name) then begin + if FromCache and Covers.CoverExists(Name) then + begin // use cache texture C := Covers.CoverNumber(Name); @@ -381,7 +385,7 @@ var begin lTextureStream := nil; -// Log.LogStatus( 'From Resource - ' + inttostr( integer( FromRegistry ) ) , Identifier +' '+ Format +' '+ Typ ); + Log.LogStatus( 'From Resource - ' + inttostr( integer( FromRegistry ) ) , Identifier +' '+ Format +' '+ Typ ); // {$IFNDEF FPC} // TODO : JB_lazarus eeeew this is a nasty one... @@ -396,10 +400,12 @@ begin if FromRegistry then begin try + {$IFNDEF FPC} lTextureStream := TResourceStream.Create(HInstance, Identifier, Format); // TEmp, untill all code is moved to refactord way.. Res := TResourceStream( lTextureStream ); + {$ENDIF} except Log.LogStatus( 'ERROR Could not load from resource' , Identifier +' '+ Format +' '+ Typ ); beep; diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas index 1e6c1e87..ccce325e 100644 --- a/Game/Code/Menu/UMenu.pas +++ b/Game/Code/Menu/UMenu.pas @@ -288,7 +288,8 @@ end; procedure TMenu.AddBackground(Name: string); begin - if Name <> '' then begin + if Name <> '' then + begin // BackImg := Texture.LoadTexture(false, PChar(Skin.SkinPath + FileName), 'JPG', 'Plain', 0); // new theme system BackImg := Texture.GetTexture(Skin.GetTextureFileName(Name), 'Plain'); BackImg.W := 800; -- cgit v1.2.3