Skip to content

Commit 877fc89

Browse files
committed
adding t he db to the example cad
1 parent c8414b9 commit 877fc89

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

exampleCad.groovy

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ import eu.mihosoft.vrl.v3d.CSG
88
import eu.mihosoft.vrl.v3d.Cube
99
import 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
1417
public ArrayList<CSG> generateCad(DHParameterKinematics d, int i) {
15-
MobileBaseCadManager manager = MobileBaseCadManager.get(d.getLinkConfiguration(i));
18+
MobileBaseCadManager manager = MobileBaseCadManager.get(csgdb,d.getLinkConfiguration(i));
1619
TransformNR offset = d.getDHStep(i).inverse();
1720

1821
ArrayList<CSG> back =[]
@@ -23,13 +26,13 @@ return new ICadGenerator(){
2326
Affine manipulator = d.getListener(i);
2427

2528
if(manager!=null) {
26-
back.addAll(manager.getOriginVitaminsDisplay(
29+
back.addAll(manager.getOriginVitaminsDisplay(csgdb,
2730
d.getAbstractLink(i),
2831
manipulator,offset));
29-
back.addAll(manager.getDefaultVitaminsDisplay(
32+
back.addAll(manager.getDefaultVitaminsDisplay(csgdb,
3033
d.getAbstractLink(i),
3134
manipulator));
32-
back.addAll(manager.getPreviousLinkVitaminsDisplay(
35+
back.addAll(manager.getPreviousLinkVitaminsDisplay(csgdb,
3336
d.getAbstractLink(i),
3437
lastLinkAffine));
3538
}else{
@@ -39,13 +42,13 @@ return new ICadGenerator(){
3942
c.getStorage().set("no-physics",true)
4043
}
4144
if(manager!=null) {
42-
back.addAll(manager.getOriginVitamins(
45+
back.addAll(manager.getOriginVitamins(csgdb,
4346
d.getAbstractLink(i),
4447
manipulator,offset));
45-
back.addAll(manager.getDefaultVitamins(
48+
back.addAll(manager.getDefaultVitamins(csgdb,
4649
d.getAbstractLink(i),
4750
manipulator));
48-
back.addAll(manager.getPreviousLinkVitamins(
51+
back.addAll(manager.getPreviousLinkVitamins(csgdb,
4952
d.getAbstractLink(i),
5053
lastLinkAffine));
5154
}
@@ -79,3 +82,7 @@ return new ICadGenerator(){
7982

8083

8184
}
85+
86+
return new myCadGen(csgdb)
87+
88+

0 commit comments

Comments
 (0)