index 7319645ffb72f1498a60a801089c0f8b25c3a1fe..86566cfa9627df9eeab1238aed7ad118dd19bc41 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,
- e_log;
+ StdCtrls, ExtCtrls, utils, Imaging, ImagingTypes, ImagingUtility;
type
TAddTextureForm = class (TAddResourceForm)
BinEditor, WADEDITOR, WADSTRUCT, f_main, g_textures, CONFIG, g_map,
g_language;
-type
- TTGAHeader = packed record
- FileType: Byte;
- ColorMapType: Byte;
- ImageType: Byte;
- ColorMapSpec: Array [0..4] of Byte;
- OrigX: Array [0..1] of Byte;
- OrigY: Array [0..1] of Byte;
- Width: Array [0..1] of Byte;
- Height: Array [0..1] of Byte;
- BPP: Byte;
- ImageInfo: Byte;
- end;
-
{$R *.lfm}
function IsAnim(Res: String): Boolean;
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;
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;
end;
function CreateBitMap(Data: Pointer; DataSize: Cardinal): TBitMap;
-const
- BG_R: Byte = 255;
- BG_G: Byte = 0;
- BG_B: Byte = 255;
var
img: TImageData;
clr: TColor32Rec;
+ bgc: TColor32Rec;
ii: PByte;
Width,
Height: Integer;
- ColorDepth: Integer;
- ImageSize: Integer;
- i, x, y: Integer;
+ x, y: Integer;
BitMap: TBitMap;
begin
InitImage(img);
if not LoadImageFromMemory(Data, DataSize, img) then
- begin
- e_WriteLog('Invalid image format?', MSG_WARNING);
Exit;
- end;
Width := img.width;
Height := img.height;
- ColorDepth := 24;
- ImageSize := Width*Height*(ColorDepth div 8);
BitMap := TBitMap.Create();
BitMap.PixelFormat := pf24bit;
begin
clr := GetPixel32(img, x, y);
// HACK: Lazarus's TBitMap doesn't seem to have a working 32 bit mode, so
- // mix color with pink background. FUCK!
- clr.r := ClampToByte(((255 - clr.a) * BG_R + clr.a * clr.r) div 255);
- clr.g := ClampToByte(((255 - clr.a) * BG_G + clr.a * clr.g) div 255);
- clr.b := ClampToByte(((255 - clr.a) * BG_B + clr.a * clr.b) div 255);
- // TODO: check for ARGB/RGBA/BGRA/ABGR somehow?
+ // mix color with checkered background. Also, can't really read
+ // CHECKERS.tga from here. FUCK!
+ 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
+ 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);
ii^ := clr.r; Inc(ii);
- // ii^ := clr.a; Inc(ii);
end;
end;
-
+ FreeImage(img);
Result := BitMap;
end;
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();
// Читаем описание анимации:
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();
for i := 0 to lbResourcesList.Count-1 do
if lbResourcesList.Selected[i] then
begin
- AddTexture(utf2win(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;