Skip to content

Commit 5bc7a21

Browse files
committed
update the Vitamins.get API as well
1 parent b1219e2 commit 5bc7a21

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

JCSG

src/main/java/com/neuronrobotics/bowlerstudio/creature/MobileBaseCadManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,7 @@ public ArrayList<CSG> generateCad(DHParameterKinematics dh) {
13741374
try {
13751375
newcad = generatorToUse.generateCad(dh, i);
13761376
} catch (Throwable t) {
1377+
Log.error(t);
13771378
getUi().highlightException(null, t);
13781379
}
13791380
if (newcad == null) {

src/main/java/com/neuronrobotics/bowlerstudio/scripting/GroovyHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ private Object inline(String code, ArrayList<Object> args, CSGDatabaseInstance d
3636
binding.setVariable("csgdb", db2);
3737
GroovyShell shell = new GroovyShell(GroovyHelper.class.getClassLoader(), binding, cc);
3838
if(!code.contains("csgdb")) {
39-
//CaDoodleVitamin.
39+
//Vitamins.get(
40+
code=code.replace("Vitamins.get(", "Vitamins.get(csgdb,");
41+
4042
code=code.replace("CaDoodleVitamin.", "new CaDoodleVitamin(csgdb).");
4143
code=code.replace("StringParameter(", "StringParameter(csgdb,");
4244
code=code.replace("LengthParameter(", "LengthParameter(csgdb,");

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ private void placeCSGsInCache(CaDoodleOperation op, List<CSG> cachedCopy) {
206206
List<CSG> back = cache.remove(op);
207207
if (back != null)
208208
back.clear();
209+
cache.put(op, cachedCopy);
209210
}
210211
private void clearCache(CaDoodleOperation key) {
211212
int opIndex = opToIndex(key);
@@ -386,7 +387,7 @@ public void run() {
386387
getSaveUpdate().renderSplashFrame(percent,
387388
"Regenerating " + op.getType() + " " + currentIndex2);
388389
getTimelineImageFile(op).delete();
389-
clearCache(op);
390+
//clearCache(op);
390391
try {
391392
op.setCaDoodleFile(cf);
392393
List<CSG> process = op.process(getPreviouState());

0 commit comments

Comments
 (0)