index 6c3840d627d290c4dd44f1261a09c24a7f377031..df0b55559f2aa34550dd653363cd36041499de83 100644 (file)
interface
uses
- LCLIntf, LCLType, LMessages, SysUtils, Variants, Classes,
+ LCLIntf, LCLType, SysUtils, Variants, Classes,
Graphics, Controls, Forms, Dialogs, f_addresource,
StdCtrls, ExtCtrls, utils, Imaging, ImagingTypes, ImagingUtility;
type
+
+ { TAddTextureForm }
+
TAddTextureForm = class (TAddResourceForm)
+ lStats: TLabel;
PanelTexPreview: TPanel;
iPreview: TImage;
eTextureName: TEdit;
var
AddTextureForm: TAddTextureForm;
+ NumFrames: Integer = 0;
function IsAnim(Res: String): Boolean;
function GetFrame(Res: String; var Data: Pointer; var DataLen: Integer;
begin
Result := False;
+ Data := nil;
+ Size := 0;
// Читаем файл и ресурс в нем:
g_ProcessResourceStr(Res, WADName, SectionName, ResourceName);
WAD := TWADEditor_1.Create();
if (not WAD.ReadFile(WADName)) or
- (not WAD.GetResource(SectionName, ResourceName, Data, Size)) then
+ (not WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), Data, Size)) then
begin
WAD.Free();
Exit;
Exit;
end;
-// Ищем в них описание анимации - "AINM":
+// Ищем в них описание анимации - "ANIM":
ok := False;
for a := 0 to High(Resources) do
if Resources[a] = 'ANIM' then
begin
Result := False;
+ AnimWAD := nil;
+ Len := 0;
+ TextData := nil;
// Читаем WAD:
g_ProcessResourceStr(Res, WADName, SectionName, ResourceName);
end;
// Читаем WAD-ресурс из WAD:
- if not WAD.GetResource(SectionName, ResourceName, AnimWAD, Len) then
+ if not WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), AnimWAD, Len) then
begin
WAD.Free();
Exit;
var
img: TImageData;
clr: TColor32Rec;
- bgc: Byte;
+ bgc: TColor32Rec;
ii: PByte;
Width,
Height: Integer;
// HACK: Lazarus's TBitMap doesn't seem to have a working 32 bit mode, so
// mix color with checkered background. Also, can't really read
// CHECKERS.tga from here. FUCK!
- if (((x shr 3) and 1) = 0) xor (((y shr 3) and 1) = 0) then
- bgc := 255
+ if UseCheckerboard then
+ begin
+ if (((x shr 3) and 1) = 0) xor (((y shr 3) and 1) = 0) then
+ bgc.Color := $FDFDFD
+ else
+ bgc.Color := $CBCBCB;
+ end
else
- bgc := 200;
- clr.r := ClampToByte(((255 - clr.a) * bgc + clr.a * clr.r) div 255);
- clr.g := ClampToByte(((255 - clr.a) * bgc + clr.a * clr.g) div 255);
- clr.b := ClampToByte(((255 - clr.a) * bgc + clr.a * clr.b) div 255);
+ begin
+ bgc.r := GetRValue(PreviewColor);
+ bgc.g := GetGValue(PreviewColor);
+ bgc.b := GetBValue(PreviewColor);
+ end;
+ clr.r := ClampToByte((Byte(255 - clr.a) * bgc.r + clr.a * clr.r) div 255);
+ clr.g := ClampToByte((Byte(255 - clr.a) * bgc.g + clr.a * clr.g) div 255);
+ clr.b := ClampToByte((Byte(255 - clr.a) * bgc.b + clr.a * clr.b) div 255);
// TODO: check for RGB/BGR somehow?
ii^ := clr.b; Inc(ii);
ii^ := clr.g; Inc(ii);
begin
Result := nil;
+ AnimWAD := nil;
+ Len := 0;
+ TextData := nil;
+ TextureData := nil;
// Читаем WAD файл и ресурс в нем:
g_ProcessResourceStr(Res, WADName, SectionName, ResourceName);
WAD := TWADEditor_1.Create();
WAD.ReadFile(WADName);
- WAD.GetResource(SectionName, ResourceName, AnimWAD, Len);
+ WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), AnimWAD, Len);
WAD.FreeWAD();
// Читаем описание анимации:
// Читаем лист текстур:
WAD.GetResource('TEXTURES', config.ReadStr('', 'resource', ''), TextureData, Len);
+ NumFrames := config.ReadInt('', 'framecount', 0);
if (TextureData <> nil) and
(WAD.GetLastError = DFWAD_NOERROR) then
begin
Result := nil;
+ TextureData := nil;
+ Len := 0;
// Читаем WAD:
g_ProcessResourceStr(ResourceStr, WADName, SectionName, ResourceName);
end;
// Читаем ресурс текстуры в нем:
- WAD.GetResource(SectionName, ResourceName, TextureData, Len);
+ WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, Len);
WAD.Free();
begin
Inherited;
+ lStats.Caption := '';
cbWADList.Items.Add(_lc[I_WAD_SPECIAL_TEXS]);
eTextureName.Text := '';
var
Texture: TBitMap;
wad: String;
+ Anim: Boolean;
begin
Inherited;
+ lStats.Caption := '';
if lbResourcesList.ItemIndex = -1 then
Exit;
if FResourceName = '' then
if wad = _lc[I_WAD_SPECIAL_TEXS] then
Exit;
- if IsAnim(FFullResourceName) then
+ Anim := IsAnim(FFullResourceName);
+ if Anim then
Texture := ShowAnim(FFullResourceName)
else
Texture := ShowTGATexture(FFullResourceName);
if Texture = nil then
Exit;
+
+ if Anim then
+ lStats.Caption := Format(_lc[I_CAP_ANIMATION], [Texture.Width, Texture.Height, NumFrames])
+ else
+ lStats.Caption := Format(_lc[I_CAP_TEXTURE], [Texture.Width, Texture.Height]);
+
iPreview.Canvas.FillRect(iPreview.Canvas.ClipRect);
iPreview.Canvas.CopyRect(Texture.Canvas.ClipRect, Texture.Canvas, Texture.Canvas.ClipRect);
Texture.Free();
for i := 0 to lbResourcesList.Count-1 do
if lbResourcesList.Selected[i] then
begin
- AddTexture(cbWADlist.Text, utf2win(cbSectionsList.Text),
- utf2win(lbResourcesList.Items[i]), False);
+ AddTexture(cbWADlist.Text, cbSectionsList.Text,
+ lbResourcesList.Items[i], False);
lbResourcesList.Selected[i] := False;
end;
end;