X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_addresource_sky.pas;h=e7b03613ddcb20db4c4f00e523db8b1647548905;hb=029af8474e551ee355f74aa3cbf87c8816d98230;hp=2f2c25f84aa6743ef5a916a9f440cc26a7e8dcb5;hpb=3dc2fe6b3d29cd54425db8f590e922f2dce50e99;p=d2df-editor.git

diff --git a/src/editor/f_addresource_sky.pas b/src/editor/f_addresource_sky.pas
index 2f2c25f..e7b0361 100644
--- a/src/editor/f_addresource_sky.pas
+++ b/src/editor/f_addresource_sky.pas
@@ -7,7 +7,7 @@ interface
 uses
   LCLIntf, LCLType, LMessages, SysUtils, Variants, Classes,
   Graphics, Controls, Forms, Dialogs, f_addresource,
-  ExtCtrls, StdCtrls, utils;
+  ExtCtrls, StdCtrls, utils, Imaging, ImagingTypes, ImagingUtility;
 
 type
   TAddSkyForm = class (TAddResourceForm)
@@ -37,27 +37,16 @@ uses
 
 function ShowTGATexture(ResourceStr: String): TBitMap;
 var
-  TGAHeader: packed record // Header type for TGA images
-    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;
-  image:      Pointer;    {or PRGBTRIPLE}
+  img:        TImageData;
+  clr:        TColor32Rec;
+  bgc:        TColor32Rec;
   Width,
   Height:     Integer;
-  ColorDepth: Integer;
-  ImageSize:  Integer;
-  I:          Integer;
+  x, y:       Integer;
   BitMap:     TBitMap;
 
   TextureData:  Pointer;
+  ImageSize:    Integer;
   WAD:          TWADEditor_1;
   WADName:      String;
   SectionName:  String;
@@ -72,48 +61,54 @@ begin
   WAD := TWADEditor_1.Create();
   WAD.ReadFile(WADName);
 
-  WAD.GetResource(SectionName, ResourceName, TextureData, ImageSize);
+  WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ImageSize);
 
   WAD.Free();
 
-// Заголовок TGA:
-  CopyMemory(@TGAHeader, TextureData, SizeOf(TGAHeader));
+  (* !!! copypaste from f_addresource_texture.CreateBitMap *)
 
-  if TGAHeader.ImageType <> 2 then
-    Exit;
-  if TGAHeader.ColorMapType <> 0 then
-    Exit;
-  if TGAHeader.BPP < 24 then
+  InitImage(img);
+  if not LoadImageFromMemory(TextureData, ImageSize, img) then
+  begin
+    FreeMem(TextureData);
     Exit;
+  end;
 
-  Width  := TGAHeader.Width[0]+TGAHeader.Width[1]*256;
-  Height := TGAHeader.Height[0]+TGAHeader.Height[1]*256;
-  ColorDepth := TGAHeader.BPP;
-  ImageSize  := Width*Height*(ColorDepth div 8);
-
-// Само изображение:
-  GetMem(Image, ImageSize);
-
-  CopyMemory(Image, Pointer(Integer(TextureData)+SizeOf(TGAHeader)), ImageSize);
-
+  Width  := img.width;
+  Height := img.height;
   BitMap := TBitMap.Create();
-
-  if TGAHeader.BPP = 24 then
-    BitMap.PixelFormat := pf24bit
-  else
-    BitMap.PixelFormat := pf32bit;
-  
+  BitMap.PixelFormat := pf24bit;
   BitMap.Width := Width;
   BitMap.Height := Height;
-
-// Копируем изображение в BitMap:
-  for I := Height-1 downto 0 do
-    CopyMemory(BitMap.ScanLine[Height-1-I],
-               Pointer(Integer(Image)+(Width*I*(TGAHeader.BPP div 8))),
-               Width*(TGAHeader.BPP div 8));
-
-  FreeMem(Image, ImageSize);
+  for y := 0 to height - 1 do
+  begin
+    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
+      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);
+      BitMap.Canvas.Pixels[x, y] := RGBToColor(clr.r, clr.g, clr.b)
+    end
+  end;
   FreeMem(TextureData);
+  FreeImage(img);
   Result := BitMap;
 end;
 
@@ -121,8 +116,7 @@ procedure TAddSkyForm.bOKClick(Sender: TObject);
 begin
   Inherited;
 
-  if not FResourceSelected then
-    Exit;
+  ModalResult := mrOk;
 end;
 
 procedure TAddSkyForm.lbResourcesListClick(Sender: TObject);
@@ -163,12 +157,12 @@ begin
     g_ProcessResourceStr(FSetResource, FileName, SectionName, ResourceName);
 
     if FileName = '' then
-      FileName := _lc[I_WAD_SPECIAL_MAP];
+      FileName := MsgWadSpecialMap;
     if SectionName = '' then
       SectionName := '..';
 
   // WAD файл:
-    a := cbWADList.Items.IndexOf(win2utf(FileName));
+    a := cbWADList.Items.IndexOf(FileName);
     if a <> -1 then
     begin
       cbWADList.ItemIndex := a;
@@ -176,7 +170,7 @@ begin
     end;
 
   // Секция:
-    a := cbSectionsList.Items.IndexOf(win2utf(SectionName));
+    a := cbSectionsList.Items.IndexOf(SectionName);
     if a <> -1 then
     begin
       cbSectionsList.ItemIndex := a;
@@ -184,7 +178,7 @@ begin
     end;
 
   // Ресурс:
-    a := lbResourcesList.Items.IndexOf(win2utf(ResourceName));
+    a := lbResourcesList.Items.IndexOf(ResourceName);
     if a <> -1 then
     begin
       lbResourcesList.ItemIndex := a;