diff --git a/VRL/VRL-UI/InstrumentationMain.groovy b/VRL/VRL-UI/InstrumentationMain.groovy index 2a6811e1..ee447c25 100644 --- a/VRL/VRL-UI/InstrumentationMain.groovy +++ b/VRL/VRL-UI/InstrumentationMain.groovy @@ -1,7 +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)); @@ -20,13 +20,10 @@ public class MainCSG { 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)); + createDiff(13, 10); + createDiff(13, 9); + createDiff(13, 8); + createDiff(13, 7); } } // @@ -444,4 +441,4 @@ public class MainCSG { */ -// \ No newline at end of file +// diff --git a/VRL/VRL-UI/MainWithChainedInvocations.groovy b/VRL/VRL-UI/MainWithChainedInvocations.groovy index c38e8bb8..cb37268d 100644 --- a/VRL/VRL-UI/MainWithChainedInvocations.groovy +++ b/VRL/VRL-UI/MainWithChainedInvocations.groovy @@ -1,8 +1,10 @@ package my.testpackage; public class MainWithChainedInvocations { - + public my.testpackage.MainWithChainedInvocations m1() { + m1(); + m1(); return this; } public static void main(String[] args) { @@ -14,16 +16,6 @@ public class MainWithChainedInvocations { // /* - - Script:my.testpackage.MainWithChainedInvocations:m1:inv:return - - 324.3620700617288 - 57.24036530501096 - 200.0 - 150.0 - true - - Script:my.testpackage.MainWithChainedInvocations:main:inv:declare m @@ -54,16 +46,6 @@ public class MainWithChainedInvocations { true - - Script:my.testpackage.MainWithChainedInvocations:m1 - - 45.0 - 181.0 - 309.3505859375 - 180.0 - true - - Script:my.testpackage.MainWithChainedInvocations:main:inv:<init> @@ -74,16 +56,6 @@ public class MainWithChainedInvocations { true - - Script:my.testpackage.MainWithChainedInvocations:main:inv:m1:0 - - 667.8955288263747 - 413.66270958709157 - 200.0 - 150.0 - true - - Script:my.testpackage.MainWithChainedInvocations:main @@ -94,16 +66,6 @@ public class MainWithChainedInvocations { true - - Script:my.testpackage.MainWithChainedInvocations:main:inv:m1 - - 663.8166713382085 - 222.65733992622984 - 200.0 - 150.0 - true - - Script:my.testpackage.MainWithChainedInvocations @@ -134,6 +96,46 @@ public class MainWithChainedInvocations { true + + Script:my.testpackage.MainWithChainedInvocations:m1:inv:return + + 324.3620700617288 + 57.24036530501096 + 200.0 + 150.0 + true + + + + Script:my.testpackage.MainWithChainedInvocations:m1 + + 45.0 + 181.0 + 309.3505859375 + 180.0 + true + + + + Script:my.testpackage.MainWithChainedInvocations:main:inv:m1:0 + + 667.8955288263747 + 413.66270958709157 + 200.0 + 150.0 + true + + + + Script:my.testpackage.MainWithChainedInvocations:main:inv:m1 + + 663.8166713382085 + 222.65733992622984 + 200.0 + 150.0 + true + + */ -// \ No newline at end of file +//