mirror-github-bspeice/apophysis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bumped into triangle limit (again) so I changed it to 100 :)

Browse Source
This commit is contained in:
zueuk
2005-09-16 13:26:45 +00:00
parent 15a2fb2558
commit 3d0b690f85
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
2.10/Source/ControlPoint.pas
View File

@ -25,7 +25,7 @@ uses
const const
EPS = 1E-10; EPS = 1E-10;
NXFORMS = 12; NXFORMS = 100; // --Z-- I don't like limitations! 8-[]
SUB_BATCH_SIZE = 10000; SUB_BATCH_SIZE = 10000;
PREFILTER_WHITE = (1 shl 26); PREFILTER_WHITE = (1 shl 26);
FILTER_CUTOFF = 1.8; FILTER_CUTOFF = 1.8;

26
2.10/Source/Editor.pas
View File

@ -333,12 +333,12 @@ type
end; end;
const const
clr: array[-1..15] of TColor = (clGray, TrgColors: array[-1..13] of TColor = (clGray,
clYellow, $ff55ff, clRed, clLime, clAqua, clGreen, $007fff, clNavy, $0000ff, $007fff, $00ffff, $33ff33, $ffff00, $ff3333, $ff55ff,
clOlive, clPurple, clTeal, clBlue, clFuchsia, clMoneyGreen, clSkyBlue, clCream); $aa00ff, $55aaff, $aaffff, $aaffaa, $ffffaa, $ffaaaa, $ffaaff);
var var
EditForm: TEditForm; EditForm: TEditForm;
pcenterx, pcentery, pscale: double; // pcenterx, pcentery, pscale: double;
function ColorValToColor(c: TColorMap; index: double): TColor; function ColorValToColor(c: TColorMap; index: double): TColor;
function FlipTriangleVertical(t: TTriangle): TTriangle; function FlipTriangleVertical(t: TTriangle): TTriangle;
@ -920,7 +920,7 @@ function TEditForm.GetTriangleColor(n: integer): TColor;
begin begin
if chkUseXFormColor.checked then if chkUseXFormColor.checked then
Result := ColorValToColor(MainCp.cmap, cp.xform[n].color) Result := ColorValToColor(MainCp.cmap, cp.xform[n].color)
else Result := clr[n mod 16]; else Result := TrgColors[n mod 14];
end; end;
procedure TEditForm.TriangleViewPaint(Sender: TObject); procedure TEditForm.TriangleViewPaint(Sender: TObject);
@ -2599,7 +2599,7 @@ begin
if (cell.Y > 0) and (cell.X = 0) then TValueListEditor(Sender).Cursor := crHandPoint if (cell.Y > 0) and (cell.X = 0) then TValueListEditor(Sender).Cursor := crHandPoint
else TValueListEditor(Sender).Cursor := crDefault; else TValueListEditor(Sender).Cursor := crDefault;
if varMM then // hack if varMM then // hack: to skip MouseMove event
begin begin
varMM:=false; varMM:=false;
varDragPos:=x; varDragPos:=x;
@ -2612,10 +2612,13 @@ begin
v := cp.xform[SelectedTriangle].vars[varDragIndex] v := cp.xform[SelectedTriangle].vars[varDragIndex]
else else
cp.xform[SelectedTriangle].GetVariable(vleVariables.Keys[varDragIndex+1], v); cp.xform[SelectedTriangle].GetVariable(vleVariables.Keys[varDragIndex+1], v);
v := {RoundTo(} v + ((x-varDragPos)*2)/1000.0; {, -6)}; v := v + ((x-varDragPos)*2)/1000.0;
varDragPos:=x; varDragPos:=x;
SetCursorPos(MousePos.x, MousePos.y); // hmmm SetCursorPos(MousePos.x, MousePos.y); // hmmm
// this Delphi is WEIRD!
// why GetCursorPos deals with TPoint,
// and SetCursorPos - with two integers?????????
varMM:=true; varMM:=true;
//cp.xform[SelectedTriangle].vars[varDragIndex] := v; //cp.xform[SelectedTriangle].vars[varDragIndex] := v;
@ -2659,20 +2662,17 @@ procedure TEditForm.VEVarsDblClick(Sender: TObject);
var var
v: double; v: double;
begin begin
if TValueListEditor(Sender).Values[VarNames(varDragIndex)] = '0' then exit; if (TValueListEditor(Sender).Values[VarNames(varDragIndex)] = '0') or
(varDragPos > TValueListEditor(Sender).ColWidths[0]) then exit;
//begin
// if cp.xform[SelectedTriangle].vars[varDragIndex] = 0 then exit;
MainForm.UpdateUndo; MainForm.UpdateUndo;
// cp.xform[SelectedTriangle].vars[varDragIndex] := 0;
if Sender = VEVars then if Sender = VEVars then
begin begin
cp.xform[SelectedTriangle].vars[varDragIndex] := 0; cp.xform[SelectedTriangle].vars[varDragIndex] := 0;
VEVars.Values[VarNames(varDragIndex)] := '0'; VEVars.Values[VarNames(varDragIndex)] := '0';
end end
else begin else begin
v := 0; // <<<----- hey!!! why it's 'var' in SETvariable??? v := 0; // <<<----- hey!!! why there is 'var' in SETvariable???
cp.xform[SelectedTriangle].SetVariable(vleVariables.Keys[varDragIndex+1], v); cp.xform[SelectedTriangle].SetVariable(vleVariables.Keys[varDragIndex+1], v);
vleVariables.Values[vleVariables.Keys[varDragIndex+1]] := '0'; vleVariables.Values[vleVariables.Keys[varDragIndex+1]] := '0';
end; end;