diff --git a/VRL/VRL-UI/InstrumentationMain.groovy b/VRL/VRL-UI/InstrumentationMain.groovy
index 07528ba8..2a6811e1 100644
--- a/VRL/VRL-UI/InstrumentationMain.groovy
+++ b/VRL/VRL-UI/InstrumentationMain.groovy
@@ -1,6 +1,7 @@
package my.testpackage;
public class MainCSG {
+
public static eu.mihosoft.vrl.v3d.jcsg.CSG createSphere(double radius) {
eu.mihosoft.vrl.v3d.jcsg.Sphere sphere;
sphere = (new eu.mihosoft.vrl.v3d.jcsg.Sphere(radius));
@@ -11,27 +12,26 @@ public class MainCSG {
cube = (new eu.mihosoft.vrl.v3d.jcsg.Cube(dimensions));
return cube.toCSG();
}
- public static void main(String[] args) {
+ public static eu.mihosoft.vrl.v3d.jcsg.CSG createDiff(double r1, double r2) {
eu.mihosoft.vrl.v3d.jcsg.CSG cube;
- cube = (createCube(12));
+ cube = (createCube(r1));
eu.mihosoft.vrl.v3d.jcsg.CSG sphere;
- sphere = (createSphere(8));
- cube.difference(sphere);
+ sphere = (createSphere(r2));
+ return cube.difference(sphere);
+ }
+ public static void main(String[] args) {
+ eu.mihosoft.vrl.v3d.jcsg.CSG res1;
+ res1 = (createDiff(13, 10));
+ eu.mihosoft.vrl.v3d.jcsg.CSG res2;
+ res2 = (createDiff(13, 9));
+ eu.mihosoft.vrl.v3d.jcsg.CSG res3;
+ res3 = (createDiff(13, 8));
+ res3 = (createDiff(13, 7));
}
}
//
/*
*/
-//
+//
\ No newline at end of file
diff --git a/VRL/VRL-UI/MainWithChainedInvocations.groovy b/VRL/VRL-UI/MainWithChainedInvocations.groovy
index 526f0cc2..c38e8bb8 100644
--- a/VRL/VRL-UI/MainWithChainedInvocations.groovy
+++ b/VRL/VRL-UI/MainWithChainedInvocations.groovy
@@ -5,8 +5,9 @@ public class MainWithChainedInvocations {
public my.testpackage.MainWithChainedInvocations m1() {
return this;
}
- public static void main() {
+ public static void main(String[] args) {
my.testpackage.MainWithChainedInvocations m;
+ m = (new my.testpackage.MainWithChainedInvocations());
m.m1().m1();
}
}
@@ -26,8 +27,8 @@ public class MainWithChainedInvocations {
Script:my.testpackage.MainWithChainedInvocations:main:inv:declare m
- 0.0
- 0.0
+ 266.8778751141102
+ 1.0848694110329684
200.0
150.0
true
@@ -43,6 +44,16 @@ public class MainWithChainedInvocations {
true
+
+ Script:my.testpackage.MainWithChainedInvocations:main:inv:declare args
+
+ 0.0
+ 0.0
+ 200.0
+ 150.0
+ true
+
+
Script:my.testpackage.MainWithChainedInvocations:m1
@@ -53,11 +64,21 @@ public class MainWithChainedInvocations {
true
+
+ Script:my.testpackage.MainWithChainedInvocations:main:inv:<init>
+
+ 2.159789134845204
+ 215.4099405489691
+ 493.0
+ 150.0
+ true
+
+
Script:my.testpackage.MainWithChainedInvocations:main:inv:m1:0
- 418.17387133220683
- 360.09416698051143
+ 667.8955288263747
+ 413.66270958709157
200.0
150.0
true
@@ -76,8 +97,8 @@ public class MainWithChainedInvocations {
Script:my.testpackage.MainWithChainedInvocations:main:inv:m1
- 414.0950138440407
- 169.08879731964996
+ 663.8166713382085
+ 222.65733992622984
200.0
150.0
true
@@ -103,6 +124,16 @@ public class MainWithChainedInvocations {
true
+
+ Script:my.testpackage.MainWithChainedInvocations:main:inv:op ASSIGN
+
+ 663.852119072537
+ 55.634031193006
+ 200.0
+ 150.0
+ true
+
+
*/
//
\ No newline at end of file