~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,11 +14,29 @@
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;
	24	+
	25	+ // Use GetUUID for backward compatibility with null.
	26	+ private UUID uuid = UUID.randomUUID();
	27	+
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+ //
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
21	40
22	41	ScriptNode scriptnode;
23	42
..	..	@@ -99,64 +118,245 @@
99	118
100	119	// transient boolean reduced; // for morph reduction
101	120
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	123
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
107	126
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)
	127	+ void SaveSupports()
120	128	{
121		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
122	152	}
123		-
124		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
125	155	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
129	287	blockloop = true;
130		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
131	294	blockloop = false;
132	295	}
133		-}
134	296
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
139	301
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
146		- {
147		- bRep.RestoreSupports();
148		- }
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155	302	blockloop = true;
156		- child.RestoreSupports();
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
157	340	blockloop = false;
158	341	}
159		-}
	342	+
	343	+ void RestoreBigData(Object3D o)
	344	+ {
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
	359	+ }
160	360
161	361	// MOCAP SUPPORT
162	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +499,8 @@
299	499	}
300	500
301	501	boolean live = false;
	502	+ transient boolean keepdontselect;
	503	+ boolean dontselect = false;
302	504	boolean hide = false;
303	505	boolean link2master = false; // performs reset support/master at each frame
304	506	boolean marked = false; // animation node
..	..	@@ -480,12 +682,14 @@
480	682	toParent = LA.newMatrix();
481	683	fromParent = LA.newMatrix();
482	684	}
	685	+
483	686	if (toParentMarked == null)
484	687	{
485	688	if (maxcount != 1)
486	689	{
487	690	new Exception().printStackTrace();
488	691	}
	692	+
489	693	toParentMarked = LA.newMatrix();
490	694	fromParentMarked = LA.newMatrix();
491	695	}
..	..	@@ -773,7 +977,7 @@
773	977	if (step == 0)
774	978	step = 1;
775	979	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	980	+ maxcount = 128; // 2048; // 4;
777	981	// if (acceleration == 0)
778	982	// acceleration = 10;
779	983	if (delay == 0) // serial
..	..	@@ -796,7 +1000,7 @@
796	1000
797	1001	if (marked && Globals.isLIVE() && live &&
798	1002	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	1004	currentframe != Globals.framecount)
801	1005	{
802	1006	currentframe = Globals.framecount;
..	..	@@ -808,7 +1012,8 @@
808	1012
809	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	1014
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
812	1017	{
813	1018	countdown = 1;
814	1019	delay = speedup?8:1;
..	..	@@ -880,6 +1085,10 @@
880	1085	if (material == null \|\| material.multiply)
881	1086	return true;
882	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1092	return material.opacity > 0.99;
884	1093	}
885	1094
..	..	@@ -911,6 +1120,11 @@
911	1120	fromParent = null; // LA.newMatrix();
912	1121	bRep = null; // new BoundaryRep();
913	1122
	1123	+ if (oname != null && oname.equals("LeftHand"))
	1124	+ {
	1125	+ name = oname;
	1126	+ }
	1127	+
914	1128	/*
915	1129	float hue = (float)Math.random();
916	1130	Color col;
..	..	@@ -953,7 +1167,7 @@
953	1167
954	1168	public Object clone()
955	1169	{
956		- return GrafreeD.clone(this);
	1170	+ return Grafreed.clone(this);
957	1171	}
958	1172
959	1173	Object3D copyExpand()
..	..	@@ -1275,6 +1489,7 @@
1275	1489	toParent = LA.newMatrix();
1276	1490	fromParent = LA.newMatrix();
1277	1491	}
	1492	+
1278	1493	LA.matCopy(other.toParent, toParent);
1279	1494	LA.matCopy(other.fromParent, fromParent);
1280	1495
..	..	@@ -1469,7 +1684,7 @@
1469	1684	BoundaryRep.SEUIL = other.material.cameralight;
1470	1685
1471	1686	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1687	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1688	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1689	}
1475	1690
..	..	@@ -1728,7 +1943,7 @@
1728	1943	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1944	o.bRep = transientrep;
1730	1945	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1946	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1947	o.CreateMaterial();
1733	1948	o.SetAttributes(this, -1);
1734	1949	//parent
..	..	@@ -1741,7 +1956,7 @@
1741	1956	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1957	o.bRep = bRep;
1743	1958	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1959	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1960	o.CreateMaterial();
1746	1961	//o.overwriteThis(this, -1);
1747	1962	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +2043,15 @@
1828	2043	if (obj.name == null)
1829	2044	continue; // can't be a null one
1830	2045
	2046	+ // Try perfect match first.
1831	2047	if (n.equals(obj.name))
1832	2048	{
1833	2049	theobj = obj;
1834	2050	count++;
1835	2051	}
1836	2052	}
	2053	+
	2054	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	2055
1838	2056	if (count != 1)
1839	2057	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2511,22 @@
2293	2511	}
2294	2512	*/
2295	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2296	2523	}
2297	2524
2298	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2526	{
2300	2527	if (newWindow)
2301	2528	{
	2529	+ new Exception().printStackTrace();
2302	2530	System.exit(0);
2303	2531	if (parent != null)
2304	2532	{
..	..	@@ -2333,6 +2561,14 @@
2333	2561	{
2334	2562	editWindow.refreshContents();
2335	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2336	2572	//if (parent != null)
2337	2573	//parent.refreshEditWindow();
2338	2574	}
..	..	@@ -2412,7 +2648,8 @@
2412	2648	private static final int editSelf = 1;
2413	2649	private static final int editChild = 2;
2414	2650
2415		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2416	2653	{
2417	2654	if (level == 0)
2418	2655	{
..	..	@@ -2420,7 +2657,8 @@
2420	2657	return;
2421	2658
2422	2659	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2424	2662	{
2425	2663	selectee = (Object3D) e.nextElement();
2426	2664	}
..	..	@@ -2428,19 +2666,22 @@
2428	2666	} else
2429	2667	{
2430	2668	//super.
2431		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2432	2671	}
2433	2672	}
2434	2673
2435		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2436	2676	{
2437	2677	doSomething = 0;
2438	2678	if (level == 0)
2439	2679	{
2440		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2441	2681	}
2442	2682	if (//super.
2443		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2444	2685	{
2445	2686	doSomething = 1;
2446	2687	return true;
..	..	@@ -2450,7 +2691,7 @@
2450	2691	}
2451	2692	}
2452	2693
2453		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2454	2695	{
2455	2696	if (selection == null)
2456	2697	{
..	..	@@ -2463,7 +2704,8 @@
2463	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2705	{
2465	2706	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2467	2709	{
2468	2710	childToDrag = selectee;
2469	2711	doSomething = 2;
..	..	@@ -2475,13 +2717,15 @@
2475	2717	return retval;
2476	2718	}
2477	2719
2478		- void doEditDrag(ClickInfo info)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2479	2722	{
2480	2723	switch (doSomething)
2481	2724	{
2482	2725	case 1: // '\001'
2483	2726	//super.
2484		- doEditDrag0(info);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2485	2729	break;
2486	2730
2487	2731	case 2: // '\002'
..	..	@@ -2494,11 +2738,13 @@
2494	2738	{
2495	2739	//sel.hitSomething = childToDrag.hitSomething;
2496	2740	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2498	2743	} else
2499	2744	{
2500	2745	//super.
2501		- doEditDrag0(info);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2502	2748	}
2503	2749	}
2504	2750	break;
..	..	@@ -2516,6 +2762,9 @@
2516	2762	{
2517	2763	deselectAll();
2518	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2519	2768	ClickInfo newInfo = new ClickInfo();
2520	2769	newInfo.flags = info.flags;
2521	2770	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2857,18 @@
2608	2857	void GenNormalsS(boolean crease)
2609	2858	{
2610	2859	selection.GenNormals(crease);
	2860	+// for (int i=0; i<selection.size(); i++)
	2861	+// {
	2862	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2863	+// selectee.GenNormals(crease);
	2864	+// }
	2865	+
	2866	+ //Touch();
	2867	+ }
	2868	+
	2869	+ void GenNormalsMeshS()
	2870	+ {
	2871	+ selection.GenNormalsMesh();
2611	2872	// for (int i=0; i<selection.size(); i++)
2612	2873	// {
2613	2874	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +3009,24 @@
2748	3009	if (child == null)
2749	3010	continue;
2750	3011	child.GenNormals(crease);
	3012	+// Children().release(i);
	3013	+ }
	3014	+ blockloop = false;
	3015	+ }
	3016	+
	3017	+ void GenNormalsMesh()
	3018	+ {
	3019	+ if (blockloop)
	3020	+ return;
	3021	+
	3022	+ blockloop = true;
	3023	+ GenNormalsMesh0();
	3024	+ for (int i = 0; i < Children().Size(); i++)
	3025	+ {
	3026	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3027	+ if (child == null)
	3028	+ continue;
	3029	+ child.GenNormalsMesh();
2751	3030	// Children().release(i);
2752	3031	}
2753	3032	blockloop = false;
..	..	@@ -2905,7 +3184,8 @@
2905	3184	{
2906	3185	if (bRep != null)
2907	3186	{
2908		- bRep.GenUV();
	3187	+ bRep.GenUV(); //1);
	3188	+ //bRep.UnfoldUV();
2909	3189	Touch();
2910	3190	}
2911	3191	}
..	..	@@ -2919,11 +3199,20 @@
2919	3199	}
2920	3200	}
2921	3201
	3202	+ void GenNormalsMesh0()
	3203	+ {
	3204	+ if (bRep != null)
	3205	+ {
	3206	+ bRep.GenerateNormalsMesh();
	3207	+ Touch();
	3208	+ }
	3209	+ }
	3210	+
2922	3211	void GenNormalsMINE0()
2923	3212	{
2924	3213	if (bRep != null)
2925	3214	{
2926		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3216	Touch();
2928	3217	}
2929	3218	}
..	..	@@ -2980,6 +3269,33 @@
2980	3269	blockloop = false;
2981	3270	}
2982	3271
	3272	+ void TransformChildren()
	3273	+ {
	3274	+ if (toParent != null)
	3275	+ {
	3276	+ for (int i=Size(); --i>=0;)
	3277	+ {
	3278	+ Object3D v = get(i);
	3279	+
	3280	+ if (v.toParent == null)
	3281	+ {
	3282	+ v.toParent = LA.newMatrix();
	3283	+ v.fromParent = LA.newMatrix();
	3284	+ }
	3285	+
	3286	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3287	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3288	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3289	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3290	+ }
	3291	+
	3292	+ toParent = null; // LA.matIdentity(toParent);
	3293	+ fromParent = null; // LA.matIdentity(fromParent);
	3294	+
	3295	+ Touch();
	3296	+ }
	3297	+ }
	3298	+
2983	3299	void TransformGeometry()
2984	3300	{
2985	3301	Object3D obj = this;
..	..	@@ -3201,9 +3517,11 @@
3201	3517
3202	3518	BoundaryRep sup = bRep.support;
3203	3519	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3520	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3521	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3522	+
	3523	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3524	+
3207	3525	bRep = temprep;
3208	3526	bRep.support = sup;
3209	3527	Touch();
..	..	@@ -3340,7 +3658,8 @@
3340	3658	if (blockloop)
3341	3659	return;
3342	3660
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3661	+ if (//marked \|\| // does not make sense
	3662	+ (bRep != null \|\| material != null)) // borderline...
3344	3663	live = h;
3345	3664
3346	3665	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3680,8 @@
3361	3680	return;
3362	3681
3363	3682	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3683	+ if (//marked \|\| // does not make sense
	3684	+ (bRep != null \|\| material != null)) // borderline...
3365	3685	link2master = h;
3366	3686
3367	3687	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3701,8 @@
3381	3701	if (blockloop)
3382	3702	return;
3383	3703
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3704	+ if (//marked \|\| // does not make sense
	3705	+ (bRep != null \|\| material != null)) // borderline...
3385	3706	hide = h;
3386	3707
3387	3708	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3722,7 @@
3401	3722	if (blockloop)
3402	3723	return;
3403	3724
3404		- if (bRep != null && material != null) // borderline...
	3725	+ if (bRep != null \|\| material != null) // borderline...
3405	3726	marked = h;
3406	3727
3407	3728	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3732,46 @@
3411	3732	continue;
3412	3733	blockloop = true;
3413	3734	child.MarkLeaves(h);
	3735	+ blockloop = false;
	3736	+ // release(i);
	3737	+ }
	3738	+ }
	3739	+
	3740	+ void RewindLeaves(boolean h)
	3741	+ {
	3742	+ if (blockloop)
	3743	+ return;
	3744	+
	3745	+ if (bRep != null \|\| material != null) // borderline...
	3746	+ rewind = h;
	3747	+
	3748	+ for (int i = 0; i < Size(); i++)
	3749	+ {
	3750	+ Object3D child = (Object3D) get(i); // reserve(i);
	3751	+ if (child == null)
	3752	+ continue;
	3753	+ blockloop = true;
	3754	+ child.RewindLeaves(h);
	3755	+ blockloop = false;
	3756	+ // release(i);
	3757	+ }
	3758	+ }
	3759	+
	3760	+ void RandomLeaves(boolean h)
	3761	+ {
	3762	+ if (blockloop)
	3763	+ return;
	3764	+
	3765	+ if (bRep != null \|\| material != null) // borderline...
	3766	+ random = h;
	3767	+
	3768	+ for (int i = 0; i < Size(); i++)
	3769	+ {
	3770	+ Object3D child = (Object3D) get(i); // reserve(i);
	3771	+ if (child == null)
	3772	+ continue;
	3773	+ blockloop = true;
	3774	+ child.RandomLeaves(h);
3414	3775	blockloop = false;
3415	3776	// release(i);
3416	3777	}
..	..	@@ -3725,7 +4086,7 @@
3725	4086	if (child == null)
3726	4087	continue;
3727	4088
3728		- if (GrafreeD.RENDERME > 0)
	4089	+ if (Grafreed.RENDERME > 0)
3729	4090	{
3730	4091	if (child instanceof Merge)
3731	4092	((Merge)child).renderme();
..	..	@@ -3876,7 +4237,7 @@
3876	4237	if (child == null)
3877	4238	continue;
3878	4239
3879		- if (GrafreeD.RENDERME > 0)
	4240	+ if (Grafreed.RENDERME > 0)
3880	4241	{
3881	4242	if (child instanceof Merge)
3882	4243	((Merge)child).renderme();
..	..	@@ -4071,7 +4432,7 @@
4071	4432	if (child == null)
4072	4433	continue;
4073	4434
4074		- if (GrafreeD.RENDERME > 0)
	4435	+ if (Grafreed.RENDERME > 0)
4075	4436	{
4076	4437	if (child instanceof Merge)
4077	4438	((Merge)child).renderme();
..	..	@@ -4184,6 +4545,55 @@
4184	4545	{
4185	4546	blockloop = true;
4186	4547	get(i).RepairShadow();
	4548	+ blockloop = false;
	4549	+ }
	4550	+ }
	4551	+
	4552	+ void RepairSOV()
	4553	+ {
	4554	+ if (blockloop)
	4555	+ return;
	4556	+
	4557	+ String texname = this.GetPigmentTexture();
	4558	+
	4559	+ if (texname.startsWith("sov"))
	4560	+ {
	4561	+ String[] s = texname.split("/");
	4562	+
	4563	+ String[] sname = s[1].split("Color.pn");
	4564	+
	4565	+ texname = sname[0];
	4566	+
	4567	+ if (sname.length > 1)
	4568	+ {
	4569	+ texname += "Color.jpg";
	4570	+ }
	4571	+
	4572	+ this.SetPigmentTexture("sov/" + texname);
	4573	+ }
	4574	+
	4575	+ texname = this.GetBumpTexture();
	4576	+
	4577	+ if (texname.startsWith("sov"))
	4578	+ {
	4579	+ String[] s = texname.split("/");
	4580	+
	4581	+ String[] sname = s[1].split("Bump.pn");
	4582	+
	4583	+ texname = sname[0];
	4584	+
	4585	+ if (sname.length > 1)
	4586	+ {
	4587	+ texname += "Bump.jpg";
	4588	+ }
	4589	+
	4590	+ this.SetBumpTexture("sov/" + texname);
	4591	+ }
	4592	+
	4593	+ for (int i=0; i<Size(); i++)
	4594	+ {
	4595	+ blockloop = true;
	4596	+ get(i).RepairSOV();
4187	4597	blockloop = false;
4188	4598	}
4189	4599	}
..	..	@@ -4678,7 +5088,7 @@
4678	5088
4679	5089	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5090	{
4681		- if (hide)
	5091	+ if (hide \|\| dontselect)
4682	5092	return null;
4683	5093
4684	5094	if (count <= 0)
..	..	@@ -4702,9 +5112,17 @@
4702	5112	}
4703	5113	}
4704	5114
	5115	+ ObjEditor GetWindow()
	5116	+ {
	5117	+ if (editWindow != null)
	5118	+ return editWindow;
	5119	+
	5120	+ return manipWindow;
	5121	+ }
	5122	+
4705	5123	cTreePath Select(int indexcount, boolean deselect)
4706	5124	{
4707		- if (hide)
	5125	+ if (hide \|\| dontselect)
4708	5126	return null;
4709	5127
4710	5128	if (count <= 0)
..	..	@@ -4738,10 +5156,11 @@
4738	5156	if (leaf != null)
4739	5157	{
4740	5158	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5159	+ ObjEditor window = GetWindow();
	5160	+ if (window != null)
4742	5161	{
4743	5162	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5163	+ window.Select(tp, deselect, true);
4745	5164	}
4746	5165
4747	5166	return tp;
..	..	@@ -4758,6 +5177,7 @@
4758	5177
4759	5178	if (child == null)
4760	5179	continue;
	5180	+
4761	5181	if (child.HasTransparency() && child.size() != 0)
4762	5182	{
4763	5183	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5187,10 @@
4767	5187	if (leaf != null)
4768	5188	{
4769	5189	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5190	+ ObjEditor window = GetWindow();
	5191	+ if (window != null)
4771	5192	{
4772		- editWindow.Select(tp, deselect, true);
	5193	+ window.Select(tp, deselect, true);
4773	5194	}
4774	5195
4775	5196	return tp;
..	..	@@ -5094,6 +5515,51 @@
5094	5515	blockloop = false;
5095	5516	}
5096	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5097	5563	boolean IsSelected()
5098	5564	{
5099	5565	if (parent == null)
..	..	@@ -5154,12 +5620,41 @@
5154	5620	if (fullname == null)
5155	5621	return "";
5156	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5157	5628	// System.out.println("Fullname = " + fullname);
5158	5629
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5630	+ // Does not work on Windows due to C:
	5631	+// if (fullname.name.indexOf(":") == -1)
	5632	+// return fullname.name;
	5633	+//
	5634	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5635
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5636	+ String[] split = fullname.name.split(":");
	5637	+
	5638	+ if (split.length == 0)
	5639	+ {
	5640	+ return fullname.pigment = "";
	5641	+ }
	5642	+
	5643	+ if (split.length <= 2)
	5644	+ {
	5645	+ if (fullname.name.endsWith(":"))
	5646	+ {
	5647	+ // Windows
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5649	+ }
	5650	+
	5651	+ return fullname.pigment = split[0];
	5652	+ }
	5653	+
	5654	+ // Windows
	5655	+ assert(split.length == 4);
	5656	+
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5163	5658	}
5164	5659
5165	5660	static String GetBump(cTexture fullname)
..	..	@@ -5167,11 +5662,44 @@
5167	5662	if (fullname == null)
5168	5663	return "";
5169	5664
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
	5669	+
5170	5670	// 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());
	5671	+ // Does not work on Windows due to C:
	5672	+// if (fullname.name.indexOf(":") == -1)
	5673	+// return "";
	5674	+//
	5675	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5676	+ String[] split = fullname.name.split(":");
	5677	+
	5678	+ if (split.length == 0)
	5679	+ {
	5680	+ return fullname.bump = "";
	5681	+ }
	5682	+
	5683	+ if (split.length == 1)
	5684	+ {
	5685	+ return fullname.bump = "";
	5686	+ }
	5687	+
	5688	+ if (split.length == 2)
	5689	+ {
	5690	+ if (fullname.name.endsWith(":"))
	5691	+ {
	5692	+ // Windows
	5693	+ return fullname.bump = "";
	5694	+ }
	5695	+
	5696	+ return fullname.bump = split[1];
	5697	+ }
	5698	+
	5699	+ // Windows
	5700	+ assert(split.length == 4);
	5701	+
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5175	5703	}
5176	5704
5177	5705	String GetPigmentTexture()
..	..	@@ -5245,7 +5773,7 @@
5245	5773	System.out.print("; textures = " + textures);
5246	5774	System.out.println("; usedtextures = " + usedtextures);
5247	5775
5248		- if (GetTextures() == null)
	5776	+ if (GetTextures() == null) // What is that??
5249	5777	GetTextures().name = ":";
5250	5778
5251	5779	String texname = tex;
..	..	@@ -5254,6 +5782,9 @@
5254	5782	texname = "";
5255	5783
5256	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5257	5788	Touch();
5258	5789	}
5259	5790
..	..	@@ -5278,6 +5809,43 @@
5278	5809	}
5279	5810	}
5280	5811
	5812	+ UUID GetUUID()
	5813	+ {
	5814	+ if (uuid == null)
	5815	+ {
	5816	+ // Serial
	5817	+ uuid = UUID.randomUUID();
	5818	+ }
	5819	+
	5820	+ return uuid;
	5821	+ }
	5822	+
	5823	+ Object3D GetObject(UUID uid)
	5824	+ {
	5825	+ if (blockloop)
	5826	+ return null;
	5827	+
	5828	+ if (GetUUID().equals(uid))
	5829	+ return this;
	5830	+
	5831	+ int nb = Size();
	5832	+ for (int i = 0; i < nb; i++)
	5833	+ {
	5834	+ Object3D child = (Object3D) get(i);
	5835	+
	5836	+ if (child == null)
	5837	+ continue;
	5838	+
	5839	+ blockloop = true;
	5840	+ Object3D obj = child.GetObject(uid);
	5841	+ blockloop = false;
	5842	+ if (obj != null)
	5843	+ return obj;
	5844	+ }
	5845	+
	5846	+ return null;
	5847	+ }
	5848	+
5281	5849	void SetBumpTexture(String tex)
5282	5850	{
5283	5851	if (GetTextures() == null)
..	..	@@ -5289,6 +5857,8 @@
5289	5857	texname = "";
5290	5858
5291	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5860	+
	5861	+ GetTextures().bump = null;
5292	5862
5293	5863	Touch();
5294	5864	}
..	..	@@ -5314,6 +5884,38 @@
5314	5884	}
5315	5885	}
5316	5886
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
5317	5919	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5920	{
5319	5921	Draw(display, root, selected, blocked);
..	..	@@ -5322,12 +5924,23 @@
5322	5924	boolean NeedSupport()
5323	5925	{
5324	5926	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5927	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5928	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5929	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5930	}
5329	5931
5330	5932	static boolean DEBUG_SELECTION = false;
	5933	+
	5934	+ boolean IsLive()
	5935	+ {
	5936	+ if (live)
	5937	+ return true;
	5938	+
	5939	+ if (parent == null)
	5940	+ return false;
	5941	+
	5942	+ return parent.IsLive();
	5943	+ }
5331	5944
5332	5945	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5946	{
..	..	@@ -5339,7 +5952,7 @@
5339	5952	}
5340	5953
5341	5954	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5955	+ (hide \|\| dontselect))
5343	5956	return;
5344	5957
5345	5958	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5984,7 @@
5371	5984	return;
5372	5985	}
5373	5986
5374		- javax.media.opengl.GL gl = display.GetGL();
	5987	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5988
5376	5989	/*
5377	5990	if (touched)
..	..	@@ -5389,8 +6002,10 @@
5389	6002	if (support != null)
5390	6003	support = support;
5391	6004
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);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5394	6009
5395	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	6011	{
..	..	@@ -5400,8 +6015,9 @@
5400	6015	// usecalllists &= !(parent instanceof RandomNode);
5401	6016	// usecalllists = false;
5402	6017
5403		- if (GetBRep() != null)
5404		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5405	6021	//System.out.println("draw " + this);
5406	6022	//new Exception().printStackTrace();
5407	6023
..	..	@@ -5410,10 +6026,12 @@
5410	6026	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	6027
5412	6028	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6029	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6030	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	6031	{
5415	6032	Globals.lighttouched = true;
5416	6033	} // all panes...
	6034	+
5417	6035	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	6036	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	6037	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5421,9 +6039,9 @@
5421	6039	if (!(this instanceof Composite))
5422	6040	touched = false;
5423	6041	//if (displaylist == -1 && usecalllists)
5424		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5425	6043	{
5426		- bRep.displaylist = gl.glGenLists(1);
	6044	+ bRep.displaylist = display.GenList();
5427	6045	assert(bRep.displaylist != 0);
5428	6046	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	6047	//System.out.println("\tgen list " + list);
..	..	@@ -5432,17 +6050,19 @@
5432	6050
5433	6051	//System.out.println("\tnew list " + list);
5434	6052	//gl.glDrawBuffer(gl.GL_NONE);
5435		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5436	6054	{
5437	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6056	+ display.NewList(bRep.displaylist);
5439	6057	}
	6058	+
5440	6059	CallList(display, root, selected, blocked);
	6060	+
5441	6061	// compiled = true;
5442		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5443	6063	{
5444	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	6065	+ display.EndList();
5446	6066	}
5447	6067	//gl.glDrawBuffer(gl.GL_BACK);
5448	6068	// XXX touched = false;
..	..	@@ -5490,7 +6110,7 @@
5490	6110	if (display.DrawMode() == iCameraPane.SHADOW)
5491	6111	{
5492	6112	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6113	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	6114	{
5495	6115	//System.out.print("CULLED");
5496	6116	culled = true;
..	..	@@ -5498,7 +6118,7 @@
5498	6118	}
5499	6119	else
5500	6120	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6121	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	6122	culled = true;
5503	6123
5504	6124	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6158,8 @@
5538	6158	{
5539	6159	if (GetBRep() != null)
5540	6160	{
5541		- CameraPane.NextIndex(this, gl);
	6161	+ display.NextIndex();
	6162	+
5542	6163	// vertex color conflict : gl.glCallList(list);
5543	6164	DrawNode(display, root, selected);
5544	6165	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6200,28 @@
5579	6200	tex = GetTextures();
5580	6201	}
5581	6202
5582		- display.BindTextures(tex, texres);
	6203	+ boolean failedPigment = false;
	6204	+ boolean failedBump = false;
	6205	+
	6206	+ try
	6207	+ {
	6208	+ display.BindPigmentTexture(tex, texres);
	6209	+ }
	6210	+ catch (Exception e)
	6211	+ {
	6212	+ System.err.println("FAILED: " + this);
	6213	+ failedPigment = true;
	6214	+ }
	6215	+
	6216	+ try
	6217	+ {
	6218	+ display.BindBumpTexture(tex, texres);
	6219	+ }
	6220	+ catch (Exception e)
	6221	+ {
	6222	+ //System.err.println("FAILED: " + this);
	6223	+ failedBump = true;
	6224	+ }
5583	6225
5584	6226	if (!compiled)
5585	6227	{
..	..	@@ -5595,13 +6237,17 @@
5595	6237
5596	6238	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6239	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6240	+ display.CallList(bRep.displaylist);
5599	6241	// june 2013 drawSelf(display, root, selected);
5600	6242	}
5601	6243	}
5602	6244	}
5603	6245
5604		- display.ReleaseTextures(tex);
	6246	+ if (!failedBump)
	6247	+ display.ReleaseBumpTexture(tex);
	6248	+
	6249	+ if (!failedPigment)
	6250	+ display.ReleasePigmentTexture(tex);
5605	6251
5606	6252	display.PopMaterial(this, selected);
5607	6253	}
..	..	@@ -5730,6 +6376,9 @@
5730	6376
5731	6377	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6378	{
	6379	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6380	+ return;
	6381	+
5733	6382	if (hide)
5734	6383	return;
5735	6384	// shadow optimisation
..	..	@@ -5855,6 +6504,9 @@
5855	6504	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6505	return; // no shadow for transparent objects
5857	6506
	6507	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6508	+ return;
	6509	+
5858	6510	if (hide)
5859	6511	return;
5860	6512
..	..	@@ -5895,9 +6547,10 @@
5895	6547	return;
5896	6548	}
5897	6549
	6550	+ //bRep.GenUV(1/material.diffuseness);
5898	6551	// bRep.lock = true;
5899	6552
5900		- javax.media.opengl.GL gl = display.GetGL();
	6553	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6554
5902	6555	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6556	{
..	..	@@ -5914,23 +6567,7 @@
5914	6567
5915	6568	bRep.getMinMax(min, max, 100);
5916	6569
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();
	6570	+ display.DrawBox(min, max);
5934	6571
5935	6572	return;
5936	6573	}
..	..	@@ -5984,178 +6621,19 @@
5984	6621	new Exception().printStackTrace();
5985	6622	return;
5986	6623	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6624	+
	6625	+ if (dontselect)
5990	6626	{
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;
	6627	+ //bRep.GenerateNormalsMINE();
6122	6628	}
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		- }
	6629	+
	6630	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6631	} else // catch (Error e)
6154	6632	{
6155	6633	// TRIANGLE ARRAY
6156	6634	if (IsOpaque()) // Static())
6157	6635	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6636	+ display.StartTriangles();
6159	6637	int facecount = bRep.FaceCount();
6160	6638	for (int i = 0; i < facecount; i++)
6161	6639	{
..	..	@@ -6220,7 +6698,7 @@
6220	6698
6221	6699	display.DrawFace(this, p, q, r, face);
6222	6700	}
6223		- gl.glEnd();
	6701	+ display.EndTriangles();
6224	6702	}
6225	6703	else
6226	6704	{
..	..	@@ -6249,8 +6727,8 @@
6249	6727	//System.out.println("SORT");
6250	6728
6251	6729	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6730	+
	6731	+ display.StartTriangles();
6254	6732	for (int i = 0; i < facecount; i++)
6255	6733	{
6256	6734	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6742,12 @@
6264	6742
6265	6743	display.DrawFace(this, p, q, r, face);
6266	6744	}
6267		- gl.glEnd();
	6745	+ display.EndTriangles();
6268	6746	}
6269	6747
6270	6748	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6749	{
	6750	+ /*
6272	6751	gl.glDisable(gl.GL_LIGHTING);
6273	6752	float[] colorV = new float[3];
6274	6753
..	..	@@ -6347,6 +6826,7 @@
6347	6826	// gl.glEnd();
6348	6827	}
6349	6828	}
	6829	+ */
6350	6830	}
6351	6831	}
6352	6832
..	..	@@ -6405,22 +6885,6 @@
6405	6885	void Print(Vertex v)
6406	6886	{
6407	6887	//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	6888	}
6425	6889
6426	6890	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6946,20 +7410,23 @@
6946	7410	}
6947	7411	}
6948	7412
6949		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
6950	7417	{
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;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
6954	7421	if (toscreen == null)
6955	7422	{
6956		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6957	7424	}
6958	7425	cVector vec = in;
6959	7426	LA.xformPos(in, toscreen, in);
6960	7427	//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();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6963	7430	outPt.x = hc + (int) vec.x;
6964	7431	outPt.y = vc - (int) vec.y;
6965	7432	outRec.x = outPt.x - 3;
..	..	@@ -6967,15 +7434,18 @@
6967	7434	outRec.width = outRec.height = 6;
6968	7435	}
6969	7436
6970		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
6971	7439	{
6972	7440	Point pt = new Point(0, 0);
6973	7441	Rectangle rec = new Rectangle();
6974		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
6975	7444	return rec;
6976	7445	}
6977	7446
6978		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
6979	7449	{
6980	7450	if (level == 0)
6981	7451	{
..	..	@@ -6984,16 +7454,19 @@
6984	7454	{
6985	7455	cVector origin = new cVector();
6986	7456	//LA.xformPos(origin, toParent, origin);
6987		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6988	7461	Rectangle boundary = new Rectangle();
6989	7462	boundary.x = spot.x - 30;
6990	7463	boundary.y = spot.y - 30;
6991	7464	boundary.width = spot.width + 60;
6992	7465	boundary.height = spot.height + 60;
6993		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
6994	7467	int spotw = spot.x + spot.width;
6995	7468	int spoth = spot.y + spot.height;
6996		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6997	7470	// if (CameraPane.Xmin > spot.x)
6998	7471	// {
6999	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -7010,11 +7483,33 @@
7010	7483	// {
7011	7484	// CameraPane.Ymax = spoth;
7012	7485	// }
7013		- spot.translate(32, 32);
	7486	+// if (CameraPane.Xmin > spot.x)
	7487	+// {
	7488	+// CameraPane.Xmin = spot.x;
	7489	+// }
	7490	+// if (CameraPane.Xmax < spotw)
	7491	+// {
	7492	+// CameraPane.Xmax = spotw;
	7493	+// }
	7494	+// if (CameraPane.Ymin > spot.y)
	7495	+// {
	7496	+// CameraPane.Ymin = spot.y;
	7497	+// }
	7498	+// if (CameraPane.Ymax < spoth)
	7499	+// {
	7500	+// CameraPane.Ymax = spoth;
	7501	+// }
	7502	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7503	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
7014	7509	spotw = spot.x + spot.width;
7015	7510	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7513	// if (CameraPane.Xmin > spot.x)
7019	7514	// {
7020	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,29 +7526,9 @@
7031	7526	// {
7032	7527	// CameraPane.Ymax = spoth;
7033	7528	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7036		- spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039		-// if (CameraPane.Xmin > spot.x)
7040		-// {
7041		-// CameraPane.Xmin = spot.x;
7042		-// }
7043		-// if (CameraPane.Xmax < spotw)
7044		-// {
7045		-// CameraPane.Xmax = spotw;
7046		-// }
7047		-// if (CameraPane.Ymin > spot.y)
7048		-// {
7049		-// CameraPane.Ymin = spot.y;
7050		-// }
7051		-// if (CameraPane.Ymax < spoth)
7052		-// {
7053		-// CameraPane.Ymax = spoth;
7054		-// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7529	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7057	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7533	// if (CameraPane.Xmin > boundary.x)
7059	7534	// {
..	..	@@ -7075,7 +7550,8 @@
7075	7550	}
7076	7551	}
7077	7552
7078		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7079	7555	{
7080	7556	if (level == 0)
7081	7557	{
..	..	@@ -7084,10 +7560,10 @@
7084	7560
7085	7561	boolean retval = false;
7086	7562
7087		- startX = info.x;
7088		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7089	7565
7090		- hitSomething = 0;
	7566	+ hitSomething = -1;
7091	7567	cVector origin = new cVector();
7092	7568	//LA.xformPos(origin, toParent, origin);
7093	7569	Rectangle spot = new Rectangle();
..	..	@@ -7095,22 +7571,53 @@
7095	7571	{
7096	7572	centerPt = new Point(0, 0);
7097	7573	}
7098		- calcHotSpot(origin, info, centerPt, spot);
7099		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7100	7577	{
7101	7578	hitSomething = hitCenter;
7102	7579	retval = true;
7103	7580	}
7104	7581	spot.translate(32, 0);
7105		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7106	7583	{
7107	7584	hitSomething = hitRotate;
7108	7585	retval = true;
7109	7586	}
7110	7587	spot.translate(0, 32);
7111		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
7112	7591	{
7113	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
7114	7621	retval = true;
7115	7622	}
7116	7623
..	..	@@ -7120,7 +7627,7 @@
7120	7627	}
7121	7628
7122	7629	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7631	//System.out.println("modified = " + modified);
7125	7632	//new Exception().printStackTrace();
7126	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7655,8 @@
7148	7655	return true;
7149	7656	}
7150	7657
7151		- void doEditDrag0(ClickInfo info)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7152	7660	{
7153	7661	if (hitSomething == 0)
7154	7662	{
..	..	@@ -7162,7 +7670,8 @@
7162	7670
7163	7671	//System.out.println("hitSomething = " + hitSomething);
7164	7672
7165		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
	7674	+
7166	7675	cVector xlate = new cVector();
7167	7676	//cVector xlate2 = new cVector();
7168	7677	switch (hitSomething)
..	..	@@ -7175,7 +7684,7 @@
7175	7684
7176	7685	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7686
7178		- if (modified)
	7687	+ if (modified \|\| opposite)
7179	7688	{
7180	7689	//assert(false);
7181	7690	/*
..	..	@@ -7195,8 +7704,8 @@
7195	7704	toParent[3][i] = xlate.get(i);
7196	7705	LA.matInvert(toParent, fromParent);
7197	7706	*/
7198		- cVector delta = LA.newVector(0, 0, startY - info.y);
7199		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7200	7709
7201	7710	LA.matCopy(startMat, toParent);
7202	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7205,7 +7714,7 @@
7205	7714	} else
7206	7715	{
7207	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7208		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7209	7718	cVector away = new cVector();
7210	7719	//cVector right2 = new cVector();
7211	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7222,19 +7731,19 @@
7222	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7732	// if (!CameraPane.LOCALTRANSFORM)
7224	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7226	7735	// if (!CameraPane.LOCALTRANSFORM)
7227	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7737	//LA.vecCross(up, cVector.Z, right2);
7229	7738
7230		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7231	7740
7232	7741	//System.out.println("DELTA0 = " + delta);
7233	7742	//System.out.println("AWAY = " + info.camera.away);
7234	7743	//System.out.println("UP = " + info.camera.up);
7235	7744	if (away.z > 0)
7236	7745	{
7237		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7238	7747	{
7239	7748	delta.x = -delta.x;
7240	7749	} else
..	..	@@ -7249,7 +7758,7 @@
7249	7758	//System.out.println("DELTA1 = " + delta);
7250	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7251	7760	//System.out.println("DELTA2 = " + delta);
7252		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7253	7762	LA.matCopy(startMat, toParent);
7254	7763	//System.out.println("DELTA3 = " + delta);
7255	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7259,8 +7768,8 @@
7259	7768	break;
7260	7769
7261	7770	case hitRotate: // rotate
7262		- int dx = info.x - centerPt.x;
7263		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7264	7773	double angle = (double) Math.atan2(dx, dy);
7265	7774	angle = -(1.570796 - angle);
7266	7775
..	..	@@ -7269,6 +7778,7 @@
7269	7778
7270	7779	if (modified)
7271	7780	{
	7781	+ // Rotate 90 degrees
7272	7782	angle /= (Math.PI / 4);
7273	7783	angle = Math.floor(angle + 0.5);
7274	7784	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7792,7 @@
7282	7792	}
7283	7793	/**/
7284	7794
7285		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7286	7796	{
7287	7797	case 1: // '\001'
7288	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7309,26 +7819,30 @@
7309	7819	break;
7310	7820
7311	7821	case hitScale: // scale
7312		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7823	+ double sign = 1;
	7824	+ if (hScale < 0)
	7825	+ {
	7826	+ sign = -1;
	7827	+ }
	7828	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7829	if (hScale < 0.01)
7314	7830	{
7315		- hScale = 0.01;
	7831	+ //hScale = 0.01;
7316	7832	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
	7833	+
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7835	+ sign = 1;
	7836	+ if (vScale < 0)
7319	7837	{
7320		- hScale = 0.01;
	7838	+ sign = -1;
7321	7839	}
7322		- double vScale = (double) (info.y - centerPt.y) / 32;
	7840	+ vScale = signMath.pow(signvScale, scale * 50);
7323	7841	if (vScale < 0.01)
7324	7842	{
7325		- vScale = 0.01;
	7843	+ //vScale = 0.01;
7326	7844	}
7327		- vScale = Math.pow(vScale, scale * 50);
7328		- if (vScale < 0.01)
7329		- {
7330		- vScale = 0.01;
7331		- }
	7845	+
7332	7846	LA.matCopy(startMat, toParent);
7333	7847	/**/
7334	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7338,39 +7852,56 @@
7338	7852	}
7339	7853	/**/
7340	7854
7341		- switch (info.pane.RenderCamera().viewCode)
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7856	+
	7857	+ if (totalScale < 0.01)
	7858	+ {
	7859	+ totalScale = 0.01;
	7860	+ }
	7861	+
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7342	7863	{
7343	7864	case 3: // '\001'
7344		- if (modified)
	7865	+ if (modified \|\| opposite)
7345	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7346	7870	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7872	} // vScale, 1);
7349	7873	else
7350	7874	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7875	+ // EXCEPTION!
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7352	7877	} // vScale, 1);
7353	7878	break;
7354	7879
7355	7880	case 2: // '\002'
7356		- if (modified)
	7881	+ if (modified \|\| opposite)
7357	7882	{
7358		- //LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7888	} else
7361	7889	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7890	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7891	}
7364	7892	break;
7365	7893
7366	7894	case 1: // '\003'
7367		- if (modified)
	7895	+ if (modified \|\| opposite)
7368	7896	{
7369		- //LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7902	} else
7372	7903	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7904	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7905	}
7375	7906	break;
7376	7907	}
..	..	@@ -7404,7 +7935,7 @@
7404	7935	} // NEW ...
7405	7936
7406	7937
7407		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7408	7939	}
7409	7940
7410	7941	boolean overflow = false;
..	..	@@ -7503,14 +8034,22 @@
7503	8034	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	8035	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	8036	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8037	+
	8038	+ String objname;
	8039	+
7506	8040	if (false) //parent != null)
7507	8041	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8042	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	8043	} else
7510	8044	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8045	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	8046	} // + super.toString();
7513	8047	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8048	+
	8049	+ if (!Globals.ADVANCED)
	8050	+ return objname;
	8051	+
	8052	+ return objname + " " + System.identityHashCode(this);
7514	8053	}
7515	8054
7516	8055	public int hashCode()
..	..	@@ -7566,6 +8105,7 @@
7566	8105	objectUI.closeUI();
7567	8106	if (editWindow != null)
7568	8107	{
	8108	+ editWindow.ctrlPanel.FlushUI();
7569	8109	editWindow.refreshContents();
7570	8110	} // ? new
7571	8111	objectUI = null;
..	..	@@ -7574,6 +8114,10 @@
7574	8114	{
7575	8115	editWindow = null;
7576	8116	} // ?
	8117	+ }
	8118	+ else
	8119	+ {
	8120	+ //editWindow.closeUI();
7577	8121	}
7578	8122	}
7579	8123
..	..	@@ -7586,7 +8130,7 @@
7586	8130	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	8131
7588	8132	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	8133	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	8134
7591	8135	double[][] toParent; // dynamic matrix
7592	8136	double[][] fromParent;
..	..	@@ -7701,7 +8245,7 @@
7701	8245	{
7702	8246	assert(bRep != null);
7703	8247	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8248	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8249	}
7706	8250	else
7707	8251	{
..	..	@@ -7732,6 +8276,10 @@
7732	8276	}
7733	8277
7734	8278	transient ObjEditor editWindow;
	8279	+ transient ObjEditor manipWindow;
	8280	+
	8281	+ transient boolean pinned;
	8282	+
7735	8283	transient ObjectUI objectUI;
7736	8284	public static int povDepth = 0;
7737	8285	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8298,9 @@
7750	8298	private static cVector edge2 = new cVector();
7751	8299	//private static cVector norm = new cVector();
7752	8300	/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;
	8301	+ static final int hitCenter = 1;
	8302	+ static final int hitScale = 2;
	8303	+ static final int hitRotate = 3;
7756	8304	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8305	/transient/ private Point centerPt;
7758	8306	/transient/ private int startX;