version 2.04

2.10/Source/About.dfm

@@ -1881,7 +1881,7 @@ object AboutForm: TAboutForm
     Top = 24
     Width = 58
     Height = 13
-    Caption = 'version 2.03'
+    Caption = 'version 2.04'
   end
   object Label3: TLabel
     Left = 120

2.10/Source/Editor.dfm

@@ -239,7 +239,7 @@ object EditForm: TEditForm
       object tbAxisLock: TToolButton
         Left = 299
         Top = 0
-        Hint = 'Lock transform axis'
+        Hint = 'Lock transform axes'
         Caption = 'tbAxisLock'
         Down = True
         ImageIndex = 16
@@ -994,11 +994,11 @@ object EditForm: TEditForm
                 end
                 object chkAxisLock: TCheckBox
                   Left = 24
-                  Top = 162
+                  Top = 163
-                  Width = 113
+                  Width = 121
                   Height = 17
-                  Hint = 'Lock axis rotation'
+                  Hint = 'Lock axes rotation'
-                  Caption = 'Lock transform axis'
+                  Caption = 'Lock transform axes'
                   Checked = True
                   ParentShowHint = False
                   ShowHint = True
@@ -1664,7 +1664,7 @@ object EditForm: TEditForm
       OnClick = tbExtendedEditClick
     end
     object mnuAxisLock: TMenuItem
-      Caption = 'Lock transform axis'
+      Caption = 'Lock transform axes'
       ImageIndex = 16
       OnClick = tbAxisLockClick
     end
@@ -2865,25 +2865,4 @@ object EditForm: TEditForm
       OnClick = mnuResetTrgScaleClick
     end
   end
-  object ExtendedEditPopup: TPopupMenu
-    Images = EditorTB
-    Left = 217
-    Top = 33
-    object mnuExtEditMove: TMenuItem
-      Caption = 'Move'
-    end
-    object mnuExtEditRotate: TMenuItem
-      Caption = 'Rotate'
-    end
-    object mnuExtEditScale: TMenuItem
-      Caption = 'Scale'
-    end
-    object N9: TMenuItem
-      Caption = '-'
-    end
-    object mnuExtEditOff: TMenuItem
-      Caption = 'Off'
-      RadioItem = True
-    end
-  end
 end

2.10/Source/Editor.pas

@@ -33,10 +33,6 @@ const
   crEditRotate = 22;
   crEditScale  = 23;
 
-  imgExtMove   = 24;
-  imgExtRotate = 25;
-  imgExtScale  = 26;
-
 type
   TEditForm = class(TForm)
     GrphPnl: TPanel;
@@ -182,12 +178,6 @@ type
     tbAxisLock: TToolButton;
     mnuSelectmode: TMenuItem;
     ToolButton6: TToolButton;
-    ExtendedEditPopup: TPopupMenu;
-    mnuExtEditOff: TMenuItem;
-    mnuExtEditMove: TMenuItem;
-    mnuExtEditRotate: TMenuItem;
-    mnuExtEditScale: TMenuItem;
-    N9: TMenuItem;
     tbPivotMode: TToolButton;
     tbRotate90CCW: TToolButton;
     tbRotate90CW: TToolButton;
@@ -877,8 +867,6 @@ procedure TEditForm.UpdateWidgets;
     Result.x := x;
     Result.y := y;
   end;
-//var
-//  xx, xy, yx, yy: double;
 begin
   with mainTriangles[Selectedtriangle] do
   begin
@@ -1940,7 +1928,6 @@ procedure TEditForm.TriangleViewMouseDown(Sender: TObject; Button: TMouseButton;
 var
   a, d, fx, fy: double;
   dx, dy, x1, y1: double;
-//  xx, xy, yx, yy: double;
   i, j: integer;
   i0, i1: integer;
 label
@@ -4234,7 +4221,6 @@ end;
 
 procedure TEditForm.mnuResetTrgRotationClick(Sender: TObject);
 var
-//  xx, xy, yx, yy: double;
   dx, dy: double;
   ax, ay, da: integer;
   nx0, ny0, nx2, ny2: double;
@@ -4269,7 +4255,6 @@ end;
 
 procedure TEditForm.mnuResetTrgScaleClick(Sender: TObject);
 var
-//  xx, xy, yx, yy: double;
   dx, dy: double;
   nx0, ny0, nx2, ny2: double;
 begin

2.10/Source/Main.dfm

@@ -2527,7 +2527,9 @@ object MainForm: TMainForm
       end
       object mnuSaveUPR: TMenuItem
         Caption = 'Export &UPR...'
-        Hint = 'Save the flame in UltraFractal parameter format'
+        Hint = 
+          'Save the flame in UltraFractal parameter format *** OUTDATED ***' +
+          ' USE AT YOUR OWN RISK!'
         OnClick = mnuSaveUPRClick
       end
       object mnuExportFLame: TMenuItem

2.10/Source/Main.pas

@@ -37,7 +37,7 @@ const
   RS_XO = 2;
   RS_VO = 3;
 
-  AppVersionString = 'Apophysis 2.03d rc1';
+  AppVersionString = 'Apophysis 2.04 beta';
 
 type
   TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
@@ -1366,6 +1366,7 @@ begin
       FileList.Add('   ' + cp1.xform[t].ToXMLString);
       Filelist.Add('   </xformset>');
 {$else}
+      // 'enabled' flag disabled in this release
       FileList.Add(cp1.xform[t].FinalToXMLString(cp1.finalXformEnabled));
 {$ifend}
 
@@ -3594,6 +3595,7 @@ var
   Ext, ex, Path: string;
   cp1: TControlPoint;
 begin
+{
   if (MainCp.NumXForms > 12) or
      (MainCP.HasNewVariants) then begin
     showMessage('WARNING: This flame will not be correctly rendered '#10#13+
@@ -3601,7 +3603,7 @@ begin
                 'Please use the 2.7b4 version or newer '#10#13+
                 'or use the internal renderer.');
   end;
-
+}
   if not FileExists(HqiPath) then
   begin
     Application.MessageBox('Renderer does not exist.', 'Apophysis', 16);
@@ -3675,11 +3677,17 @@ begin
       if ExportDialog.udStrips.Position > 1 then
         FileList.Add('set nstrips=' + IntToStr(ExportDialog.udStrips.Position));
       FileList.Add('set out=' + ExportDialog.Filename);
-      FileList.Add('@echo Rendering ' + ExportDialog.Filename);
+      FileList.Add('@echo Rendering "' + ExportDialog.Filename + '"');
-
+{
       FileList.Add(ExtractShortPathName(hqiPath) + ' < ' + ExtractShortPathName(ChangeFileExt(ExportDialog.Filename, '.flame')));
-
       Path := ExtractShortPathName(ExtractFileDir(ExportDialog.Filename) + '\');
+}
+      // short path names are confusing (for both user AND system)
+      // (and they're quite ugly after all! :)
+
+      FileList.Add(hqiPath + ' < "' + ChangeFileExt(ExportDialog.Filename, '.flame') + '"');
+      Path := ExtractFilePath(ExtractFileDir(ExportDialog.Filename) + '\');
+
       FileList.SaveToFile(Path + 'render.bat');
       if ExportDialog.chkRender.Checked then
       begin
@@ -3730,7 +3738,7 @@ begin
   begin
     v := Attributes.Value('enabled');
     if v <> '' then ParseCP.finalXformEnabled := (StrToInt(v) <> 0)
-    else ParseCP.finalXformEnabled := false;
+    else ParseCP.finalXformEnabled := true;
 
     inc(activeXformSet);
   end
@@ -3872,7 +3880,7 @@ begin
       begin
         v := Attributes.Value('enabled');
         if v <> '' then ParseCP.finalXformEnabled := (StrToInt(v) <> 0)
-        else ParseCP.finalXformEnabled := false;
+        else ParseCP.finalXformEnabled := true;
       end;
 
       if activexformset > 0 then density := 0; // tmp...

2.10/Source/Render.pas

@@ -90,6 +90,8 @@ type
         read GetNrSlices;
     property Slice: integer
         read GetSlice;
+    property Failed: boolean // hmm...
+        read FStop;
   end;
 
 type

2.10/Source/RenderThread.pas

@@ -148,6 +148,8 @@ begin
   FRenderer.compatibility := compatibility;
   FRenderer.OnProgress := FOnProgress;
   Frenderer.Render;
+
+  if FRenderer.Failed then Terminate; // hmm
 end;
 
 ///////////////////////////////////////////////////////////////////////////////

2.10/Source/XForm.pas

@@ -2006,7 +2006,7 @@ var
   Value: double;
 begin
   result := Format('   <xform weight="%g" color="%g" ', [density, color]);
-  if symmetry <> 0 then result := result + format('symmetry="%g"', [symmetry]);
+  if symmetry <> 0 then result := result + format('symmetry="%g" ', [symmetry]);
   
   for i := 0 to nrvar - 1 do begin
     if vars[i] <> 0 then
@@ -2037,7 +2037,7 @@ begin
 //  result := Format('   <finalxform enabled="%d" color="%g" symmetry="%g" ',
 //                   [ifthen(IsEnabled, 1, 0), color, symmetry]);
   result := Format('   <finalxform color="%g" ', [color]);
-  if symmetry <> 0 then result := result + format('symmetry="%g"', [symmetry]);
+  if symmetry <> 0 then result := result + format('symmetry="%g" ', [symmetry]);
   for i := 0 to nrvar - 1 do begin
     if vars[i] <> 0 then
       Result := Result + varnames(i) + format('="%g" ', [vars[i]]);