~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,28 @@
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	+ // 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	+
22	39	ScriptNode scriptnode;
23	40
24	41	void InitOthers()
..	..	@@ -99,64 +116,201 @@
99	116
100	117	// transient boolean reduced; // for morph reduction
101	118
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	121
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
107	124
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)
	125	+ void SaveSupports()
120	126	{
121		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
122	150	}
123		-
124		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
125	153	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	154	+ if (blockloop)
	155	+ return;
	156	+
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
	161	+
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	179	+ {
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
	282	+ if (blockloop)
	283	+ return;
	284	+
129	285	blockloop = true;
130		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
131	294	blockloop = false;
132	295	}
133		-}
134	296
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)
	297	+ void RestoreBigData(Object3D o)
146	298	{
147		- bRep.RestoreSupports();
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
148	313	}
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	314
161	315	// MOCAP SUPPORT
162	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +453,8 @@
299	453	}
300	454
301	455	boolean live = false;
	456	+ transient boolean keepdontselect;
	457	+ boolean dontselect = false;
302	458	boolean hide = false;
303	459	boolean link2master = false; // performs reset support/master at each frame
304	460	boolean marked = false; // animation node
..	..	@@ -480,12 +636,14 @@
480	636	toParent = LA.newMatrix();
481	637	fromParent = LA.newMatrix();
482	638	}
	639	+
483	640	if (toParentMarked == null)
484	641	{
485	642	if (maxcount != 1)
486	643	{
487	644	new Exception().printStackTrace();
488	645	}
	646	+
489	647	toParentMarked = LA.newMatrix();
490	648	fromParentMarked = LA.newMatrix();
491	649	}
..	..	@@ -773,7 +931,7 @@
773	931	if (step == 0)
774	932	step = 1;
775	933	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
777	935	// if (acceleration == 0)
778	936	// acceleration = 10;
779	937	if (delay == 0) // serial
..	..	@@ -796,7 +954,7 @@
796	954
797	955	if (marked && Globals.isLIVE() && live &&
798	956	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	958	currentframe != Globals.framecount)
801	959	{
802	960	currentframe = Globals.framecount;
..	..	@@ -808,7 +966,8 @@
808	966
809	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	968
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
812	971	{
813	972	countdown = 1;
814	973	delay = speedup?8:1;
..	..	@@ -880,6 +1039,10 @@
880	1039	if (material == null \|\| material.multiply)
881	1040	return true;
882	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1046	return material.opacity > 0.99;
884	1047	}
885	1048
..	..	@@ -911,6 +1074,11 @@
911	1074	fromParent = null; // LA.newMatrix();
912	1075	bRep = null; // new BoundaryRep();
913	1076
	1077	+ if (oname != null && oname.equals("LeftHand"))
	1078	+ {
	1079	+ name = oname;
	1080	+ }
	1081	+
914	1082	/*
915	1083	float hue = (float)Math.random();
916	1084	Color col;
..	..	@@ -953,7 +1121,7 @@
953	1121
954	1122	public Object clone()
955	1123	{
956		- return GrafreeD.clone(this);
	1124	+ return Grafreed.clone(this);
957	1125	}
958	1126
959	1127	Object3D copyExpand()
..	..	@@ -1275,6 +1443,7 @@
1275	1443	toParent = LA.newMatrix();
1276	1444	fromParent = LA.newMatrix();
1277	1445	}
	1446	+
1278	1447	LA.matCopy(other.toParent, toParent);
1279	1448	LA.matCopy(other.fromParent, fromParent);
1280	1449
..	..	@@ -1469,7 +1638,7 @@
1469	1638	BoundaryRep.SEUIL = other.material.cameralight;
1470	1639
1471	1640	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1641	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1642	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1643	}
1475	1644
..	..	@@ -1728,7 +1897,7 @@
1728	1897	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1898	o.bRep = transientrep;
1730	1899	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1900	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1901	o.CreateMaterial();
1733	1902	o.SetAttributes(this, -1);
1734	1903	//parent
..	..	@@ -1741,7 +1910,7 @@
1741	1910	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1911	o.bRep = bRep;
1743	1912	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1913	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1914	o.CreateMaterial();
1746	1915	//o.overwriteThis(this, -1);
1747	1916	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1997,15 @@
1828	1997	if (obj.name == null)
1829	1998	continue; // can't be a null one
1830	1999
	2000	+ // Try perfect match first.
1831	2001	if (n.equals(obj.name))
1832	2002	{
1833	2003	theobj = obj;
1834	2004	count++;
1835	2005	}
1836	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	2009
1838	2010	if (count != 1)
1839	2011	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2465,22 @@
2293	2465	}
2294	2466	*/
2295	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2296	2477	}
2297	2478
2298	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2480	{
2300	2481	if (newWindow)
2301	2482	{
	2483	+ new Exception().printStackTrace();
2302	2484	System.exit(0);
2303	2485	if (parent != null)
2304	2486	{
..	..	@@ -2333,6 +2515,14 @@
2333	2515	{
2334	2516	editWindow.refreshContents();
2335	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2336	2526	//if (parent != null)
2337	2527	//parent.refreshEditWindow();
2338	2528	}
..	..	@@ -2412,7 +2602,8 @@
2412	2602	private static final int editSelf = 1;
2413	2603	private static final int editChild = 2;
2414	2604
2415		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2416	2607	{
2417	2608	if (level == 0)
2418	2609	{
..	..	@@ -2420,7 +2611,8 @@
2420	2611	return;
2421	2612
2422	2613	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2424	2616	{
2425	2617	selectee = (Object3D) e.nextElement();
2426	2618	}
..	..	@@ -2428,19 +2620,22 @@
2428	2620	} else
2429	2621	{
2430	2622	//super.
2431		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2432	2625	}
2433	2626	}
2434	2627
2435		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2436	2630	{
2437	2631	doSomething = 0;
2438	2632	if (level == 0)
2439	2633	{
2440		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2441	2635	}
2442	2636	if (//super.
2443		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2444	2639	{
2445	2640	doSomething = 1;
2446	2641	return true;
..	..	@@ -2450,7 +2645,7 @@
2450	2645	}
2451	2646	}
2452	2647
2453		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2454	2649	{
2455	2650	if (selection == null)
2456	2651	{
..	..	@@ -2463,7 +2658,8 @@
2463	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2659	{
2465	2660	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2467	2663	{
2468	2664	childToDrag = selectee;
2469	2665	doSomething = 2;
..	..	@@ -2475,13 +2671,15 @@
2475	2671	return retval;
2476	2672	}
2477	2673
2478		- void doEditDrag(ClickInfo info)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2479	2676	{
2480	2677	switch (doSomething)
2481	2678	{
2482	2679	case 1: // '\001'
2483	2680	//super.
2484		- doEditDrag0(info);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2485	2683	break;
2486	2684
2487	2685	case 2: // '\002'
..	..	@@ -2494,11 +2692,13 @@
2494	2692	{
2495	2693	//sel.hitSomething = childToDrag.hitSomething;
2496	2694	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2498	2697	} else
2499	2698	{
2500	2699	//super.
2501		- doEditDrag0(info);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2502	2702	}
2503	2703	}
2504	2704	break;
..	..	@@ -2516,6 +2716,9 @@
2516	2716	{
2517	2717	deselectAll();
2518	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2519	2722	ClickInfo newInfo = new ClickInfo();
2520	2723	newInfo.flags = info.flags;
2521	2724	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2811,18 @@
2608	2811	void GenNormalsS(boolean crease)
2609	2812	{
2610	2813	selection.GenNormals(crease);
	2814	+// for (int i=0; i<selection.size(); i++)
	2815	+// {
	2816	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2817	+// selectee.GenNormals(crease);
	2818	+// }
	2819	+
	2820	+ //Touch();
	2821	+ }
	2822	+
	2823	+ void GenNormalsMeshS()
	2824	+ {
	2825	+ selection.GenNormalsMesh();
2611	2826	// for (int i=0; i<selection.size(); i++)
2612	2827	// {
2613	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2963,24 @@
2748	2963	if (child == null)
2749	2964	continue;
2750	2965	child.GenNormals(crease);
	2966	+// Children().release(i);
	2967	+ }
	2968	+ blockloop = false;
	2969	+ }
	2970	+
	2971	+ void GenNormalsMesh()
	2972	+ {
	2973	+ if (blockloop)
	2974	+ return;
	2975	+
	2976	+ blockloop = true;
	2977	+ GenNormalsMesh0();
	2978	+ for (int i = 0; i < Children().Size(); i++)
	2979	+ {
	2980	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2981	+ if (child == null)
	2982	+ continue;
	2983	+ child.GenNormalsMesh();
2751	2984	// Children().release(i);
2752	2985	}
2753	2986	blockloop = false;
..	..	@@ -2905,7 +3138,8 @@
2905	3138	{
2906	3139	if (bRep != null)
2907	3140	{
2908		- bRep.GenUV();
	3141	+ bRep.GenUV(); //1);
	3142	+ //bRep.UnfoldUV();
2909	3143	Touch();
2910	3144	}
2911	3145	}
..	..	@@ -2919,11 +3153,20 @@
2919	3153	}
2920	3154	}
2921	3155
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2922	3165	void GenNormalsMINE0()
2923	3166	{
2924	3167	if (bRep != null)
2925	3168	{
2926		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3170	Touch();
2928	3171	}
2929	3172	}
..	..	@@ -2980,6 +3223,33 @@
2980	3223	blockloop = false;
2981	3224	}
2982	3225
	3226	+ void TransformChildren()
	3227	+ {
	3228	+ if (toParent != null)
	3229	+ {
	3230	+ for (int i=Size(); --i>=0;)
	3231	+ {
	3232	+ Object3D v = get(i);
	3233	+
	3234	+ if (v.toParent == null)
	3235	+ {
	3236	+ v.toParent = LA.newMatrix();
	3237	+ v.fromParent = LA.newMatrix();
	3238	+ }
	3239	+
	3240	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3241	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3242	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3243	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3244	+ }
	3245	+
	3246	+ toParent = null; // LA.matIdentity(toParent);
	3247	+ fromParent = null; // LA.matIdentity(fromParent);
	3248	+
	3249	+ Touch();
	3250	+ }
	3251	+ }
	3252	+
2983	3253	void TransformGeometry()
2984	3254	{
2985	3255	Object3D obj = this;
..	..	@@ -3201,9 +3471,11 @@
3201	3471
3202	3472	BoundaryRep sup = bRep.support;
3203	3473	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3474	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3475	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3476	+
	3477	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3478	+
3207	3479	bRep = temprep;
3208	3480	bRep.support = sup;
3209	3481	Touch();
..	..	@@ -3340,7 +3612,8 @@
3340	3612	if (blockloop)
3341	3613	return;
3342	3614
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3344	3617	live = h;
3345	3618
3346	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3634,8 @@
3361	3634	return;
3362	3635
3363	3636	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3365	3639	link2master = h;
3366	3640
3367	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3655,8 @@
3381	3655	if (blockloop)
3382	3656	return;
3383	3657
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3385	3660	hide = h;
3386	3661
3387	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3676,7 @@
3401	3676	if (blockloop)
3402	3677	return;
3403	3678
3404		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3405	3680	marked = h;
3406	3681
3407	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3686,46 @@
3411	3686	continue;
3412	3687	blockloop = true;
3413	3688	child.MarkLeaves(h);
	3689	+ blockloop = false;
	3690	+ // release(i);
	3691	+ }
	3692	+ }
	3693	+
	3694	+ void RewindLeaves(boolean h)
	3695	+ {
	3696	+ if (blockloop)
	3697	+ return;
	3698	+
	3699	+ if (bRep != null \|\| material != null) // borderline...
	3700	+ rewind = h;
	3701	+
	3702	+ for (int i = 0; i < Size(); i++)
	3703	+ {
	3704	+ Object3D child = (Object3D) get(i); // reserve(i);
	3705	+ if (child == null)
	3706	+ continue;
	3707	+ blockloop = true;
	3708	+ child.RewindLeaves(h);
	3709	+ blockloop = false;
	3710	+ // release(i);
	3711	+ }
	3712	+ }
	3713	+
	3714	+ void RandomLeaves(boolean h)
	3715	+ {
	3716	+ if (blockloop)
	3717	+ return;
	3718	+
	3719	+ if (bRep != null \|\| material != null) // borderline...
	3720	+ random = h;
	3721	+
	3722	+ for (int i = 0; i < Size(); i++)
	3723	+ {
	3724	+ Object3D child = (Object3D) get(i); // reserve(i);
	3725	+ if (child == null)
	3726	+ continue;
	3727	+ blockloop = true;
	3728	+ child.RandomLeaves(h);
3414	3729	blockloop = false;
3415	3730	// release(i);
3416	3731	}
..	..	@@ -3725,7 +4040,7 @@
3725	4040	if (child == null)
3726	4041	continue;
3727	4042
3728		- if (GrafreeD.RENDERME > 0)
	4043	+ if (Grafreed.RENDERME > 0)
3729	4044	{
3730	4045	if (child instanceof Merge)
3731	4046	((Merge)child).renderme();
..	..	@@ -3876,7 +4191,7 @@
3876	4191	if (child == null)
3877	4192	continue;
3878	4193
3879		- if (GrafreeD.RENDERME > 0)
	4194	+ if (Grafreed.RENDERME > 0)
3880	4195	{
3881	4196	if (child instanceof Merge)
3882	4197	((Merge)child).renderme();
..	..	@@ -4071,7 +4386,7 @@
4071	4386	if (child == null)
4072	4387	continue;
4073	4388
4074		- if (GrafreeD.RENDERME > 0)
	4389	+ if (Grafreed.RENDERME > 0)
4075	4390	{
4076	4391	if (child instanceof Merge)
4077	4392	((Merge)child).renderme();
..	..	@@ -4184,6 +4499,55 @@
4184	4499	{
4185	4500	blockloop = true;
4186	4501	get(i).RepairShadow();
	4502	+ blockloop = false;
	4503	+ }
	4504	+ }
	4505	+
	4506	+ void RepairSOV()
	4507	+ {
	4508	+ if (blockloop)
	4509	+ return;
	4510	+
	4511	+ String texname = this.GetPigmentTexture();
	4512	+
	4513	+ if (texname.startsWith("sov"))
	4514	+ {
	4515	+ String[] s = texname.split("/");
	4516	+
	4517	+ String[] sname = s[1].split("Color.pn");
	4518	+
	4519	+ texname = sname[0];
	4520	+
	4521	+ if (sname.length > 1)
	4522	+ {
	4523	+ texname += "Color.jpg";
	4524	+ }
	4525	+
	4526	+ this.SetPigmentTexture("sov/" + texname);
	4527	+ }
	4528	+
	4529	+ texname = this.GetBumpTexture();
	4530	+
	4531	+ if (texname.startsWith("sov"))
	4532	+ {
	4533	+ String[] s = texname.split("/");
	4534	+
	4535	+ String[] sname = s[1].split("Bump.pn");
	4536	+
	4537	+ texname = sname[0];
	4538	+
	4539	+ if (sname.length > 1)
	4540	+ {
	4541	+ texname += "Bump.jpg";
	4542	+ }
	4543	+
	4544	+ this.SetBumpTexture("sov/" + texname);
	4545	+ }
	4546	+
	4547	+ for (int i=0; i<Size(); i++)
	4548	+ {
	4549	+ blockloop = true;
	4550	+ get(i).RepairSOV();
4187	4551	blockloop = false;
4188	4552	}
4189	4553	}
..	..	@@ -4678,7 +5042,7 @@
4678	5042
4679	5043	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5044	{
4681		- if (hide)
	5045	+ if (hide \|\| dontselect)
4682	5046	return null;
4683	5047
4684	5048	if (count <= 0)
..	..	@@ -4702,9 +5066,17 @@
4702	5066	}
4703	5067	}
4704	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4705	5077	cTreePath Select(int indexcount, boolean deselect)
4706	5078	{
4707		- if (hide)
	5079	+ if (hide \|\| dontselect)
4708	5080	return null;
4709	5081
4710	5082	if (count <= 0)
..	..	@@ -4738,10 +5110,11 @@
4738	5110	if (leaf != null)
4739	5111	{
4740	5112	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4742	5115	{
4743	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4745	5118	}
4746	5119
4747	5120	return tp;
..	..	@@ -4758,6 +5131,7 @@
4758	5131
4759	5132	if (child == null)
4760	5133	continue;
	5134	+
4761	5135	if (child.HasTransparency() && child.size() != 0)
4762	5136	{
4763	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5141,10 @@
4767	5141	if (leaf != null)
4768	5142	{
4769	5143	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4771	5146	{
4772		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4773	5148	}
4774	5149
4775	5150	return tp;
..	..	@@ -5094,6 +5469,51 @@
5094	5469	blockloop = false;
5095	5470	}
5096	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5097	5517	boolean IsSelected()
5098	5518	{
5099	5519	if (parent == null)
..	..	@@ -5154,12 +5574,41 @@
5154	5574	if (fullname == null)
5155	5575	return "";
5156	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5157	5582	// System.out.println("Fullname = " + fullname);
5158	5583
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5584	+ // Does not work on Windows due to C:
	5585	+// if (fullname.name.indexOf(":") == -1)
	5586	+// return fullname.name;
	5587	+//
	5588	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5589
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5590	+ String[] split = fullname.name.split(":");
	5591	+
	5592	+ if (split.length == 0)
	5593	+ {
	5594	+ return fullname.pigment = "";
	5595	+ }
	5596	+
	5597	+ if (split.length <= 2)
	5598	+ {
	5599	+ if (fullname.name.endsWith(":"))
	5600	+ {
	5601	+ // Windows
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5603	+ }
	5604	+
	5605	+ return fullname.pigment = split[0];
	5606	+ }
	5607	+
	5608	+ // Windows
	5609	+ assert(split.length == 4);
	5610	+
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5163	5612	}
5164	5613
5165	5614	static String GetBump(cTexture fullname)
..	..	@@ -5167,11 +5616,44 @@
5167	5616	if (fullname == null)
5168	5617	return "";
5169	5618
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
	5623	+
5170	5624	// 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());
	5625	+ // Does not work on Windows due to C:
	5626	+// if (fullname.name.indexOf(":") == -1)
	5627	+// return "";
	5628	+//
	5629	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5630	+ String[] split = fullname.name.split(":");
	5631	+
	5632	+ if (split.length == 0)
	5633	+ {
	5634	+ return fullname.bump = "";
	5635	+ }
	5636	+
	5637	+ if (split.length == 1)
	5638	+ {
	5639	+ return fullname.bump = "";
	5640	+ }
	5641	+
	5642	+ if (split.length == 2)
	5643	+ {
	5644	+ if (fullname.name.endsWith(":"))
	5645	+ {
	5646	+ // Windows
	5647	+ return fullname.bump = "";
	5648	+ }
	5649	+
	5650	+ return fullname.bump = split[1];
	5651	+ }
	5652	+
	5653	+ // Windows
	5654	+ assert(split.length == 4);
	5655	+
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5175	5657	}
5176	5658
5177	5659	String GetPigmentTexture()
..	..	@@ -5245,7 +5727,7 @@
5245	5727	System.out.print("; textures = " + textures);
5246	5728	System.out.println("; usedtextures = " + usedtextures);
5247	5729
5248		- if (GetTextures() == null)
	5730	+ if (GetTextures() == null) // What is that??
5249	5731	GetTextures().name = ":";
5250	5732
5251	5733	String texname = tex;
..	..	@@ -5254,6 +5736,9 @@
5254	5736	texname = "";
5255	5737
5256	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5257	5742	Touch();
5258	5743	}
5259	5744
..	..	@@ -5278,6 +5763,43 @@
5278	5763	}
5279	5764	}
5280	5765
	5766	+ UUID GetUUID()
	5767	+ {
	5768	+ if (uuid == null)
	5769	+ {
	5770	+ // Serial
	5771	+ uuid = UUID.randomUUID();
	5772	+ }
	5773	+
	5774	+ return uuid;
	5775	+ }
	5776	+
	5777	+ Object3D GetObject(UUID uid)
	5778	+ {
	5779	+ if (blockloop)
	5780	+ return null;
	5781	+
	5782	+ if (GetUUID().equals(uid))
	5783	+ return this;
	5784	+
	5785	+ int nb = Size();
	5786	+ for (int i = 0; i < nb; i++)
	5787	+ {
	5788	+ Object3D child = (Object3D) get(i);
	5789	+
	5790	+ if (child == null)
	5791	+ continue;
	5792	+
	5793	+ blockloop = true;
	5794	+ Object3D obj = child.GetObject(uid);
	5795	+ blockloop = false;
	5796	+ if (obj != null)
	5797	+ return obj;
	5798	+ }
	5799	+
	5800	+ return null;
	5801	+ }
	5802	+
5281	5803	void SetBumpTexture(String tex)
5282	5804	{
5283	5805	if (GetTextures() == null)
..	..	@@ -5289,6 +5811,8 @@
5289	5811	texname = "";
5290	5812
5291	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5814	+
	5815	+ GetTextures().bump = null;
5292	5816
5293	5817	Touch();
5294	5818	}
..	..	@@ -5314,6 +5838,38 @@
5314	5838	}
5315	5839	}
5316	5840
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
	5869	+ blockloop = false;
	5870	+ }
	5871	+ }
	5872	+
5317	5873	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5874	{
5319	5875	Draw(display, root, selected, blocked);
..	..	@@ -5322,12 +5878,23 @@
5322	5878	boolean NeedSupport()
5323	5879	{
5324	5880	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5881	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5882	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5883	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5884	}
5329	5885
5330	5886	static boolean DEBUG_SELECTION = false;
	5887	+
	5888	+ boolean IsLive()
	5889	+ {
	5890	+ if (live)
	5891	+ return true;
	5892	+
	5893	+ if (parent == null)
	5894	+ return false;
	5895	+
	5896	+ return parent.IsLive();
	5897	+ }
5331	5898
5332	5899	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5900	{
..	..	@@ -5339,7 +5906,7 @@
5339	5906	}
5340	5907
5341	5908	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5909	+ (hide \|\| dontselect))
5343	5910	return;
5344	5911
5345	5912	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5938,7 @@
5371	5938	return;
5372	5939	}
5373	5940
5374		- javax.media.opengl.GL gl = display.GetGL();
	5941	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5942
5376	5943	/*
5377	5944	if (touched)
..	..	@@ -5389,8 +5956,10 @@
5389	5956	if (support != null)
5390	5957	support = support;
5391	5958
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);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5394	5963
5395	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5965	{
..	..	@@ -5400,8 +5969,9 @@
5400	5969	// usecalllists &= !(parent instanceof RandomNode);
5401	5970	// usecalllists = false;
5402	5971
5403		- if (GetBRep() != null)
5404		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5405	5975	//System.out.println("draw " + this);
5406	5976	//new Exception().printStackTrace();
5407	5977
..	..	@@ -5410,10 +5980,12 @@
5410	5980	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5981
5412	5982	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5983	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5984	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5985	{
5415	5986	Globals.lighttouched = true;
5416	5987	} // all panes...
	5988	+
5417	5989	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5990	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5991	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5421,9 +5993,9 @@
5421	5993	if (!(this instanceof Composite))
5422	5994	touched = false;
5423	5995	//if (displaylist == -1 && usecalllists)
5424		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5425	5997	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5998	+ bRep.displaylist = display.GenList();
5427	5999	assert(bRep.displaylist != 0);
5428	6000	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	6001	//System.out.println("\tgen list " + list);
..	..	@@ -5432,17 +6004,19 @@
5432	6004
5433	6005	//System.out.println("\tnew list " + list);
5434	6006	//gl.glDrawBuffer(gl.GL_NONE);
5435		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5436	6008	{
5437	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6010	+ display.NewList(bRep.displaylist);
5439	6011	}
	6012	+
5440	6013	CallList(display, root, selected, blocked);
	6014	+
5441	6015	// compiled = true;
5442		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5443	6017	{
5444	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	6019	+ display.EndList();
5446	6020	}
5447	6021	//gl.glDrawBuffer(gl.GL_BACK);
5448	6022	// XXX touched = false;
..	..	@@ -5490,7 +6064,7 @@
5490	6064	if (display.DrawMode() == iCameraPane.SHADOW)
5491	6065	{
5492	6066	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6067	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	6068	{
5495	6069	//System.out.print("CULLED");
5496	6070	culled = true;
..	..	@@ -5498,7 +6072,7 @@
5498	6072	}
5499	6073	else
5500	6074	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6075	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	6076	culled = true;
5503	6077
5504	6078	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6112,8 @@
5538	6112	{
5539	6113	if (GetBRep() != null)
5540	6114	{
5541		- CameraPane.NextIndex(this, gl);
	6115	+ display.NextIndex();
	6116	+
5542	6117	// vertex color conflict : gl.glCallList(list);
5543	6118	DrawNode(display, root, selected);
5544	6119	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6154,28 @@
5579	6154	tex = GetTextures();
5580	6155	}
5581	6156
5582		- display.BindTextures(tex, texres);
	6157	+ boolean failedPigment = false;
	6158	+ boolean failedBump = false;
	6159	+
	6160	+ try
	6161	+ {
	6162	+ display.BindPigmentTexture(tex, texres);
	6163	+ }
	6164	+ catch (Exception e)
	6165	+ {
	6166	+ System.err.println("FAILED: " + this);
	6167	+ failedPigment = true;
	6168	+ }
	6169	+
	6170	+ try
	6171	+ {
	6172	+ display.BindBumpTexture(tex, texres);
	6173	+ }
	6174	+ catch (Exception e)
	6175	+ {
	6176	+ //System.err.println("FAILED: " + this);
	6177	+ failedBump = true;
	6178	+ }
5583	6179
5584	6180	if (!compiled)
5585	6181	{
..	..	@@ -5595,13 +6191,17 @@
5595	6191
5596	6192	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6193	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6194	+ display.CallList(bRep.displaylist);
5599	6195	// june 2013 drawSelf(display, root, selected);
5600	6196	}
5601	6197	}
5602	6198	}
5603	6199
5604		- display.ReleaseTextures(tex);
	6200	+ if (!failedBump)
	6201	+ display.ReleaseBumpTexture(tex);
	6202	+
	6203	+ if (!failedPigment)
	6204	+ display.ReleasePigmentTexture(tex);
5605	6205
5606	6206	display.PopMaterial(this, selected);
5607	6207	}
..	..	@@ -5730,6 +6330,9 @@
5730	6330
5731	6331	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6332	{
	6333	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6334	+ return;
	6335	+
5733	6336	if (hide)
5734	6337	return;
5735	6338	// shadow optimisation
..	..	@@ -5855,6 +6458,9 @@
5855	6458	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6459	return; // no shadow for transparent objects
5857	6460
	6461	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6462	+ return;
	6463	+
5858	6464	if (hide)
5859	6465	return;
5860	6466
..	..	@@ -5895,9 +6501,10 @@
5895	6501	return;
5896	6502	}
5897	6503
	6504	+ //bRep.GenUV(1/material.diffuseness);
5898	6505	// bRep.lock = true;
5899	6506
5900		- javax.media.opengl.GL gl = display.GetGL();
	6507	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6508
5902	6509	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6510	{
..	..	@@ -5914,23 +6521,7 @@
5914	6521
5915	6522	bRep.getMinMax(min, max, 100);
5916	6523
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();
	6524	+ display.DrawBox(min, max);
5934	6525
5935	6526	return;
5936	6527	}
..	..	@@ -5984,178 +6575,19 @@
5984	6575	new Exception().printStackTrace();
5985	6576	return;
5986	6577	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6578	+
	6579	+ if (dontselect)
5990	6580	{
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;
	6581	+ //bRep.GenerateNormalsMINE();
6122	6582	}
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		- }
	6583	+
	6584	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6585	} else // catch (Error e)
6154	6586	{
6155	6587	// TRIANGLE ARRAY
6156	6588	if (IsOpaque()) // Static())
6157	6589	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6590	+ display.StartTriangles();
6159	6591	int facecount = bRep.FaceCount();
6160	6592	for (int i = 0; i < facecount; i++)
6161	6593	{
..	..	@@ -6220,7 +6652,7 @@
6220	6652
6221	6653	display.DrawFace(this, p, q, r, face);
6222	6654	}
6223		- gl.glEnd();
	6655	+ display.EndTriangles();
6224	6656	}
6225	6657	else
6226	6658	{
..	..	@@ -6249,8 +6681,8 @@
6249	6681	//System.out.println("SORT");
6250	6682
6251	6683	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6684	+
	6685	+ display.StartTriangles();
6254	6686	for (int i = 0; i < facecount; i++)
6255	6687	{
6256	6688	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6696,12 @@
6264	6696
6265	6697	display.DrawFace(this, p, q, r, face);
6266	6698	}
6267		- gl.glEnd();
	6699	+ display.EndTriangles();
6268	6700	}
6269	6701
6270	6702	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6703	{
	6704	+ /*
6272	6705	gl.glDisable(gl.GL_LIGHTING);
6273	6706	float[] colorV = new float[3];
6274	6707
..	..	@@ -6347,6 +6780,7 @@
6347	6780	// gl.glEnd();
6348	6781	}
6349	6782	}
	6783	+ */
6350	6784	}
6351	6785	}
6352	6786
..	..	@@ -6405,22 +6839,6 @@
6405	6839	void Print(Vertex v)
6406	6840	{
6407	6841	//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	6842	}
6425	6843
6426	6844	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6946,20 +7364,23 @@
6946	7364	}
6947	7365	}
6948	7366
6949		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
6950	7371	{
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;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
6954	7375	if (toscreen == null)
6955	7376	{
6956		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6957	7378	}
6958	7379	cVector vec = in;
6959	7380	LA.xformPos(in, toscreen, in);
6960	7381	//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();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6963	7384	outPt.x = hc + (int) vec.x;
6964	7385	outPt.y = vc - (int) vec.y;
6965	7386	outRec.x = outPt.x - 3;
..	..	@@ -6967,15 +7388,18 @@
6967	7388	outRec.width = outRec.height = 6;
6968	7389	}
6969	7390
6970		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
6971	7393	{
6972	7394	Point pt = new Point(0, 0);
6973	7395	Rectangle rec = new Rectangle();
6974		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
6975	7398	return rec;
6976	7399	}
6977	7400
6978		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
6979	7403	{
6980	7404	if (level == 0)
6981	7405	{
..	..	@@ -6984,16 +7408,19 @@
6984	7408	{
6985	7409	cVector origin = new cVector();
6986	7410	//LA.xformPos(origin, toParent, origin);
6987		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6988	7415	Rectangle boundary = new Rectangle();
6989	7416	boundary.x = spot.x - 30;
6990	7417	boundary.y = spot.y - 30;
6991	7418	boundary.width = spot.width + 60;
6992	7419	boundary.height = spot.height + 60;
6993		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.white);
6994	7421	int spotw = spot.x + spot.width;
6995	7422	int spoth = spot.y + spot.height;
6996		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6997	7424	// if (CameraPane.Xmin > spot.x)
6998	7425	// {
6999	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -7010,11 +7437,33 @@
7010	7437	// {
7011	7438	// CameraPane.Ymax = spoth;
7012	7439	// }
7013		- spot.translate(32, 32);
	7440	+// if (CameraPane.Xmin > spot.x)
	7441	+// {
	7442	+// CameraPane.Xmin = spot.x;
	7443	+// }
	7444	+// if (CameraPane.Xmax < spotw)
	7445	+// {
	7446	+// CameraPane.Xmax = spotw;
	7447	+// }
	7448	+// if (CameraPane.Ymin > spot.y)
	7449	+// {
	7450	+// CameraPane.Ymin = spot.y;
	7451	+// }
	7452	+// if (CameraPane.Ymax < spoth)
	7453	+// {
	7454	+// CameraPane.Ymax = spoth;
	7455	+// }
	7456	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7457	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
7014	7463	spotw = spot.x + spot.width;
7015	7464	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7467	// if (CameraPane.Xmin > spot.x)
7019	7468	// {
7020	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,29 +7480,9 @@
7031	7480	// {
7032	7481	// CameraPane.Ymax = spoth;
7033	7482	// }
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);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7057	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7487	// if (CameraPane.Xmin > boundary.x)
7059	7488	// {
..	..	@@ -7075,7 +7504,8 @@
7075	7504	}
7076	7505	}
7077	7506
7078		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
7079	7509	{
7080	7510	if (level == 0)
7081	7511	{
..	..	@@ -7084,10 +7514,10 @@
7084	7514
7085	7515	boolean retval = false;
7086	7516
7087		- startX = info.x;
7088		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
7089	7519
7090		- hitSomething = 0;
	7520	+ hitSomething = -1;
7091	7521	cVector origin = new cVector();
7092	7522	//LA.xformPos(origin, toParent, origin);
7093	7523	Rectangle spot = new Rectangle();
..	..	@@ -7095,22 +7525,53 @@
7095	7525	{
7096	7526	centerPt = new Point(0, 0);
7097	7527	}
7098		- calcHotSpot(origin, info, centerPt, spot);
7099		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
7100	7531	{
7101	7532	hitSomething = hitCenter;
7102	7533	retval = true;
7103	7534	}
7104	7535	spot.translate(32, 0);
7105		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
7106	7537	{
7107	7538	hitSomething = hitRotate;
7108	7539	retval = true;
7109	7540	}
7110	7541	spot.translate(0, 32);
7111		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
7112	7545	{
7113	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
7114	7575	retval = true;
7115	7576	}
7116	7577
..	..	@@ -7120,7 +7581,7 @@
7120	7581	}
7121	7582
7122	7583	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7585	//System.out.println("modified = " + modified);
7125	7586	//new Exception().printStackTrace();
7126	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7609,8 @@
7148	7609	return true;
7149	7610	}
7150	7611
7151		- void doEditDrag0(ClickInfo info)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
7152	7614	{
7153	7615	if (hitSomething == 0)
7154	7616	{
..	..	@@ -7162,7 +7624,8 @@
7162	7624
7163	7625	//System.out.println("hitSomething = " + hitSomething);
7164	7626
7165		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
	7628	+
7166	7629	cVector xlate = new cVector();
7167	7630	//cVector xlate2 = new cVector();
7168	7631	switch (hitSomething)
..	..	@@ -7175,7 +7638,7 @@
7175	7638
7176	7639	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7640
7178		- if (modified)
	7641	+ if (modified \|\| opposite)
7179	7642	{
7180	7643	//assert(false);
7181	7644	/*
..	..	@@ -7195,8 +7658,8 @@
7195	7658	toParent[3][i] = xlate.get(i);
7196	7659	LA.matInvert(toParent, fromParent);
7197	7660	*/
7198		- cVector delta = LA.newVector(0, 0, startY - info.y);
7199		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7200	7663
7201	7664	LA.matCopy(startMat, toParent);
7202	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7205,7 +7668,7 @@
7205	7668	} else
7206	7669	{
7207	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7208		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7209	7672	cVector away = new cVector();
7210	7673	//cVector right2 = new cVector();
7211	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7222,19 +7685,19 @@
7222	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7686	// if (!CameraPane.LOCALTRANSFORM)
7224	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7226	7689	// if (!CameraPane.LOCALTRANSFORM)
7227	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7691	//LA.vecCross(up, cVector.Z, right2);
7229	7692
7230		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7231	7694
7232	7695	//System.out.println("DELTA0 = " + delta);
7233	7696	//System.out.println("AWAY = " + info.camera.away);
7234	7697	//System.out.println("UP = " + info.camera.up);
7235	7698	if (away.z > 0)
7236	7699	{
7237		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7238	7701	{
7239	7702	delta.x = -delta.x;
7240	7703	} else
..	..	@@ -7249,7 +7712,7 @@
7249	7712	//System.out.println("DELTA1 = " + delta);
7250	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7251	7714	//System.out.println("DELTA2 = " + delta);
7252		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7253	7716	LA.matCopy(startMat, toParent);
7254	7717	//System.out.println("DELTA3 = " + delta);
7255	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7259,8 +7722,8 @@
7259	7722	break;
7260	7723
7261	7724	case hitRotate: // rotate
7262		- int dx = info.x - centerPt.x;
7263		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7264	7727	double angle = (double) Math.atan2(dx, dy);
7265	7728	angle = -(1.570796 - angle);
7266	7729
..	..	@@ -7269,6 +7732,7 @@
7269	7732
7270	7733	if (modified)
7271	7734	{
	7735	+ // Rotate 90 degrees
7272	7736	angle /= (Math.PI / 4);
7273	7737	angle = Math.floor(angle + 0.5);
7274	7738	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7746,7 @@
7282	7746	}
7283	7747	/**/
7284	7748
7285		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7286	7750	{
7287	7751	case 1: // '\001'
7288	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7309,26 +7773,30 @@
7309	7773	break;
7310	7774
7311	7775	case hitScale: // scale
7312		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7777	+ double sign = 1;
	7778	+ if (hScale < 0)
	7779	+ {
	7780	+ sign = -1;
	7781	+ }
	7782	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7783	if (hScale < 0.01)
7314	7784	{
7315		- hScale = 0.01;
	7785	+ //hScale = 0.01;
7316	7786	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
	7787	+
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7789	+ sign = 1;
	7790	+ if (vScale < 0)
7319	7791	{
7320		- hScale = 0.01;
	7792	+ sign = -1;
7321	7793	}
7322		- double vScale = (double) (info.y - centerPt.y) / 32;
	7794	+ vScale = signMath.pow(signvScale, scale * 50);
7323	7795	if (vScale < 0.01)
7324	7796	{
7325		- vScale = 0.01;
	7797	+ //vScale = 0.01;
7326	7798	}
7327		- vScale = Math.pow(vScale, scale * 50);
7328		- if (vScale < 0.01)
7329		- {
7330		- vScale = 0.01;
7331		- }
	7799	+
7332	7800	LA.matCopy(startMat, toParent);
7333	7801	/**/
7334	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7338,39 +7806,56 @@
7338	7806	}
7339	7807	/**/
7340	7808
7341		- switch (info.pane.RenderCamera().viewCode)
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7810	+
	7811	+ if (totalScale < 0.01)
	7812	+ {
	7813	+ totalScale = 0.01;
	7814	+ }
	7815	+
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7342	7817	{
7343	7818	case 3: // '\001'
7344		- if (modified)
	7819	+ if (modified \|\| opposite)
7345	7820	{
	7821	+ if (modified && opposite)
	7822	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7823	+ else
7346	7824	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7825	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7826	} // vScale, 1);
7349	7827	else
7350	7828	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7829	+ // EXCEPTION!
	7830	+ LA.matScale(toParent, 1, totalScale, totalScale);
7352	7831	} // vScale, 1);
7353	7832	break;
7354	7833
7355	7834	case 2: // '\002'
7356		- if (modified)
	7835	+ if (modified \|\| opposite)
7357	7836	{
7358		- //LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7837	+ if (modified && opposite)
	7838	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7839	+ else
	7840	+ //LA.matScale(toParent, hScale, 1, vScale);
	7841	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7842	} else
7361	7843	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7844	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7845	}
7364	7846	break;
7365	7847
7366	7848	case 1: // '\003'
7367		- if (modified)
	7849	+ if (modified \|\| opposite)
7368	7850	{
7369		- //LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7851	+ if (modified && opposite)
	7852	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7853	+ else
	7854	+ //LA.matScale(toParent, hScale, vScale, 1);
	7855	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7856	} else
7372	7857	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7858	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7859	}
7375	7860	break;
7376	7861	}
..	..	@@ -7404,7 +7889,7 @@
7404	7889	} // NEW ...
7405	7890
7406	7891
7407		- info.pane.repaint();
	7892	+ clickInfo.pane.repaint();
7408	7893	}
7409	7894
7410	7895	boolean overflow = false;
..	..	@@ -7503,14 +7988,22 @@
7503	7988	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7989	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7990	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7991	+
	7992	+ String objname;
	7993	+
7506	7994	if (false) //parent != null)
7507	7995	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7996	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7997	} else
7510	7998	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7999	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	8000	} // + super.toString();
7513	8001	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8002	+
	8003	+ if (!Globals.ADVANCED)
	8004	+ return objname;
	8005	+
	8006	+ return objname + " " + System.identityHashCode(this);
7514	8007	}
7515	8008
7516	8009	public int hashCode()
..	..	@@ -7566,6 +8059,7 @@
7566	8059	objectUI.closeUI();
7567	8060	if (editWindow != null)
7568	8061	{
	8062	+ editWindow.ctrlPanel.FlushUI();
7569	8063	editWindow.refreshContents();
7570	8064	} // ? new
7571	8065	objectUI = null;
..	..	@@ -7574,6 +8068,10 @@
7574	8068	{
7575	8069	editWindow = null;
7576	8070	} // ?
	8071	+ }
	8072	+ else
	8073	+ {
	8074	+ //editWindow.closeUI();
7577	8075	}
7578	8076	}
7579	8077
..	..	@@ -7586,7 +8084,7 @@
7586	8084	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	8085
7588	8086	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	8087	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	8088
7591	8089	double[][] toParent; // dynamic matrix
7592	8090	double[][] fromParent;
..	..	@@ -7701,7 +8199,7 @@
7701	8199	{
7702	8200	assert(bRep != null);
7703	8201	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8202	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8203	}
7706	8204	else
7707	8205	{
..	..	@@ -7732,6 +8230,10 @@
7732	8230	}
7733	8231
7734	8232	transient ObjEditor editWindow;
	8233	+ transient ObjEditor manipWindow;
	8234	+
	8235	+ transient boolean pinned;
	8236	+
7735	8237	transient ObjectUI objectUI;
7736	8238	public static int povDepth = 0;
7737	8239	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8252,9 @@
7750	8252	private static cVector edge2 = new cVector();
7751	8253	//private static cVector norm = new cVector();
7752	8254	/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;
	8255	+ static final int hitCenter = 1;
	8256	+ static final int hitScale = 2;
	8257	+ static final int hitRotate = 3;
7756	8258	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8259	/transient/ private Point centerPt;
7758	8260	/transient/ private int startX;