@@ -8,11 +8,14 @@ import eu.mihosoft.vrl.v3d.CSG
88import eu.mihosoft.vrl.v3d.Cube
99import javafx.scene.transform.Affine
1010
11- return new ICadGenerator (){
12-
11+ class myCadGen implements ICadGenerator {
12+ eu.mihosoft.vrl.v3d.parametrics.CSGDatabaseInstance csgdb;
13+ public myCadGen (eu.mihosoft.vrl.v3d.parametrics.CSGDatabaseInstance db ) {
14+ csgdb= db;
15+ }
1316@Override
1417public ArrayList<CSG> generateCad (DHParameterKinematics d , int i ) {
15- MobileBaseCadManager manager = MobileBaseCadManager . get(d. getLinkConfiguration(i));
18+ MobileBaseCadManager manager = MobileBaseCadManager . get(csgdb, d. getLinkConfiguration(i));
1619TransformNR offset = d. getDHStep(i). inverse();
1720
1821ArrayList<CSG> back = []
@@ -23,13 +26,13 @@ return new ICadGenerator(){
2326Affine manipulator = d. getListener(i);
2427
2528if (manager!= null ) {
26- back. addAll(manager. getOriginVitaminsDisplay(
29+ back. addAll(manager. getOriginVitaminsDisplay(csgdb,
2730d. getAbstractLink(i),
2831manipulator,offset));
29- back. addAll(manager. getDefaultVitaminsDisplay(
32+ back. addAll(manager. getDefaultVitaminsDisplay(csgdb,
3033d. getAbstractLink(i),
3134manipulator));
32- back. addAll(manager. getPreviousLinkVitaminsDisplay(
35+ back. addAll(manager. getPreviousLinkVitaminsDisplay(csgdb,
3336d. getAbstractLink(i),
3437lastLinkAffine));
3538}else {
@@ -39,13 +42,13 @@ return new ICadGenerator(){
3942c. getStorage(). set(" no-physics" ,true )
4043}
4144if (manager!= null ) {
42- back. addAll(manager. getOriginVitamins(
45+ back. addAll(manager. getOriginVitamins(csgdb,
4346d. getAbstractLink(i),
4447manipulator,offset));
45- back. addAll(manager. getDefaultVitamins(
48+ back. addAll(manager. getDefaultVitamins(csgdb,
4649d. getAbstractLink(i),
4750manipulator));
48- back. addAll(manager. getPreviousLinkVitamins(
51+ back. addAll(manager. getPreviousLinkVitamins(csgdb,
4952d. getAbstractLink(i),
5053lastLinkAffine));
5154}
@@ -79,3 +82,7 @@ return new ICadGenerator(){
7982
8083
8184}
85+
86+ return new myCadGen(csgdb)
87+
88+
0 commit comments