parent: 481df910 | patch | commit
Normand Briere
2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439 
Rename Grafreed
18 files modified
1 files renamed
303 ■■■■■ changed files
BoundaryRep.java 26 ●●●●● patch | view | raw | blame | history
CameraPane.java 28 ●●●●● patch | view | raw | blame | history
GenericJoint.java 2 ●●●●● patch | view | raw | blame | history
GrafreedTEMP.java 11 ●●●●● patch | view | raw | blame | history
GroupEditor.java 140 ●●●●● patch | view | raw | blame | history
ImplicitTiler.java 4 ●●●●● patch | view | raw | blame | history
LA.java 16 ●●●●● patch | view | raw | blame | history
Merge.java 2 ●●●●● patch | view | raw | blame | history
Mocap.java 4 ●●●●● patch | view | raw | blame | history
MorphNode.java 6 ●●●●● patch | view | raw | blame | history
ObjEditor.java 22 ●●●●● patch | view | raw | blame | history
Object3D.java 16 ●●●●● patch | view | raw | blame | history
RandomNode.java 2 ●●●●● patch | view | raw | blame | history
SwitchNode.java 6 ●●●●● patch | view | raw | blame | history
Vertex.java 2 ●●●●● patch | view | raw | blame | history
cFileSystemPane.java 2 ●●●●● patch | view | raw | blame | history
cMesh.java 10 ●●●●● patch | view | raw | blame | history
cRadio.java 2 ●●●●● patch | view | raw | blame | history
cVector.java 2 ●●●●● patch | view | raw | blame | history 
 BoundaryRep.java
....@@ -172,16 +172,16 @@
172172             bufV = other.bufV;
173173             bufF = other.bufF;
174174 
175
-            positions = (float[]) GrafreeD.clone(other.positions);
176
-            normals = (float[]) GrafreeD.clone(other.normals);
177
-            colors = (float[]) GrafreeD.clone(other.colors);
178
-            uvmap = (float[]) GrafreeD.clone(other.uvmap);
179
-            triangles = (int[]) GrafreeD.clone(other.triangles);
175
+            positions = (float[]) Grafreed.clone(other.positions);
176
+            normals = (float[]) Grafreed.clone(other.normals);
177
+            colors = (float[]) Grafreed.clone(other.colors);
178
+            uvmap = (float[]) Grafreed.clone(other.uvmap);
179
+            triangles = (int[]) Grafreed.clone(other.triangles);
180180             
181
-            indices = (int[]) GrafreeD.clone(other.indices);
181
+            indices = (int[]) Grafreed.clone(other.indices);
182182 
183
-            vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices);
184
-            faces = (Vector<Face>) GrafreeD.clone(other.faces);
183
+            vertices = (Vector<Vertex>) Grafreed.clone(other.vertices);
184
+            faces = (Vector<Face>) Grafreed.clone(other.faces);
185185         }
186186         else
187187         {
....@@ -1518,7 +1518,7 @@
15181518             InitFaceIndices();
15191519         }
15201520         
1521
-        BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
1521
+        BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
15221522         //float[] v = new float[100];
15231523         
15241524         for (int loops=1; --loops>=0;)
....@@ -1548,7 +1548,7 @@
15481548             InitFaceIndices();
15491549         }
15501550         
1551
-        BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
1551
+        BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
15521552         //float[] v = new float[100];
15531553         
15541554         for (int loops=10; --loops>=0;)
....@@ -2670,7 +2670,7 @@
26702670 
26712671             if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
26722672             {
2673
-                GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2673
+                Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
26742674 
26752675                 lastsoundtime = Globals.framecount;
26762676             }
....@@ -3403,7 +3403,7 @@
34033403                     k /= x*x + y*y;
34043404                 }
34053405                 else
3406
-                    GrafreeD.Assert(z == 1);
3406
+                    Grafreed.Assert(z == 1);
34073407                 
34083408                 if (k < 0)
34093409                     k = 0;
....@@ -8233,7 +8233,7 @@
82338233         if (!trimmed)
82348234             return;
82358235         
8236
-        GrafreeD.linkUV = false;
8236
+        Grafreed.linkUV = false;
82378237         
82388238         try
82398239         {


 CameraPane.java
....@@ -1628,7 +1628,7 @@
16281628             
16291629         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301630 
1631
-        float[] colorV = GrafreeD.colorV;
1631
+        float[] colorV = Grafreed.colorV;
16321632 
16331633         /**/
16341634         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -2140,7 +2140,7 @@
21402140         System.err.println("LIVE = " + Globals.isLIVE());
21412141         
21422142         if (!Globals.isLIVE()) // save sound
2143
-            GrafreeD.savesound = true; // wav.save();
2143
+            Grafreed.savesound = true; // wav.save();
21442144      //   else
21452145             repaint(); // start loop // may 2013
21462146     }
....@@ -9542,7 +9542,7 @@
95429542             
95439543             if (!BOXMODE)
95449544             {
9545
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9545
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95469546             }
95479547     
95489548             if (!BOXMODE)
....@@ -9580,7 +9580,7 @@
95809580             ABORTED = false;
95819581         }
95829582         else
9583
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9583
+            Grafreed.wav.cursor += 735 * ACSIZE;
95849584         
95859585         if (false)
95869586         {
....@@ -10243,11 +10243,11 @@
1024310243 
1024410244     public void display(GLAutoDrawable drawable)
1024510245     {
10246
-        if (GrafreeD.savesound && GrafreeD.hassound)
10246
+        if (Grafreed.savesound && Grafreed.hassound)
1024710247         {
10248
-            GrafreeD.wav.save();
10249
-            GrafreeD.savesound = false;
10250
-            GrafreeD.hassound = false;
10248
+            Grafreed.wav.save();
10249
+            Grafreed.savesound = false;
10250
+            Grafreed.hassound = false;
1025110251         }
1025210252 //        if (DEBUG_SELECTION)
1025310253 //        {
....@@ -10377,7 +10377,7 @@
1037710377             Object3D theobject = object;
1037810378             Object3D theparent = object.parent;
1037910379             object.parent = null;
10380
-            object = (Object3D)GrafreeD.clone(object);
10380
+            object = (Object3D)Grafreed.clone(object);
1038110381             object.Stripify();
1038210382             if (theobject.selection == null || theobject.selection.Size() == 0)
1038310383                 theobject.PreprocessOcclusion(this);
....@@ -11283,8 +11283,8 @@
1128311283             e.printStackTrace();
1128411284         }
1128511285         
11286
-        if (GrafreeD.RENDERME > 0)
11287
-            GrafreeD.RENDERME--; // mechante magouille
11286
+        if (Grafreed.RENDERME > 0)
11287
+            Grafreed.RENDERME--; // mechante magouille
1128811288         
1128911289         Globals.ONESTEP = false;
1129011290     }
....@@ -16427,16 +16427,16 @@
1642716427                             System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
1642816428                         }
1642916429                         
16430
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16430
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1643116431                     }
1643216432                 }
1643316433                 
1643416434                 if (!movingcamera && !PAINTMODE)
1643516435                     object.editWindow.ScreenFitPoint(); // fev 2014
1643616436                 
16437
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16437
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643816438                 {
16439
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16439
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1644016440                     
1644116441                     Object3D group = new Object3D("inst" + paintcount++);
1644216442                     


 GenericJoint.java
....@@ -381,7 +381,7 @@
381381         try
382382         {
383383             //font = FontRender.createFont("Dialog", 11, false, true);
384
-            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
384
+            font = new FontRender.GLFont(gl, Grafreed.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
385385         } catch (java.io.IOException e)
386386         {
387387             e.printStackTrace();


 GrafreeD.java
similarity index 99%rename from GrafreeD.javarename to GrafreedTEMP.java
....@@ -13,7 +13,7 @@
1313 import javax.sound.sampled.*;
1414 
1515 //import com.jamonapi.*;
16
-public class GrafreeD extends Applet implements ActionListener
16
+public class Grafreed extends Applet implements ActionListener
1717 {
1818         static boolean NIMBUSLAF = true;
1919         
....@@ -27,7 +27,7 @@
2727     static boolean hassound = false;
2828     static boolean savesound = false;
2929     
30
-    public GrafreeD()
30
+    public Grafreed()
3131     {
3232         javax.swing.Timer timer = new javax.swing.Timer(1000, this);
3333 
....@@ -604,7 +604,7 @@
604604         {
605605             String javaPath = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
606606                         System.out.println("javaPath = " + javaPath);
607
-            java.net.URL u = new GrafreeD().getClass().getResource("default.png");
607
+            java.net.URL u = new Grafreed().getClass().getResource("default.png");
608608 
609609                         System.out.println("URL = " + u);
610610                 
....@@ -843,7 +843,7 @@
843843         
844844         //Monitor mon=MonitorFactory.start("myFirstMonitor");
845845         standAlone = true;
846
-        grafreeD = new GrafreeD();
846
+        grafreeD = new Grafreed();
847847         grafreeD.universe = new Composite();
848848         grafreeD.universe.name = "Grafreed";
849849         grafreeD.universe.material = new cMaterial();
....@@ -866,6 +866,7 @@
866866             //System.gc();
867867         }
868868     }
869
+    
869870     static int depth = 0;
870871     static java.util.Stack stack = new java.util.Stack();
871872     static boolean traceoff = false; // true;
....@@ -1078,7 +1079,7 @@
10781079         } while (avail > 0 && numRead >= 0);
10791080         return new String(data, 0, pos, "US-ASCII");
10801081     }
1081
-    public static GrafreeD grafreeD;
1082
+    public static Grafreed grafreeD;
10821083     public static boolean standAlone = true;
10831084     public Composite universe;
10841085     public static Object3D clipboard = new Object3D();


 GroupEditor.java
....@@ -98,14 +98,14 @@
9898 
9999     void CloneClipboard(boolean supports)
100100     {
101
-        assert(GrafreeD.clipboard.parent == null);
102
-        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
-        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
-        if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
-            makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
101
+        assert(Grafreed.clipboard.parent == null);
102
+        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
103
+        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
104
+        if (LA.isIdentity(Grafreed.clipboard.toParent))
105
+            makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106106         else
107
-            makeSomething(CloneObject(GrafreeD.clipboard, false));
108
-        GrafreeD.clipboard.get(0).parent = keepparent;
107
+            makeSomething(CloneObject(Grafreed.clipboard, false));
108
+        Grafreed.clipboard.get(0).parent = keepparent;
109109     }
110110     
111111     static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -119,7 +119,7 @@
119119         //               obj.support = null;
120120         if (!supports)
121121             obj.SaveSupports();
122
-        Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+        Object3D clone = (Object3D)Grafreed.clone(obj);
123123         obj.parent = parent;
124124         //               obj.support = support;
125125         //               clone.support = support; // aout 2013
....@@ -491,7 +491,7 @@
491491                 liveCB.setToolTipText("Enabled animation");
492492                                 liveCB.addItemListener(this);
493493 
494
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495495                 oneStepButton.setToolTipText("Animate one step forward");
496496 		oneStepButton.addActionListener(this);
497497                 
....@@ -503,7 +503,7 @@
503503                 trackCB.setToolTipText("Enable tracking");
504504                                 trackCB.addItemListener(this);
505505 
506
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
506
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507507                 screenfitButton.setToolTipText("Screen fit");
508508 		screenfitButton.addActionListener(this);
509509 
....@@ -512,39 +512,39 @@
512512 
513513                 if (Globals.ADVANCED)
514514                 {
515
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
515
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516516                         snapobjectButton.addActionListener(this);
517517                         snapobjectButton.setToolTipText("Snap Object");
518518                 }
519519 
520
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521521                 flashSelectionButton.setToolTipText("Show selection");
522522 		flashSelectionButton.addActionListener(this);
523523                 
524524 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525525                 
526
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527527                 twoButton.setToolTipText("Show center view only");
528528 		twoButton.addActionListener(this);
529
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530530 		fourButton.addActionListener(this);
531531                 fourButton.setToolTipText("Show left panel only");
532
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
532
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533533                 sixButton.setToolTipText("2-column layout left");
534534 		sixButton.addActionListener(this);
535
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
535
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536536                 threeButton.setToolTipText("2-column layout right");
537537 		threeButton.addActionListener(this);
538
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
538
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539539                 sevenButton.setToolTipText("3-column layout");
540540 		sevenButton.addActionListener(this);
541541                 //
542542 
543
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544544                 rootButton.setToolTipText("Edit selection in new tab");
545545 		rootButton.addActionListener(this);
546546 
547
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
547
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548548                 closeButton.setToolTipText("Close tab");
549549 		closeButton.addActionListener(this);
550550 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -552,11 +552,11 @@
552552                         
553553                 cGridBag commandsPanel = new cGridBag();
554554                 
555
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
555
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556556                 editButton.setToolTipText("Edit selection");
557557 		editButton.addActionListener(this);
558558 
559
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
559
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560560                 uneditButton.setToolTipText("Unedit selection");
561561 		uneditButton.addActionListener(this);
562562 
....@@ -564,11 +564,11 @@
564564                 allParamsButton.setToolTipText("Edit all params");
565565 		allParamsButton.addActionListener(this);
566566 
567
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
567
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568568                 clearPanelButton.setToolTipText("Clear edit panel");
569569 		clearPanelButton.addActionListener(this);
570570 
571
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
571
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572572                 unselectButton.setToolTipText("Unselect");
573573 		unselectButton.addActionListener(this);
574574 
....@@ -1542,9 +1542,9 @@
15421542     
15431543     void Overwrite(int mask)
15441544     {
1545
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1545
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
15461546         {
1547
-            Object3D content = GrafreeD.clipboard.get(0);
1547
+            Object3D content = Grafreed.clipboard.get(0);
15481548 
15491549             if (content instanceof cGroup && ((cGroup)content).transientlink )
15501550                 content = ((cGroup)content).get(0);
....@@ -1892,7 +1892,7 @@
18921892 		if (source == invariantsItem)
18931893 		{
18941894                     System.out.println("Invariants:");
1895
-                    GrafreeD.grafreeD.universe.invariants();
1895
+                    Grafreed.grafreeD.universe.invariants();
18961896 		} else
18971897 		if (source == memoryItem)
18981898 		{
....@@ -1967,10 +1967,10 @@
19671967 		} else
19681968 		if (source == duplicateItem)
19691969 		{
1970
-                    Object3D keep = GrafreeD.clipboard;
1970
+                    Object3D keep = Grafreed.clipboard;
19711971 			loadClipboard(false);
19721972 			paste(false);
1973
-                    GrafreeD.clipboard = keep;
1973
+                    Grafreed.clipboard = keep;
19741974 		} else
19751975 		if (source == cloneItem)
19761976 		{
....@@ -2190,9 +2190,9 @@
21902190 //                        group.selection.get(0).setMasterThis(content); // should be identity
21912191 //		refreshContents();
21922192 //                    }
2193
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2193
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21942194                     {
2195
-                        Object3D content = GrafreeD.clipboard.get(0);
2195
+                        Object3D content = Grafreed.clipboard.get(0);
21962196                         
21972197                         if (content instanceof cGroup && ((cGroup)content).transientlink )
21982198                             content = ((cGroup)content).get(0);
....@@ -2242,9 +2242,9 @@
22422242 		} else
22432243 		if (source == setMasterItem)
22442244 		{
2245
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2245
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
22462246                     {
2247
-                        Object3D content = GrafreeD.clipboard.get(0);
2247
+                        Object3D content = Grafreed.clipboard.get(0);
22482248                         
22492249                         if (content instanceof cGroup && ((cGroup)content).transientlink )
22502250                             content = ((cGroup)content).get(0);
....@@ -2257,9 +2257,9 @@
22572257 		{
22582258                     if (group.selection.size() == 1)
22592259                     {
2260
-                        if (GrafreeD.clipboard.size() == 1)
2260
+                        if (Grafreed.clipboard.size() == 1)
22612261                         {
2262
-                            Object3D content = GrafreeD.clipboard.get(0);
2262
+                            Object3D content = Grafreed.clipboard.get(0);
22632263 
22642264                             if (content instanceof cGroup && ((cGroup)content).transientlink )
22652265                                 content = ((cGroup)content).get(0);
....@@ -3338,9 +3338,9 @@
33383338                     obj = (Object3D)e.nextElement();
33393339                     
33403340                     System.out.println("Object is: " + obj);
3341
-                    GrafreeD.AnalyzeObject(obj);
3341
+                    Grafreed.AnalyzeObject(obj);
33423342                     System.out.println("Boundary rep: " + obj.bRep);
3343
-                    GrafreeD.AnalyzeObject(obj.bRep);
3343
+                    Grafreed.AnalyzeObject(obj.bRep);
33443344                     
33453345 //                    System.err.println((size/1024) + " KB is the size of " + obj);
33463346                 }
....@@ -3554,8 +3554,8 @@
35543554 	
35553555 	void ParseVertices()
35563556 	{
3557
-            boolean epsequal = GrafreeD.epsequal;
3558
-            GrafreeD.epsequal = true;
3557
+            boolean epsequal = Grafreed.epsequal;
3558
+            Grafreed.epsequal = true;
35593559             
35603560             for (int i=0; i<group.selection.size(); i++)
35613561             {
....@@ -3580,7 +3580,7 @@
35803580                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35813581                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35823582 
3583
-                                g.add(GrafreeD.clipboard);
3583
+                                g.add(Grafreed.clipboard);
35843584 
35853585                                 buffer.add(g);
35863586                             }
....@@ -3595,7 +3595,7 @@
35953595                 makeSomething(buffer, i==group.selection.size()-1);
35963596             }
35973597             
3598
-            GrafreeD.epsequal = epsequal;
3598
+            Grafreed.epsequal = epsequal;
35993599             
36003600             refreshContents();
36013601 	}
....@@ -3745,7 +3745,7 @@
37453745                 return;
37463746             
37473747             Object3D poses = group.selection.get(0);
3748
-            Object3D ref = GrafreeD.clipboard.get(0);
3748
+            Object3D ref = Grafreed.clipboard.get(0);
37493749             
37503750             Object3D newgroup = new Object3D("Po:" + poses.name);
37513751             
....@@ -3939,9 +3939,9 @@
39393939 	
39403940 	void ClipMesh()
39413941 	{
3942
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3942
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
39433943             {
3944
-                Object3D content = GrafreeD.clipboard.get(0);
3944
+                Object3D content = Grafreed.clipboard.get(0);
39453945 
39463946                 if (content instanceof cGroup && ((cGroup)content).transientlink )
39473947                     content = ((cGroup)content).get(0);
....@@ -3950,7 +3950,7 @@
39503950 //                {
39513951 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
39523952 //                }
3953
-                  group.selection.ClipMesh(GrafreeD.clipboard);
3953
+                  group.selection.ClipMesh(Grafreed.clipboard);
39543954             }
39553955 //		group.selection.ClipMesh(GrafreeD.clipboard);
39563956             System.out.println("DONE.");
....@@ -4290,12 +4290,12 @@
42904290 	{
42914291 		if (group.selection.isEmpty())
42924292 			return;
4293
-		GrafreeD.clipboardIsTempGroup = false;
4293
+		Grafreed.clipboardIsTempGroup = false;
42944294 		Composite tGroup = null;
42954295 		if (group.selection.size() > 0) // 1)
42964296 		{
42974297 			tGroup = new cGroup();
4298
-			GrafreeD.clipboardIsTempGroup = true;
4298
+			Grafreed.clipboardIsTempGroup = true;
42994299 		}
43004300                 
43014301 		if (cut)
....@@ -4335,16 +4335,16 @@
43354335 		//System.out.println("cut " + child);
43364336 		//System.out.println("parent = " + child.parent);
43374337                 //                   tmp.addChild(child);
4338
-                                    if (GrafreeD.clipboardIsTempGroup)
4338
+                                    if (Grafreed.clipboardIsTempGroup)
43394339                                             tGroup.add/*Child*/(tmp);
43404340                                     else
4341
-                                            GrafreeD.clipboard = tmp;
4341
+                                            Grafreed.clipboard = tmp;
43424342                                 }
43434343                                 else
4344
-                                    if (GrafreeD.clipboardIsTempGroup)
4344
+                                    if (Grafreed.clipboardIsTempGroup)
43454345                                             tGroup.add/*Child*/(child);
43464346                                     else
4347
-                                            GrafreeD.clipboard = child;
4347
+                                            Grafreed.clipboard = child;
43484348 			}
43494349 			
43504350 			//ResetModel();
....@@ -4376,21 +4376,21 @@
43764376 		//System.out.println("cut " + elem);
43774377 		//System.out.println("parent = " + elem.parent);
43784378                 //                    tmp.addChild(elem);
4379
-                                    if (GrafreeD.clipboardIsTempGroup)
4379
+                                    if (Grafreed.clipboardIsTempGroup)
43804380                                             tGroup.add/*Child*/(tmp);
43814381                                     else
4382
-                                            GrafreeD.clipboard = tmp;
4382
+                                            Grafreed.clipboard = tmp;
43834383                                 }
43844384                                 else
4385
-                                    if (GrafreeD.clipboardIsTempGroup)
4385
+                                    if (Grafreed.clipboardIsTempGroup)
43864386                                             tGroup.add/*Child*/(child);
43874387                                     else
4388
-                                            GrafreeD.clipboard = child;
4388
+                                            Grafreed.clipboard = child;
43894389 			}
43904390 			
43914391 		}
4392
-		if (GrafreeD.clipboardIsTempGroup)
4393
-			GrafreeD.clipboard = tGroup;
4392
+		if (Grafreed.clipboardIsTempGroup)
4393
+			Grafreed.clipboard = tGroup;
43944394 		if (cut)
43954395                 {
43964396                     ResetModel();
....@@ -4404,7 +4404,7 @@
44044404 	//		return;
44054405 		boolean first = true;
44064406 		
4407
-		if (GrafreeD.clipboardIsTempGroup)
4407
+		if (Grafreed.clipboardIsTempGroup)
44084408 		{
44094409 			Composite temp;
44104410 			
....@@ -4415,7 +4415,7 @@
44154415 				temp = (Composite)Applet3D.clipboard.deepCopy();
44164416                          */
44174417 			Object3D elem;
4418
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4418
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
44194419 			{
44204420 				Object3D child = (Object3D)e.nextElement();
44214421                                 
....@@ -4449,14 +4449,14 @@
44494449 			//Object3D cb = Applet3D.clipboard;
44504450 			//temp.addChild(cb);
44514451 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452
-                    assert(GrafreeD.clipboard.parent == null);
4453
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4454
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4452
+                    assert(Grafreed.clipboard.parent == null);
4453
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4454
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4455
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4456
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
44574457                         else
4458
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4458
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4459
+                        Grafreed.clipboard.get(0).parent = keepparent;
44604460 		}
44614461 		
44624462 		ResetModel();
....@@ -4505,9 +4505,9 @@
45054505 		{
45064506 			boolean first = true;
45074507 			
4508
-			if (GrafreeD.clipboardIsTempGroup)
4508
+			if (Grafreed.clipboardIsTempGroup)
45094509 			{
4510
-				Composite temp = (Composite)GrafreeD.clipboard;
4510
+				Composite temp = (Composite)Grafreed.clipboard;
45114511 				Object3D copy;
45124512 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
45134513 				{
....@@ -4517,7 +4517,7 @@
45174517 				}
45184518 			} else
45194519 			{
4520
-				linkSomething(GrafreeD.clipboard); //.get(0));
4520
+				linkSomething(Grafreed.clipboard); //.get(0));
45214521 			}
45224522 		}
45234523             }
....@@ -4962,7 +4962,7 @@
49624962 
49634963 	void ImportVRMLX3D()
49644964 	{
4965
-		if (GrafreeD.standAlone)
4965
+		if (Grafreed.standAlone)
49664966 		{
49674967                     /**/
49684968 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
....@@ -4979,7 +4979,7 @@
49794979 				
49804980 	String GetFile(String dialogName)
49814981 	{
4982
-		if (GrafreeD.standAlone)
4982
+		if (Grafreed.standAlone)
49834983 		{
49844984 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
49854985 			browser.show();


 ImplicitTiler.java
....@@ -194,8 +194,8 @@
194194             {
195195                 // Merge normals: tolerance == 0 means use analytic,
196196                 //                tolerance == 10 means use generated normals
197
-                BoundaryRep analytic = (BoundaryRep) GrafreeD.clone(bRep);
198
-                BoundaryRep generated = (BoundaryRep) GrafreeD.clone(bRep);
197
+                BoundaryRep analytic = (BoundaryRep) Grafreed.clone(bRep);
198
+                BoundaryRep generated = (BoundaryRep) Grafreed.clone(bRep);
199199 
200200                 analytic.Trim(trim, false, false, stripify, true);
201201                 generated.Trim(trim, true, false, stripify, true);


 LA.java
....@@ -307,14 +307,14 @@
307307 
308308         }
309309 
310
-        GrafreeD.Assert(Math.abs(src[0][3]) <= 1E-15);
311
-        GrafreeD.Assert(Math.abs(src[1][3]) <= 1E-15);
312
-        GrafreeD.Assert(Math.abs(src[2][3]) <= 1E-15);
313
-        GrafreeD.Assert(Math.abs(src[3][3] - 1) <= 1E-15);
314
-        GrafreeD.Assert(Math.abs(dst[0][3]) <= 1E-15);
315
-        GrafreeD.Assert(Math.abs(dst[1][3]) <= 1E-15);
316
-        GrafreeD.Assert(Math.abs(dst[2][3]) <= 1E-15);
317
-        GrafreeD.Assert(Math.abs(dst[3][3] - 1) <= 1E-15);
310
+        Grafreed.Assert(Math.abs(src[0][3]) <= 1E-15);
311
+        Grafreed.Assert(Math.abs(src[1][3]) <= 1E-15);
312
+        Grafreed.Assert(Math.abs(src[2][3]) <= 1E-15);
313
+        Grafreed.Assert(Math.abs(src[3][3] - 1) <= 1E-15);
314
+        Grafreed.Assert(Math.abs(dst[0][3]) <= 1E-15);
315
+        Grafreed.Assert(Math.abs(dst[1][3]) <= 1E-15);
316
+        Grafreed.Assert(Math.abs(dst[2][3]) <= 1E-15);
317
+        Grafreed.Assert(Math.abs(dst[3][3] - 1) <= 1E-15);
318318     }
319319 
320320     static double toRadians(double degrees)


 Merge.java
....@@ -192,7 +192,7 @@
192192         try
193193         {
194194             //font = FontRender.createFont("Dialog", 11, false, true);
195
-            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
195
+            font = new FontRender.GLFont(gl, Grafreed.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
196196         } catch (java.io.IOException e)
197197         {
198198             e.printStackTrace();


 Mocap.java
....@@ -921,7 +921,7 @@
921921 //                    //GetFileRoot();
922922                   
923923                     // sept 2014: //
924
-                    GrafreeD.RENDERME = 3; // patch for Merge objects
924
+                    Grafreed.RENDERME = 3; // patch for Merge objects
925925                     float[] thedata = bvh.animation.getBoneData(0);
926926                     
927927                     os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
....@@ -1566,7 +1566,7 @@
15661566 
15671567                         lastsoundtime = Globals.framecount;
15681568                         
1569
-                        GrafreeD.hassound = true;
1569
+                        Grafreed.hassound = true;
15701570                     }
15711571 //                    else
15721572 //                        System.out.println("skipped");


 MorphNode.java
....@@ -19,7 +19,7 @@
1919         {
2020             CreateMaterial();
2121             morphobject.get(0).bRep.SaveSupports();
22
-            bRep = (BoundaryRep) GrafreeD.clone(morphobject.get(0).bRep);
22
+            bRep = (BoundaryRep) Grafreed.clone(morphobject.get(0).bRep);
2323             morphobject.get(0).bRep.RestoreSupports();
2424         }
2525         
....@@ -30,7 +30,7 @@
3030             duplicate.parent = null;
3131             Object3D sup = duplicate.support;
3232             duplicate.support = null;
33
-            addChild((Object3D)GrafreeD.clone(duplicate));
33
+            addChild((Object3D)Grafreed.clone(duplicate));
3434             duplicate.parent = par;
3535             duplicate.support = sup;
3636         }
....@@ -112,7 +112,7 @@
112112         super.deepCopySelf(other);
113113         MorphNode bp = (MorphNode)other;
114114         
115
-        bp.morphweights = (double[]) GrafreeD.clone(morphweights);
115
+        bp.morphweights = (double[]) Grafreed.clone(morphweights);
116116     }
117117     
118118     void createEditWindow(GroupEditor callee, boolean newWindow)


 ObjEditor.java
....@@ -752,7 +752,7 @@
752752     protected static ImageIcon createImageIcon(String path,
753753             String description)
754754     {
755
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
755
+        java.net.URL imgURL = Grafreed.class.getResource(path);
756756         if (imgURL != null)
757757         {
758758             return new ImageIcon(imgURL, description);
....@@ -1476,19 +1476,19 @@
14761476 
14771477         cGridBag editBar = new cGridBag().setVertical(false);
14781478             
1479
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1479
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14801480                 createMaterialButton.setToolTipText("Create material");
14811481 
14821482         /*
14831483         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14841484          */
14851485 
1486
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1486
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14871487                 clearMaterialButton.setToolTipText("Clear material");
14881488         
14891489         if (Globals.ADVANCED)
14901490         {
1491
-                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1491
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
14921492                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
14931493                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14941494         }
....@@ -2396,7 +2396,7 @@
23962396 
23972397     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23982398     {
2399
-        if (GrafreeD.standAlone)
2399
+        if (Grafreed.standAlone)
24002400         {
24012401             /**/
24022402             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
....@@ -3255,8 +3255,8 @@
32553255 
32563256                 Globals.ANIMATION ^= true;
32573257 
3258
-                GrafreeD.wav.cursor = 0;
3259
-                GrafreeD.wav.loop = 0;
3258
+                Grafreed.wav.cursor = 0;
3259
+                Grafreed.wav.loop = 0;
32603260             }
32613261         } else
32623262         {
....@@ -4200,7 +4200,7 @@
42004200 
42014201     void load() // throws ClassNotFoundException
42024202     {
4203
-        if (GrafreeD.standAlone)
4203
+        if (Grafreed.standAlone)
42044204         {
42054205             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
42064206             browser.show();
....@@ -4305,7 +4305,7 @@
43054305 
43064306     void saveAs()
43074307     {
4308
-        if (GrafreeD.standAlone)
4308
+        if (Grafreed.standAlone)
43094309         {
43104310             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
43114311             browser.setVisible(true);
....@@ -4416,7 +4416,7 @@
44164416             Object3D objectparent = obj.parent;
44174417             obj.parent = null;
44184418 
4419
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4419
+            Object3D object = (Object3D) Grafreed.clone(obj);
44204420 
44214421             obj.parent = objectparent;
44224422 
....@@ -4450,7 +4450,7 @@
44504450         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44514451         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44524452         copy.generatePOV(buffer);
4453
-        if (GrafreeD.standAlone)
4453
+        if (Grafreed.standAlone)
44544454         {
44554455             FileDialog browser = new FileDialog(frame, "Export POV", 1);
44564456             browser.show();


 Object3D.java
....@@ -954,7 +954,7 @@
954954 
955955     public Object clone()
956956     {
957
-        return GrafreeD.clone(this);
957
+        return Grafreed.clone(this);
958958     }
959959 
960960     Object3D copyExpand()
....@@ -1729,7 +1729,7 @@
17291729             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301730             o.bRep = transientrep;
17311731             if (clone)
1732
-                o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1732
+                o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331733             o.CreateMaterial();
17341734             o.SetAttributes(this, -1);
17351735             //parent
....@@ -1742,7 +1742,7 @@
17421742             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431743             o.bRep = bRep;
17441744             if (clone)
1745
-                o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1745
+                o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461746             o.CreateMaterial();
17471747             //o.overwriteThis(this, -1);
17481748             o.SetAttributes(this, -1);
....@@ -3204,7 +3204,7 @@
32043204         
32053205         BoundaryRep sup = bRep.support;
32063206         bRep.support = null;
3207
-        BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3207
+        BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32083208 //            bRep.SplitInTwo(onlyone); // thread...
32093209             temprep.SplitInTwo(reduction34, onlyone);
32103210             bRep = temprep;
....@@ -3728,7 +3728,7 @@
37283728             if (child == null)
37293729                 continue;
37303730             
3731
-            if (GrafreeD.RENDERME > 0)
3731
+            if (Grafreed.RENDERME > 0)
37323732             {
37333733                 if (child instanceof Merge)
37343734                     ((Merge)child).renderme();
....@@ -3879,7 +3879,7 @@
38793879                 if (child == null)
38803880                     continue;
38813881                 
3882
-                if (GrafreeD.RENDERME > 0)
3882
+                if (Grafreed.RENDERME > 0)
38833883                 {
38843884                     if (child instanceof Merge)
38853885                         ((Merge)child).renderme();
....@@ -4074,7 +4074,7 @@
40744074                 if (child == null)
40754075                     continue;
40764076                 
4077
-                if (GrafreeD.RENDERME > 0)
4077
+                if (Grafreed.RENDERME > 0)
40784078                 {
40794079                     if (child instanceof Merge)
40804080                         ((Merge)child).renderme();
....@@ -7567,7 +7567,7 @@
75677567         {
75687568             assert(bRep != null);
75697569             if (!(support instanceof GenericJoint)) // support.bRep != null)
7570
-                GrafreeD.Assert(support.bRep == bRep.support);
7570
+                Grafreed.Assert(support.bRep == bRep.support);
75717571         }
75727572         else
75737573         {


 RandomNode.java
....@@ -95,7 +95,7 @@
9595         
9696             //(int)(Math.random()*super.size());
9797         //globalcount++;
98
-        gcount += GrafreeD.mix3(rnd+12345,firstchoice*12345,gcount);
98
+        gcount += Grafreed.mix3(rnd+12345,firstchoice*12345,gcount);
9999         
100100         gcount &= 0x7fffffff;
101101         


 SwitchNode.java
....@@ -20,7 +20,7 @@
2020         {
2121             CreateMaterial();
2222             switchobject.get(0).bRep.SaveSupports();
23
-            bRep = (BoundaryRep) GrafreeD.clone(switchobject.get(0).bRep);
23
+            bRep = (BoundaryRep) Grafreed.clone(switchobject.get(0).bRep);
2424             switchobject.get(0).bRep.RestoreSupports();
2525         }
2626         
....@@ -30,7 +30,7 @@
3030             Object3D par = duplicate.parent;
3131             duplicate.parent = null;
3232             duplicate.SaveSupports();
33
-            addChild((Object3D)GrafreeD.clone(duplicate));
33
+            addChild((Object3D)Grafreed.clone(duplicate));
3434             duplicate.parent = par;
3535             duplicate.RestoreSupports();
3636         }
....@@ -97,7 +97,7 @@
9797         
9898         if (bRep == null)
9999         {
100
-            bRep = (BoundaryRep) GrafreeD.clone(switchobject.get(0).bRep);
100
+            bRep = (BoundaryRep) Grafreed.clone(switchobject.get(0).bRep);
101101         }
102102         
103103         if (CameraPane.SUPPORT && display.DrawMode() == display.SHADOW)


 Vertex.java
....@@ -133,7 +133,7 @@
133133         return Math.abs(/*pos.*/x - vert./*pos.*/x) +
134134                 Math.abs(/*pos.*/y - vert./*pos.*/y) +
135135                 Math.abs(/*pos.*/z - vert./*pos.*/z) < 0.00001 && // GrafreeD.epsvertex2 && // WARNING: USE 0.0001 for serial issues
136
-                (GrafreeD.linkUV || Math.abs(s - vert.s) + Math.abs(t - vert.t) < 0.00001)
136
+                (Grafreed.linkUV || Math.abs(s - vert.s) + Math.abs(t - vert.t) < 0.00001)
137137                 ; // GrafreeD.epsvertex2;
138138     }
139139     /*


 cFileSystemPane.java
....@@ -136,7 +136,7 @@
136136         
137137         jTree.setModel(new cFileSystemModel(
138138                 //java.io.File.listRoots()[1])
139
-                javax.swing.filechooser.FileSystemView.getFileSystemView().getHomeDirectory(),
139
+                javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory(),
140140                 filter
141141         ));
142142     }


 cMesh.java
....@@ -404,8 +404,8 @@
404404         if (ref == null)
405405             return;
406406         
407
-        GrafreeD.epsequal = IsEpsEqual();
408
-        GrafreeD.linkUV = IsLinkUV();
407
+        Grafreed.epsequal = IsEpsEqual();
408
+        Grafreed.linkUV = IsLinkUV();
409409         
410410 //        BoundaryRep oldrep = transientrep;
411411         
....@@ -419,7 +419,7 @@
419419         Object3D obj = ref.GetObject();
420420         
421421         // may 2014: side-effect with UVs!!
422
-        obj = (Object3D) GrafreeD.clone(obj);
422
+        obj = (Object3D) Grafreed.clone(obj);
423423         
424424         merge(obj);
425425 
....@@ -429,7 +429,7 @@
429429         bRep.Trim(false, false,false,false,false);
430430             System.out.println("------> TRIM " + ref + "; #vertices = " + bRep.VertexCount() + "; #faces = " + bRep.FaceCount());
431431 
432
-        GrafreeD.epsequal = false;
432
+        Grafreed.epsequal = false;
433433 
434434         if (transientrep != null && bRep.VertexCount() == transientrep.VertexCount())
435435         {
....@@ -470,7 +470,7 @@
470470         }
471471         else
472472             // geometry is merged...
473
-            refcopy = (BoundaryRep) GrafreeD.clone(transientrep);
473
+            refcopy = (BoundaryRep) Grafreed.clone(transientrep);
474474     }
475475     
476476     transient cVector minima = new cVector();


 cRadio.java
....@@ -32,7 +32,7 @@
3232         if (link)
3333             camera = c;
3434         else
35
-            camera = (Camera)GrafreeD.clone(c);
35
+            camera = (Camera)Grafreed.clone(c);
3636     }
3737     
3838     Object3D object;


 cVector.java
....@@ -266,7 +266,7 @@
266266         long ly = Double.doubleToRawLongBits(y);
267267         long lz = Double.doubleToRawLongBits(z);
268268 
269
-        if (GrafreeD.epsequal)
269
+        if (Grafreed.epsequal)
270270         {
271271             return 0;
272272         } else