~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,12 +14,27 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
22	38	ScriptNode scriptnode;
23	39
24	40	void InitOthers()
..	..	@@ -99,64 +115,178 @@
99	115
100	116	// transient boolean reduced; // for morph reduction
101	117
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	120
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
107	123
108		-void SaveSupports()
109		-{
110		- if (blockloop)
111		- return;
112		-
113		- transientsupport = support;
114		- transientlink2master = link2master;
115		-
116		- support = null;
117		- link2master = false;
118		-
119		- if (bRep != null)
	124	+ void SaveSupports()
120	125	{
121		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
122	149	}
123		-
124		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
125	152	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
129	261	blockloop = true;
130		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
131	270	blockloop = false;
132	271	}
133		-}
134	272
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
139		-
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
	273	+ void RestoreBigData(Object3D o)
146	274	{
147		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
148	289	}
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155		- blockloop = true;
156		- child.RestoreSupports();
157		- blockloop = false;
158		- }
159		-}
160	290
161	291	// MOCAP SUPPORT
162	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +429,8 @@
299	429	}
300	430
301	431	boolean live = false;
	432	+ transient boolean keepdontselect;
	433	+ boolean dontselect = false;
302	434	boolean hide = false;
303	435	boolean link2master = false; // performs reset support/master at each frame
304	436	boolean marked = false; // animation node
..	..	@@ -430,16 +562,16 @@
430	562	{
431	563	Object3D copy = this;
432	564
433		- Camera parentcam = CameraPane.theRenderer.ManipCamera();
	565	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	566
435		- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
	567	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	568	{
437		- parentcam = CameraPane.theRenderer.Cameras()[1];
	569	+ parentcam = Globals.theRenderer.Cameras()[1];
438	570	}
439	571
440		- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
	572	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	573	{
442		- parentcam = CameraPane.theRenderer.Cameras()[0];
	574	+ parentcam = Globals.theRenderer.Cameras()[0];
443	575	}
444	576
445	577	if (this == parentcam)
..	..	@@ -447,7 +579,7 @@
447	579	//assert(this instanceof Camera);
448	580
449	581	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
	582	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	583	}
452	584
453	585	copy.marked ^= true;
..	..	@@ -467,7 +599,7 @@
467	599	//assert(this instanceof Camera);
468	600
469	601	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
	602	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	603	}
472	604
473	605	copy.Touch(); // display list issue
..	..	@@ -480,12 +612,14 @@
480	612	toParent = LA.newMatrix();
481	613	fromParent = LA.newMatrix();
482	614	}
	615	+
483	616	if (toParentMarked == null)
484	617	{
485	618	if (maxcount != 1)
486	619	{
487	620	new Exception().printStackTrace();
488	621	}
	622	+
489	623	toParentMarked = LA.newMatrix();
490	624	fromParentMarked = LA.newMatrix();
491	625	}
..	..	@@ -773,7 +907,7 @@
773	907	if (step == 0)
774	908	step = 1;
775	909	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
777	911	// if (acceleration == 0)
778	912	// acceleration = 10;
779	913	if (delay == 0) // serial
..	..	@@ -796,7 +930,7 @@
796	930
797	931	if (marked && Globals.isLIVE() && live &&
798	932	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	934	currentframe != Globals.framecount)
801	935	{
802	936	currentframe = Globals.framecount;
..	..	@@ -808,7 +942,8 @@
808	942
809	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	944
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
812	947	{
813	948	countdown = 1;
814	949	delay = speedup?8:1;
..	..	@@ -880,6 +1015,10 @@
880	1015	if (material == null \|\| material.multiply)
881	1016	return true;
882	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1022	return material.opacity > 0.99;
884	1023	}
885	1024
..	..	@@ -911,6 +1050,11 @@
911	1050	fromParent = null; // LA.newMatrix();
912	1051	bRep = null; // new BoundaryRep();
913	1052
	1053	+ if (oname != null && oname.equals("LeftHand"))
	1054	+ {
	1055	+ name = oname;
	1056	+ }
	1057	+
914	1058	/*
915	1059	float hue = (float)Math.random();
916	1060	Color col;
..	..	@@ -953,7 +1097,7 @@
953	1097
954	1098	public Object clone()
955	1099	{
956		- return GrafreeD.clone(this);
	1100	+ return Grafreed.clone(this);
957	1101	}
958	1102
959	1103	Object3D copyExpand()
..	..	@@ -1275,6 +1419,7 @@
1275	1419	toParent = LA.newMatrix();
1276	1420	fromParent = LA.newMatrix();
1277	1421	}
	1422	+
1278	1423	LA.matCopy(other.toParent, toParent);
1279	1424	LA.matCopy(other.fromParent, fromParent);
1280	1425
..	..	@@ -1469,7 +1614,7 @@
1469	1614	BoundaryRep.SEUIL = other.material.cameralight;
1470	1615
1471	1616	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1617	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1618	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1619	}
1475	1620
..	..	@@ -1728,7 +1873,7 @@
1728	1873	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1874	o.bRep = transientrep;
1730	1875	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1876	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1877	o.CreateMaterial();
1733	1878	o.SetAttributes(this, -1);
1734	1879	//parent
..	..	@@ -1741,7 +1886,7 @@
1741	1886	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1887	o.bRep = bRep;
1743	1888	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1889	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1890	o.CreateMaterial();
1746	1891	//o.overwriteThis(this, -1);
1747	1892	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1973,15 @@
1828	1973	if (obj.name == null)
1829	1974	continue; // can't be a null one
1830	1975
	1976	+ // Try perfect match first.
1831	1977	if (n.equals(obj.name))
1832	1978	{
1833	1979	theobj = obj;
1834	1980	count++;
1835	1981	}
1836	1982	}
	1983	+
	1984	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1985
1838	1986	if (count != 1)
1839	1987	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2441,17 @@
2293	2441	}
2294	2442	*/
2295	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2296	2448	}
2297	2449
2298	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2451	{
2300	2452	if (newWindow)
2301	2453	{
	2454	+ new Exception().printStackTrace();
2302	2455	System.exit(0);
2303	2456	if (parent != null)
2304	2457	{
..	..	@@ -2333,6 +2486,14 @@
2333	2486	{
2334	2487	editWindow.refreshContents();
2335	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2336	2497	//if (parent != null)
2337	2498	//parent.refreshEditWindow();
2338	2499	}
..	..	@@ -2412,7 +2573,8 @@
2412	2573	private static final int editSelf = 1;
2413	2574	private static final int editChild = 2;
2414	2575
2415		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2416	2578	{
2417	2579	if (level == 0)
2418	2580	{
..	..	@@ -2420,7 +2582,8 @@
2420	2582	return;
2421	2583
2422	2584	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2424	2587	{
2425	2588	selectee = (Object3D) e.nextElement();
2426	2589	}
..	..	@@ -2428,19 +2591,22 @@
2428	2591	} else
2429	2592	{
2430	2593	//super.
2431		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2432	2596	}
2433	2597	}
2434	2598
2435		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2436	2601	{
2437	2602	doSomething = 0;
2438	2603	if (level == 0)
2439	2604	{
2440		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2441	2606	}
2442	2607	if (//super.
2443		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2444	2610	{
2445	2611	doSomething = 1;
2446	2612	return true;
..	..	@@ -2450,7 +2616,7 @@
2450	2616	}
2451	2617	}
2452	2618
2453		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2454	2620	{
2455	2621	if (selection == null)
2456	2622	{
..	..	@@ -2463,7 +2629,8 @@
2463	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2630	{
2465	2631	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2467	2634	{
2468	2635	childToDrag = selectee;
2469	2636	doSomething = 2;
..	..	@@ -2475,13 +2642,15 @@
2475	2642	return retval;
2476	2643	}
2477	2644
2478		- void doEditDrag(ClickInfo info)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2479	2647	{
2480	2648	switch (doSomething)
2481	2649	{
2482	2650	case 1: // '\001'
2483	2651	//super.
2484		- doEditDrag0(info);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2485	2654	break;
2486	2655
2487	2656	case 2: // '\002'
..	..	@@ -2494,11 +2663,13 @@
2494	2663	{
2495	2664	//sel.hitSomething = childToDrag.hitSomething;
2496	2665	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2498	2668	} else
2499	2669	{
2500	2670	//super.
2501		- doEditDrag0(info);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2502	2673	}
2503	2674	}
2504	2675	break;
..	..	@@ -2516,6 +2687,9 @@
2516	2687	{
2517	2688	deselectAll();
2518	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2519	2693	ClickInfo newInfo = new ClickInfo();
2520	2694	newInfo.flags = info.flags;
2521	2695	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2782,18 @@
2608	2782	void GenNormalsS(boolean crease)
2609	2783	{
2610	2784	selection.GenNormals(crease);
	2785	+// for (int i=0; i<selection.size(); i++)
	2786	+// {
	2787	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2788	+// selectee.GenNormals(crease);
	2789	+// }
	2790	+
	2791	+ //Touch();
	2792	+ }
	2793	+
	2794	+ void GenNormalsMeshS()
	2795	+ {
	2796	+ selection.GenNormalsMesh();
2611	2797	// for (int i=0; i<selection.size(); i++)
2612	2798	// {
2613	2799	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2934,24 @@
2748	2934	if (child == null)
2749	2935	continue;
2750	2936	child.GenNormals(crease);
	2937	+// Children().release(i);
	2938	+ }
	2939	+ blockloop = false;
	2940	+ }
	2941	+
	2942	+ void GenNormalsMesh()
	2943	+ {
	2944	+ if (blockloop)
	2945	+ return;
	2946	+
	2947	+ blockloop = true;
	2948	+ GenNormalsMesh0();
	2949	+ for (int i = 0; i < Children().Size(); i++)
	2950	+ {
	2951	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2952	+ if (child == null)
	2953	+ continue;
	2954	+ child.GenNormalsMesh();
2751	2955	// Children().release(i);
2752	2956	}
2753	2957	blockloop = false;
..	..	@@ -2905,7 +3109,8 @@
2905	3109	{
2906	3110	if (bRep != null)
2907	3111	{
2908		- bRep.GenUV();
	3112	+ bRep.GenUV(); //1);
	3113	+ //bRep.UnfoldUV();
2909	3114	Touch();
2910	3115	}
2911	3116	}
..	..	@@ -2919,11 +3124,20 @@
2919	3124	}
2920	3125	}
2921	3126
	3127	+ void GenNormalsMesh0()
	3128	+ {
	3129	+ if (bRep != null)
	3130	+ {
	3131	+ bRep.GenerateNormalsMesh();
	3132	+ Touch();
	3133	+ }
	3134	+ }
	3135	+
2922	3136	void GenNormalsMINE0()
2923	3137	{
2924	3138	if (bRep != null)
2925	3139	{
2926		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3141	Touch();
2928	3142	}
2929	3143	}
..	..	@@ -2980,6 +3194,33 @@
2980	3194	blockloop = false;
2981	3195	}
2982	3196
	3197	+ void TransformChildren()
	3198	+ {
	3199	+ if (toParent != null)
	3200	+ {
	3201	+ for (int i=Size(); --i>=0;)
	3202	+ {
	3203	+ Object3D v = get(i);
	3204	+
	3205	+ if (v.toParent == null)
	3206	+ {
	3207	+ v.toParent = LA.newMatrix();
	3208	+ v.fromParent = LA.newMatrix();
	3209	+ }
	3210	+
	3211	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3212	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3213	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3214	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3215	+ }
	3216	+
	3217	+ toParent = null; // LA.matIdentity(toParent);
	3218	+ fromParent = null; // LA.matIdentity(fromParent);
	3219	+
	3220	+ Touch();
	3221	+ }
	3222	+ }
	3223	+
2983	3224	void TransformGeometry()
2984	3225	{
2985	3226	Object3D obj = this;
..	..	@@ -3201,9 +3442,11 @@
3201	3442
3202	3443	BoundaryRep sup = bRep.support;
3203	3444	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3445	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3446	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3447	+
	3448	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3449	+
3207	3450	bRep = temprep;
3208	3451	bRep.support = sup;
3209	3452	Touch();
..	..	@@ -3340,7 +3583,8 @@
3340	3583	if (blockloop)
3341	3584	return;
3342	3585
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3344	3588	live = h;
3345	3589
3346	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3605,8 @@
3361	3605	return;
3362	3606
3363	3607	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3365	3610	link2master = h;
3366	3611
3367	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3626,8 @@
3381	3626	if (blockloop)
3382	3627	return;
3383	3628
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3385	3631	hide = h;
3386	3632
3387	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3647,7 @@
3401	3647	if (blockloop)
3402	3648	return;
3403	3649
3404		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3405	3651	marked = h;
3406	3652
3407	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3657,46 @@
3411	3657	continue;
3412	3658	blockloop = true;
3413	3659	child.MarkLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RewindLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ rewind = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RewindLeaves(h);
	3680	+ blockloop = false;
	3681	+ // release(i);
	3682	+ }
	3683	+ }
	3684	+
	3685	+ void RandomLeaves(boolean h)
	3686	+ {
	3687	+ if (blockloop)
	3688	+ return;
	3689	+
	3690	+ if (bRep != null \|\| material != null) // borderline...
	3691	+ random = h;
	3692	+
	3693	+ for (int i = 0; i < Size(); i++)
	3694	+ {
	3695	+ Object3D child = (Object3D) get(i); // reserve(i);
	3696	+ if (child == null)
	3697	+ continue;
	3698	+ blockloop = true;
	3699	+ child.RandomLeaves(h);
3414	3700	blockloop = false;
3415	3701	// release(i);
3416	3702	}
..	..	@@ -3725,7 +4011,7 @@
3725	4011	if (child == null)
3726	4012	continue;
3727	4013
3728		- if (GrafreeD.RENDERME > 0)
	4014	+ if (Grafreed.RENDERME > 0)
3729	4015	{
3730	4016	if (child instanceof Merge)
3731	4017	((Merge)child).renderme();
..	..	@@ -3876,7 +4162,7 @@
3876	4162	if (child == null)
3877	4163	continue;
3878	4164
3879		- if (GrafreeD.RENDERME > 0)
	4165	+ if (Grafreed.RENDERME > 0)
3880	4166	{
3881	4167	if (child instanceof Merge)
3882	4168	((Merge)child).renderme();
..	..	@@ -4071,7 +4357,7 @@
4071	4357	if (child == null)
4072	4358	continue;
4073	4359
4074		- if (GrafreeD.RENDERME > 0)
	4360	+ if (Grafreed.RENDERME > 0)
4075	4361	{
4076	4362	if (child instanceof Merge)
4077	4363	((Merge)child).renderme();
..	..	@@ -4184,6 +4470,55 @@
4184	4470	{
4185	4471	blockloop = true;
4186	4472	get(i).RepairShadow();
	4473	+ blockloop = false;
	4474	+ }
	4475	+ }
	4476	+
	4477	+ void RepairSOV()
	4478	+ {
	4479	+ if (blockloop)
	4480	+ return;
	4481	+
	4482	+ String texname = this.GetPigmentTexture();
	4483	+
	4484	+ if (texname.startsWith("sov"))
	4485	+ {
	4486	+ String[] s = texname.split("/");
	4487	+
	4488	+ String[] sname = s[1].split("Color.pn");
	4489	+
	4490	+ texname = sname[0];
	4491	+
	4492	+ if (sname.length > 1)
	4493	+ {
	4494	+ texname += "Color.jpg";
	4495	+ }
	4496	+
	4497	+ this.SetPigmentTexture("sov/" + texname);
	4498	+ }
	4499	+
	4500	+ texname = this.GetBumpTexture();
	4501	+
	4502	+ if (texname.startsWith("sov"))
	4503	+ {
	4504	+ String[] s = texname.split("/");
	4505	+
	4506	+ String[] sname = s[1].split("Bump.pn");
	4507	+
	4508	+ texname = sname[0];
	4509	+
	4510	+ if (sname.length > 1)
	4511	+ {
	4512	+ texname += "Bump.jpg";
	4513	+ }
	4514	+
	4515	+ this.SetBumpTexture("sov/" + texname);
	4516	+ }
	4517	+
	4518	+ for (int i=0; i<Size(); i++)
	4519	+ {
	4520	+ blockloop = true;
	4521	+ get(i).RepairSOV();
4187	4522	blockloop = false;
4188	4523	}
4189	4524	}
..	..	@@ -4678,7 +5013,7 @@
4678	5013
4679	5014	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5015	{
4681		- if (hide)
	5016	+ if (hide \|\| dontselect)
4682	5017	return null;
4683	5018
4684	5019	if (count <= 0)
..	..	@@ -4702,9 +5037,17 @@
4702	5037	}
4703	5038	}
4704	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4705	5048	cTreePath Select(int indexcount, boolean deselect)
4706	5049	{
4707		- if (hide)
	5050	+ if (hide \|\| dontselect)
4708	5051	return null;
4709	5052
4710	5053	if (count <= 0)
..	..	@@ -4738,10 +5081,11 @@
4738	5081	if (leaf != null)
4739	5082	{
4740	5083	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4742	5086	{
4743	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4745	5089	}
4746	5090
4747	5091	return tp;
..	..	@@ -4758,6 +5102,7 @@
4758	5102
4759	5103	if (child == null)
4760	5104	continue;
	5105	+
4761	5106	if (child.HasTransparency() && child.size() != 0)
4762	5107	{
4763	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5112,10 @@
4767	5112	if (leaf != null)
4768	5113	{
4769	5114	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4771	5117	{
4772		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4773	5119	}
4774	5120
4775	5121	return tp;
..	..	@@ -5094,6 +5440,51 @@
5094	5440	blockloop = false;
5095	5441	}
5096	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5097	5488	boolean IsSelected()
5098	5489	{
5099	5490	if (parent == null)
..	..	@@ -5156,10 +5547,34 @@
5156	5547
5157	5548	// System.out.println("Fullname = " + fullname);
5158	5549
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5550	+ // Does not work on Windows due to C:
	5551	+// if (fullname.name.indexOf(":") == -1)
	5552	+// return fullname.name;
	5553	+//
	5554	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5555
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5556	+ String[] split = fullname.name.split(":");
	5557	+
	5558	+ if (split.length == 0)
	5559	+ {
	5560	+ return "";
	5561	+ }
	5562	+
	5563	+ if (split.length <= 2)
	5564	+ {
	5565	+ if (fullname.name.endsWith(":"))
	5566	+ {
	5567	+ // Windows
	5568	+ return fullname.name.substring(0, fullname.name.length()-1);
	5569	+ }
	5570	+
	5571	+ return split[0];
	5572	+ }
	5573	+
	5574	+ // Windows
	5575	+ assert(split.length == 4);
	5576	+
	5577	+ return split[0] + ":" + split[1];
5163	5578	}
5164	5579
5165	5580	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5583,38 @@
5168	5583	return "";
5169	5584
5170	5585	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5586	+ // Does not work on Windows due to C:
	5587	+// if (fullname.name.indexOf(":") == -1)
	5588	+// return "";
	5589	+//
	5590	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5591	+ String[] split = fullname.name.split(":");
	5592	+
	5593	+ if (split.length == 0)
	5594	+ {
	5595	+ return "";
	5596	+ }
	5597	+
	5598	+ if (split.length == 1)
	5599	+ {
	5600	+ return "";
	5601	+ }
	5602	+
	5603	+ if (split.length == 2)
	5604	+ {
	5605	+ if (fullname.name.endsWith(":"))
	5606	+ {
	5607	+ // Windows
	5608	+ return "";
	5609	+ }
	5610	+
	5611	+ return split[1];
	5612	+ }
	5613	+
	5614	+ // Windows
	5615	+ assert(split.length == 4);
	5616	+
	5617	+ return split[2] + ":" + split[3];
5175	5618	}
5176	5619
5177	5620	String GetPigmentTexture()
..	..	@@ -5245,7 +5688,7 @@
5245	5688	System.out.print("; textures = " + textures);
5246	5689	System.out.println("; usedtextures = " + usedtextures);
5247	5690
5248		- if (GetTextures() == null)
	5691	+ if (GetTextures() == null) // What is that??
5249	5692	GetTextures().name = ":";
5250	5693
5251	5694	String texname = tex;
..	..	@@ -5276,6 +5719,43 @@
5276	5719	child.ResetPigmentTexture();
5277	5720	blockloop = false;
5278	5721	}
	5722	+ }
	5723	+
	5724	+ UUID GetUUID()
	5725	+ {
	5726	+ if (uuid == null)
	5727	+ {
	5728	+ // Serial
	5729	+ uuid = UUID.randomUUID();
	5730	+ }
	5731	+
	5732	+ return uuid;
	5733	+ }
	5734	+
	5735	+ Object3D GetObject(UUID uid)
	5736	+ {
	5737	+ if (blockloop)
	5738	+ return null;
	5739	+
	5740	+ if (GetUUID().equals(uid))
	5741	+ return this;
	5742	+
	5743	+ int nb = Size();
	5744	+ for (int i = 0; i < nb; i++)
	5745	+ {
	5746	+ Object3D child = (Object3D) get(i);
	5747	+
	5748	+ if (child == null)
	5749	+ continue;
	5750	+
	5751	+ blockloop = true;
	5752	+ Object3D obj = child.GetObject(uid);
	5753	+ blockloop = false;
	5754	+ if (obj != null)
	5755	+ return obj;
	5756	+ }
	5757	+
	5758	+ return null;
5279	5759	}
5280	5760
5281	5761	void SetBumpTexture(String tex)
..	..	@@ -5314,6 +5794,38 @@
5314	5794	}
5315	5795	}
5316	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5317	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5830	{
5319	5831	Draw(display, root, selected, blocked);
..	..	@@ -5322,12 +5834,23 @@
5322	5834	boolean NeedSupport()
5323	5835	{
5324	5836	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5837	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5838	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5839	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5840	}
5329	5841
5330	5842	static boolean DEBUG_SELECTION = false;
	5843	+
	5844	+ boolean IsLive()
	5845	+ {
	5846	+ if (live)
	5847	+ return true;
	5848	+
	5849	+ if (parent == null)
	5850	+ return false;
	5851	+
	5852	+ return parent.IsLive();
	5853	+ }
5331	5854
5332	5855	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5856	{
..	..	@@ -5339,7 +5862,7 @@
5339	5862	}
5340	5863
5341	5864	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5865	+ (hide \|\| dontselect))
5343	5866	return;
5344	5867
5345	5868	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5894,7 @@
5371	5894	return;
5372	5895	}
5373	5896
5374		- javax.media.opengl.GL gl = display.GetGL();
	5897	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5898
5376	5899	/*
5377	5900	if (touched)
..	..	@@ -5389,8 +5912,10 @@
5389	5912	if (support != null)
5390	5913	support = support;
5391	5914
5392		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5393		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5394	5919
5395	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5921	{
..	..	@@ -5400,8 +5925,9 @@
5400	5925	// usecalllists &= !(parent instanceof RandomNode);
5401	5926	// usecalllists = false;
5402	5927
5403		- if (GetBRep() != null)
5404		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5405	5931	//System.out.println("draw " + this);
5406	5932	//new Exception().printStackTrace();
5407	5933
..	..	@@ -5410,10 +5936,12 @@
5410	5936	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5937
5412	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5939	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5941	{
5415	5942	Globals.lighttouched = true;
5416	5943	} // all panes...
	5944	+
5417	5945	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5946	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5947	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5421,9 +5949,9 @@
5421	5949	if (!(this instanceof Composite))
5422	5950	touched = false;
5423	5951	//if (displaylist == -1 && usecalllists)
5424		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5425	5953	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5954	+ bRep.displaylist = display.GenList();
5427	5955	assert(bRep.displaylist != 0);
5428	5956	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5957	//System.out.println("\tgen list " + list);
..	..	@@ -5432,17 +5960,19 @@
5432	5960
5433	5961	//System.out.println("\tnew list " + list);
5434	5962	//gl.glDrawBuffer(gl.GL_NONE);
5435		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5436	5964	{
5437	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5966	+ display.NewList(bRep.displaylist);
5439	5967	}
	5968	+
5440	5969	CallList(display, root, selected, blocked);
	5970	+
5441	5971	// compiled = true;
5442		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5443	5973	{
5444	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5975	+ display.EndList();
5446	5976	}
5447	5977	//gl.glDrawBuffer(gl.GL_BACK);
5448	5978	// XXX touched = false;
..	..	@@ -5490,7 +6020,7 @@
5490	6020	if (display.DrawMode() == iCameraPane.SHADOW)
5491	6021	{
5492	6022	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6023	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	6024	{
5495	6025	//System.out.print("CULLED");
5496	6026	culled = true;
..	..	@@ -5498,7 +6028,7 @@
5498	6028	}
5499	6029	else
5500	6030	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6031	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	6032	culled = true;
5503	6033
5504	6034	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6068,8 @@
5538	6068	{
5539	6069	if (GetBRep() != null)
5540	6070	{
5541		- CameraPane.NextIndex(this, gl);
	6071	+ display.NextIndex();
	6072	+
5542	6073	// vertex color conflict : gl.glCallList(list);
5543	6074	DrawNode(display, root, selected);
5544	6075	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6110,28 @@
5579	6110	tex = GetTextures();
5580	6111	}
5581	6112
5582		- display.BindTextures(tex, texres);
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
	6115	+
	6116	+ try
	6117	+ {
	6118	+ display.BindPigmentTexture(tex, texres);
	6119	+ }
	6120	+ catch (Exception e)
	6121	+ {
	6122	+ System.err.println("FAILED: " + this);
	6123	+ failedPigment = true;
	6124	+ }
	6125	+
	6126	+ try
	6127	+ {
	6128	+ display.BindBumpTexture(tex, texres);
	6129	+ }
	6130	+ catch (Exception e)
	6131	+ {
	6132	+ //System.err.println("FAILED: " + this);
	6133	+ failedBump = true;
	6134	+ }
5583	6135
5584	6136	if (!compiled)
5585	6137	{
..	..	@@ -5595,13 +6147,17 @@
5595	6147
5596	6148	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6149	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6150	+ display.CallList(bRep.displaylist);
5599	6151	// june 2013 drawSelf(display, root, selected);
5600	6152	}
5601	6153	}
5602	6154	}
5603	6155
5604		- display.ReleaseTextures(tex);
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
5605	6161
5606	6162	display.PopMaterial(this, selected);
5607	6163	}
..	..	@@ -5730,6 +6286,9 @@
5730	6286
5731	6287	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6288	{
	6289	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6290	+ return;
	6291	+
5733	6292	if (hide)
5734	6293	return;
5735	6294	// shadow optimisation
..	..	@@ -5855,6 +6414,9 @@
5855	6414	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6415	return; // no shadow for transparent objects
5857	6416
	6417	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6418	+ return;
	6419	+
5858	6420	if (hide)
5859	6421	return;
5860	6422
..	..	@@ -5895,9 +6457,10 @@
5895	6457	return;
5896	6458	}
5897	6459
	6460	+ //bRep.GenUV(1/material.diffuseness);
5898	6461	// bRep.lock = true;
5899	6462
5900		- javax.media.opengl.GL gl = display.GetGL();
	6463	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6464
5902	6465	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6466	{
..	..	@@ -5914,23 +6477,7 @@
5914	6477
5915	6478	bRep.getMinMax(min, max, 100);
5916	6479
5917		- gl.glBegin(gl.GL_LINES);
5918		-
5919		- gl.glVertex3d(min.x, min.y, min.z);
5920		- gl.glVertex3d(min.x, min.y, max.z);
5921		- gl.glVertex3d(min.x, min.y, min.z);
5922		- gl.glVertex3d(min.x, max.y, min.z);
5923		- gl.glVertex3d(min.x, min.y, min.z);
5924		- gl.glVertex3d(max.x, min.y, min.z);
5925		-
5926		- gl.glVertex3d(max.x, max.y, max.z);
5927		- gl.glVertex3d(min.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, max.y, max.z);
5929		- gl.glVertex3d(max.x, min.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, max.z);
5931		- gl.glVertex3d(max.x, max.y, min.z);
5932		-
5933		- gl.glEnd();
	6480	+ display.DrawBox(min, max);
5934	6481
5935	6482	return;
5936	6483	}
..	..	@@ -5984,178 +6531,19 @@
5984	6531	new Exception().printStackTrace();
5985	6532	return;
5986	6533	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6534	+
	6535	+ if (dontselect)
5990	6536	{
5991		- float[] v = bRep.getRawVertices();
5992		- float[] n = bRep.getRawNormals();
5993		- float[] c = bRep.getRawColors();
5994		- float[] uv = bRep.getRawUVMap();
5995		-
5996		- int count2 = 0;
5997		- int count3 = 0;
5998		-
5999		- if (n.length > 0)
6000		- {
6001		- for (int i = 0; i < strips.length; i++)
6002		- {
6003		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6004		-
6005		- /*
6006		- boolean locked = false;
6007		- float eps = 0.1f;
6008		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6009		-
6010		- int dot = 0;
6011		-
6012		- if ((dot&1) == 0)
6013		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6014		-
6015		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6016		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6017		- else
6018		- {
6019		- locked = true;
6020		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6021		- }
6022		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6023		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6024		- if (hasnorm)
6025		- {
6026		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6027		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6028		- }
6029		-
6030		- if ((dot&4) == 0)
6031		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6032		-
6033		- if (wrap \|\| !locked && (dot&8) != 0)
6034		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6035		- else
6036		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6037		-
6038		- f.dot = dot;
6039		- */
6040		-
6041		- if (!selectmode)
6042		- {
6043		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6044		- {
6045		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6046		- } else
6047		- {
6048		- gl.glNormal3f(0, 0, 1);
6049		- }
6050		-
6051		- if (c != null)
6052		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6053		- {
6054		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6055		- }
6056		- }
6057		- if (flipV)
6058		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6059		- else
6060		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6061		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6062		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6063		-
6064		- count2 += 2;
6065		- count3 += 3;
6066		- if (!selectmode)
6067		- {
6068		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6069		- {
6070		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6071		- } else
6072		- {
6073		- gl.glNormal3f(0, 0, 1);
6074		- }
6075		- if (c != null)
6076		- {
6077		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6078		- }
6079		- }
6080		- if (flipV)
6081		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6082		- else
6083		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6084		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6085		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6086		-
6087		- count2 += 2;
6088		- count3 += 3;
6089		- for (int j = 0; j < strips[i] - 2; j++)
6090		- {
6091		- //gl.glTexCoord2d(...);
6092		- if (!selectmode)
6093		- {
6094		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6095		- {
6096		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6097		- } else
6098		- {
6099		- gl.glNormal3f(0, 0, 1);
6100		- }
6101		- if (c != null)
6102		- {
6103		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6104		- }
6105		- }
6106		-
6107		- if (flipV)
6108		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6109		- else
6110		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6111		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6112		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6113		- count2 += 2;
6114		- count3 += 3;
6115		- }
6116		-
6117		- gl.glEnd();
6118		- }
6119		- }
6120		-
6121		- assert count3 == v.length;
	6537	+ //bRep.GenerateNormalsMINE();
6122	6538	}
6123		- else // !trimmed
6124		- {
6125		- int count = 0;
6126		- for (int i = 0; i < strips.length; i++)
6127		- {
6128		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6129		-
6130		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6131		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6132		-
6133		- drawVertex(gl, p, selectmode);
6134		- drawVertex(gl, q, selectmode);
6135		-
6136		- for (int j = 0; j < strips[i] - 2; j++)
6137		- {
6138		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6139		-
6140		-// if (j%2 == 0)
6141		-// drawFace(p, q, r, display, null);
6142		-// else
6143		-// drawFace(p, r, q, display, null);
6144		-
6145		-// p = q;
6146		-// q = r;
6147		- drawVertex(gl, r, selectmode);
6148		- }
6149		-
6150		- gl.glEnd();
6151		- }
6152		- }
	6539	+
	6540	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6541	} else // catch (Error e)
6154	6542	{
6155	6543	// TRIANGLE ARRAY
6156	6544	if (IsOpaque()) // Static())
6157	6545	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6546	+ display.StartTriangles();
6159	6547	int facecount = bRep.FaceCount();
6160	6548	for (int i = 0; i < facecount; i++)
6161	6549	{
..	..	@@ -6220,7 +6608,7 @@
6220	6608
6221	6609	display.DrawFace(this, p, q, r, face);
6222	6610	}
6223		- gl.glEnd();
	6611	+ display.EndTriangles();
6224	6612	}
6225	6613	else
6226	6614	{
..	..	@@ -6249,8 +6637,8 @@
6249	6637	//System.out.println("SORT");
6250	6638
6251	6639	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6640	+
	6641	+ display.StartTriangles();
6254	6642	for (int i = 0; i < facecount; i++)
6255	6643	{
6256	6644	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6652,12 @@
6264	6652
6265	6653	display.DrawFace(this, p, q, r, face);
6266	6654	}
6267		- gl.glEnd();
	6655	+ display.EndTriangles();
6268	6656	}
6269	6657
6270	6658	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6659	{
	6660	+ /*
6272	6661	gl.glDisable(gl.GL_LIGHTING);
6273	6662	float[] colorV = new float[3];
6274	6663
..	..	@@ -6347,6 +6736,7 @@
6347	6736	// gl.glEnd();
6348	6737	}
6349	6738	}
	6739	+ */
6350	6740	}
6351	6741	}
6352	6742
..	..	@@ -6391,7 +6781,7 @@
6391	6781	center.add(r);
6392	6782	center.mul(1.0/3);
6393	6783
6394		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6784	+ center.sub(Globals.theRenderer.EyeCamera().location);
6395	6785
6396	6786	distance = center.dot(center);
6397	6787	}
..	..	@@ -6405,22 +6795,6 @@
6405	6795	void Print(Vertex v)
6406	6796	{
6407	6797	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6408		- }
6409		-
6410		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6411		- {
6412		- if (!selectmode)
6413		- {
6414		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6415		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6416		-
6417		- if (flipV)
6418		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6419		- else
6420		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6421		- }
6422		-
6423		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6424	6798	}
6425	6799
6426	6800	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6946,20 +7320,23 @@
6946	7320	}
6947	7321	}
6948	7322
6949		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
6950	7327	{
6951		- int hc = info.bounds.x + info.bounds.width / 2;
6952		- int vc = info.bounds.y + info.bounds.height / 2;
6953		- double[][] toscreen = info.toScreen;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
6954	7331	if (toscreen == null)
6955	7332	{
6956		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6957	7334	}
6958	7335	cVector vec = in;
6959	7336	LA.xformPos(in, toscreen, in);
6960	7337	//System.out.println("Distance = " + info.camera.Distance());
6961		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6962		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6963	7340	outPt.x = hc + (int) vec.x;
6964	7341	outPt.y = vc - (int) vec.y;
6965	7342	outRec.x = outPt.x - 3;
..	..	@@ -6967,15 +7344,18 @@
6967	7344	outRec.width = outRec.height = 6;
6968	7345	}
6969	7346
6970		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
6971	7349	{
6972	7350	Point pt = new Point(0, 0);
6973	7351	Rectangle rec = new Rectangle();
6974		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
6975	7354	return rec;
6976	7355	}
6977	7356
6978		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
6979	7359	{
6980	7360	if (level == 0)
6981	7361	{
..	..	@@ -6984,16 +7364,19 @@
6984	7364	{
6985	7365	cVector origin = new cVector();
6986	7366	//LA.xformPos(origin, toParent, origin);
6987		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6988	7371	Rectangle boundary = new Rectangle();
6989	7372	boundary.x = spot.x - 30;
6990	7373	boundary.y = spot.y - 30;
6991	7374	boundary.width = spot.width + 60;
6992	7375	boundary.height = spot.height + 60;
6993		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
6994	7377	int spotw = spot.x + spot.width;
6995	7378	int spoth = spot.y + spot.height;
6996		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6997	7380	// if (CameraPane.Xmin > spot.x)
6998	7381	// {
6999	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -7013,8 +7396,8 @@
7013	7396	spot.translate(32, 32);
7014	7397	spotw = spot.x + spot.width;
7015	7398	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7401	// if (CameraPane.Xmin > spot.x)
7019	7402	// {
7020	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,11 +7414,12 @@
7031	7414	// {
7032	7415	// CameraPane.Ymax = spoth;
7033	7416	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7417	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7418	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7036	7419	spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
7039	7423	// if (CameraPane.Xmin > spot.x)
7040	7424	// {
7041	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,8 +7436,8 @@
7052	7436	// {
7053	7437	// CameraPane.Ymax = spoth;
7054	7438	// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7057	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7442	// if (CameraPane.Xmin > boundary.x)
7059	7443	// {
..	..	@@ -7075,7 +7459,8 @@
7075	7459	}
7076	7460	}
7077	7461
7078		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7079	7464	{
7080	7465	if (level == 0)
7081	7466	{
..	..	@@ -7084,10 +7469,10 @@
7084	7469
7085	7470	boolean retval = false;
7086	7471
7087		- startX = info.x;
7088		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7089	7474
7090		- hitSomething = 0;
	7475	+ hitSomething = -1;
7091	7476	cVector origin = new cVector();
7092	7477	//LA.xformPos(origin, toParent, origin);
7093	7478	Rectangle spot = new Rectangle();
..	..	@@ -7095,22 +7480,51 @@
7095	7480	{
7096	7481	centerPt = new Point(0, 0);
7097	7482	}
7098		- calcHotSpot(origin, info, centerPt, spot);
7099		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7100	7486	{
7101	7487	hitSomething = hitCenter;
7102	7488	retval = true;
7103	7489	}
7104	7490	spot.translate(32, 0);
7105		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7106	7492	{
7107	7493	hitSomething = hitRotate;
7108	7494	retval = true;
7109	7495	}
7110	7496	spot.translate(0, 32);
7111		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7112	7498	{
7113	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7114	7528	retval = true;
7115	7529	}
7116	7530
..	..	@@ -7120,7 +7534,7 @@
7120	7534	}
7121	7535
7122	7536	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7538	//System.out.println("modified = " + modified);
7125	7539	//new Exception().printStackTrace();
7126	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7562,8 @@
7148	7562	return true;
7149	7563	}
7150	7564
7151		- void doEditDrag0(ClickInfo info)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7152	7567	{
7153	7568	if (hitSomething == 0)
7154	7569	{
..	..	@@ -7162,7 +7577,8 @@
7162	7577
7163	7578	//System.out.println("hitSomething = " + hitSomething);
7164	7579
7165		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
	7581	+
7166	7582	cVector xlate = new cVector();
7167	7583	//cVector xlate2 = new cVector();
7168	7584	switch (hitSomething)
..	..	@@ -7173,9 +7589,9 @@
7173	7589
7174	7590	case hitCenter: // Translate
7175	7591
7176		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7592	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7593
7178		- if (modified)
	7594	+ if (modified \|\| opposite)
7179	7595	{
7180	7596	//assert(false);
7181	7597	/*
..	..	@@ -7195,8 +7611,8 @@
7195	7611	toParent[3][i] = xlate.get(i);
7196	7612	LA.matInvert(toParent, fromParent);
7197	7613	*/
7198		- cVector delta = LA.newVector(0, 0, startY - info.y);
7199		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7200	7616
7201	7617	LA.matCopy(startMat, toParent);
7202	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7205,7 +7621,7 @@
7205	7621	} else
7206	7622	{
7207	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7208		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7209	7625	cVector away = new cVector();
7210	7626	//cVector right2 = new cVector();
7211	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7221,20 +7637,20 @@
7221	7637	}
7222	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7639	// if (!CameraPane.LOCALTRANSFORM)
7224		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7225		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7640	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7226	7642	// if (!CameraPane.LOCALTRANSFORM)
7227		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7643	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7644	//LA.vecCross(up, cVector.Z, right2);
7229	7645
7230		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7231	7647
7232	7648	//System.out.println("DELTA0 = " + delta);
7233	7649	//System.out.println("AWAY = " + info.camera.away);
7234	7650	//System.out.println("UP = " + info.camera.up);
7235	7651	if (away.z > 0)
7236	7652	{
7237		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7238	7654	{
7239	7655	delta.x = -delta.x;
7240	7656	} else
..	..	@@ -7249,7 +7665,7 @@
7249	7665	//System.out.println("DELTA1 = " + delta);
7250	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7251	7667	//System.out.println("DELTA2 = " + delta);
7252		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7253	7669	LA.matCopy(startMat, toParent);
7254	7670	//System.out.println("DELTA3 = " + delta);
7255	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7259,8 +7675,8 @@
7259	7675	break;
7260	7676
7261	7677	case hitRotate: // rotate
7262		- int dx = info.x - centerPt.x;
7263		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7264	7680	double angle = (double) Math.atan2(dx, dy);
7265	7681	angle = -(1.570796 - angle);
7266	7682
..	..	@@ -7269,6 +7685,7 @@
7269	7685
7270	7686	if (modified)
7271	7687	{
	7688	+ // Rotate 90 degrees
7272	7689	angle /= (Math.PI / 4);
7273	7690	angle = Math.floor(angle + 0.5);
7274	7691	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7699,7 @@
7282	7699	}
7283	7700	/**/
7284	7701
7285		- switch (info.pane.renderCamera.viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7286	7703	{
7287	7704	case 1: // '\001'
7288	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7309,26 +7726,30 @@
7309	7726	break;
7310	7727
7311	7728	case hitScale: // scale
7312		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7730	+ double sign = 1;
	7731	+ if (hScale < 0)
	7732	+ {
	7733	+ sign = -1;
	7734	+ }
	7735	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7736	if (hScale < 0.01)
7314	7737	{
7315		- hScale = 0.01;
	7738	+ //hScale = 0.01;
7316	7739	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
	7740	+
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7742	+ sign = 1;
	7743	+ if (vScale < 0)
7319	7744	{
7320		- hScale = 0.01;
	7745	+ sign = -1;
7321	7746	}
7322		- double vScale = (double) (info.y - centerPt.y) / 32;
	7747	+ vScale = signMath.pow(signvScale, scale * 50);
7323	7748	if (vScale < 0.01)
7324	7749	{
7325		- vScale = 0.01;
	7750	+ //vScale = 0.01;
7326	7751	}
7327		- vScale = Math.pow(vScale, scale * 50);
7328		- if (vScale < 0.01)
7329		- {
7330		- vScale = 0.01;
7331		- }
	7752	+
7332	7753	LA.matCopy(startMat, toParent);
7333	7754	/**/
7334	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7338,39 +7759,47 @@
7338	7759	}
7339	7760	/**/
7340	7761
7341		- switch (info.pane.renderCamera.viewCode)
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7763	+
	7764	+ if (totalScale < 0.01)
	7765	+ {
	7766	+ totalScale = 0.01;
	7767	+ }
	7768	+
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7342	7770	{
7343	7771	case 3: // '\001'
7344		- if (modified)
	7772	+ if (modified \|\| opposite)
7345	7773	{
7346	7774	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7775	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7776	} // vScale, 1);
7349	7777	else
7350	7778	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7779	+ // EXCEPTION!
	7780	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7781	} // vScale, 1);
7353	7782	break;
7354	7783
7355	7784	case 2: // '\002'
7356		- if (modified)
	7785	+ if (modified \|\| opposite)
7357	7786	{
7358	7787	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7788	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7789	} else
7361	7790	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7791	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7792	}
7364	7793	break;
7365	7794
7366	7795	case 1: // '\003'
7367		- if (modified)
	7796	+ if (modified \|\| opposite)
7368	7797	{
7369	7798	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7799	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7800	} else
7372	7801	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7802	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7803	}
7375	7804	break;
7376	7805	}
..	..	@@ -7404,7 +7833,7 @@
7404	7833	} // NEW ...
7405	7834
7406	7835
7407		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7408	7837	}
7409	7838
7410	7839	boolean overflow = false;
..	..	@@ -7503,14 +7932,22 @@
7503	7932	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7933	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7934	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7935	+
	7936	+ String objname;
	7937	+
7506	7938	if (false) //parent != null)
7507	7939	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7940	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7941	} else
7510	7942	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7943	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	7944	} // + super.toString();
7513	7945	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7946	+
	7947	+ if (!Globals.ADVANCED)
	7948	+ return objname;
	7949	+
	7950	+ return objname + " " + System.identityHashCode(this);
7514	7951	}
7515	7952
7516	7953	public int hashCode()
..	..	@@ -7566,6 +8003,7 @@
7566	8003	objectUI.closeUI();
7567	8004	if (editWindow != null)
7568	8005	{
	8006	+ editWindow.ctrlPanel.FlushUI();
7569	8007	editWindow.refreshContents();
7570	8008	} // ? new
7571	8009	objectUI = null;
..	..	@@ -7574,6 +8012,10 @@
7574	8012	{
7575	8013	editWindow = null;
7576	8014	} // ?
	8015	+ }
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
7577	8019	}
7578	8020	}
7579	8021
..	..	@@ -7586,7 +8028,7 @@
7586	8028	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	8029
7588	8030	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	8031	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	8032
7591	8033	double[][] toParent; // dynamic matrix
7592	8034	double[][] fromParent;
..	..	@@ -7701,7 +8143,7 @@
7701	8143	{
7702	8144	assert(bRep != null);
7703	8145	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8146	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8147	}
7706	8148	else
7707	8149	{
..	..	@@ -7732,6 +8174,10 @@
7732	8174	}
7733	8175
7734	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7735	8181	transient ObjectUI objectUI;
7736	8182	public static int povDepth = 0;
7737	8183	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8196,9 @@
7750	8196	private static cVector edge2 = new cVector();
7751	8197	//private static cVector norm = new cVector();
7752	8198	/transient private/ int hitSomething;
7753		- private static final int hitCenter = 1;
7754		- private static final int hitScale = 2;
7755		- private static final int hitRotate = 3;
	8199	+ static final int hitCenter = 1;
	8200	+ static final int hitScale = 2;
	8201	+ static final int hitRotate = 3;
7756	8202	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8203	/transient/ private Point centerPt;
7758	8204	/transient/ private int startX;