From: Peter S. <zu...@us...> - 2006-01-06 16:29:15
|
Update of /cvsroot/apophysis/2.10/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4894/Source Modified Files: ControlPoint.pas Editor.dfm Editor.pas Main.pas XFormMan.pas varFan2.pas varRings2.pas Log Message: final preparations for the 2.03c Index: varRings2.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/varRings2.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** varRings2.pas 5 Jan 2006 18:24:25 -0000 1.2 --- varRings2.pas 6 Jan 2006 16:29:02 -0000 1.3 *************** *** 31,35 **** Math; ! { TVariationTest } /////////////////////////////////////////////////////////////////////////////// --- 31,35 ---- Math; ! { TVariationRings2 } /////////////////////////////////////////////////////////////////////////////// *************** *** 57,61 **** // dx := sqr(FVal) + EPS; - we can precalc it!!! // r := Length + dx - System.Int((Length + dx)/(2 * dx)) * 2 * dx - dx + Length * (1-dx); ! // ^^^^......he he, lots of useless calculation.......^^^^ r := vvar * (2 - dx * (System.Int((Length/dx + 1)/2) * 2 / Length + 1)); --- 57,61 ---- // dx := sqr(FVal) + EPS; - we can precalc it!!! // r := Length + dx - System.Int((Length + dx)/(2 * dx)) * 2 * dx - dx + Length * (1-dx); ! // ^^^^......he he, lots of useless calculations......^^^^ r := vvar * (2 - dx * (System.Int((Length/dx + 1)/2) * 2 / Length + 1)); Index: Editor.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Editor.pas,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Editor.pas 5 Jan 2006 18:38:34 -0000 1.33 --- Editor.pas 6 Jan 2006 16:29:02 -0000 1.34 *************** *** 1010,1014 **** with Bitmap.Canvas do begin ! brush.Color := EditorBkgColor; //pnlBackColor.Color; FillRect(Rect(0, 0, Width, Height)); --- 1010,1014 ---- with Bitmap.Canvas do begin ! brush.Color := EditorBkgColor; FillRect(Rect(0, 0, Width, Height)); *************** *** 1057,1061 **** {Reference Triangle} Pen.Style := psDot; ! Pen.color := ReferenceTriangleColor; //pnlReference.Color; brush.Color := gridColor1 shr 1 and $7f7f7f; a := ToScreen(MainTriangles[-1].x[0], MainTriangles[-1].y[0]); --- 1057,1061 ---- {Reference Triangle} Pen.Style := psDot; ! Pen.color := ReferenceTriangleColor; brush.Color := gridColor1 shr 1 and $7f7f7f; a := ToScreen(MainTriangles[-1].x[0], MainTriangles[-1].y[0]); *************** *** 1064,1068 **** Polyline([a, b, c, a]); ! brush.Color := EditorBkgColor; //pnlBackColor.Color; Font.color := Pen.color; TextOut(c.x-9, c.y-12, 'Y'); --- 1064,1068 ---- Polyline([a, b, c, a]); ! brush.Color := EditorBkgColor; Font.color := Pen.color; TextOut(c.x-9, c.y-12, 'Y'); *************** *** 1252,1256 **** brush.Color:=Pen.Color shr 1 and $7f7f7f; ! if SelectMode or (mouseOverTriangle = SelectedTriangle) then Polygon([a, b, c]) else --- 1252,1256 ---- brush.Color:=Pen.Color shr 1 and $7f7f7f; ! if (SelectMode and (editMode <> modePick)) or (mouseOverTriangle = SelectedTriangle) then Polygon([a, b, c]) else *************** *** 1289,1297 **** else if (mouseOverTriangle>=0) and (mouseOverCorner >= 0) then // highlight corner under cursor begin - // brush.Color:=clSilver; - case mouseOverCorner of 0: brush.Color:=clRed; ! 2: brush.Color:=clGreen; else brush.Color:=clSilver; end; --- 1289,1295 ---- else if (mouseOverTriangle>=0) and (mouseOverCorner >= 0) then // highlight corner under cursor begin case mouseOverCorner of 0: brush.Color:=clRed; ! 2: brush.Color:=clBlue; else brush.Color:=clSilver; end; *************** *** 1533,1536 **** --- 1531,1536 ---- modeScale: TriangleView.Cursor := crEditScale; + modePick: + TriangleView.Cursor := crEditArrow; end else *************** *** 3779,3782 **** --- 3779,3783 ---- editMode := oldMode; oldMode := modeNone; + TriangleView.Invalidate; // hack: to generate MouseMove event GetCursorPos(MousePos); *************** *** 3788,3792 **** oldMode := editMode; editMode := modePick; ! //TriangleView.Cursor := crCross; //... btnPickPivot.Down := true; end; --- 3789,3793 ---- oldMode := editMode; editMode := modePick; ! TriangleView.Invalidate; btnPickPivot.Down := true; end; Index: ControlPoint.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/ControlPoint.pas,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ControlPoint.pas 30 Dec 2005 13:04:48 -0000 1.19 --- ControlPoint.pas 6 Jan 2006 16:29:02 -0000 1.20 *************** *** 1749,1754 **** i,v: integer; begin ! Result := false; ! for i:= 0 to NXFORMS - 1 do begin if xform[i].density = 0 then --- 1749,1754 ---- i,v: integer; begin ! Result := false; // flam3 will be updated anyway :-) ! { for i:= 0 to NXFORMS - 1 do begin if xform[i].density = 0 then *************** *** 1761,1764 **** --- 1761,1765 ---- break; end; + } end; Index: varFan2.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/varFan2.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** varFan2.pas 5 Jan 2006 18:24:25 -0000 1.3 --- varFan2.pas 6 Jan 2006 16:29:02 -0000 1.4 *************** *** 32,36 **** Math; ! { TVariationTest } /////////////////////////////////////////////////////////////////////////////// --- 32,36 ---- Math; ! { TVariationFan2 } /////////////////////////////////////////////////////////////////////////////// *************** *** 90,98 **** constructor TVariationFan2.Create; begin ! // randomization removed to please mutator users ;-) ! // FX := 2 * Random - 1; ! // FY := 2 * Random - 1; ! FX := 1; ! FY := 1; end; --- 90,95 ---- constructor TVariationFan2.Create; begin ! FX := 2 * Random - 1; ! FY := 2 * Random - 1; end; Index: XFormMan.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/XFormMan.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XFormMan.pas 30 Dec 2005 13:04:49 -0000 1.3 --- XFormMan.pas 6 Jan 2006 16:29:02 -0000 1.4 *************** *** 7,11 **** const ! NRLOCVAR = 27; function NrVar: integer; --- 7,11 ---- const ! NRLOCVAR = 26; function NrVar: integer; *************** *** 61,66 **** 'eyefish', 'bubble', ! 'cylinder', ! 'smoke' ); begin --- 61,66 ---- 'eyefish', 'bubble', ! 'cylinder' ! // 'smoke' - variation disabled... for now :) ); begin Index: Editor.dfm =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Editor.dfm,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Editor.dfm 5 Jan 2006 18:38:33 -0000 1.29 --- Editor.dfm 6 Jan 2006 16:29:02 -0000 1.30 *************** *** 1221,1226 **** --- 1221,1228 ---- Hint = 'Reset vector X' Caption = 'X' + Enabled = False ParentShowHint = False ShowHint = True + Visible = False OnClick = btnXpostClick end *************** *** 1232,1237 **** --- 1234,1241 ---- Hint = 'Reset vector Y' Caption = 'Y' + Enabled = False ParentShowHint = False ShowHint = True + Visible = False OnClick = btnYpostClick end *************** *** 1243,1248 **** --- 1247,1254 ---- Hint = 'Reset vector O' Caption = 'O' + Enabled = False ParentShowHint = False ShowHint = True + Visible = False OnClick = btnOpostClick end *************** *** 1254,1259 **** --- 1260,1267 ---- Hint = 'Reset post-transform vectors to defaults' Caption = 'Reset post-transform' + Enabled = False ParentShowHint = False ShowHint = True + Visible = False OnClick = btnResetPostXFormClick end *************** *** 1265,1268 **** --- 1273,1277 ---- Hint = 'Swap Xform with PostXform' Caption = '[ Xform <-> PostXform ]' + Enabled = False Flat = True Font.Charset = ANSI_CHARSET *************** *** 1274,1277 **** --- 1283,1287 ---- ParentShowHint = False ShowHint = True + Visible = False OnClick = btnSwapXformsClick end *************** *** 1367,1372 **** --- 1377,1384 ---- Width = 57 Height = 21 + Enabled = False TabOrder = 8 Text = '0' + Visible = False OnExit = PostCoefValidate OnKeyPress = PostCoefKeypress *************** *** 1377,1382 **** --- 1389,1396 ---- Width = 57 Height = 21 + Enabled = False TabOrder = 9 Text = '0' + Visible = False OnExit = PostCoefValidate OnKeyPress = PostCoefKeypress *************** *** 1387,1392 **** --- 1401,1408 ---- Width = 57 Height = 21 + Enabled = False TabOrder = 10 Text = '0' + Visible = False OnExit = PostCoefValidate OnKeyPress = PostCoefKeypress *************** *** 1397,1402 **** --- 1413,1420 ---- Width = 57 Height = 21 + Enabled = False TabOrder = 11 Text = '0' + Visible = False OnExit = PostCoefValidate OnKeyPress = PostCoefKeypress *************** *** 1407,1412 **** --- 1425,1432 ---- Width = 57 Height = 21 + Enabled = False TabOrder = 12 Text = '0' + Visible = False OnExit = PostCoefValidate OnKeyPress = PostCoefKeypress *************** *** 1417,1422 **** --- 1437,1444 ---- Width = 57 Height = 21 + Enabled = False TabOrder = 13 Text = '0' + Visible = False OnExit = PostCoefValidate OnKeyPress = PostCoefKeypress Index: Main.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Main.pas,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Main.pas 31 Dec 2005 08:30:50 -0000 1.31 --- Main.pas 6 Jan 2006 16:29:02 -0000 1.32 *************** *** 2116,2120 **** or saving to file } var ! IterDensity, m, j: integer; scale, a, b, c, d, e, f, p: double; GradStrings, Strings: TStringList; --- 2116,2120 ---- or saving to file } var ! IterDensity, m, i, j: integer; scale, a, b, c, d, e, f, p: double; GradStrings, Strings: TStringList; *************** *** 4055,4059 **** begin // diable generating pallete ! if Parsecp.cmapindex = -2 then Parsecp.cmapindex := -1; --- 4055,4059 ---- begin // diable generating pallete ! //if Parsecp.cmapindex = -2 then Parsecp.cmapindex := -1; *************** *** 4068,4071 **** --- 4068,4072 ---- begin ParseCompactcolors(Parsecp, StrToInt(Attributes.value('count')), Attributes.value('data')); + Parsecp.cmapindex := -1; end; if TagName = 'symmetry' then |