.. | .. |
---|
14 | 14 | import //weka.core. |
---|
15 | 15 | matrix.Matrix; |
---|
16 | 16 | |
---|
| 17 | +import java.util.UUID; |
---|
| 18 | + |
---|
17 | 19 | //import net.sourceforge.sizeof.SizeOf; |
---|
18 | 20 | public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D> |
---|
19 | 21 | { |
---|
20 | 22 | //static final long serialVersionUID = -607422624994562685L; |
---|
21 | 23 | static final long serialVersionUID = 5022536242724664900L; |
---|
| 24 | + |
---|
| 25 | + private UUID uuid = UUID.randomUUID(); |
---|
| 26 | + |
---|
| 27 | + // TEMPORARY for mocap undo |
---|
| 28 | + mocap.reader.BVHReader.BVHResult bvh; |
---|
| 29 | + Object3D skeleton; |
---|
| 30 | + // |
---|
22 | 31 | |
---|
23 | 32 | ScriptNode scriptnode; |
---|
24 | 33 | |
---|
.. | .. |
---|
100 | 109 | |
---|
101 | 110 | // transient boolean reduced; // for morph reduction |
---|
102 | 111 | |
---|
103 | | -transient com.bulletphysics.linearmath.Transform cache; // for fast merge |
---|
104 | | -transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge |
---|
| 112 | + transient com.bulletphysics.linearmath.Transform cache; // for fast merge |
---|
| 113 | + transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge |
---|
105 | 114 | |
---|
106 | | -transient Object3D transientsupport; // for cloning |
---|
107 | | -transient boolean transientlink2master; |
---|
| 115 | + transient Object3D transientsupport; // for cloning |
---|
| 116 | + transient boolean transientlink2master; |
---|
108 | 117 | |
---|
109 | | -void SaveSupports() |
---|
110 | | -{ |
---|
111 | | - if (blockloop) |
---|
112 | | - return; |
---|
113 | | - |
---|
114 | | - transientsupport = support; |
---|
115 | | - transientlink2master = link2master; |
---|
116 | | - |
---|
117 | | - support = null; |
---|
118 | | - link2master = false; |
---|
119 | | - |
---|
120 | | - if (bRep != null) |
---|
| 118 | + void SaveSupports() |
---|
121 | 119 | { |
---|
122 | | - bRep.SaveSupports(); |
---|
123 | | - } |
---|
124 | | - |
---|
125 | | - for (int i = 0; i < Size(); i++) |
---|
126 | | - { |
---|
127 | | - Object3D child = (Object3D) get(i); |
---|
128 | | - if (child == null) |
---|
129 | | - continue; |
---|
130 | | - blockloop = true; |
---|
131 | | - child.SaveSupports(); |
---|
132 | | - blockloop = false; |
---|
133 | | - } |
---|
134 | | -} |
---|
| 120 | + if (blockloop) |
---|
| 121 | + return; |
---|
135 | 122 | |
---|
136 | | -void RestoreSupports() |
---|
137 | | -{ |
---|
138 | | - if (blockloop) |
---|
139 | | - return; |
---|
| 123 | + transientsupport = support; |
---|
| 124 | + transientlink2master = link2master; |
---|
140 | 125 | |
---|
141 | | - support = transientsupport; |
---|
142 | | - link2master = transientlink2master; |
---|
143 | | - transientsupport = null; |
---|
144 | | - transientlink2master = false; |
---|
145 | | - |
---|
146 | | - if (bRep != null) |
---|
147 | | - { |
---|
148 | | - bRep.RestoreSupports(); |
---|
| 126 | + support = null; |
---|
| 127 | + link2master = false; |
---|
| 128 | + |
---|
| 129 | + if (bRep != null) |
---|
| 130 | + { |
---|
| 131 | + bRep.SaveSupports(); |
---|
| 132 | + } |
---|
| 133 | + |
---|
| 134 | + for (int i = 0; i < Size(); i++) |
---|
| 135 | + { |
---|
| 136 | + Object3D child = (Object3D) get(i); |
---|
| 137 | + if (child == null) |
---|
| 138 | + continue; |
---|
| 139 | + blockloop = true; |
---|
| 140 | + child.SaveSupports(); |
---|
| 141 | + blockloop = false; |
---|
| 142 | + } |
---|
149 | 143 | } |
---|
150 | | - |
---|
151 | | - for (int i = 0; i < Size(); i++) |
---|
| 144 | + |
---|
| 145 | + void RestoreSupports() |
---|
152 | 146 | { |
---|
153 | | - Object3D child = (Object3D) get(i); |
---|
154 | | - if (child == null) |
---|
155 | | - continue; |
---|
156 | | - blockloop = true; |
---|
157 | | - child.RestoreSupports(); |
---|
158 | | - blockloop = false; |
---|
| 147 | + if (blockloop) |
---|
| 148 | + return; |
---|
| 149 | + |
---|
| 150 | + support = transientsupport; |
---|
| 151 | + link2master = transientlink2master; |
---|
| 152 | + transientsupport = null; |
---|
| 153 | + transientlink2master = false; |
---|
| 154 | + |
---|
| 155 | + if (bRep != null) |
---|
| 156 | + { |
---|
| 157 | + bRep.RestoreSupports(); |
---|
| 158 | + } |
---|
| 159 | + |
---|
| 160 | + for (int i = 0; i < Size(); i++) |
---|
| 161 | + { |
---|
| 162 | + Object3D child = (Object3D) get(i); |
---|
| 163 | + if (child == null) |
---|
| 164 | + continue; |
---|
| 165 | + blockloop = true; |
---|
| 166 | + child.RestoreSupports(); |
---|
| 167 | + blockloop = false; |
---|
| 168 | + } |
---|
159 | 169 | } |
---|
160 | | -} |
---|
| 170 | + |
---|
| 171 | + void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable) |
---|
| 172 | + { |
---|
| 173 | + if (hashtable.containsKey(GetUUID())) |
---|
| 174 | + { |
---|
| 175 | + Object3D o = hashtable.get(GetUUID()); |
---|
| 176 | + |
---|
| 177 | + Grafreed.Assert(this.bRep == o.bRep); |
---|
| 178 | + if (this.bRep != null) |
---|
| 179 | + assert(this.bRep.support == o.transientrep); |
---|
| 180 | + |
---|
| 181 | + return; |
---|
| 182 | + } |
---|
| 183 | + |
---|
| 184 | + Object3D o = new Object3D(); |
---|
| 185 | + |
---|
| 186 | + hashtable.put(GetUUID(), o); |
---|
| 187 | + |
---|
| 188 | + for (int i=0; i<Size(); i++) |
---|
| 189 | + { |
---|
| 190 | + get(i).ExtractBigData(hashtable); |
---|
| 191 | + } |
---|
| 192 | + |
---|
| 193 | + ExtractBigData(o); |
---|
| 194 | + } |
---|
| 195 | + |
---|
| 196 | + void ExtractBigData(Object3D o) |
---|
| 197 | + { |
---|
| 198 | + o.bRep = this.bRep; |
---|
| 199 | + if (this.bRep != null) |
---|
| 200 | + { |
---|
| 201 | + o.transientrep = this.bRep.support; |
---|
| 202 | + o.bRep.support = null; |
---|
| 203 | + } |
---|
| 204 | + |
---|
| 205 | + // o.support = this.support; |
---|
| 206 | + // o.fileparent = this.fileparent; |
---|
| 207 | + // if (this.bRep != null) |
---|
| 208 | + // o.bRep = this.bRep.support; |
---|
| 209 | + |
---|
| 210 | + this.bRep = null; |
---|
| 211 | + // if (this.bRep != null) |
---|
| 212 | + // this.bRep.support = null; |
---|
| 213 | + // this.support = null; |
---|
| 214 | + // this.fileparent = null; |
---|
| 215 | + } |
---|
| 216 | + |
---|
| 217 | + void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable) |
---|
| 218 | + { |
---|
| 219 | + if (!hashtable.containsKey(GetUUID())) |
---|
| 220 | + return; |
---|
| 221 | + |
---|
| 222 | + Object3D o = hashtable.get(GetUUID()); |
---|
| 223 | + |
---|
| 224 | + RestoreBigData(o); |
---|
| 225 | + |
---|
| 226 | + hashtable.remove(GetUUID()); |
---|
| 227 | + |
---|
| 228 | + for (int i=0; i<Size(); i++) |
---|
| 229 | + { |
---|
| 230 | + get(i).RestoreBigData(hashtable); |
---|
| 231 | + } |
---|
| 232 | + } |
---|
| 233 | + |
---|
| 234 | + void RestoreBigData(Object3D o) |
---|
| 235 | + { |
---|
| 236 | + this.bRep = o.bRep; |
---|
| 237 | + if (this.bRep != null) |
---|
| 238 | + this.bRep.support = o.transientrep; |
---|
| 239 | + // this.support = o.support; |
---|
| 240 | + // this.fileparent = o.fileparent; |
---|
| 241 | + } |
---|
161 | 242 | |
---|
162 | 243 | // MOCAP SUPPORT |
---|
163 | 244 | double tx,ty,tz,rx,ry,rz; |
---|
.. | .. |
---|
300 | 381 | } |
---|
301 | 382 | |
---|
302 | 383 | boolean live = false; |
---|
| 384 | + boolean dontselect = false; |
---|
303 | 385 | boolean hide = false; |
---|
304 | 386 | boolean link2master = false; // performs reset support/master at each frame |
---|
305 | 387 | boolean marked = false; // animation node |
---|
.. | .. |
---|
481 | 563 | toParent = LA.newMatrix(); |
---|
482 | 564 | fromParent = LA.newMatrix(); |
---|
483 | 565 | } |
---|
| 566 | + |
---|
484 | 567 | if (toParentMarked == null) |
---|
485 | 568 | { |
---|
486 | 569 | if (maxcount != 1) |
---|
487 | 570 | { |
---|
488 | 571 | new Exception().printStackTrace(); |
---|
489 | 572 | } |
---|
| 573 | + |
---|
490 | 574 | toParentMarked = LA.newMatrix(); |
---|
491 | 575 | fromParentMarked = LA.newMatrix(); |
---|
492 | 576 | } |
---|
.. | .. |
---|
774 | 858 | if (step == 0) |
---|
775 | 859 | step = 1; |
---|
776 | 860 | if (maxcount == 0) |
---|
777 | | - maxcount = 2048; // 4; |
---|
| 861 | + maxcount = 128; // 2048; // 4; |
---|
778 | 862 | // if (acceleration == 0) |
---|
779 | 863 | // acceleration = 10; |
---|
780 | 864 | if (delay == 0) // serial |
---|
.. | .. |
---|
797 | 881 | |
---|
798 | 882 | if (marked && Globals.isLIVE() && live && |
---|
799 | 883 | //TEMP21aug2018 |
---|
800 | | - Globals.DrawMode() == iCameraPane.SHADOW && |
---|
| 884 | + (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) && |
---|
801 | 885 | currentframe != Globals.framecount) |
---|
802 | 886 | { |
---|
803 | 887 | currentframe = Globals.framecount; |
---|
.. | .. |
---|
912 | 996 | fromParent = null; // LA.newMatrix(); |
---|
913 | 997 | bRep = null; // new BoundaryRep(); |
---|
914 | 998 | |
---|
| 999 | + if (oname != null && oname.equals("LeftHand")) |
---|
| 1000 | + { |
---|
| 1001 | + name = oname; |
---|
| 1002 | + } |
---|
| 1003 | + |
---|
915 | 1004 | /* |
---|
916 | 1005 | float hue = (float)Math.random(); |
---|
917 | 1006 | Color col; |
---|
.. | .. |
---|
954 | 1043 | |
---|
955 | 1044 | public Object clone() |
---|
956 | 1045 | { |
---|
957 | | - return GrafreeD.clone(this); |
---|
| 1046 | + return Grafreed.clone(this); |
---|
958 | 1047 | } |
---|
959 | 1048 | |
---|
960 | 1049 | Object3D copyExpand() |
---|
.. | .. |
---|
1470 | 1559 | BoundaryRep.SEUIL = other.material.cameralight; |
---|
1471 | 1560 | |
---|
1472 | 1561 | // Set default to 0.1 |
---|
1473 | | - BoundaryRep.SEUIL /= 2; |
---|
| 1562 | + BoundaryRep.SEUIL /= 4; // 2; |
---|
1474 | 1563 | System.out.println("SEUIL = " + BoundaryRep.SEUIL); |
---|
1475 | 1564 | } |
---|
1476 | 1565 | |
---|
.. | .. |
---|
1729 | 1818 | Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name); |
---|
1730 | 1819 | o.bRep = transientrep; |
---|
1731 | 1820 | if (clone) |
---|
1732 | | - o.bRep = (BoundaryRep) GrafreeD.clone(transientrep); |
---|
| 1821 | + o.bRep = (BoundaryRep) Grafreed.clone(transientrep); |
---|
1733 | 1822 | o.CreateMaterial(); |
---|
1734 | 1823 | o.SetAttributes(this, -1); |
---|
1735 | 1824 | //parent |
---|
.. | .. |
---|
1742 | 1831 | Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name); |
---|
1743 | 1832 | o.bRep = bRep; |
---|
1744 | 1833 | if (clone) |
---|
1745 | | - o.bRep = (BoundaryRep) GrafreeD.clone(bRep); |
---|
| 1834 | + o.bRep = (BoundaryRep) Grafreed.clone(bRep); |
---|
1746 | 1835 | o.CreateMaterial(); |
---|
1747 | 1836 | //o.overwriteThis(this, -1); |
---|
1748 | 1837 | o.SetAttributes(this, -1); |
---|
.. | .. |
---|
1829 | 1918 | if (obj.name == null) |
---|
1830 | 1919 | continue; // can't be a null one |
---|
1831 | 1920 | |
---|
| 1921 | + // Try perfect match first. |
---|
1832 | 1922 | if (n.equals(obj.name)) |
---|
1833 | 1923 | { |
---|
1834 | 1924 | theobj = obj; |
---|
1835 | 1925 | count++; |
---|
1836 | 1926 | } |
---|
1837 | 1927 | } |
---|
| 1928 | + |
---|
| 1929 | + // not needed: n = n.split(":")[0]; // Poser generates a count |
---|
1838 | 1930 | |
---|
1839 | 1931 | if (count != 1) |
---|
1840 | 1932 | for (int i=Size(); --i>=0;) |
---|
.. | .. |
---|
2477 | 2569 | return retval; |
---|
2478 | 2570 | } |
---|
2479 | 2571 | |
---|
2480 | | - void doEditDrag(ClickInfo info) |
---|
| 2572 | + void doEditDrag(ClickInfo info, boolean opposite) |
---|
2481 | 2573 | { |
---|
2482 | 2574 | switch (doSomething) |
---|
2483 | 2575 | { |
---|
2484 | 2576 | case 1: // '\001' |
---|
2485 | 2577 | //super. |
---|
2486 | | - doEditDrag0(info); |
---|
| 2578 | + doEditDrag0(info, opposite); |
---|
2487 | 2579 | break; |
---|
2488 | 2580 | |
---|
2489 | 2581 | case 2: // '\002' |
---|
.. | .. |
---|
2496 | 2588 | { |
---|
2497 | 2589 | //sel.hitSomething = childToDrag.hitSomething; |
---|
2498 | 2590 | //childToDrag.doEditDrag(info); |
---|
2499 | | - sel.doEditDrag(info); |
---|
| 2591 | + sel.doEditDrag(info, opposite); |
---|
2500 | 2592 | } else |
---|
2501 | 2593 | { |
---|
2502 | 2594 | //super. |
---|
2503 | | - doEditDrag0(info); |
---|
| 2595 | + doEditDrag0(info, opposite); |
---|
2504 | 2596 | } |
---|
2505 | 2597 | } |
---|
2506 | 2598 | break; |
---|
.. | .. |
---|
2610 | 2702 | void GenNormalsS(boolean crease) |
---|
2611 | 2703 | { |
---|
2612 | 2704 | selection.GenNormals(crease); |
---|
| 2705 | +// for (int i=0; i<selection.size(); i++) |
---|
| 2706 | +// { |
---|
| 2707 | +// Object3D selectee = (Object3D) selection.elementAt(i); |
---|
| 2708 | +// selectee.GenNormals(crease); |
---|
| 2709 | +// } |
---|
| 2710 | + |
---|
| 2711 | + //Touch(); |
---|
| 2712 | + } |
---|
| 2713 | + |
---|
| 2714 | + void GenNormalsMeshS() |
---|
| 2715 | + { |
---|
| 2716 | + selection.GenNormalsMesh(); |
---|
2613 | 2717 | // for (int i=0; i<selection.size(); i++) |
---|
2614 | 2718 | // { |
---|
2615 | 2719 | // Object3D selectee = (Object3D) selection.elementAt(i); |
---|
.. | .. |
---|
2750 | 2854 | if (child == null) |
---|
2751 | 2855 | continue; |
---|
2752 | 2856 | child.GenNormals(crease); |
---|
| 2857 | +// Children().release(i); |
---|
| 2858 | + } |
---|
| 2859 | + blockloop = false; |
---|
| 2860 | + } |
---|
| 2861 | + |
---|
| 2862 | + void GenNormalsMesh() |
---|
| 2863 | + { |
---|
| 2864 | + if (blockloop) |
---|
| 2865 | + return; |
---|
| 2866 | + |
---|
| 2867 | + blockloop = true; |
---|
| 2868 | + GenNormalsMesh0(); |
---|
| 2869 | + for (int i = 0; i < Children().Size(); i++) |
---|
| 2870 | + { |
---|
| 2871 | + Object3D child = (Object3D) Children().get(i); // reserve(i); |
---|
| 2872 | + if (child == null) |
---|
| 2873 | + continue; |
---|
| 2874 | + child.GenNormalsMesh(); |
---|
2753 | 2875 | // Children().release(i); |
---|
2754 | 2876 | } |
---|
2755 | 2877 | blockloop = false; |
---|
.. | .. |
---|
2922 | 3044 | } |
---|
2923 | 3045 | } |
---|
2924 | 3046 | |
---|
| 3047 | + void GenNormalsMesh0() |
---|
| 3048 | + { |
---|
| 3049 | + if (bRep != null) |
---|
| 3050 | + { |
---|
| 3051 | + bRep.GenerateNormalsMesh(); |
---|
| 3052 | + Touch(); |
---|
| 3053 | + } |
---|
| 3054 | + } |
---|
| 3055 | + |
---|
2925 | 3056 | void GenNormalsMINE0() |
---|
2926 | 3057 | { |
---|
2927 | 3058 | if (bRep != null) |
---|
.. | .. |
---|
2983 | 3114 | blockloop = false; |
---|
2984 | 3115 | } |
---|
2985 | 3116 | |
---|
| 3117 | + void TransformChildren() |
---|
| 3118 | + { |
---|
| 3119 | + if (toParent != null) |
---|
| 3120 | + { |
---|
| 3121 | + for (int i=Size(); --i>=0;) |
---|
| 3122 | + { |
---|
| 3123 | + Object3D v = get(i); |
---|
| 3124 | + |
---|
| 3125 | + if (v.toParent == null) |
---|
| 3126 | + { |
---|
| 3127 | + v.toParent = LA.newMatrix(); |
---|
| 3128 | + v.fromParent = LA.newMatrix(); |
---|
| 3129 | + } |
---|
| 3130 | + |
---|
| 3131 | +// LA.matConcat(v.toParent, toParent, v.toParent); |
---|
| 3132 | +// LA.matConcat(fromParent, v.fromParent, v.fromParent); |
---|
| 3133 | + LA.matConcat(toParent, v.toParent, v.toParent); |
---|
| 3134 | + LA.matConcat(v.fromParent, fromParent, v.fromParent); |
---|
| 3135 | + } |
---|
| 3136 | + |
---|
| 3137 | + toParent = null; // LA.matIdentity(toParent); |
---|
| 3138 | + fromParent = null; // LA.matIdentity(fromParent); |
---|
| 3139 | + |
---|
| 3140 | + Touch(); |
---|
| 3141 | + } |
---|
| 3142 | + } |
---|
| 3143 | + |
---|
2986 | 3144 | void TransformGeometry() |
---|
2987 | 3145 | { |
---|
2988 | 3146 | Object3D obj = this; |
---|
.. | .. |
---|
3204 | 3362 | |
---|
3205 | 3363 | BoundaryRep sup = bRep.support; |
---|
3206 | 3364 | bRep.support = null; |
---|
3207 | | - BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep); |
---|
| 3365 | + BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep); |
---|
3208 | 3366 | // bRep.SplitInTwo(onlyone); // thread... |
---|
3209 | | - temprep.SplitInTwo(reduction34, onlyone); |
---|
| 3367 | + |
---|
| 3368 | + while(temprep.SplitInTwo(reduction34, onlyone)); |
---|
| 3369 | + |
---|
3210 | 3370 | bRep = temprep; |
---|
3211 | 3371 | bRep.support = sup; |
---|
3212 | 3372 | Touch(); |
---|
.. | .. |
---|
3728 | 3888 | if (child == null) |
---|
3729 | 3889 | continue; |
---|
3730 | 3890 | |
---|
3731 | | - if (GrafreeD.RENDERME > 0) |
---|
| 3891 | + if (Grafreed.RENDERME > 0) |
---|
3732 | 3892 | { |
---|
3733 | 3893 | if (child instanceof Merge) |
---|
3734 | 3894 | ((Merge)child).renderme(); |
---|
.. | .. |
---|
3879 | 4039 | if (child == null) |
---|
3880 | 4040 | continue; |
---|
3881 | 4041 | |
---|
3882 | | - if (GrafreeD.RENDERME > 0) |
---|
| 4042 | + if (Grafreed.RENDERME > 0) |
---|
3883 | 4043 | { |
---|
3884 | 4044 | if (child instanceof Merge) |
---|
3885 | 4045 | ((Merge)child).renderme(); |
---|
.. | .. |
---|
4074 | 4234 | if (child == null) |
---|
4075 | 4235 | continue; |
---|
4076 | 4236 | |
---|
4077 | | - if (GrafreeD.RENDERME > 0) |
---|
| 4237 | + if (Grafreed.RENDERME > 0) |
---|
4078 | 4238 | { |
---|
4079 | 4239 | if (child instanceof Merge) |
---|
4080 | 4240 | ((Merge)child).renderme(); |
---|
.. | .. |
---|
4681 | 4841 | |
---|
4682 | 4842 | cTreePath SelectLeaf(int indexcount, boolean deselect) |
---|
4683 | 4843 | { |
---|
4684 | | - if (hide) |
---|
| 4844 | + if (hide || dontselect) |
---|
4685 | 4845 | return null; |
---|
4686 | 4846 | |
---|
4687 | 4847 | if (count <= 0) |
---|
.. | .. |
---|
4707 | 4867 | |
---|
4708 | 4868 | cTreePath Select(int indexcount, boolean deselect) |
---|
4709 | 4869 | { |
---|
4710 | | - if (hide) |
---|
| 4870 | + if (hide || dontselect) |
---|
4711 | 4871 | return null; |
---|
4712 | 4872 | |
---|
4713 | 4873 | if (count <= 0) |
---|
.. | .. |
---|
5159 | 5319 | |
---|
5160 | 5320 | // System.out.println("Fullname = " + fullname); |
---|
5161 | 5321 | |
---|
5162 | | - if (fullname.name.indexOf(":") == -1) |
---|
5163 | | - return fullname.name; |
---|
| 5322 | + // Does not work on Windows due to C: |
---|
| 5323 | +// if (fullname.name.indexOf(":") == -1) |
---|
| 5324 | +// return fullname.name; |
---|
| 5325 | +// |
---|
| 5326 | +// return fullname.name.substring(0,fullname.name.indexOf(":")); |
---|
5164 | 5327 | |
---|
5165 | | - return fullname.name.substring(0,fullname.name.indexOf(":")); |
---|
| 5328 | + String[] split = fullname.name.split(":"); |
---|
| 5329 | + |
---|
| 5330 | + if (split.length == 0) |
---|
| 5331 | + { |
---|
| 5332 | + return ""; |
---|
| 5333 | + } |
---|
| 5334 | + |
---|
| 5335 | + if (split.length <= 2) |
---|
| 5336 | + { |
---|
| 5337 | + if (fullname.name.endsWith(":")) |
---|
| 5338 | + { |
---|
| 5339 | + // Windows |
---|
| 5340 | + return fullname.name.substring(0, fullname.name.length()-1); |
---|
| 5341 | + } |
---|
| 5342 | + |
---|
| 5343 | + return split[0]; |
---|
| 5344 | + } |
---|
| 5345 | + |
---|
| 5346 | + // Windows |
---|
| 5347 | + assert(split.length == 4); |
---|
| 5348 | + |
---|
| 5349 | + return split[0] + ":" + split[1]; |
---|
5166 | 5350 | } |
---|
5167 | 5351 | |
---|
5168 | 5352 | static String GetBump(cTexture fullname) |
---|
.. | .. |
---|
5171 | 5355 | return ""; |
---|
5172 | 5356 | |
---|
5173 | 5357 | // System.out.println("Fullname = " + fullname); |
---|
5174 | | - if (fullname.name.indexOf(":") == -1) |
---|
5175 | | - return ""; |
---|
5176 | | - |
---|
5177 | | - return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length()); |
---|
| 5358 | + // Does not work on Windows due to C: |
---|
| 5359 | +// if (fullname.name.indexOf(":") == -1) |
---|
| 5360 | +// return ""; |
---|
| 5361 | +// |
---|
| 5362 | +// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length()); |
---|
| 5363 | + String[] split = fullname.name.split(":"); |
---|
| 5364 | + |
---|
| 5365 | + if (split.length == 0) |
---|
| 5366 | + { |
---|
| 5367 | + return ""; |
---|
| 5368 | + } |
---|
| 5369 | + |
---|
| 5370 | + if (split.length == 1) |
---|
| 5371 | + { |
---|
| 5372 | + return ""; |
---|
| 5373 | + } |
---|
| 5374 | + |
---|
| 5375 | + if (split.length == 2) |
---|
| 5376 | + { |
---|
| 5377 | + if (fullname.name.endsWith(":")) |
---|
| 5378 | + { |
---|
| 5379 | + // Windows |
---|
| 5380 | + return ""; |
---|
| 5381 | + } |
---|
| 5382 | + |
---|
| 5383 | + return split[1]; |
---|
| 5384 | + } |
---|
| 5385 | + |
---|
| 5386 | + // Windows |
---|
| 5387 | + assert(split.length == 4); |
---|
| 5388 | + |
---|
| 5389 | + return split[2] + ":" + split[3]; |
---|
5178 | 5390 | } |
---|
5179 | 5391 | |
---|
5180 | 5392 | String GetPigmentTexture() |
---|
.. | .. |
---|
5248 | 5460 | System.out.print("; textures = " + textures); |
---|
5249 | 5461 | System.out.println("; usedtextures = " + usedtextures); |
---|
5250 | 5462 | |
---|
5251 | | - if (GetTextures() == null) |
---|
| 5463 | + if (GetTextures() == null) // What is that?? |
---|
5252 | 5464 | GetTextures().name = ":"; |
---|
5253 | 5465 | |
---|
5254 | 5466 | String texname = tex; |
---|
.. | .. |
---|
5279 | 5491 | child.ResetPigmentTexture(); |
---|
5280 | 5492 | blockloop = false; |
---|
5281 | 5493 | } |
---|
| 5494 | + } |
---|
| 5495 | + |
---|
| 5496 | + UUID GetUUID() |
---|
| 5497 | + { |
---|
| 5498 | + if (uuid == null) |
---|
| 5499 | + { |
---|
| 5500 | + // Serial |
---|
| 5501 | + uuid = UUID.randomUUID(); |
---|
| 5502 | + } |
---|
| 5503 | + |
---|
| 5504 | + return uuid; |
---|
| 5505 | + } |
---|
| 5506 | + |
---|
| 5507 | + Object3D GetObject(UUID uid) |
---|
| 5508 | + { |
---|
| 5509 | + if (blockloop) |
---|
| 5510 | + return null; |
---|
| 5511 | + |
---|
| 5512 | + if (GetUUID().equals(uid)) |
---|
| 5513 | + return this; |
---|
| 5514 | + |
---|
| 5515 | + int nb = Size(); |
---|
| 5516 | + for (int i = 0; i < nb; i++) |
---|
| 5517 | + { |
---|
| 5518 | + Object3D child = (Object3D) get(i); |
---|
| 5519 | + |
---|
| 5520 | + if (child == null) |
---|
| 5521 | + continue; |
---|
| 5522 | + |
---|
| 5523 | + blockloop = true; |
---|
| 5524 | + Object3D obj = child.GetObject(uid); |
---|
| 5525 | + blockloop = false; |
---|
| 5526 | + if (obj != null) |
---|
| 5527 | + return obj; |
---|
| 5528 | + } |
---|
| 5529 | + |
---|
| 5530 | + return null; |
---|
5282 | 5531 | } |
---|
5283 | 5532 | |
---|
5284 | 5533 | void SetBumpTexture(String tex) |
---|
.. | .. |
---|
5325 | 5574 | boolean NeedSupport() |
---|
5326 | 5575 | { |
---|
5327 | 5576 | return |
---|
5328 | | - CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null |
---|
| 5577 | + CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null |
---|
5329 | 5578 | // PROBLEM with CROWD!! |
---|
5330 | | - && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD); |
---|
| 5579 | + && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD); |
---|
5331 | 5580 | } |
---|
5332 | 5581 | |
---|
5333 | 5582 | static boolean DEBUG_SELECTION = false; |
---|
| 5583 | + |
---|
| 5584 | + boolean IsLive() |
---|
| 5585 | + { |
---|
| 5586 | + if (live) |
---|
| 5587 | + return true; |
---|
| 5588 | + |
---|
| 5589 | + if (parent == null) |
---|
| 5590 | + return false; |
---|
| 5591 | + |
---|
| 5592 | + return parent.IsLive(); |
---|
| 5593 | + } |
---|
5334 | 5594 | |
---|
5335 | 5595 | void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked) |
---|
5336 | 5596 | { |
---|
.. | .. |
---|
5342 | 5602 | } |
---|
5343 | 5603 | |
---|
5344 | 5604 | if (display.DrawMode() == iCameraPane.SELECTION && |
---|
5345 | | - hide) |
---|
| 5605 | + (hide || dontselect)) |
---|
5346 | 5606 | return; |
---|
5347 | 5607 | |
---|
5348 | 5608 | if (name != null && name.contains("sclera")) |
---|
.. | .. |
---|
5393 | 5653 | support = support; |
---|
5394 | 5654 | |
---|
5395 | 5655 | //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
5396 | | - boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
| 5656 | + boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
5397 | 5657 | |
---|
5398 | 5658 | if (!usecalllists && bRep != null && bRep.displaylist > 0) |
---|
5399 | 5659 | { |
---|
.. | .. |
---|
5413 | 5673 | boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection(); |
---|
5414 | 5674 | |
---|
5415 | 5675 | if (!selectmode && //display.DrawMode() != display.SELECTION && |
---|
5416 | | - (touched || (bRep != null && bRep.displaylist <= 0))) |
---|
| 5676 | + //(touched || (bRep != null && bRep.displaylist <= 0))) |
---|
| 5677 | + (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0))) |
---|
5417 | 5678 | { |
---|
5418 | 5679 | Globals.lighttouched = true; |
---|
5419 | 5680 | } // all panes... |
---|
| 5681 | + |
---|
5420 | 5682 | //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW && |
---|
5421 | 5683 | if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW && |
---|
5422 | 5684 | (touched || (bRep != null && bRep.displaylist <= 0))) |
---|
.. | .. |
---|
5584 | 5846 | tex = GetTextures(); |
---|
5585 | 5847 | } |
---|
5586 | 5848 | |
---|
5587 | | - display.BindTextures(tex, texres); |
---|
| 5849 | + boolean failed = false; |
---|
| 5850 | + |
---|
| 5851 | + try |
---|
| 5852 | + { |
---|
| 5853 | + display.BindTextures(tex, texres); |
---|
| 5854 | + } |
---|
| 5855 | + catch (Exception e) |
---|
| 5856 | + { |
---|
| 5857 | + System.err.println("FAILED: " + this); |
---|
| 5858 | + failed = true; |
---|
| 5859 | + } |
---|
5588 | 5860 | |
---|
5589 | 5861 | if (!compiled) |
---|
5590 | 5862 | { |
---|
.. | .. |
---|
5606 | 5878 | } |
---|
5607 | 5879 | } |
---|
5608 | 5880 | |
---|
5609 | | - display.ReleaseTextures(tex); |
---|
| 5881 | + if (!failed) |
---|
| 5882 | + display.ReleaseTextures(tex); |
---|
5610 | 5883 | |
---|
5611 | 5884 | display.PopMaterial(this, selected); |
---|
5612 | 5885 | } |
---|
.. | .. |
---|
5735 | 6008 | |
---|
5736 | 6009 | void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked) |
---|
5737 | 6010 | { |
---|
| 6011 | + if (display.DrawMode() == iCameraPane.SELECTION && dontselect) |
---|
| 6012 | + return; |
---|
| 6013 | + |
---|
5738 | 6014 | if (hide) |
---|
5739 | 6015 | return; |
---|
5740 | 6016 | // shadow optimisation |
---|
.. | .. |
---|
5859 | 6135 | { |
---|
5860 | 6136 | if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000) |
---|
5861 | 6137 | return; // no shadow for transparent objects |
---|
| 6138 | + |
---|
| 6139 | + if (display.DrawMode() == iCameraPane.SELECTION && dontselect) |
---|
| 6140 | + return; |
---|
5862 | 6141 | |
---|
5863 | 6142 | if (hide) |
---|
5864 | 6143 | return; |
---|
.. | .. |
---|
6825 | 7104 | spot.translate(32, 32); |
---|
6826 | 7105 | spotw = spot.x + spot.width; |
---|
6827 | 7106 | spoth = spot.y + spot.height; |
---|
6828 | | - info.g.setColor(Color.blue); |
---|
| 7107 | + info.g.setColor(Color.cyan); |
---|
6829 | 7108 | info.g.fillRect(spot.x, spot.y, spot.width, spot.height); |
---|
6830 | 7109 | // if (CameraPane.Xmin > spot.x) |
---|
6831 | 7110 | // { |
---|
.. | .. |
---|
6843 | 7122 | // { |
---|
6844 | 7123 | // CameraPane.Ymax = spoth; |
---|
6845 | 7124 | // } |
---|
6846 | | - info.g.drawLine(spotw, spoth, spotw, spoth - 15); |
---|
6847 | | - info.g.drawLine(spotw, spoth, spotw - 15, spoth); |
---|
| 7125 | + // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15 |
---|
| 7126 | + //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15 |
---|
6848 | 7127 | spot.translate(0, -32); |
---|
6849 | | - info.g.setColor(Color.green); |
---|
| 7128 | + info.g.setColor(Color.yellow); |
---|
6850 | 7129 | info.g.fillRect(spot.x, spot.y, spot.width, spot.height); |
---|
| 7130 | + info.g.setColor(Color.green); |
---|
6851 | 7131 | // if (CameraPane.Xmin > spot.x) |
---|
6852 | 7132 | // { |
---|
6853 | 7133 | // CameraPane.Xmin = spot.x; |
---|
.. | .. |
---|
6899 | 7179 | startX = info.x; |
---|
6900 | 7180 | startY = info.y; |
---|
6901 | 7181 | |
---|
6902 | | - hitSomething = 0; |
---|
| 7182 | + hitSomething = -1; |
---|
6903 | 7183 | cVector origin = new cVector(); |
---|
6904 | 7184 | //LA.xformPos(origin, toParent, origin); |
---|
6905 | 7185 | Rectangle spot = new Rectangle(); |
---|
.. | .. |
---|
6932 | 7212 | } |
---|
6933 | 7213 | |
---|
6934 | 7214 | //System.out.println("info.modifiers = " + info.modifiers); |
---|
6935 | | - modified = (info.modifiers & CameraPane.META) != 0; |
---|
| 7215 | + modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META |
---|
6936 | 7216 | //System.out.println("modified = " + modified); |
---|
6937 | 7217 | //new Exception().printStackTrace(); |
---|
6938 | 7218 | //viewCode = info.pane.renderCamera.viewCode; |
---|
.. | .. |
---|
6960 | 7240 | return true; |
---|
6961 | 7241 | } |
---|
6962 | 7242 | |
---|
6963 | | - void doEditDrag0(ClickInfo info) |
---|
| 7243 | + void doEditDrag0(ClickInfo info, boolean opposite) |
---|
6964 | 7244 | { |
---|
6965 | 7245 | if (hitSomething == 0) |
---|
6966 | 7246 | { |
---|
.. | .. |
---|
6975 | 7255 | //System.out.println("hitSomething = " + hitSomething); |
---|
6976 | 7256 | |
---|
6977 | 7257 | double scale = 0.005f * info.camera.Distance(); |
---|
| 7258 | + |
---|
6978 | 7259 | cVector xlate = new cVector(); |
---|
6979 | 7260 | //cVector xlate2 = new cVector(); |
---|
6980 | 7261 | switch (hitSomething) |
---|
.. | .. |
---|
6987 | 7268 | |
---|
6988 | 7269 | scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance(); |
---|
6989 | 7270 | |
---|
6990 | | - if (modified) |
---|
| 7271 | + if (modified || opposite) |
---|
6991 | 7272 | { |
---|
6992 | 7273 | //assert(false); |
---|
6993 | 7274 | /* |
---|
.. | .. |
---|
7081 | 7362 | |
---|
7082 | 7363 | if (modified) |
---|
7083 | 7364 | { |
---|
| 7365 | + // Rotate 90 degrees |
---|
7084 | 7366 | angle /= (Math.PI / 4); |
---|
7085 | 7367 | angle = Math.floor(angle + 0.5); |
---|
7086 | 7368 | angle *= (Math.PI / 4); |
---|
.. | .. |
---|
7122 | 7404 | |
---|
7123 | 7405 | case hitScale: // scale |
---|
7124 | 7406 | double hScale = (double) (info.x - centerPt.x) / 32; |
---|
| 7407 | + double sign = 1; |
---|
| 7408 | + if (hScale < 0) |
---|
| 7409 | + { |
---|
| 7410 | + sign = -1; |
---|
| 7411 | + } |
---|
| 7412 | + hScale = sign*Math.pow(sign*hScale, scale * 50); |
---|
7125 | 7413 | if (hScale < 0.01) |
---|
7126 | 7414 | { |
---|
7127 | | - hScale = 0.01; |
---|
| 7415 | + //hScale = 0.01; |
---|
7128 | 7416 | } |
---|
7129 | | - hScale = Math.pow(hScale, scale * 50); |
---|
7130 | | - if (hScale < 0.01) |
---|
7131 | | - { |
---|
7132 | | - hScale = 0.01; |
---|
7133 | | - } |
---|
| 7417 | + |
---|
7134 | 7418 | double vScale = (double) (info.y - centerPt.y) / 32; |
---|
7135 | | - if (vScale < 0.01) |
---|
| 7419 | + sign = 1; |
---|
| 7420 | + if (vScale < 0) |
---|
7136 | 7421 | { |
---|
7137 | | - vScale = 0.01; |
---|
| 7422 | + sign = -1; |
---|
7138 | 7423 | } |
---|
7139 | | - vScale = Math.pow(vScale, scale * 50); |
---|
| 7424 | + vScale = sign*Math.pow(sign*vScale, scale * 50); |
---|
7140 | 7425 | if (vScale < 0.01) |
---|
7141 | 7426 | { |
---|
7142 | | - vScale = 0.01; |
---|
| 7427 | + //vScale = 0.01; |
---|
7143 | 7428 | } |
---|
7144 | 7429 | LA.matCopy(startMat, toParent); |
---|
7145 | 7430 | /**/ |
---|
.. | .. |
---|
7150 | 7435 | } |
---|
7151 | 7436 | /**/ |
---|
7152 | 7437 | |
---|
| 7438 | + double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2); |
---|
| 7439 | + |
---|
| 7440 | + if (totalScale < 0.01) |
---|
| 7441 | + { |
---|
| 7442 | + totalScale = 0.01; |
---|
| 7443 | + } |
---|
| 7444 | + |
---|
7153 | 7445 | switch (info.pane.RenderCamera().viewCode) |
---|
7154 | 7446 | { |
---|
7155 | 7447 | case 3: // '\001' |
---|
7156 | | - if (modified) |
---|
| 7448 | + if (modified || opposite) |
---|
7157 | 7449 | { |
---|
7158 | 7450 | //LA.matScale(toParent, 1, hScale, vScale); |
---|
7159 | | - LA.matScale(toParent, vScale, 1, 1); |
---|
| 7451 | + LA.matScale(toParent, totalScale, 1, 1); |
---|
7160 | 7452 | } // vScale, 1); |
---|
7161 | 7453 | else |
---|
7162 | 7454 | { |
---|
7163 | | - LA.matScale(toParent, vScale, vScale, vScale); |
---|
| 7455 | + // EXCEPTION! |
---|
| 7456 | + LA.matScale(toParent, totalScale, totalScale, totalScale); |
---|
7164 | 7457 | } // vScale, 1); |
---|
7165 | 7458 | break; |
---|
7166 | 7459 | |
---|
7167 | 7460 | case 2: // '\002' |
---|
7168 | | - if (modified) |
---|
| 7461 | + if (modified || opposite) |
---|
7169 | 7462 | { |
---|
7170 | 7463 | //LA.matScale(toParent, hScale, 1, vScale); |
---|
7171 | | - LA.matScale(toParent, 1, vScale, 1); |
---|
| 7464 | + LA.matScale(toParent, 1, totalScale, 1); |
---|
7172 | 7465 | } else |
---|
7173 | 7466 | { |
---|
7174 | | - LA.matScale(toParent, vScale, 1, vScale); |
---|
| 7467 | + LA.matScale(toParent, totalScale, 1, totalScale); |
---|
7175 | 7468 | } |
---|
7176 | 7469 | break; |
---|
7177 | 7470 | |
---|
7178 | 7471 | case 1: // '\003' |
---|
7179 | | - if (modified) |
---|
| 7472 | + if (modified || opposite) |
---|
7180 | 7473 | { |
---|
7181 | 7474 | //LA.matScale(toParent, hScale, vScale, 1); |
---|
7182 | | - LA.matScale(toParent, 1, 1, vScale); |
---|
| 7475 | + LA.matScale(toParent, 1, 1, totalScale); |
---|
7183 | 7476 | } else |
---|
7184 | 7477 | { |
---|
7185 | | - LA.matScale(toParent, vScale, vScale, 1); |
---|
| 7478 | + LA.matScale(toParent, totalScale, totalScale, 1); |
---|
7186 | 7479 | } |
---|
7187 | 7480 | break; |
---|
7188 | 7481 | } |
---|
.. | .. |
---|
7315 | 7608 | //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")"; |
---|
7316 | 7609 | //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString(); |
---|
7317 | 7610 | //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString(); |
---|
| 7611 | + |
---|
| 7612 | + String objname; |
---|
| 7613 | + |
---|
7318 | 7614 | if (false) //parent != null) |
---|
7319 | 7615 | { |
---|
7320 | | - return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")"; |
---|
| 7616 | + objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")"; |
---|
7321 | 7617 | } else |
---|
7322 | 7618 | { |
---|
7323 | | - return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this); |
---|
| 7619 | + objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ ""; |
---|
7324 | 7620 | } // + super.toString(); |
---|
7325 | 7621 | //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName(); |
---|
| 7622 | + |
---|
| 7623 | + if (!Globals.ADVANCED) |
---|
| 7624 | + return objname; |
---|
| 7625 | + |
---|
| 7626 | + return objname + " " + System.identityHashCode(this); |
---|
7326 | 7627 | } |
---|
7327 | 7628 | |
---|
7328 | 7629 | public int hashCode() |
---|
.. | .. |
---|
7378 | 7679 | objectUI.closeUI(); |
---|
7379 | 7680 | if (editWindow != null) |
---|
7380 | 7681 | { |
---|
| 7682 | + editWindow.ctrlPanel.FlushUI(); |
---|
7381 | 7683 | editWindow.refreshContents(); |
---|
7382 | 7684 | } // ? new |
---|
7383 | 7685 | objectUI = null; |
---|
.. | .. |
---|
7398 | 7700 | /*transient*/ cVector2[] projectedVertices = new cVector2[0]; |
---|
7399 | 7701 | |
---|
7400 | 7702 | Object3D /*Composite*/ parent; |
---|
7401 | | - Object3D /*Composite*/ fileparent; |
---|
| 7703 | + Object3D /*Composite*/ fileparent; // In the case of FileObject |
---|
7402 | 7704 | |
---|
7403 | 7705 | double[][] toParent; // dynamic matrix |
---|
7404 | 7706 | double[][] fromParent; |
---|
.. | .. |
---|
7513 | 7815 | { |
---|
7514 | 7816 | assert(bRep != null); |
---|
7515 | 7817 | if (!(support instanceof GenericJoint)) // support.bRep != null) |
---|
7516 | | - GrafreeD.Assert(support.bRep == bRep.support); |
---|
| 7818 | + Grafreed.Assert(support.bRep == bRep.support); |
---|
7517 | 7819 | } |
---|
7518 | 7820 | else |
---|
7519 | 7821 | { |
---|
.. | .. |
---|
7562 | 7864 | private static cVector edge2 = new cVector(); |
---|
7563 | 7865 | //private static cVector norm = new cVector(); |
---|
7564 | 7866 | /*transient private*/ int hitSomething; |
---|
7565 | | - private static final int hitCenter = 1; |
---|
7566 | | - private static final int hitScale = 2; |
---|
7567 | | - private static final int hitRotate = 3; |
---|
| 7867 | + static final int hitCenter = 1; |
---|
| 7868 | + static final int hitScale = 2; |
---|
| 7869 | + static final int hitRotate = 3; |
---|
7568 | 7870 | /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag |
---|
7569 | 7871 | /*transient*/ private Point centerPt; |
---|
7570 | 7872 | /*transient*/ private int startX; |
---|