index 79362df8f84f194d09b5a83da44b128da106b1be..e7b03613ddcb20db4c4f00e523db8b1647548905 100644 (file)
implementation
uses
- WADEDITOR, f_main, g_language, g_resources;
+ BinEditor, WADEDITOR, f_main, g_language;
{$R *.lfm}
img: TImageData;
clr: TColor32Rec;
bgc: TColor32Rec;
- ii: PByte;
Width,
Height: Integer;
x, y: Integer;
TextureData: Pointer;
ImageSize: Integer;
+ WAD: TWADEditor_1;
WADName: String;
SectionName: String;
ResourceName: String;
begin
Result := nil;
+
+// Загружаем ресурс текстуры из WAD:
g_ProcessResourceStr(ResourceStr, WADName, SectionName, ResourceName);
- g_ReadResource(WADName, SectionName, ResourceName, TextureData, ImageSize);
+
+ WAD := TWADEditor_1.Create();
+ WAD.ReadFile(WADName);
+
+ WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ImageSize);
+
+ WAD.Free();
(* !!! copypaste from f_addresource_texture.CreateBitMap *)
Width := img.width;
Height := img.height;
-
BitMap := TBitMap.Create();
BitMap.PixelFormat := pf24bit;
-
BitMap.Width := Width;
BitMap.Height := Height;
-
-// Копируем в BitMap:
- ii := BitMap.RawImage.Data;
- for y := 0 to height-1 do
+ for y := 0 to height - 1 do
begin
- for x := 0 to width-1 do
+ for x := 0 to width - 1 do
begin
clr := GetPixel32(img, x, y);
// 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 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
+ 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;
+ 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);
-
- (* Why this works in linux? *)
- {$IFNDEF WINDOWS}Inc(ii){$ENDIF}
- end;
+ BitMap.Canvas.Pixels[x, y] := RGBToColor(clr.r, clr.g, clr.b)
+ end
end;
FreeMem(TextureData);
FreeImage(img);
g_ProcessResourceStr(FSetResource, FileName, SectionName, ResourceName);
if FileName = '' then
- FileName := _lc[I_WAD_SPECIAL_MAP];
+ FileName := MsgWadSpecialMap;
if SectionName = '' then
SectionName := '..';