--- oup/rewrite/Global/OniImgClass.pas	2007/02/20 20:43:29	101
+++ oup/current/Global/OniImgClass.pas	2007/05/26 14:24:55	193
@@ -2,49 +2,43 @@ unit OniImgClass;
 
 interface
 
-uses Math, Dialogs, Types, SysUtils, Classes, Data, ConnectionManager, TypeDefs;
+uses Math, Dialogs, Types, SysUtils, Classes, Data, ConnectionManager, TypeDefs,
+  Imaging, ImagingTypes, Graphics;
 
-type
-  TImgDataType = set of (DT_OniReverted, DT_Oni, DT_Decoded32);
 
 type
   TOniImage = class
   private
-    FLoaded:    Boolean;
-    FDataType:  TImgDataType;
-    FData:      TByteData;
-    FWidth, FHeight: Word;
-    FDepth:     Byte;
-    FStoreType: Byte;
-
-    function ResizeImage(oldx, oldy: Integer; img: TByteData): TByteData;
-    procedure RevertImage;
-    procedure DecodeImage;
-    procedure DecompressImage;
+    FImages: TDynImageDataArray;
+    function GetImage(MipGen: Integer): TImageData;
+    function GetWidth(MipGen: Integer): Integer;
+    function GetHeight(MipGen: Integer): Integer;
+    function GetImageFormat: TImageFormat;
+    procedure SetImageFormat(Format: TImageFormat);
+    function GetHasMipMaps: Boolean;
   protected
   public
-    property Loaded:    Boolean      Read FLoaded    Write FLoaded;
-    property DataType:  TImgDataType Read FDataType  Write FDataType;
-    property Width:     Word         Read FWidth     Write FWidth;
-    property Height:    Word         Read FHeight    Write FHeight;
-    property Depth:     Byte         Read FDepth     Write FDepth;
-    property StoreType: Byte         Read FStoreType Write FStoreType;
-    property Data:      TByteData    Read FData      Write FData;
+    property Images: TDynImageDataArray         read FImages;
+    property Image[MipGen: Integer]: TImageData read GetImage;
+    property Width[MipGen: Integer]: Integer    read GetWidth;
+    property Height[MipGen: Integer]: Integer   read GetHeight;
+    property Format: TImageFormat read GetImageFormat write SetImageFormat;
+    property HasMipMaps: Boolean read GetHasMipMaps;
 
     constructor Create;
+    procedure Free;
     function Load(ConnectionID, FileID: Integer): Boolean;
     function LoadFromPSpc(ConnectionID, FileID: Integer): Boolean;
     function LoadFromTXMP(ConnectionID, FileID: Integer): Boolean;
     function LoadFromTXMB(ConnectionID, FileID: Integer): Boolean;
-    function GetImageDataSize(fading: Boolean): Integer;
 
-    function GetAsData: TByteData;
-    function GetAs32bit: TByteData;
-    procedure GetAsBMP(var Target: TByteData); overload;
-    procedure GetAsBMP(var Target: TStream); overload;
-    function LoadFromBMP(filename: String): Boolean;
-    function WriteToBMP(filename: String): Boolean;
-    function GetMipMappedImage(var faded: TByteData): Boolean;
+    procedure SaveDataToStream(MipMaps: Boolean; var Target: TStream);
+
+    function LoadFromFile(filename: String): Boolean;
+    function WriteToFile(filename: String): Boolean;
+
+    procedure DrawOnCanvas(Canvas: TCanvas; Index: Integer);
+    function GetImageSize(MipMaps: Boolean): Integer;
   published
   end;
 
@@ -52,261 +46,99 @@ type
 implementation
 
 //uses Functions;
+uses Img_DDSTypes, ImagingComponents;
+
 
+procedure TOniImage.DrawOnCanvas(Canvas: TCanvas; Index: Integer);
+var
+  singleimg: TImageData;
+  rect: TRect;
+begin
+  InitImage(singleimg);
+  CloneImage(FImages[Index-1], singleimg);
+  ConvertImage(singleimg, ifX8R8G8B8);
+  rect.Left := 0;
+  rect.Top := 0;
+  rect.Right := singleimg.Width - 1;
+  rect.Bottom := singleimg.Height - 1;
+  Canvas.Brush.Color := $C8D0D4;
+  Canvas.FillRect(Canvas.ClipRect);
+  DisplayImageData(Canvas, rect, singleimg, rect);
+  FreeImage(singleimg);
+end;
 
 
 
 constructor TOniImage.Create;
 begin
-  Self.FLoaded   := False;
-  Self.FDataType := [];
-  SetLength(Self.FData, 0);
-  Self.FWidth     := 0;
-  Self.FHeight    := 0;
-  Self.FDepth     := 0;
-  Self.FStoreType := 0;
 end;
 
 
 
+procedure TOniImage.Free;
+begin
+  FreeImagesInArray(FImages);
+end;
 
-function TOniImage.ResizeImage(oldx, oldy: Integer; img: TByteData): TByteData;
-var
-  i, j: Integer;
-  col, row, row_orig: Integer;
+
+
+
+function TOniImage.GetImage(MipGen: Integer): TImageData;
 begin
-  SetLength(Result, (oldx div 2) * (oldy div 2) * (Self.FDepth div 8));
-  row_orig := 0;
-  row      := 0;
-  col      := 0;
-  for i := 0 to (oldx * oldy) - 1 do
+  if MipGen <= Length(FImages) then
   begin
-    if ((i mod oldx) = 0) and (i > 0) then
-    begin
-      Inc(row_orig);
-      if (row_orig mod 2) = 0 then
-      begin
-        Inc(row);
-        col := 0;
-      end;
-    end;
-    if (row_orig mod 2) = 0 then
-    begin
-      if (i mod 2) = 0 then
-      begin
-        for j := 0 to (Self.FDepth div 8) - 1 do
-          Result[((row * (oldx div 2)) + col) * (Self.FDepth div 8) + j] :=
-            img[(i * (Self.FDepth div 8)) + j];
-        Inc(col);
-      end;
-    end;
+    InitImage(Result);
+    CloneImage(FImages[MipGen-1], Result);
   end;
 end;
 
 
 
-
-procedure TOniImage.RevertImage;
-var
-  x, y, i: Integer;
-  tempd:   TByteData;
+function TOniImage.GetWidth(MipGen: Integer): Integer;
 begin
-  SetLength(tempd, Self.FWidth * Self.FHeight * (Self.FDepth div 8));
-  for y := 0 to Self.FHeight - 1 do
-    for x := 0 to Self.FWidth - 1 do
-      for i := 0 to (Self.FDepth div 8) - 1 do
-        tempd[((Self.FWidth * (Self.FHeight - 1 - y) + x) * (Self.FDepth div 8)) + i] :=
-          Self.FData[(Self.FWidth * y + x) * (Self.FDepth div 8) + i];
-  for x := 0 to High(tempd) do
-    Self.FData[x] := tempd[x];
-  if DT_OniReverted in Self.FDataType then
-    Self.FDataType := Self.FDataType - [DT_OniReverted]
+  if MipGen <= Length(FImages) then
+    Result := FImages[MipGen-1].Width
   else
-    Self.FDataType := Self.FDataType + [DT_OniReverted];
+    Result := -1;
 end;
 
 
-
-
-procedure TOniImage.DecodeImage;
-var
-  x, y:  Integer;
-  tempd: TByteData;
+function TOniImage.GetHeight(MipGen: Integer): Integer;
 begin
-  if not (DT_Decoded32 in Self.FDataType) then
-  begin
-    SetLength(tempd, Self.FWidth * Self.FHeight * 4);
-    case Self.FStoreType of
-      0:
-      begin
-        for y := 0 to Self.FHeight - 1 do
-        begin
-          for x := 0 to Self.FWidth - 1 do
-          begin
-            tempd[((Self.FWidth * y + x) * 4) + 0] :=
-              Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
-              $000F) / $000F * 255);
-            tempd[((Self.FWidth * y + x) * 4) + 1] :=
-              Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
-              $00F0) / $00F0 * 255);
-            tempd[((Self.FWidth * y + x) * 4) + 2] :=
-              Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
-              $0F00) / $0F00 * 255);
-            tempd[((Self.FWidth * y + x) * 4) + 3] := 0;
-          end;
-        end;
-      end;
-      1, 2:
-      begin
-        for y := 0 to Self.FHeight - 1 do
-        begin
-          for x := 0 to Self.FWidth - 1 do
-          begin
-            tempd[((Self.FWidth * y + x) * 4) + 0] :=
-              Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
-              $001F) / $001F * 255);
-            tempd[((Self.FWidth * y + x) * 4) + 1] :=
-              Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
-              $03E0) / $03E0 * 255);
-            tempd[((Self.FWidth * y + x) * 4) + 2] :=
-              Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
-              $7C00) / $7C00 * 255);
-            tempd[((Self.FWidth * y + x) * 4) + 3] := 0;
-          end;
-        end;
-      end;
-      9:
-      begin
-        DecompressImage;
-      end;
-    end;
-    Self.FDepth := 32;
-    if (Self.FStoreType <> 9) and (Self.FStoreType <> 8) then
-    begin
-      SetLength(Self.FData, Length(tempd));
-      for x := 0 to High(tempd) do
-        Self.FData[x] := tempd[x];
-    end;
-    Self.FStoreType := 8;
-    if DT_Oni in Self.FDataType then
-      Self.FDataType := Self.FDataType - [DT_Oni];
-    Self.FDataType := Self.FDataType + [DT_Decoded32];
-  end;
-  if DT_OniReverted in Self.FDataType then
-    Self.RevertImage;
+  if MipGen <= Length(FImages) then
+    Result := FImages[MipGen-1].Height
+  else
+    Result := -1;
 end;
 
 
+function TOniImage.GetImageFormat: TImageFormat;
+begin
+  if Length(FImages) > 0 then
+    Result := FImages[0].Format
+  else
+    Result := ifUnknown;
+end;
 
-
-procedure TOniImage.DecompressImage;
-type
-  Tcolor = record
-    RGBb: Byte;
-    RGBg: Byte;
-    RGBr: Byte;
-    RGBa: Byte;
-  end;
+procedure TOniImage.SetImageFormat(Format: TImageFormat);
 var
-  i, j, x, y: Integer;
-  color:      array[1..4] of Tcolor;
-  pixel:      array[1..16] of Byte;
-  tempd:      TByteData;
-begin
-  x := 0;
-  y := 0;
-  SetLength(tempd, Self.FWidth * Self.FHeight * 4);
-  for i := 0 to ((Self.FWidth * Self.FHeight) div 16) - 1 do
-  begin
-    Color[1].RGBb := Round(((Self.FData[(i * 8) + 0] + Self.FData[(i * 8) + 1] * 256) and $001F) /
-      $001F * 255);
-    Color[1].RGBg := Round(((Self.FData[(i * 8) + 0] + Self.FData[(i * 8) + 1] * 256) and $07E0) /
-      $07E0 * 255);
-    Color[1].RGBr := Round(((Self.FData[(i * 8) + 0] + Self.FData[(i * 8) + 1] * 256) and $F800) /
-      $F800 * 255);
-    Color[1].RGBa := 255;
-    Color[2].RGBb := Round(((Self.FData[(i * 8) + 2] + Self.FData[(i * 8) + 3] * 256) and $001F) /
-      $001F * 255);
-    Color[2].RGBg := Round(((Self.FData[(i * 8) + 2] + Self.FData[(i * 8) + 3] * 256) and $07E0) /
-      $07E0 * 255);
-    Color[2].RGBr := Round(((Self.FData[(i * 8) + 2] + Self.FData[(i * 8) + 3] * 256) and $F800) /
-      $F800 * 255);
-    Color[2].RGBa := 255;
-    Color[3].RGBb := Round(Color[1].RGBb / 3 * 2 + Color[2].RGBb / 3);
-    Color[3].RGBg := Round(Color[1].RGBg / 3 * 2 + Color[2].RGBg / 3);
-    Color[3].RGBr := Round(Color[1].RGBr / 3 * 2 + Color[2].RGBr / 3);
-    Color[3].RGBa := 255;
-    Color[4].RGBb := Round(Color[1].RGBb / 3 + Color[2].RGBb / 3 * 2);
-    Color[4].RGBg := Round(Color[1].RGBg / 3 + Color[2].RGBg / 3 * 2);
-    Color[4].RGBr := Round(Color[1].RGBr / 3 + Color[2].RGBr / 3 * 2);
-    Color[4].RGBa := 255;
-    Pixel[1]      := Round((Self.FData[(i * 8) + 4] and $C0) / $40 + 1);
-    Pixel[2]      := Round((Self.FData[(i * 8) + 4] and $30) / $10 + 1);
-    Pixel[3]      := Round((Self.FData[(i * 8) + 4] and $0C) / $04 + 1);
-    Pixel[4]      := Round((Self.FData[(i * 8) + 4] and $03) + 1);
-    Pixel[5]      := Round((Self.FData[(i * 8) + 5] and $C0) / $40 + 1);
-    Pixel[6]      := Round((Self.FData[(i * 8) + 5] and $30) / $10 + 1);
-    Pixel[7]      := Round((Self.FData[(i * 8) + 5] and $0C) / $04 + 1);
-    Pixel[8]      := Round((Self.FData[(i * 8) + 5] and $03) + 1);
-    Pixel[9]      := Round((Self.FData[(i * 8) + 6] and $C0) / $40 + 1);
-    Pixel[10]     := Round((Self.FData[(i * 8) + 6] and $30) / $10 + 1);
-    Pixel[11]     := Round((Self.FData[(i * 8) + 6] and $0C) / $04 + 1);
-    Pixel[12]     := Round((Self.FData[(i * 8) + 6] and $03) + 1);
-    Pixel[13]     := Round((Self.FData[(i * 8) + 7] and $C0) / $40 + 1);
-    Pixel[14]     := Round((Self.FData[(i * 8) + 7] and $30) / $10 + 1);
-    Pixel[15]     := Round((Self.FData[(i * 8) + 7] and $0C) / $04 + 1);
-    Pixel[16]     := Round((Self.FData[(i * 8) + 7] and $03) + 1);
-    for j := 0 to 3 do
-    begin
-      tempd[((y + 3) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[16 - j]].RGBb;
-      tempd[((y + 3) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[16 - j]].RGBg;
-      tempd[((y + 3) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[16 - j]].RGBr;
-      tempd[((y + 3) * Self.FWidth + x + j) * 4 + 3] := 0;
-    end;
-    for j := 0 to 3 do
-    begin
-      tempd[((y + 2) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[12 - j]].RGBb;
-      tempd[((y + 2) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[12 - j]].RGBg;
-      tempd[((y + 2) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[12 - j]].RGBr;
-      tempd[((y + 2) * Self.FWidth + x + j) * 4 + 3] := 0;
-    end;
-    for j := 0 to 3 do
-    begin
-      tempd[((y + 1) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[8 - j]].RGBb;
-      tempd[((y + 1) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[8 - j]].RGBg;
-      tempd[((y + 1) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[8 - j]].RGBr;
-      tempd[((y + 1) * Self.FWidth + x + j) * 4 + 3] := 0;
-    end;
-    for j := 0 to 3 do
-    begin
-      tempd[((y + 0) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[4 - j]].RGBb;
-      tempd[((y + 0) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[4 - j]].RGBg;
-      tempd[((y + 0) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[4 - j]].RGBr;
-      tempd[((y + 0) * Self.FWidth + x + j) * 4 + 3] := 0;
-    end;
-    x := x + 4;
-    if x = Self.FWidth then
-    begin
-      y := y + 4;
-      x := 0;
-    end;
-  end;
-  SetLength(Self.FData, Length(tempd));
-  for i := 0 to High(tempd) do
-    Self.FData[i] := tempd[i];
-  Self.FStoreType := 8;
-  Self.FDepth    := 32;
-  Self.FDataType := Self.FDataType - [DT_Oni] + [DT_Decoded32];
+  i: Integer;
+begin
+  if Length(FImages) > 0 then
+    for i := 0 to High(FImages) do
+      ConvertImage(FImages[i], Format);
 end;
 
 
-
+function TOniImage.GetHasMipMaps: Boolean;
+begin
+  Result := Length(FImages) > 1;
+end;
 
 
 function TOniImage.Load(ConnectionID, FileID: Integer): Boolean;
 var
   FileInfo: TFileInfo;
-  ext:      String;
 begin
   FileInfo := ConManager.Connection[ConnectionID].GetFileInfo(fileid);
   if FileInfo.Extension = 'PSpc' then
@@ -357,6 +189,7 @@ var
   rows:     array[0..2] of Word;
   col, row: Byte;
 begin
+(*
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $08, SizeOf(PSpc), @PSpc);
   PSpc.TXMP := PSpc.TXMP div 256;
   if PSpc.TXMP = 0 then
@@ -366,9 +199,9 @@ begin
   end;
   txmpimg := TOniImage.Create;
   txmpimg.LoadFromTXMP(ConnectionID, PSpc.TXMP);
-  txmpimg.DecodeImage;
+  txmpimg.DecodeImageTo32bit;
 //  txmpimg.WriteToBMP('C:\file.bmp');
-  txmpdata := txmpimg.GetAs32bit;
+  txmpimg.GetAs32bit(txmpdata);
 {    ShowMessage(IntToStr(txmpimg.Width)+'x'+IntToStr(txmpimg.Height));
     for i:=0 to High(txmpdata) do
       txmpimg.Data[i]:=txmpdata[i];
@@ -459,6 +292,7 @@ begin
   Self.FStoreType := 8;
   Self.FDataType  := [DT_Decoded32];
   //    Self.RevertImage;
+*)
 end;
 
 
@@ -467,44 +301,153 @@ end;
 function TOniImage.LoadFromTXMP(ConnectionID, FileID: Integer): Boolean;
 var
   img_addr: Integer;
+  data: TMemoryStream;
+  hdr: TDDSDXTHeader;
+  imginfo: Integer;
+  x,y, i: Integer;
+
+  _width, _height: Word;
+  _storetype: Byte;
+  _depth: Byte;
 begin
   Result := True;
-  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(Self.FWidth), @Self.FWidth);
-  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(Self.FHeight), @Self.FHeight);
-  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(Self.FStoreType),
-    @Self.FStoreType);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(_width), @_width);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(_height), @_height);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(_storetype), @_storetype);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(imginfo), @imginfo);
   if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
     ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, SizeOf(img_addr), @img_addr)
   else
     ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, SizeOf(img_addr), @img_addr);
 
-  case Self.FStoreType of
+  case _storetype of
     0, 1, 2:
-    begin
-      SetLength(Self.FData, Self.FWidth * Self.FHeight * 2);
-      Self.FDepth := 16;
-    end;
-    8:
-    begin
-      SetLength(Self.FData, Self.FWidth * Self.FHeight * 4);
-      Self.FDepth := 32;
-    end;
+      _depth := 16;
+    7, 8:
+      _depth := 32;
     9:
-    begin
-      SetLength(Self.FData, Self.FWidth * Self.FHeight div 2);
-      Self.FDepth := 16;
-    end;
+      _depth := 16;
     else
       Result := False;
       Exit;
   end;
 
+  with hdr do
+  begin
+    FOURCC := 'DDS ';
+    with SURFACEDESC2 do
+    begin
+      Size := 124;
+      Flags := DDSD_CAPS or DDSD_PIXELFORMAT or DDSD_WIDTH or DDSD_HEIGHT;
+      if _storetype = 9 then
+        Flags := Flags or DDSD_LINEARSIZE
+      else
+        Flags := Flags or DDSD_PITCH;
+      if (imginfo and $01) > 0 then
+        Flags := Flags or DDSD_MIPMAPCOUNT;
+      Height := _height;
+      Width := _width;
+      if _storetype = 9 then
+        PitchOrLinearSize := width * height div 2
+      else
+        PitchOrLinearSize := width * _depth div 8;
+      Depth := 0;
+      MipMapCount := 1;
+      if (imginfo and $01) > 0 then
+      begin
+        x := width;
+        y := height;
+        while (x > 1) and (y > 1) do
+        begin
+          x := x div 2;
+          y := y div 2;
+          Inc(MipMapCount);
+        end;
+      end;
+      for i := 1 to 11 do
+        Reserved[i] := 0;
+      with PIXELFORMAT do
+      begin
+        Size := 32;
+        if _storetype = 9 then
+          Flags := DDPF_FOURCC
+        else
+          Flags := DDPF_RGB;
+        if _storetype in [0, 2] then
+          Flags := Flags or DDPF_ALPHAPIXELS;
+        if _storetype = 9 then
+          FOURCC := 'DXT1'
+        else
+        begin
+          RGBBitCount := _depth;
+          case _storetype of
+            0: begin
+              RBitMask := $0F00;
+              GBitMask := $00F0;
+              BBitMask := $000F;
+              AlphaBitMask := $F000;
+            end;
+            1, 2: begin
+              RBitMask := $7C00;
+              GBitMask := $03E0;
+              BBitMask := $001F;
+              if _storetype = 2 then
+                AlphaBitMask := $8000
+              else
+                AlphaBitMask := $0000;
+            end;
+            8: begin
+              RBitMask := $00FF0000;
+              GBitMask := $0000FF00;
+              BBitMask := $000000FF;
+              AlphaBitMask := $00000000;
+            end;
+          end;
+        end;
+      end;
+      with DDSCAPS2 do
+      begin
+        Caps1 := DDSCAPS_TEXTURE;
+        if (imginfo and $01) > 0 then
+          Caps1 := Caps1 or DDSCAPS_COMPLEX or DDSCAPS_MIPMAP;
+        Caps2 := 0;
+        Reserved[1] := 0;
+        Reserved[2] := 0;
+      end;
+    end;
+  end;
+
+  data := TMemoryStream.Create;
+  data.Write(hdr, SizeOf(hdr));
   if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
-    ConManager.Connection[ConnectionID].LoadRawFile(fileid, $9C, FData)
+    ConManager.Connection[ConnectionID].LoadRawFile(fileid, $9C, TStream(data))
   else
-    ConManager.Connection[ConnectionID].LoadRawFile(fileid, $A0, FData);
+    ConManager.Connection[ConnectionID].LoadRawFile(fileid, $A0, TStream(data));
 
-  Self.FDataType := [DT_OniReverted, DT_Oni];
+//  data.Seek(0, soFromBeginning);
+//  data.SaveToFile('m:\test.txmp');
+
+  data.Seek(0, soFromBeginning);
+  result := LoadMultiImageFromStream(data, FImages);
+  data.Free;
+{
+  if result then
+  begin
+    for i := 0 to High(FImages) do
+    begin
+      data := TMemoryStream.Create;
+      data.Write(FImages[i].Bits^, FImages[i].Size);
+      data.Seek(0, soFromBeginning);
+      data.SaveToFile('m:\test.txmp.'+IntToStr(i));
+      data.Free;
+    end;
+  end;
+}
+  if not result then
+  begin
+    ShowMessage('Error while loading file' + #13#10 + DetermineStreamFormat(data));
+//    data.SaveToFile('m:\prob.dds');
+  end;
 end;
 
 
@@ -516,321 +459,130 @@ var
   rows, cols: Word;
   linkcount: Integer;
   link: Integer;
-  images_decoded: array of TOniImage;
+  images: array of TOniImage;
   x_start, y_start: Integer;
+
+  width, height: Word;
 begin
-  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, SizeOf(Self.FWidth), @Self.FWidth);
-  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $12, SizeOf(Self.FHeight), @Self.FHeight);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, SizeOf(width), @width);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $12, SizeOf(height), @height);
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, SizeOf(cols), @cols);
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1A, SizeOf(rows), @rows);
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, SizeOf(linkcount), @linkcount);
-  SetLength(images_decoded, linkcount);
+  SetLength(images, linkcount);
   for i := 0 to linkcount - 1 do
   begin
     ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * 4, SizeOf(link), @link);
     link := link div 256;
-    images_decoded[i] := TOniImage.Create;
-    images_decoded[i].LoadFromTXMP(ConnectionID, link);
-    images_decoded[i].DecodeImage;
-    images_decoded[i].RevertImage;
+    images[i] := TOniImage.Create;
+    images[i].LoadFromTXMP(ConnectionID, link);
+    SetLength(FImages, 1);
+    NewImage(width, height, ifA1R5G5B5, FImages[0]);
   end;
-  SetLength(Self.FData, Self.FWidth * Self.FHeight * 4);
   for y := 0 to rows - 1 do
   begin
     for x := 0 to cols - 1 do
     begin
-      imgid   := y * cols + x;
+      imgid := y * cols + x;
       x_start := 0;
       y_start := 0;
       for i := 0 to x do
         if i < x then
-          x_start := x_start + images_decoded[i].Width;
+          x_start := x_start + images[i].Image[0].Width;
       for i := 0 to y do
         if i < y then
-          y_start := y_start + images_decoded[i].Height;
-      for y2 := 0 to images_decoded[imgid].Height - 1 do
-      begin
-        for x2 := 0 to images_decoded[imgid].Width - 1 do
-        begin
-          if ((x_start + x2) < Self.FWidth) and ((y_start + y2) < Self.FHeight) then
-          begin
-            pixelid := y_start * Self.FWidth + x_start + y2 * Self.FWidth + x2;
-            Self.FData[pixelid * 4 + 0] :=
-              images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 0];
-            Self.FData[pixelid * 4 + 1] :=
-              images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 1];
-            Self.FData[pixelid * 4 + 2] :=
-              images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 2];
-            Self.FData[pixelid * 4 + 3] :=
-              images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 3];
-          end;
-        end;
-      end;
+          y_start := y_start + images[i].Image[0].Height;
+      CopyRect(images[imgid].Image[0], 0, 0, images[imgid].Image[0].Width,
+          images[imgid].Image[0].Height, FImages[0], x_start, y_start);
     end;
   end;
   for i := 0 to linkcount - 1 do
-    images_decoded[i].Free;
-  Self.FDepth     := 32;
-  Self.FStoreType := 8;
-  Self.FDataType  := [DT_Decoded32];
-  Self.RevertImage;
+    images[i].Free;
 end;
 
 
 
-
-function TOniImage.GetImageDataSize(fading: Boolean): Integer;
+procedure TOniImage.SaveDataToStream(MipMaps: Boolean; var Target: TStream);
 var
-  size: Integer;
-  x, y: Word;
-  bpp:  Byte;
+  images: TDynImageDataArray;
+  mem: TMemoryStream;
+  i: Integer;
 begin
-  case Self.FStoreType of
-    9:
-      bpp := 8;
-    0, 1, 2:
-      bpp := 16;
-    8:
-      bpp := 32;
+  if Length(FImages) = 0 then
+    Exit;
+  if MipMaps then
+  begin
+    if Length(FImages) = 1 then
+    begin
+      if not GenerateMipMaps(FImages[0], 0, images) then
+      begin
+        ShowMessage('Could not generate MipMaps');
+        Exit;
+      end;
+    end
     else
-      Result := 0;
+    begin
+      SetLength(images, Length(FImages));
+      for i := 0 to High(FImages) do
+        CloneImage(FImages[i], images[i]);
+    end;
+    mem := TMemoryStream.Create;
+    if not SaveMultiImageToStream('dds', mem, images) then
+    begin
+      ShowMessage('Could not save images to stream');
       Exit;
-  end;
-
-  x    := Self.FWidth;
-  y    := Self.FHeight;
-  size := x * y * bpp div 8;
-  if fading then
-  begin
-    repeat
-      x    := x div 2;
-      y    := y div 2;
-      size := size + x * y * bpp div 8;
-    until (x = 1) or (y = 1);
-  end;
-  Result := size;
-end;
-
-
-
-
-function TOniImage.GetAsData: TByteData;
-var
-  i:      Integer;
-  revert: Boolean;
-begin
-  //    if not (DT_Decoded32 in Self.FDataType) then
-  //      Self.DecodeImage;
-  if not (DT_OniReverted in Self.FDataType) then
-  begin
-    revert := True;
-    Self.RevertImage;
+    end;
+    FreeImagesInArray(images);
   end
   else
-    revert := False;
-  SetLength(Result, Length(Self.FData));
-  for i := 0 to High(Result) do
-    Result[i] := Self.FData[i];
-  if revert then
-    Self.RevertImage;
-end;
-
-
-
-
-function TOniImage.GetAs32bit: TByteData;
-var
-  i: Integer;
-begin
-  if not (DT_Decoded32 in Self.FDataType) then
-    Self.DecodeImage;
-  SetLength(Result, Length(Self.FData));
-  for i := 0 to High(Result) do
-    Result[i] := Self.FData[i];
-end;
-
-
-
-
-procedure TOniImage.GetAsBMP(var Target: TByteData);
-const
-  BMPheader: array[0..53] of Byte =
-    ($42, $4D, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0,
-    40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, $18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-var
-  i, x, y: Integer;
-begin
-  if not (DT_Decoded32 in Self.FDataType) then
-    Self.DecodeImage;
-
-  SetLength(Target, Self.FWidth * Self.FHeight * 3 + 54);
-  for y := 0 to Self.FHeight - 1 do
   begin
-    for x := 0 to Self.FWidth - 1 do
+    mem := TMemoryStream.Create;
+    if not SaveImageToStream('dds', mem, FImages[0]) then
     begin
-      Target[((Self.FWidth * y + x) * 3) + 0 + 54] := Self.FData[(Self.FWidth * y + x) * 4 + 0];
-      Target[((Self.FWidth * y + x) * 3) + 1 + 54] := Self.FData[(Self.FWidth * y + x) * 4 + 1];
-      Target[((Self.FWidth * y + x) * 3) + 2 + 54] := Self.FData[(Self.FWidth * y + x) * 4 + 2];
+      ShowMessage('Could not save image to stream');
+      Exit;
     end;
   end;
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
 
-  for i := 0 to High(BMPheader) do
-    Target[i] := BMPheader[i];
-  Target[2] := ((Self.FWidth * Self.FHeight * 3 + 54) and $000000FF) div $1;
-  Target[3]  := ((Self.FWidth * Self.FHeight * 3 + 54) and $0000FF00) div $100;
-  Target[4]  := ((Self.FWidth * Self.FHeight * 3 + 54) and $00FF0000) div $10000;
-  Target[5]  := ((Self.FWidth * Self.FHeight * 3 + 54) and $FF000000) div $1000000;
-  Target[18] := (Self.FWidth and $000000FF) div $1;
-  Target[19] := (Self.FWidth and $0000FF00) div $100;
-  Target[20] := (Self.FWidth and $00FF0000) div $10000;
-  Target[21] := (Self.FWidth and $FF000000) div $1000000;
-  Target[22] := (Self.FHeight and $000000FF) div $1;
-  Target[23] := (Self.FHeight and $0000FF00) div $100;
-  Target[24] := (Self.FHeight and $00FF0000) div $10000;
-  Target[25] := (Self.FHeight and $FF000000) div $1000000;
-  Target[34] := ((Self.FWidth * Self.FHeight * 3) and $000000FF) div $1;
-  Target[35] := ((Self.FWidth * Self.FHeight * 3) and $0000FF00) div $100;
-  Target[36] := ((Self.FWidth * Self.FHeight * 3) and $00FF0000) div $10000;
-  Target[37] := ((Self.FWidth * Self.FHeight * 3) and $FF000000) div $1000000;
-end;
+//  mem.Seek(0, soFromBeginning);
+//  mem.SaveToFile('m:\dds.dds');
 
-
-procedure TOniImage.GetAsBMP(var Target: TStream);
-var
-  data: TByteData;
-  streampos: Integer;
-begin
-  GetAsBMP(data);
-  streampos := Target.Position;
-  Target.Write(data[0], Length(data));
-  Target.Seek(streampos, soFromBeginning);
+  mem.Seek(128, soFromBeginning);
+  Target.CopyFrom(mem, mem.Size - 128);
+  mem.Free;
+  Target.Seek(0, soFromBeginning);
 end;
 
 
-function TOniImage.LoadFromBMP(filename: String): Boolean;
-var
-  filestream: TFileStream;
-  tempd:      TByteData;
-
-  x, y: Integer;
+function TOniImage.LoadFromFile(filename: String): Boolean;
 begin
-  filestream := TFileStream.Create(filename, fmOpenRead);
-  SetLength(tempd, filestream.Size);
-  filestream.Read(tempd[0], filestream.Size);
-  filestream.Free;
-
-  if not ((tempd[00] = $42) and (tempd[01] = $4D)) then
-  begin
-    Result := False;
-    ShowMessage('Not a standard 24bit bitmap');
-    Exit;
-  end;
-  if not (tempd[10] = 54) then
-  begin
-    Result := False;
-    ShowMessage('Imagedata has to start at 0x54');
-    Exit;
-  end;
-  if not (tempd[14] = 40) then
-  begin
-    Result := False;
-    ShowMessage('Second bitmap header has to have 40 bytes');
-    Exit;
-  end;
-  if not (tempd[28] = 24) then
-  begin
-    Result := False;
-    ShowMessage('Bitmap has to have 24bits');
-    Exit;
-  end;
-  if not (tempd[30] = 0) then
-  begin
-    Result := False;
-    ShowMessage('Bitmap has to be uncompressed');
-    Exit;
-  end;
-
-  Self.FWidth     := tempd[18] + tempd[19] * 256 + tempd[20] * 256 * 256 + tempd[21] * 256 * 256 * 256;
-  Self.FHeight    := tempd[22] + tempd[23] * 256 + tempd[24] * 256 * 256 + tempd[25] * 256 * 256 * 256;
-  Self.FDepth     := 32;
-  Self.FStoreType := 8;
-
-  SetLength(Self.FData, Self.FWidth * Self.FHeight * Self.FDepth div 8);
-  for y := 0 to Self.FHeight - 1 do
-  begin
-    for x := 0 to Self.FWidth - 1 do
-    begin
-      Self.FData[((Self.FWidth * y + x) * 4) + 0] := tempd[54 + (Self.FWidth * y + x) * 3 + 0];
-      Self.FData[((Self.FWidth * y + x) * 4) + 1] := tempd[54 + (Self.FWidth * y + x) * 3 + 1];
-      Self.FData[((Self.FWidth * y + x) * 4) + 2] := tempd[54 + (Self.FWidth * y + x) * 3 + 2];
-      Self.FData[((Self.FWidth * y + x) * 4) + 3] := 0;
-    end;
-  end;
-
-  Self.FDataType := [DT_Decoded32];
+  if not LoadMultiImageFromFile(filename, FImages) then
+    ShowMessage('Couldn''t load image file');
 end;
 
 
-
-
-function TOniImage.WriteToBMP(filename: String): Boolean;
-var
-  filestream: TFileStream;
+function TOniImage.WriteToFile(filename: String): Boolean;
 begin
-  filestream := TFileStream.Create(filename, fmCreate);
-  GetAsBMP(TStream(filestream));
-  filestream.Free;
+  SaveMultiImageToFile(filename, FImages);
 end;
 
 
 
-
-function TOniImage.GetMipMappedImage(var faded: TByteData): Boolean;
+function TOniImage.GetImageSize(MipMaps: Boolean): Integer;
 var
-  i:      Integer;
-  x, y:   Word;
-  fadelvldata: TByteData;
-  revert: Boolean;
-begin
-  Result := False;
-
-  //    if not (DT_Decoded32 in Self.FDataType) then
-  //      Self.DecodeImage;
-  if Self.FStoreType = 9 then
-    Self.DecompressImage;
-  if not (DT_OniReverted in Self.FDataType) then
+  i: Integer;
+begin
+  if Length(FImages) > 0 then
   begin
-    revert := True;
-    Self.RevertImage;
+    Result := FImages[0].Size;
+    if mipmaps then
+      for i := 1 to High(FImages) do
+        Result := Result + FImages[i].Size;
   end
   else
-    revert := False;
-
-  x := Self.FWidth;
-  y := Self.FHeight;
-  SetLength(faded, x * y * Self.FDepth div 8);
-  SetLength(fadelvldata, x * y * Self.FDepth div 8);
-  for i := 0 to Length(faded) - 1 do
-  begin
-    faded[i] := Self.FData[i];
-    fadelvldata[i] := Self.FData[i];
-  end;
-  repeat
-    fadelvldata := Self.ResizeImage(x, y, fadelvldata);
-    x := x div 2;
-    y := y div 2;
-    SetLength(faded, Length(faded) + x * y * Self.FDepth div 8);
-    for i := 0 to Length(fadelvldata) - 1 do
-      faded[Length(faded) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
-  until (x = 1) or (y = 1) or ((x mod 2) = 1) or ((y mod 2) = 1);
-  if (x > 1) and (y > 1) then
-    Exit;
-  Result := True;
-
-  if revert then
-    Self.RevertImage;
+    Result := -1;
 end;
 
-
 end.
\ No newline at end of file