From f3d73d6d6f862d19379f4eac23b463dc97907213 Mon Sep 17 00:00:00 2001 From: ronaldhordijk Date: Sun, 2 Oct 2005 07:33:11 +0000 Subject: [PATCH] version 203a check before export gradient saved in different field --- 2.10/Source/Main.dfm | 12 ++++++------ 2.10/Source/Main.pas | 22 +++++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/2.10/Source/Main.dfm b/2.10/Source/Main.dfm index 34c703b..5f5cdd4 100644 --- a/2.10/Source/Main.dfm +++ b/2.10/Source/Main.dfm @@ -2,7 +2,7 @@ object MainForm: TMainForm Left = 387 Top = 166 Width = 605 - Height = 595 + Height = 615 Caption = 'Apophysis' Color = clBtnFace Font.Charset = ANSI_CHARSET @@ -27,7 +27,7 @@ object MainForm: TMainForm Left = 160 Top = 28 Width = 4 - Height = 498 + Height = 514 end object ToolBar: TToolBar Left = 0 @@ -284,7 +284,7 @@ object MainForm: TMainForm Left = 0 Top = 28 Width = 160 - Height = 498 + Height = 514 Align = alLeft Columns = < item @@ -303,7 +303,7 @@ object MainForm: TMainForm Left = 164 Top = 28 Width = 433 - Height = 498 + Height = 514 Align = alClient BevelInner = bvLowered BevelOuter = bvNone @@ -314,7 +314,7 @@ object MainForm: TMainForm Left = 1 Top = 1 Width = 431 - Height = 496 + Height = 512 Align = alClient AutoSize = True PopupMenu = DisplayPopup @@ -327,7 +327,7 @@ object MainForm: TMainForm end object StatusBar: TStatusBar Left = 0 - Top = 526 + Top = 542 Width = 597 Height = 19 Panels = < diff --git a/2.10/Source/Main.pas b/2.10/Source/Main.pas index 34ee40d..e1d7cd1 100644 --- a/2.10/Source/Main.pas +++ b/2.10/Source/Main.pas @@ -1364,11 +1364,14 @@ begin x := cp1.center[0]; y := cp1.center[1]; pal := ''; hue := ''; -// if sheep then -// begin + if sheep then begin if cp1.cmapindex >= 0 then pal := 'palette="' + IntToStr(cp1.cmapindex) + '" '; hue := 'hue="' + format('%g', [cp1.hue_rotation]) + '" '; -// end; + end; + + if cp1.cmapindex >= 0 then + pal := pal + 'gradient="' + IntToStr(cp1.cmapindex) + '" '; + if Trim(SheepNick) <> '' then nick := 'nick="' + Trim(SheepNick) + '"'; if Trim(SheepURL) <> '' then url := 'url="' + Trim(SheepURL) + '" '; try @@ -3697,10 +3700,10 @@ var Ext, ex, Path: string; cp1: TControlPoint; begin -// if MainCp.FAngle <> 0 then begin -// showMessage('This flame is rotated. It cannot be correctly rendered this way'); -// Exit; -// end; + if (MainCp.NumXForms > 12) or + (MainCP.HasNewVariants) then begin + showMessage('This flame will not be correctly rendered this way. Please use the internal renderer.'); + end; if not FileExists(HqiPath) then begin @@ -3899,6 +3902,11 @@ begin v := Attributes.Value('time'); if v <> '' then Parsecp.Time := StrToFloat(v); v := Attributes.value('palette'); + if v <> '' then + Parsecp.cmapindex := StrToInt(v) + else + Parsecp.cmapindex := -1; + v := Attributes.value('gradient'); if v <> '' then Parsecp.cmapindex := StrToInt(v) else