~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,12 +14,27 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
22	38	ScriptNode scriptnode;
23	39
24	40	void InitOthers()
..	..	@@ -99,64 +115,178 @@
99	115
100	116	// transient boolean reduced; // for morph reduction
101	117
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	120
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
107	123
108		-void SaveSupports()
109		-{
110		- if (blockloop)
111		- return;
112		-
113		- transientsupport = support;
114		- transientlink2master = link2master;
115		-
116		- support = null;
117		- link2master = false;
118		-
119		- if (bRep != null)
	124	+ void SaveSupports()
120	125	{
121		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
122	149	}
123		-
124		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
125	152	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
129	261	blockloop = true;
130		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
131	270	blockloop = false;
132	271	}
133		-}
134	272
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
139		-
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
	273	+ void RestoreBigData(Object3D o)
146	274	{
147		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
148	289	}
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155		- blockloop = true;
156		- child.RestoreSupports();
157		- blockloop = false;
158		- }
159		-}
160	290
161	291	// MOCAP SUPPORT
162	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +429,8 @@
299	429	}
300	430
301	431	boolean live = false;
	432	+ transient boolean keepdontselect;
	433	+ boolean dontselect = false;
302	434	boolean hide = false;
303	435	boolean link2master = false; // performs reset support/master at each frame
304	436	boolean marked = false; // animation node
..	..	@@ -480,12 +612,14 @@
480	612	toParent = LA.newMatrix();
481	613	fromParent = LA.newMatrix();
482	614	}
	615	+
483	616	if (toParentMarked == null)
484	617	{
485	618	if (maxcount != 1)
486	619	{
487	620	new Exception().printStackTrace();
488	621	}
	622	+
489	623	toParentMarked = LA.newMatrix();
490	624	fromParentMarked = LA.newMatrix();
491	625	}
..	..	@@ -773,7 +907,7 @@
773	907	if (step == 0)
774	908	step = 1;
775	909	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
777	911	// if (acceleration == 0)
778	912	// acceleration = 10;
779	913	if (delay == 0) // serial
..	..	@@ -796,7 +930,7 @@
796	930
797	931	if (marked && Globals.isLIVE() && live &&
798	932	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	934	currentframe != Globals.framecount)
801	935	{
802	936	currentframe = Globals.framecount;
..	..	@@ -808,7 +942,8 @@
808	942
809	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	944
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
812	947	{
813	948	countdown = 1;
814	949	delay = speedup?8:1;
..	..	@@ -880,6 +1015,7 @@
880	1015	if (material == null \|\| material.multiply)
881	1016	return true;
882	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1019	return material.opacity > 0.99;
884	1020	}
885	1021
..	..	@@ -911,6 +1047,11 @@
911	1047	fromParent = null; // LA.newMatrix();
912	1048	bRep = null; // new BoundaryRep();
913	1049
	1050	+ if (oname != null && oname.equals("LeftHand"))
	1051	+ {
	1052	+ name = oname;
	1053	+ }
	1054	+
914	1055	/*
915	1056	float hue = (float)Math.random();
916	1057	Color col;
..	..	@@ -953,7 +1094,7 @@
953	1094
954	1095	public Object clone()
955	1096	{
956		- return GrafreeD.clone(this);
	1097	+ return Grafreed.clone(this);
957	1098	}
958	1099
959	1100	Object3D copyExpand()
..	..	@@ -1275,6 +1416,7 @@
1275	1416	toParent = LA.newMatrix();
1276	1417	fromParent = LA.newMatrix();
1277	1418	}
	1419	+
1278	1420	LA.matCopy(other.toParent, toParent);
1279	1421	LA.matCopy(other.fromParent, fromParent);
1280	1422
..	..	@@ -1469,7 +1611,7 @@
1469	1611	BoundaryRep.SEUIL = other.material.cameralight;
1470	1612
1471	1613	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1614	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1615	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1616	}
1475	1617
..	..	@@ -1728,7 +1870,7 @@
1728	1870	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1871	o.bRep = transientrep;
1730	1872	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1873	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1874	o.CreateMaterial();
1733	1875	o.SetAttributes(this, -1);
1734	1876	//parent
..	..	@@ -1741,7 +1883,7 @@
1741	1883	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1884	o.bRep = bRep;
1743	1885	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1886	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1887	o.CreateMaterial();
1746	1888	//o.overwriteThis(this, -1);
1747	1889	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1970,15 @@
1828	1970	if (obj.name == null)
1829	1971	continue; // can't be a null one
1830	1972
	1973	+ // Try perfect match first.
1831	1974	if (n.equals(obj.name))
1832	1975	{
1833	1976	theobj = obj;
1834	1977	count++;
1835	1978	}
1836	1979	}
	1980	+
	1981	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1982
1838	1983	if (count != 1)
1839	1984	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2438,17 @@
2293	2438	}
2294	2439	*/
2295	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2296	2445	}
2297	2446
2298	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2448	{
2300	2449	if (newWindow)
2301	2450	{
	2451	+ new Exception().printStackTrace();
2302	2452	System.exit(0);
2303	2453	if (parent != null)
2304	2454	{
..	..	@@ -2333,6 +2483,14 @@
2333	2483	{
2334	2484	editWindow.refreshContents();
2335	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2336	2494	//if (parent != null)
2337	2495	//parent.refreshEditWindow();
2338	2496	}
..	..	@@ -2412,7 +2570,8 @@
2412	2570	private static final int editSelf = 1;
2413	2571	private static final int editChild = 2;
2414	2572
2415		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2416	2575	{
2417	2576	if (level == 0)
2418	2577	{
..	..	@@ -2420,7 +2579,8 @@
2420	2579	return;
2421	2580
2422	2581	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2424	2584	{
2425	2585	selectee = (Object3D) e.nextElement();
2426	2586	}
..	..	@@ -2428,19 +2588,22 @@
2428	2588	} else
2429	2589	{
2430	2590	//super.
2431		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2432	2593	}
2433	2594	}
2434	2595
2435		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2436	2598	{
2437	2599	doSomething = 0;
2438	2600	if (level == 0)
2439	2601	{
2440		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2441	2603	}
2442	2604	if (//super.
2443		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2444	2607	{
2445	2608	doSomething = 1;
2446	2609	return true;
..	..	@@ -2450,7 +2613,7 @@
2450	2613	}
2451	2614	}
2452	2615
2453		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2454	2617	{
2455	2618	if (selection == null)
2456	2619	{
..	..	@@ -2463,7 +2626,8 @@
2463	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2627	{
2465	2628	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2467	2631	{
2468	2632	childToDrag = selectee;
2469	2633	doSomething = 2;
..	..	@@ -2475,13 +2639,15 @@
2475	2639	return retval;
2476	2640	}
2477	2641
2478		- void doEditDrag(ClickInfo info)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2479	2644	{
2480	2645	switch (doSomething)
2481	2646	{
2482	2647	case 1: // '\001'
2483	2648	//super.
2484		- doEditDrag0(info);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2485	2651	break;
2486	2652
2487	2653	case 2: // '\002'
..	..	@@ -2494,11 +2660,13 @@
2494	2660	{
2495	2661	//sel.hitSomething = childToDrag.hitSomething;
2496	2662	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2498	2665	} else
2499	2666	{
2500	2667	//super.
2501		- doEditDrag0(info);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2502	2670	}
2503	2671	}
2504	2672	break;
..	..	@@ -2516,6 +2684,9 @@
2516	2684	{
2517	2685	deselectAll();
2518	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2519	2690	ClickInfo newInfo = new ClickInfo();
2520	2691	newInfo.flags = info.flags;
2521	2692	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2779,18 @@
2608	2779	void GenNormalsS(boolean crease)
2609	2780	{
2610	2781	selection.GenNormals(crease);
	2782	+// for (int i=0; i<selection.size(); i++)
	2783	+// {
	2784	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2785	+// selectee.GenNormals(crease);
	2786	+// }
	2787	+
	2788	+ //Touch();
	2789	+ }
	2790	+
	2791	+ void GenNormalsMeshS()
	2792	+ {
	2793	+ selection.GenNormalsMesh();
2611	2794	// for (int i=0; i<selection.size(); i++)
2612	2795	// {
2613	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2931,24 @@
2748	2931	if (child == null)
2749	2932	continue;
2750	2933	child.GenNormals(crease);
	2934	+// Children().release(i);
	2935	+ }
	2936	+ blockloop = false;
	2937	+ }
	2938	+
	2939	+ void GenNormalsMesh()
	2940	+ {
	2941	+ if (blockloop)
	2942	+ return;
	2943	+
	2944	+ blockloop = true;
	2945	+ GenNormalsMesh0();
	2946	+ for (int i = 0; i < Children().Size(); i++)
	2947	+ {
	2948	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2949	+ if (child == null)
	2950	+ continue;
	2951	+ child.GenNormalsMesh();
2751	2952	// Children().release(i);
2752	2953	}
2753	2954	blockloop = false;
..	..	@@ -2905,7 +3106,8 @@
2905	3106	{
2906	3107	if (bRep != null)
2907	3108	{
2908		- bRep.GenUV();
	3109	+ bRep.GenUV(); //1);
	3110	+ //bRep.UnfoldUV();
2909	3111	Touch();
2910	3112	}
2911	3113	}
..	..	@@ -2919,11 +3121,20 @@
2919	3121	}
2920	3122	}
2921	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2922	3133	void GenNormalsMINE0()
2923	3134	{
2924	3135	if (bRep != null)
2925	3136	{
2926		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3138	Touch();
2928	3139	}
2929	3140	}
..	..	@@ -2980,6 +3191,33 @@
2980	3191	blockloop = false;
2981	3192	}
2982	3193
	3194	+ void TransformChildren()
	3195	+ {
	3196	+ if (toParent != null)
	3197	+ {
	3198	+ for (int i=Size(); --i>=0;)
	3199	+ {
	3200	+ Object3D v = get(i);
	3201	+
	3202	+ if (v.toParent == null)
	3203	+ {
	3204	+ v.toParent = LA.newMatrix();
	3205	+ v.fromParent = LA.newMatrix();
	3206	+ }
	3207	+
	3208	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3209	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3210	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3211	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3212	+ }
	3213	+
	3214	+ toParent = null; // LA.matIdentity(toParent);
	3215	+ fromParent = null; // LA.matIdentity(fromParent);
	3216	+
	3217	+ Touch();
	3218	+ }
	3219	+ }
	3220	+
2983	3221	void TransformGeometry()
2984	3222	{
2985	3223	Object3D obj = this;
..	..	@@ -3201,9 +3439,11 @@
3201	3439
3202	3440	BoundaryRep sup = bRep.support;
3203	3441	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3442	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3443	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3444	+
	3445	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3446	+
3207	3447	bRep = temprep;
3208	3448	bRep.support = sup;
3209	3449	Touch();
..	..	@@ -3340,7 +3580,8 @@
3340	3580	if (blockloop)
3341	3581	return;
3342	3582
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3344	3585	live = h;
3345	3586
3346	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3602,8 @@
3361	3602	return;
3362	3603
3363	3604	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3365	3607	link2master = h;
3366	3608
3367	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3623,8 @@
3381	3623	if (blockloop)
3382	3624	return;
3383	3625
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3385	3628	hide = h;
3386	3629
3387	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3644,7 @@
3401	3644	if (blockloop)
3402	3645	return;
3403	3646
3404		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3405	3648	marked = h;
3406	3649
3407	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3654,46 @@
3411	3654	continue;
3412	3655	blockloop = true;
3413	3656	child.MarkLeaves(h);
	3657	+ blockloop = false;
	3658	+ // release(i);
	3659	+ }
	3660	+ }
	3661	+
	3662	+ void RewindLeaves(boolean h)
	3663	+ {
	3664	+ if (blockloop)
	3665	+ return;
	3666	+
	3667	+ if (bRep != null \|\| material != null) // borderline...
	3668	+ rewind = h;
	3669	+
	3670	+ for (int i = 0; i < Size(); i++)
	3671	+ {
	3672	+ Object3D child = (Object3D) get(i); // reserve(i);
	3673	+ if (child == null)
	3674	+ continue;
	3675	+ blockloop = true;
	3676	+ child.RewindLeaves(h);
	3677	+ blockloop = false;
	3678	+ // release(i);
	3679	+ }
	3680	+ }
	3681	+
	3682	+ void RandomLeaves(boolean h)
	3683	+ {
	3684	+ if (blockloop)
	3685	+ return;
	3686	+
	3687	+ if (bRep != null \|\| material != null) // borderline...
	3688	+ random = h;
	3689	+
	3690	+ for (int i = 0; i < Size(); i++)
	3691	+ {
	3692	+ Object3D child = (Object3D) get(i); // reserve(i);
	3693	+ if (child == null)
	3694	+ continue;
	3695	+ blockloop = true;
	3696	+ child.RandomLeaves(h);
3414	3697	blockloop = false;
3415	3698	// release(i);
3416	3699	}
..	..	@@ -3725,7 +4008,7 @@
3725	4008	if (child == null)
3726	4009	continue;
3727	4010
3728		- if (GrafreeD.RENDERME > 0)
	4011	+ if (Grafreed.RENDERME > 0)
3729	4012	{
3730	4013	if (child instanceof Merge)
3731	4014	((Merge)child).renderme();
..	..	@@ -3876,7 +4159,7 @@
3876	4159	if (child == null)
3877	4160	continue;
3878	4161
3879		- if (GrafreeD.RENDERME > 0)
	4162	+ if (Grafreed.RENDERME > 0)
3880	4163	{
3881	4164	if (child instanceof Merge)
3882	4165	((Merge)child).renderme();
..	..	@@ -4071,7 +4354,7 @@
4071	4354	if (child == null)
4072	4355	continue;
4073	4356
4074		- if (GrafreeD.RENDERME > 0)
	4357	+ if (Grafreed.RENDERME > 0)
4075	4358	{
4076	4359	if (child instanceof Merge)
4077	4360	((Merge)child).renderme();
..	..	@@ -4184,6 +4467,55 @@
4184	4467	{
4185	4468	blockloop = true;
4186	4469	get(i).RepairShadow();
	4470	+ blockloop = false;
	4471	+ }
	4472	+ }
	4473	+
	4474	+ void RepairSOV()
	4475	+ {
	4476	+ if (blockloop)
	4477	+ return;
	4478	+
	4479	+ String texname = this.GetPigmentTexture();
	4480	+
	4481	+ if (texname.startsWith("sov"))
	4482	+ {
	4483	+ String[] s = texname.split("/");
	4484	+
	4485	+ String[] sname = s[1].split("Color.pn");
	4486	+
	4487	+ texname = sname[0];
	4488	+
	4489	+ if (sname.length > 1)
	4490	+ {
	4491	+ texname += "Color.jpg";
	4492	+ }
	4493	+
	4494	+ this.SetPigmentTexture("sov/" + texname);
	4495	+ }
	4496	+
	4497	+ texname = this.GetBumpTexture();
	4498	+
	4499	+ if (texname.startsWith("sov"))
	4500	+ {
	4501	+ String[] s = texname.split("/");
	4502	+
	4503	+ String[] sname = s[1].split("Bump.pn");
	4504	+
	4505	+ texname = sname[0];
	4506	+
	4507	+ if (sname.length > 1)
	4508	+ {
	4509	+ texname += "Bump.jpg";
	4510	+ }
	4511	+
	4512	+ this.SetBumpTexture("sov/" + texname);
	4513	+ }
	4514	+
	4515	+ for (int i=0; i<Size(); i++)
	4516	+ {
	4517	+ blockloop = true;
	4518	+ get(i).RepairSOV();
4187	4519	blockloop = false;
4188	4520	}
4189	4521	}
..	..	@@ -4678,7 +5010,7 @@
4678	5010
4679	5011	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5012	{
4681		- if (hide)
	5013	+ if (hide \|\| dontselect)
4682	5014	return null;
4683	5015
4684	5016	if (count <= 0)
..	..	@@ -4702,9 +5034,17 @@
4702	5034	}
4703	5035	}
4704	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4705	5045	cTreePath Select(int indexcount, boolean deselect)
4706	5046	{
4707		- if (hide)
	5047	+ if (hide \|\| dontselect)
4708	5048	return null;
4709	5049
4710	5050	if (count <= 0)
..	..	@@ -4738,10 +5078,11 @@
4738	5078	if (leaf != null)
4739	5079	{
4740	5080	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4742	5083	{
4743	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4745	5086	}
4746	5087
4747	5088	return tp;
..	..	@@ -4758,6 +5099,7 @@
4758	5099
4759	5100	if (child == null)
4760	5101	continue;
	5102	+
4761	5103	if (child.HasTransparency() && child.size() != 0)
4762	5104	{
4763	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5109,10 @@
4767	5109	if (leaf != null)
4768	5110	{
4769	5111	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4771	5114	{
4772		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4773	5116	}
4774	5117
4775	5118	return tp;
..	..	@@ -5094,6 +5437,51 @@
5094	5437	blockloop = false;
5095	5438	}
5096	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5097	5485	boolean IsSelected()
5098	5486	{
5099	5487	if (parent == null)
..	..	@@ -5156,10 +5544,34 @@
5156	5544
5157	5545	// System.out.println("Fullname = " + fullname);
5158	5546
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5547	+ // Does not work on Windows due to C:
	5548	+// if (fullname.name.indexOf(":") == -1)
	5549	+// return fullname.name;
	5550	+//
	5551	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5552
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5553	+ String[] split = fullname.name.split(":");
	5554	+
	5555	+ if (split.length == 0)
	5556	+ {
	5557	+ return "";
	5558	+ }
	5559	+
	5560	+ if (split.length <= 2)
	5561	+ {
	5562	+ if (fullname.name.endsWith(":"))
	5563	+ {
	5564	+ // Windows
	5565	+ return fullname.name.substring(0, fullname.name.length()-1);
	5566	+ }
	5567	+
	5568	+ return split[0];
	5569	+ }
	5570	+
	5571	+ // Windows
	5572	+ assert(split.length == 4);
	5573	+
	5574	+ return split[0] + ":" + split[1];
5163	5575	}
5164	5576
5165	5577	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5580,38 @@
5168	5580	return "";
5169	5581
5170	5582	// 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());
	5583	+ // Does not work on Windows due to C:
	5584	+// if (fullname.name.indexOf(":") == -1)
	5585	+// return "";
	5586	+//
	5587	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5588	+ String[] split = fullname.name.split(":");
	5589	+
	5590	+ if (split.length == 0)
	5591	+ {
	5592	+ return "";
	5593	+ }
	5594	+
	5595	+ if (split.length == 1)
	5596	+ {
	5597	+ return "";
	5598	+ }
	5599	+
	5600	+ if (split.length == 2)
	5601	+ {
	5602	+ if (fullname.name.endsWith(":"))
	5603	+ {
	5604	+ // Windows
	5605	+ return "";
	5606	+ }
	5607	+
	5608	+ return split[1];
	5609	+ }
	5610	+
	5611	+ // Windows
	5612	+ assert(split.length == 4);
	5613	+
	5614	+ return split[2] + ":" + split[3];
5175	5615	}
5176	5616
5177	5617	String GetPigmentTexture()
..	..	@@ -5245,7 +5685,7 @@
5245	5685	System.out.print("; textures = " + textures);
5246	5686	System.out.println("; usedtextures = " + usedtextures);
5247	5687
5248		- if (GetTextures() == null)
	5688	+ if (GetTextures() == null) // What is that??
5249	5689	GetTextures().name = ":";
5250	5690
5251	5691	String texname = tex;
..	..	@@ -5276,6 +5716,43 @@
5276	5716	child.ResetPigmentTexture();
5277	5717	blockloop = false;
5278	5718	}
	5719	+ }
	5720	+
	5721	+ UUID GetUUID()
	5722	+ {
	5723	+ if (uuid == null)
	5724	+ {
	5725	+ // Serial
	5726	+ uuid = UUID.randomUUID();
	5727	+ }
	5728	+
	5729	+ return uuid;
	5730	+ }
	5731	+
	5732	+ Object3D GetObject(UUID uid)
	5733	+ {
	5734	+ if (blockloop)
	5735	+ return null;
	5736	+
	5737	+ if (GetUUID().equals(uid))
	5738	+ return this;
	5739	+
	5740	+ int nb = Size();
	5741	+ for (int i = 0; i < nb; i++)
	5742	+ {
	5743	+ Object3D child = (Object3D) get(i);
	5744	+
	5745	+ if (child == null)
	5746	+ continue;
	5747	+
	5748	+ blockloop = true;
	5749	+ Object3D obj = child.GetObject(uid);
	5750	+ blockloop = false;
	5751	+ if (obj != null)
	5752	+ return obj;
	5753	+ }
	5754	+
	5755	+ return null;
5279	5756	}
5280	5757
5281	5758	void SetBumpTexture(String tex)
..	..	@@ -5314,6 +5791,38 @@
5314	5791	}
5315	5792	}
5316	5793
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
5317	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5827	{
5319	5828	Draw(display, root, selected, blocked);
..	..	@@ -5322,12 +5831,23 @@
5322	5831	boolean NeedSupport()
5323	5832	{
5324	5833	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5835	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5836	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5837	}
5329	5838
5330	5839	static boolean DEBUG_SELECTION = false;
	5840	+
	5841	+ boolean IsLive()
	5842	+ {
	5843	+ if (live)
	5844	+ return true;
	5845	+
	5846	+ if (parent == null)
	5847	+ return false;
	5848	+
	5849	+ return parent.IsLive();
	5850	+ }
5331	5851
5332	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5853	{
..	..	@@ -5339,7 +5859,7 @@
5339	5859	}
5340	5860
5341	5861	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5862	+ (hide \|\| dontselect))
5343	5863	return;
5344	5864
5345	5865	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5891,7 @@
5371	5891	return;
5372	5892	}
5373	5893
5374		- javax.media.opengl.GL gl = display.GetGL();
	5894	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5895
5376	5896	/*
5377	5897	if (touched)
..	..	@@ -5390,7 +5910,7 @@
5390	5910	support = support;
5391	5911
5392	5912	//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);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394	5914
5395	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5916	{
..	..	@@ -5410,10 +5930,12 @@
5410	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5931
5412	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5933	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5935	{
5415	5936	Globals.lighttouched = true;
5416	5937	} // all panes...
	5938	+
5417	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5423,7 +5945,7 @@
5423	5945	//if (displaylist == -1 && usecalllists)
5424	5946	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5947	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5948	+ bRep.displaylist = display.GenList();
5427	5949	assert(bRep.displaylist != 0);
5428	5950	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5951	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5957,16 @@
5435	5957	if (usecalllists)
5436	5958	{
5437	5959	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5960	+ display.NewList(bRep.displaylist);
5439	5961	}
	5962	+
5440	5963	CallList(display, root, selected, blocked);
	5964	+
5441	5965	// compiled = true;
5442	5966	if (usecalllists)
5443	5967	{
5444	5968	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5969	+ display.EndList();
5446	5970	}
5447	5971	//gl.glDrawBuffer(gl.GL_BACK);
5448	5972	// XXX touched = false;
..	..	@@ -5490,7 +6014,7 @@
5490	6014	if (display.DrawMode() == iCameraPane.SHADOW)
5491	6015	{
5492	6016	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6017	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	6018	{
5495	6019	//System.out.print("CULLED");
5496	6020	culled = true;
..	..	@@ -5498,7 +6022,7 @@
5498	6022	}
5499	6023	else
5500	6024	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6025	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	6026	culled = true;
5503	6027
5504	6028	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6062,8 @@
5538	6062	{
5539	6063	if (GetBRep() != null)
5540	6064	{
5541		- CameraPane.NextIndex(this, gl);
	6065	+ display.NextIndex();
	6066	+
5542	6067	// vertex color conflict : gl.glCallList(list);
5543	6068	DrawNode(display, root, selected);
5544	6069	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6104,28 @@
5579	6104	tex = GetTextures();
5580	6105	}
5581	6106
5582		- display.BindTextures(tex, texres);
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
	6109	+
	6110	+ try
	6111	+ {
	6112	+ display.BindPigmentTexture(tex, texres);
	6113	+ }
	6114	+ catch (Exception e)
	6115	+ {
	6116	+ System.err.println("FAILED: " + this);
	6117	+ failedPigment = true;
	6118	+ }
	6119	+
	6120	+ try
	6121	+ {
	6122	+ display.BindBumpTexture(tex, texres);
	6123	+ }
	6124	+ catch (Exception e)
	6125	+ {
	6126	+ //System.err.println("FAILED: " + this);
	6127	+ failedBump = true;
	6128	+ }
5583	6129
5584	6130	if (!compiled)
5585	6131	{
..	..	@@ -5595,13 +6141,17 @@
5595	6141
5596	6142	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6143	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6144	+ display.CallList(bRep.displaylist);
5599	6145	// june 2013 drawSelf(display, root, selected);
5600	6146	}
5601	6147	}
5602	6148	}
5603	6149
5604		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5605	6155
5606	6156	display.PopMaterial(this, selected);
5607	6157	}
..	..	@@ -5730,6 +6280,9 @@
5730	6280
5731	6281	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6282	{
	6283	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6284	+ return;
	6285	+
5733	6286	if (hide)
5734	6287	return;
5735	6288	// shadow optimisation
..	..	@@ -5855,6 +6408,9 @@
5855	6408	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6409	return; // no shadow for transparent objects
5857	6410
	6411	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6412	+ return;
	6413	+
5858	6414	if (hide)
5859	6415	return;
5860	6416
..	..	@@ -5895,9 +6451,10 @@
5895	6451	return;
5896	6452	}
5897	6453
	6454	+ //bRep.GenUV(1/material.diffuseness);
5898	6455	// bRep.lock = true;
5899	6456
5900		- javax.media.opengl.GL gl = display.GetGL();
	6457	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6458
5902	6459	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6460	{
..	..	@@ -5914,23 +6471,7 @@
5914	6471
5915	6472	bRep.getMinMax(min, max, 100);
5916	6473
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();
	6474	+ display.DrawBox(min, max);
5934	6475
5935	6476	return;
5936	6477	}
..	..	@@ -5984,178 +6525,19 @@
5984	6525	new Exception().printStackTrace();
5985	6526	return;
5986	6527	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6528	+
	6529	+ if (dontselect)
5990	6530	{
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;
	6531	+ //bRep.GenerateNormalsMINE();
6122	6532	}
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		- }
	6533	+
	6534	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6535	} else // catch (Error e)
6154	6536	{
6155	6537	// TRIANGLE ARRAY
6156	6538	if (IsOpaque()) // Static())
6157	6539	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6540	+ display.StartTriangles();
6159	6541	int facecount = bRep.FaceCount();
6160	6542	for (int i = 0; i < facecount; i++)
6161	6543	{
..	..	@@ -6220,7 +6602,7 @@
6220	6602
6221	6603	display.DrawFace(this, p, q, r, face);
6222	6604	}
6223		- gl.glEnd();
	6605	+ display.EndTriangles();
6224	6606	}
6225	6607	else
6226	6608	{
..	..	@@ -6249,8 +6631,8 @@
6249	6631	//System.out.println("SORT");
6250	6632
6251	6633	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6634	+
	6635	+ display.StartTriangles();
6254	6636	for (int i = 0; i < facecount; i++)
6255	6637	{
6256	6638	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6646,12 @@
6264	6646
6265	6647	display.DrawFace(this, p, q, r, face);
6266	6648	}
6267		- gl.glEnd();
	6649	+ display.EndTriangles();
6268	6650	}
6269	6651
6270	6652	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6653	{
	6654	+ /*
6272	6655	gl.glDisable(gl.GL_LIGHTING);
6273	6656	float[] colorV = new float[3];
6274	6657
..	..	@@ -6347,6 +6730,7 @@
6347	6730	// gl.glEnd();
6348	6731	}
6349	6732	}
	6733	+ */
6350	6734	}
6351	6735	}
6352	6736
..	..	@@ -6405,22 +6789,6 @@
6405	6789	void Print(Vertex v)
6406	6790	{
6407	6791	//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	6792	}
6425	6793
6426	6794	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6946,20 +7314,23 @@
6946	7314	}
6947	7315	}
6948	7316
6949		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
6950	7321	{
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;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
6954	7325	if (toscreen == null)
6955	7326	{
6956		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6957	7328	}
6958	7329	cVector vec = in;
6959	7330	LA.xformPos(in, toscreen, in);
6960	7331	//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();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6963	7334	outPt.x = hc + (int) vec.x;
6964	7335	outPt.y = vc - (int) vec.y;
6965	7336	outRec.x = outPt.x - 3;
..	..	@@ -6967,15 +7338,18 @@
6967	7338	outRec.width = outRec.height = 6;
6968	7339	}
6969	7340
6970		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6971	7343	{
6972	7344	Point pt = new Point(0, 0);
6973	7345	Rectangle rec = new Rectangle();
6974		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6975	7348	return rec;
6976	7349	}
6977	7350
6978		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
6979	7353	{
6980	7354	if (level == 0)
6981	7355	{
..	..	@@ -6984,16 +7358,19 @@
6984	7358	{
6985	7359	cVector origin = new cVector();
6986	7360	//LA.xformPos(origin, toParent, origin);
6987		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6988	7365	Rectangle boundary = new Rectangle();
6989	7366	boundary.x = spot.x - 30;
6990	7367	boundary.y = spot.y - 30;
6991	7368	boundary.width = spot.width + 60;
6992	7369	boundary.height = spot.height + 60;
6993		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
6994	7371	int spotw = spot.x + spot.width;
6995	7372	int spoth = spot.y + spot.height;
6996		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6997	7374	// if (CameraPane.Xmin > spot.x)
6998	7375	// {
6999	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -7013,8 +7390,8 @@
7013	7390	spot.translate(32, 32);
7014	7391	spotw = spot.x + spot.width;
7015	7392	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7395	// if (CameraPane.Xmin > spot.x)
7019	7396	// {
7020	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,11 +7408,12 @@
7031	7408	// {
7032	7409	// CameraPane.Ymax = spoth;
7033	7410	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7411	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7412	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7036	7413	spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
7039	7417	// if (CameraPane.Xmin > spot.x)
7040	7418	// {
7041	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,8 +7430,8 @@
7052	7430	// {
7053	7431	// CameraPane.Ymax = spoth;
7054	7432	// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7057	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7436	// if (CameraPane.Xmin > boundary.x)
7059	7437	// {
..	..	@@ -7075,7 +7453,8 @@
7075	7453	}
7076	7454	}
7077	7455
7078		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7079	7458	{
7080	7459	if (level == 0)
7081	7460	{
..	..	@@ -7084,10 +7463,10 @@
7084	7463
7085	7464	boolean retval = false;
7086	7465
7087		- startX = info.x;
7088		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7089	7468
7090		- hitSomething = 0;
	7469	+ hitSomething = -1;
7091	7470	cVector origin = new cVector();
7092	7471	//LA.xformPos(origin, toParent, origin);
7093	7472	Rectangle spot = new Rectangle();
..	..	@@ -7095,22 +7474,51 @@
7095	7474	{
7096	7475	centerPt = new Point(0, 0);
7097	7476	}
7098		- calcHotSpot(origin, info, centerPt, spot);
7099		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7100	7480	{
7101	7481	hitSomething = hitCenter;
7102	7482	retval = true;
7103	7483	}
7104	7484	spot.translate(32, 0);
7105		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7106	7486	{
7107	7487	hitSomething = hitRotate;
7108	7488	retval = true;
7109	7489	}
7110	7490	spot.translate(0, 32);
7111		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7112	7492	{
7113	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7114	7522	retval = true;
7115	7523	}
7116	7524
..	..	@@ -7120,7 +7528,7 @@
7120	7528	}
7121	7529
7122	7530	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7532	//System.out.println("modified = " + modified);
7125	7533	//new Exception().printStackTrace();
7126	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7556,8 @@
7148	7556	return true;
7149	7557	}
7150	7558
7151		- void doEditDrag0(ClickInfo info)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7152	7561	{
7153	7562	if (hitSomething == 0)
7154	7563	{
..	..	@@ -7162,7 +7571,8 @@
7162	7571
7163	7572	//System.out.println("hitSomething = " + hitSomething);
7164	7573
7165		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
	7575	+
7166	7576	cVector xlate = new cVector();
7167	7577	//cVector xlate2 = new cVector();
7168	7578	switch (hitSomething)
..	..	@@ -7175,7 +7585,7 @@
7175	7585
7176	7586	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7587
7178		- if (modified)
	7588	+ if (modified \|\| opposite)
7179	7589	{
7180	7590	//assert(false);
7181	7591	/*
..	..	@@ -7195,8 +7605,8 @@
7195	7605	toParent[3][i] = xlate.get(i);
7196	7606	LA.matInvert(toParent, fromParent);
7197	7607	*/
7198		- cVector delta = LA.newVector(0, 0, startY - info.y);
7199		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7200	7610
7201	7611	LA.matCopy(startMat, toParent);
7202	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7205,7 +7615,7 @@
7205	7615	} else
7206	7616	{
7207	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7208		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7209	7619	cVector away = new cVector();
7210	7620	//cVector right2 = new cVector();
7211	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7222,19 +7632,19 @@
7222	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7633	// if (!CameraPane.LOCALTRANSFORM)
7224	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7226	7636	// if (!CameraPane.LOCALTRANSFORM)
7227	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7638	//LA.vecCross(up, cVector.Z, right2);
7229	7639
7230		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7231	7641
7232	7642	//System.out.println("DELTA0 = " + delta);
7233	7643	//System.out.println("AWAY = " + info.camera.away);
7234	7644	//System.out.println("UP = " + info.camera.up);
7235	7645	if (away.z > 0)
7236	7646	{
7237		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7238	7648	{
7239	7649	delta.x = -delta.x;
7240	7650	} else
..	..	@@ -7249,7 +7659,7 @@
7249	7659	//System.out.println("DELTA1 = " + delta);
7250	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7251	7661	//System.out.println("DELTA2 = " + delta);
7252		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7253	7663	LA.matCopy(startMat, toParent);
7254	7664	//System.out.println("DELTA3 = " + delta);
7255	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7259,8 +7669,8 @@
7259	7669	break;
7260	7670
7261	7671	case hitRotate: // rotate
7262		- int dx = info.x - centerPt.x;
7263		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7264	7674	double angle = (double) Math.atan2(dx, dy);
7265	7675	angle = -(1.570796 - angle);
7266	7676
..	..	@@ -7269,6 +7679,7 @@
7269	7679
7270	7680	if (modified)
7271	7681	{
	7682	+ // Rotate 90 degrees
7272	7683	angle /= (Math.PI / 4);
7273	7684	angle = Math.floor(angle + 0.5);
7274	7685	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7693,7 @@
7282	7693	}
7283	7694	/**/
7284	7695
7285		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7286	7697	{
7287	7698	case 1: // '\001'
7288	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7309,26 +7720,30 @@
7309	7720	break;
7310	7721
7311	7722	case hitScale: // scale
7312		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7724	+ double sign = 1;
	7725	+ if (hScale < 0)
	7726	+ {
	7727	+ sign = -1;
	7728	+ }
	7729	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7730	if (hScale < 0.01)
7314	7731	{
7315		- hScale = 0.01;
	7732	+ //hScale = 0.01;
7316	7733	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
	7734	+
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7736	+ sign = 1;
	7737	+ if (vScale < 0)
7319	7738	{
7320		- hScale = 0.01;
	7739	+ sign = -1;
7321	7740	}
7322		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ vScale = signMath.pow(signvScale, scale * 50);
7323	7742	if (vScale < 0.01)
7324	7743	{
7325		- vScale = 0.01;
	7744	+ //vScale = 0.01;
7326	7745	}
7327		- vScale = Math.pow(vScale, scale * 50);
7328		- if (vScale < 0.01)
7329		- {
7330		- vScale = 0.01;
7331		- }
	7746	+
7332	7747	LA.matCopy(startMat, toParent);
7333	7748	/**/
7334	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7338,39 +7753,47 @@
7338	7753	}
7339	7754	/**/
7340	7755
7341		- switch (info.pane.RenderCamera().viewCode)
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7757	+
	7758	+ if (totalScale < 0.01)
	7759	+ {
	7760	+ totalScale = 0.01;
	7761	+ }
	7762	+
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7342	7764	{
7343	7765	case 3: // '\001'
7344		- if (modified)
	7766	+ if (modified \|\| opposite)
7345	7767	{
7346	7768	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7769	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7770	} // vScale, 1);
7349	7771	else
7350	7772	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7773	+ // EXCEPTION!
	7774	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7775	} // vScale, 1);
7353	7776	break;
7354	7777
7355	7778	case 2: // '\002'
7356		- if (modified)
	7779	+ if (modified \|\| opposite)
7357	7780	{
7358	7781	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7782	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7783	} else
7361	7784	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7785	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7786	}
7364	7787	break;
7365	7788
7366	7789	case 1: // '\003'
7367		- if (modified)
	7790	+ if (modified \|\| opposite)
7368	7791	{
7369	7792	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7793	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7794	} else
7372	7795	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7796	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7797	}
7375	7798	break;
7376	7799	}
..	..	@@ -7404,7 +7827,7 @@
7404	7827	} // NEW ...
7405	7828
7406	7829
7407		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7408	7831	}
7409	7832
7410	7833	boolean overflow = false;
..	..	@@ -7503,14 +7926,22 @@
7503	7926	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7927	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7928	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7929	+
	7930	+ String objname;
	7931	+
7506	7932	if (false) //parent != null)
7507	7933	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7934	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7935	} else
7510	7936	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7937	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	7938	} // + super.toString();
7513	7939	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7940	+
	7941	+ if (!Globals.ADVANCED)
	7942	+ return objname;
	7943	+
	7944	+ return objname + " " + System.identityHashCode(this);
7514	7945	}
7515	7946
7516	7947	public int hashCode()
..	..	@@ -7566,6 +7997,7 @@
7566	7997	objectUI.closeUI();
7567	7998	if (editWindow != null)
7568	7999	{
	8000	+ editWindow.ctrlPanel.FlushUI();
7569	8001	editWindow.refreshContents();
7570	8002	} // ? new
7571	8003	objectUI = null;
..	..	@@ -7574,6 +8006,10 @@
7574	8006	{
7575	8007	editWindow = null;
7576	8008	} // ?
	8009	+ }
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
7577	8013	}
7578	8014	}
7579	8015
..	..	@@ -7586,7 +8022,7 @@
7586	8022	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	8023
7588	8024	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	8025	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	8026
7591	8027	double[][] toParent; // dynamic matrix
7592	8028	double[][] fromParent;
..	..	@@ -7701,7 +8137,7 @@
7701	8137	{
7702	8138	assert(bRep != null);
7703	8139	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8140	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8141	}
7706	8142	else
7707	8143	{
..	..	@@ -7732,6 +8168,10 @@
7732	8168	}
7733	8169
7734	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7735	8175	transient ObjectUI objectUI;
7736	8176	public static int povDepth = 0;
7737	8177	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8190,9 @@
7750	8190	private static cVector edge2 = new cVector();
7751	8191	//private static cVector norm = new cVector();
7752	8192	/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;
	8193	+ static final int hitCenter = 1;
	8194	+ static final int hitScale = 2;
	8195	+ static final int hitRotate = 3;
7756	8196	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8197	/transient/ private Point centerPt;
7758	8198	/transient/ private int startX;