Changeset 194 for oup/current

Timestamp:

May 26, 2007, 8:26:48 PM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/current

Files:

• Global/OniImgClass.pas (modified) (3 diffs)
• Tools/Preview.dfm (modified) (1 diff)
• Tools/Preview.pas (modified) (6 diffs)
• Tools/TxmpReplace.dfm (modified) (3 diffs)
• Tools/TxmpReplace.pas (modified) (6 diffs)
• _exe/OniUnPacker.exe (modified) ( previous)

oup/current/Global/OniImgClass.pas

@@ -16 +16 @@
     function GetImageFormat: TImageFormat;
     procedure SetImageFormat(Format: TImageFormat);
+    function pGetImageFormatInfo: TImageFormatInfo;
     function GetHasMipMaps: Boolean;
   protected
@@ -24 +25 @@
     property Height[MipGen: Integer]: Integer   read GetHeight;
     property Format: TImageFormat read GetImageFormat write SetImageFormat;
+    property FormatInfo: TImageFormatInfo read pGetImageFormatInfo;
     property HasMipMaps: Boolean read GetHasMipMaps;
 
@@ -128 +130 @@
     for i := 0 to High(FImages) do
       ConvertImage(FImages[i], Format);
+end;
+
+
+function TOniImage.pGetImageFormatInfo: TImageFormatInfo;
+begin
+  if Length(FImages) > 0 then
+    GetImageFormatInfo(FImages[0].Format, Result);
 end;
 

oup/current/Tools/Preview.dfm

@@ -6 +6 @@
   PixelsPerInch = 96
   TextHeight = 13
+  inherited Splitter1: TSplitter
+    OnMoved = Splitter1Moved
+  end
   inherited content: TPanel
     object lbl_notpossible: TLabel

oup/current/Tools/Preview.pas

@@ -29 +29 @@
     procedure SetBitmapCount(Count: Integer);
     procedure LoadImage(fileid, index: Integer);
+    procedure Splitter1Moved(Sender: TObject);
   private
     bitmaps:   array of TOniImage;
@@ -41 +42 @@
 implementation
 {$R *.dfm}
-uses Imaging, ImagingComponents, ImagingTypes;
+uses Imaging, ImagingComponents, ImagingTypes, jpeg;
 
 
@@ -48 +49 @@
   inherited;
   Self.OnNewFileSelected := NewFile;
+  SetBitmapCount(0);
 end;
 
@@ -56 +58 @@
 begin
   _fileid := fileinfo.ID;
+  SetBitmapCount(0);
   if _fileid >= 0 then
   begin
@@ -115 +118 @@
 
 
+procedure TForm_Preview.Splitter1Moved(Sender: TObject);
+begin
+  inherited;
+  img.Picture.Assign(nil);
+  if Length(bitmaps) > 0 then
+    DrawImage(0);
+end;
+
 procedure TForm_Preview.PreviewImage;
 begin
@@ -160 +171 @@
   Self.btn_dec.Enabled := not Self.timer.Enabled;
   Self.btn_inc.Enabled := not Self.timer.Enabled;
+  if self.timer.Enabled then
+    timerTimer(Self);
   if Self.timer.Enabled then
     Self.btn_startstop.Caption := 'Stop automatic'

oup/current/Tools/TxmpReplace.dfm

@@ -8 +8 @@
   inherited Splitter1: TSplitter
     Height = 344
+    OnMoved = Splitter1Moved
     ExplicitHeight = 344
   end
@@ -104 +105 @@
           Width = 121
           Height = 25
-          Caption = 'Load BMP ...'
+          Caption = 'Load image...'
           TabOrder = 0
           OnClick = btn_loadClick
@@ -154 +155 @@
     DefaultExt = 'bmp'
     Filter = 
-      'All supported files (*.bmp, *.dds)|*.bmp;*.dds|Windows Bitmap (*' +
-      '.bmp)|*.bmp|DirectDraw Surface (*.dds)|*.dds|Targa (*.tga)|*.tga' +
-      '|JPEG (*.jpg, *.jpeg)|*.jpg;*.jpeg|All files (*.*)|*'
+      'All supported files (*.bmp, *.dds, *.tga, *.jpg, *.jpeg)|*.bmp;*' +
+      '.dds;*.tga;*.jpg;*.jpeg;*.png|Windows Bitmap (*.bmp)|*.bmp|Direc' +
+      'tDraw Surface (*.dds)|*.dds|Targa (*.tga)|*.tga|JPEG (*.jpg, *.j' +
+      'peg)|*.jpg;*.jpeg|PNG (*.png)|*.png|All files (*.*)|*'
     Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]
     Left = 104

oup/current/Tools/TxmpReplace.pas

@@ -28 +28 @@
     procedure btn_loadClick(Sender: TObject);
     procedure btn_replaceClick(Sender: TObject);
+    procedure Splitter1Moved(Sender: TObject);
   private
     OniImage_Old: TOniImage;
@@ -57 +58 @@
   OniImage_Old.LoadFromTXMP(ConnectionID, fileid);
   old_size := OniImage_Old.GetImageSize(True);
-  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 2);
+  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
 
   check_fading.Checked := OniImage_Old.HasMipMaps;
@@ -66 +67 @@
 end;
 
+
+procedure TForm_TxmpReplace.Splitter1Moved(Sender: TObject);
+begin
+  inherited;
+  image_txmppreview.Picture.Assign(nil);
+  image_bmppreview.Picture.Assign(nil);
+  if Length(OniImage_Old.Images) > 0 then
+    OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
+  if Length(OniImage_New.Images) > 0 then
+    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 1);
+end;
 
 procedure TForm_TxmpReplace.btn_loadClick(Sender: TObject);
@@ -90 +102 @@
   mem: TMemoryStream;
   new_storetype: Byte;
+  formatinfo: TImageFormatInfo;
 begin
   if filelist.ItemIndex >= 0 then
@@ -127 +140 @@
       ifDXT1: new_storetype := 9;
     else
+      if OniImage_New.FormatInfo.HasAlphaChannel then
+        ShowMessage('Loaded image has an alpha-channel.' + #13#10 +
+                    'Because the format is neither ARGB1555' +#13#10 +
+                    'nor ARGB4444 it can not be imported without conversion.' + #13#10 +
+                    'It is converted to RGB888, so alpha gets dropped.' + #13#10 +
+                    'If you need alpha you have to save your image in' + #13#10 +
+                    'one of the previously named formats.');  
       OniImage_New.Format := ifX8R8G8B8;
       new_storetype := 8;
@@ -164 +184 @@
 
     ShowMessage('TXMP-image replaced');
+    Self.listClick(Self);
   end;
 end;