From f69d25e4682ca33edfc8cfad26187050f4eb558a Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Sun, 05 May 2019 14:06:57 -0400 Subject: [PATCH] Remove "D". --- Object3D.java | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Object3D.java b/Object3D.java index 6536ddc..aa628e7 100644 --- a/Object3D.java +++ b/Object3D.java @@ -954,7 +954,7 @@ public Object clone() { - return GrafreeD.clone(this); + return Grafreed.clone(this); } Object3D copyExpand() @@ -1729,7 +1729,7 @@ Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name); o.bRep = transientrep; if (clone) - o.bRep = (BoundaryRep) GrafreeD.clone(transientrep); + o.bRep = (BoundaryRep) Grafreed.clone(transientrep); o.CreateMaterial(); o.SetAttributes(this, -1); //parent @@ -1742,7 +1742,7 @@ Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name); o.bRep = bRep; if (clone) - o.bRep = (BoundaryRep) GrafreeD.clone(bRep); + o.bRep = (BoundaryRep) Grafreed.clone(bRep); o.CreateMaterial(); //o.overwriteThis(this, -1); o.SetAttributes(this, -1); @@ -2477,13 +2477,13 @@ return retval; } - void doEditDrag(ClickInfo info) + void doEditDrag(ClickInfo info, boolean opposite) { switch (doSomething) { case 1: // '\001' //super. - doEditDrag0(info); + doEditDrag0(info, opposite); break; case 2: // '\002' @@ -2496,11 +2496,11 @@ { //sel.hitSomething = childToDrag.hitSomething; //childToDrag.doEditDrag(info); - sel.doEditDrag(info); + sel.doEditDrag(info, opposite); } else { //super. - doEditDrag0(info); + doEditDrag0(info, opposite); } } break; @@ -3204,7 +3204,7 @@ BoundaryRep sup = bRep.support; bRep.support = null; - BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep); + BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep); // bRep.SplitInTwo(onlyone); // thread... temprep.SplitInTwo(reduction34, onlyone); bRep = temprep; @@ -3728,7 +3728,7 @@ if (child == null) continue; - if (GrafreeD.RENDERME > 0) + if (Grafreed.RENDERME > 0) { if (child instanceof Merge) ((Merge)child).renderme(); @@ -3879,7 +3879,7 @@ if (child == null) continue; - if (GrafreeD.RENDERME > 0) + if (Grafreed.RENDERME > 0) { if (child instanceof Merge) ((Merge)child).renderme(); @@ -4074,7 +4074,7 @@ if (child == null) continue; - if (GrafreeD.RENDERME > 0) + if (Grafreed.RENDERME > 0) { if (child instanceof Merge) ((Merge)child).renderme(); @@ -7012,7 +7012,7 @@ return true; } - void doEditDrag0(ClickInfo info) + void doEditDrag0(ClickInfo info, boolean opposite) { if (hitSomething == 0) { @@ -7039,7 +7039,7 @@ scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance(); - if (modified) + if (modified || opposite) { //assert(false); /* @@ -7133,6 +7133,7 @@ if (modified) { + // Rotate 90 degrees angle /= (Math.PI / 4); angle = Math.floor(angle + 0.5); angle *= (Math.PI / 4); @@ -7566,7 +7567,7 @@ { assert(bRep != null); if (!(support instanceof GenericJoint)) // support.bRep != null) - GrafreeD.Assert(support.bRep == bRep.support); + Grafreed.Assert(support.bRep == bRep.support); } else { -- Gitblit v1.6.2