Skip to content

Commit b0eef2c

Browse files
committed
Tweak split/cluster algorithms:
- width/height params are now xrad, yrad using ellipse distance - for 8 way (diagonal) connections use <x>.5 distance
1 parent 48c3261 commit b0eef2c

File tree

3 files changed

+122
-217
lines changed

3 files changed

+122
-217
lines changed

Source/script/imports/simba.import_point.pas

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -891,43 +891,43 @@ function TPointArray.Split(Dist: Integer): T2DPointArray;
891891
*)
892892
procedure _LapeTPASplit1(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
893893
begin
894-
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Split(PInteger(Params^[1])^);
894+
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Split(PSingle(Params^[1])^);
895895
end;
896896

897897
(*
898898
TPointArray.Split
899899
-----------------
900900
```
901-
function TPointArray.Split(DistX, DistY: Integer): T2DPointArray;
901+
function TPointArray.Split(DistX, DistY: Single): T2DPointArray;
902902
```
903903
*)
904904
procedure _LapeTPASplit2(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
905905
begin
906-
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Split(PInteger(Params^[1])^, PInteger(Params^[2])^);
906+
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Split(PSingle(Params^[1])^, PSingle(Params^[2])^);
907907
end;
908908

909909
(*
910910
TPointArray.Cluster
911911
-------------------
912912
```
913-
function TPointArray.Cluster(Dist: Integer): T2DPointArray;
913+
function TPointArray.Cluster(Dist: Single): T2DPointArray;
914914
```
915915
*)
916916
procedure _LapeTPACluster1(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
917917
begin
918-
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Cluster(PInteger(Params^[1])^);
918+
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Cluster(PSingle(Params^[1])^);
919919
end;
920920

921921
(*
922922
TPointArray.Cluster
923923
-------------------
924924
```
925-
function TPointArray.Cluster(DistX, DistY: Integer): T2DPointArray;
925+
function TPointArray.Cluster(DistX, DistY: Single): T2DPointArray;
926926
```
927927
*)
928928
procedure _LapeTPACluster2(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
929929
begin
930-
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Cluster(PInteger(Params^[1])^, PInteger(Params^[2])^);
930+
P2DPointArray(Result)^ := PPointArray(Params^[0])^.Cluster(PSingle(Params^[1])^, PSingle(Params^[2])^);
931931
end;
932932

933933
(*
@@ -1609,10 +1609,10 @@ procedure ImportPoint(Script: TSimbaScript);
16091609
addGlobalFunc('function TPointArray.SortByRow(Reverse: Boolean = False): TPointArray', @_LapeTPASortByRow);
16101610
addGlobalFunc('function TPointArray.SortByColumn(Reverse: Boolean = False): TPointArray', @_LapeTPASortByColumn);
16111611

1612-
addGlobalFunc('function TPointArray.Split(Dist: Integer): T2DPointArray; overload', @_LapeTPASplit1);
1613-
addGlobalFunc('function TPointArray.Split(DistX, DistY: Integer): T2DPointArray; overload', @_LapeTPASplit2);
1614-
addGlobalFunc('function TPointArray.Cluster(Dist: Integer): T2DPointArray; overload', @_LapeTPACluster1);
1615-
addGlobalFunc('function TPointArray.Cluster(DistX, DistY: Integer): T2DPointArray; overload', @_LapeTPACluster2);
1612+
addGlobalFunc('function TPointArray.Split(Dist: Single): T2DPointArray; overload', @_LapeTPASplit1);
1613+
addGlobalFunc('function TPointArray.Split(DistX, DistY: Single): T2DPointArray; overload', @_LapeTPASplit2);
1614+
addGlobalFunc('function TPointArray.Cluster(Dist: Single): T2DPointArray; overload', @_LapeTPACluster1);
1615+
addGlobalFunc('function TPointArray.Cluster(DistX, DistY: Single): T2DPointArray; overload', @_LapeTPACluster2);
16161616

16171617
addGlobalFunc('function TPointArray.Partition(Dist: Integer): T2DPointArray; overload', @_LapeTPAPartition1);
16181618
addGlobalFunc('function TPointArray.Partition(Width, Height: Integer): T2DPointArray; overload', @_LapeTPAPartition2);

0 commit comments

Comments
 (0)