~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,14 +14,45 @@
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	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
22	41	ScriptNode scriptnode;
23	42
	43	+ int VersionCount()
	44	+ {
	45	+ int count = 0;
	46	+
	47	+ for (int i = versionlist.length; --i >= 0;)
	48	+ {
	49	+ if (versionlist[i] != null)
	50	+ count++;
	51	+ }
	52	+
	53	+ return count;
	54	+ }
	55	+
24	56	void InitOthers()
25	57	{
26	58	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -99,64 +131,245 @@
99	131
100	132	// transient boolean reduced; // for morph reduction
101	133
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	134	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	135	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	136
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	137	+ transient Object3D transientsupport; // for cloning
	138	+ transient boolean transientlink2master;
107	139
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)
	140	+ void SaveSupports()
120	141	{
121		- bRep.SaveSupports();
	142	+ if (blockloop)
	143	+ return;
	144	+
	145	+ transientsupport = support;
	146	+ transientlink2master = link2master;
	147	+
	148	+ support = null;
	149	+ link2master = false;
	150	+
	151	+ if (bRep != null)
	152	+ {
	153	+ bRep.SaveSupports();
	154	+ }
	155	+
	156	+ for (int i = 0; i < Size(); i++)
	157	+ {
	158	+ Object3D child = (Object3D) get(i);
	159	+ if (child == null)
	160	+ continue;
	161	+ blockloop = true;
	162	+ child.SaveSupports();
	163	+ blockloop = false;
	164	+ }
122	165	}
123		-
124		- for (int i = 0; i < Size(); i++)
	166	+
	167	+ void RestoreSupports()
125	168	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	169	+ if (blockloop)
	170	+ return;
	171	+
	172	+ support = transientsupport;
	173	+ link2master = transientlink2master;
	174	+ transientsupport = null;
	175	+ transientlink2master = false;
	176	+
	177	+ if (bRep != null)
	178	+ {
	179	+ bRep.RestoreSupports();
	180	+ }
	181	+
	182	+ for (int i = 0; i < Size(); i++)
	183	+ {
	184	+ Object3D child = (Object3D) get(i);
	185	+ if (child == null)
	186	+ continue;
	187	+ blockloop = true;
	188	+ child.RestoreSupports();
	189	+ blockloop = false;
	190	+ }
	191	+ }
	192	+
	193	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	194	+ {
	195	+ Object3D o;
	196	+
	197	+ if (hashtable.containsKey(GetUUID()))
	198	+ {
	199	+ o = hashtable.get(GetUUID());
	200	+
	201	+ Grafreed.Assert(this.bRep == o.bRep);
	202	+ //if (this.bRep != null)
	203	+ // assert(this.bRep.support == o.transientrep);
	204	+ if (this.support != null)
	205	+ assert(this.support.bRep == o.transientrep);
	206	+ }
	207	+ else
	208	+ {
	209	+ o = new Object3D("copy of " + this.name);
	210	+
	211	+ hashtable.put(GetUUID(), o);
	212	+ }
	213	+
	214	+ if (!blockloop)
	215	+ {
	216	+ blockloop = true;
	217	+
	218	+ for (int i=0; i<Size(); i++)
	219	+ {
	220	+ get(i).ExtractBigData(hashtable);
	221	+ }
	222	+
	223	+ blockloop = false;
	224	+ }
	225	+
	226	+ ExtractBigData(o);
	227	+ }
	228	+
	229	+ void ExtractBigData(Object3D o)
	230	+ {
	231	+ if (o.bRep != null)
	232	+ Grafreed.Assert(o.bRep == this.bRep);
	233	+
	234	+ o.bRep = this.bRep;
	235	+// July 2019 if (this.bRep != null)
	236	+// {
	237	+// o.transientrep = this.bRep.support;
	238	+// o.bRep.support = null;
	239	+// }
	240	+ o.selection = this.selection;
	241	+ o.versionlist = this.versionlist;
	242	+ o.versionindex = this.versionindex;
	243	+
	244	+ if (this.support != null)
	245	+ {
	246	+ if (o.transientrep != null)
	247	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	248	+
	249	+ o.transientrep = this.support.bRep;
	250	+ this.support.bRep = null;
	251	+ }
	252	+
	253	+ // o.support = this.support;
	254	+ // o.fileparent = this.fileparent;
	255	+ // if (this.bRep != null)
	256	+ // o.bRep = this.bRep.support;
	257	+
	258	+ this.bRep = null;
	259	+ // if (this.bRep != null)
	260	+ // this.bRep.support = null;
	261	+ // this.support = null;
	262	+ // this.fileparent = null;
	263	+ }
	264	+
	265	+// Object3D GetObject(java.util.UUID uuid)
	266	+// {
	267	+// if (this.uuid.equals(uuid))
	268	+// return this;
	269	+//
	270	+// if (blockloop)
	271	+// return null;
	272	+//
	273	+// blockloop = true;
	274	+//
	275	+// for (int i=0; i<Size(); i++)
	276	+// {
	277	+// Object3D o = get(i).GetObject(uuid);
	278	+//
	279	+// if (o != null)
	280	+// return o;
	281	+// }
	282	+//
	283	+// blockloop = false;
	284	+//
	285	+// return null;
	286	+// }
	287	+
	288	+ transient boolean tag;
	289	+
	290	+ void TagObjects(Object3D o, boolean tag)
	291	+ {
	292	+ if (blockloop)
	293	+ return;
	294	+
	295	+ o.tag = tag;
	296	+
	297	+ if (o == this)
	298	+ return;
	299	+
129	300	blockloop = true;
130		- child.SaveSupports();
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
131	307	blockloop = false;
132	308	}
133		-}
134	309
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
139	314
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
146		- {
147		- bRep.RestoreSupports();
148		- }
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155	315	blockloop = true;
156		- child.RestoreSupports();
	316	+
	317	+ boolean hasTags = false;
	318	+
	319	+ for (int i=0; i<Size(); i++)
	320	+ {
	321	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	322	+
	323	+ if (hasTags)
	324	+ break;
	325	+ }
	326	+
	327	+ blockloop = false;
	328	+
	329	+ return hasTags;
	330	+ }
	331	+
	332	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	333	+ {
	334	+ if (!hashtable.containsKey(GetUUID()))
	335	+ return;
	336	+
	337	+ Object3D o = hashtable.get(GetUUID());
	338	+
	339	+ RestoreBigData(o);
	340	+
	341	+ if (blockloop)
	342	+ return;
	343	+
	344	+ blockloop = true;
	345	+
	346	+ //hashtable.remove(GetUUID());
	347	+
	348	+ for (int i=0; i<Size(); i++)
	349	+ {
	350	+ get(i).RestoreBigData(hashtable);
	351	+ }
	352	+
157	353	blockloop = false;
158	354	}
159		-}
	355	+
	356	+ void RestoreBigData(Object3D o)
	357	+ {
	358	+ this.bRep = o.bRep;
	359	+ if (this.support != null && o.transientrep != null)
	360	+ {
	361	+ this.support.bRep = o.transientrep;
	362	+ }
	363	+
	364	+ this.selection = o.selection;
	365	+
	366	+ this.versionlist = o.versionlist;
	367	+ this.versionindex = o.versionindex;
	368	+// July 2019 if (this.bRep != null)
	369	+// this.bRep.support = o.transientrep;
	370	+ // this.support = o.support;
	371	+ // this.fileparent = o.fileparent;
	372	+ }
160	373
161	374	// MOCAP SUPPORT
162	375	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +512,8 @@
299	512	}
300	513
301	514	boolean live = false;
	515	+ transient boolean keepdontselect;
	516	+ boolean dontselect = false;
302	517	boolean hide = false;
303	518	boolean link2master = false; // performs reset support/master at each frame
304	519	boolean marked = false; // animation node
..	..	@@ -366,11 +581,11 @@
366	581	}
367	582	}
368	583
369		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
370	585
371	586	int MemorySize()
372	587	{
373		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
374	589	{
375	590	try
376	591	{
..	..	@@ -480,12 +695,14 @@
480	695	toParent = LA.newMatrix();
481	696	fromParent = LA.newMatrix();
482	697	}
	698	+
483	699	if (toParentMarked == null)
484	700	{
485	701	if (maxcount != 1)
486	702	{
487		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
488	704	}
	705	+
489	706	toParentMarked = LA.newMatrix();
490	707	fromParentMarked = LA.newMatrix();
491	708	}
..	..	@@ -773,7 +990,7 @@
773	990	if (step == 0)
774	991	step = 1;
775	992	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	993	+ maxcount = 128; // 2048; // 4;
777	994	// if (acceleration == 0)
778	995	// acceleration = 10;
779	996	if (delay == 0) // serial
..	..	@@ -796,7 +1013,7 @@
796	1013
797	1014	if (marked && Globals.isLIVE() && live &&
798	1015	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	1016	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	1017	currentframe != Globals.framecount)
801	1018	{
802	1019	currentframe = Globals.framecount;
..	..	@@ -808,7 +1025,8 @@
808	1025
809	1026	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	1027
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1028	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1029	+ (step == 1 && changedir))
812	1030	{
813	1031	countdown = 1;
814	1032	delay = speedup?8:1;
..	..	@@ -880,6 +1098,10 @@
880	1098	if (material == null \|\| material.multiply)
881	1099	return true;
882	1100
	1101	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1102	+ return false;
	1103	+
	1104	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1105	return material.opacity > 0.99;
884	1106	}
885	1107
..	..	@@ -911,6 +1133,11 @@
911	1133	fromParent = null; // LA.newMatrix();
912	1134	bRep = null; // new BoundaryRep();
913	1135
	1136	+ if (oname != null && oname.equals("LeftHand"))
	1137	+ {
	1138	+ name = oname;
	1139	+ }
	1140	+
914	1141	/*
915	1142	float hue = (float)Math.random();
916	1143	Color col;
..	..	@@ -953,7 +1180,7 @@
953	1180
954	1181	public Object clone()
955	1182	{
956		- return GrafreeD.clone(this);
	1183	+ return Grafreed.clone(this);
957	1184	}
958	1185
959	1186	Object3D copyExpand()
..	..	@@ -1275,6 +1502,7 @@
1275	1502	toParent = LA.newMatrix();
1276	1503	fromParent = LA.newMatrix();
1277	1504	}
	1505	+
1278	1506	LA.matCopy(other.toParent, toParent);
1279	1507	LA.matCopy(other.fromParent, fromParent);
1280	1508
..	..	@@ -1469,7 +1697,7 @@
1469	1697	BoundaryRep.SEUIL = other.material.cameralight;
1470	1698
1471	1699	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1700	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1701	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1702	}
1475	1703
..	..	@@ -1728,7 +1956,7 @@
1728	1956	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1957	o.bRep = transientrep;
1730	1958	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1959	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1960	o.CreateMaterial();
1733	1961	o.SetAttributes(this, -1);
1734	1962	//parent
..	..	@@ -1741,7 +1969,7 @@
1741	1969	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1970	o.bRep = bRep;
1743	1971	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1972	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1973	o.CreateMaterial();
1746	1974	//o.overwriteThis(this, -1);
1747	1975	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +2056,15 @@
1828	2056	if (obj.name == null)
1829	2057	continue; // can't be a null one
1830	2058
	2059	+ // Try perfect match first.
1831	2060	if (n.equals(obj.name))
1832	2061	{
1833	2062	theobj = obj;
1834	2063	count++;
1835	2064	}
1836	2065	}
	2066	+
	2067	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	2068
1838	2069	if (count != 1)
1839	2070	for (int i=Size(); --i>=0;)
..	..	@@ -2151,11 +2382,6 @@
2151	2382
2152	2383	InitOthers();
2153	2384
2154		- if (this instanceof Camera)
2155		- {
2156		- material.shift = 90;
2157		- }
2158		-
2159	2385	material.multiply = multiply;
2160	2386
2161	2387	if (multiply)
..	..	@@ -2293,12 +2519,22 @@
2293	2519	}
2294	2520	*/
2295	2521	}
	2522	+ else
	2523	+ {
	2524	+ //((ObjEditor)editWindow).SetupUI2(null);
	2525	+ if (objectUI != null)
	2526	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2527	+ else
	2528	+ //new Exception().printStackTrace();
	2529	+ System.err.println("objectUI is null");
	2530	+ }
2296	2531	}
2297	2532
2298	2533	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2534	{
2300	2535	if (newWindow)
2301	2536	{
	2537	+ new Exception().printStackTrace();
2302	2538	System.exit(0);
2303	2539	if (parent != null)
2304	2540	{
..	..	@@ -2333,6 +2569,14 @@
2333	2569	{
2334	2570	editWindow.refreshContents();
2335	2571	}
	2572	+ else
	2573	+ {
	2574	+ if (manipWindow != null)
	2575	+ {
	2576	+ manipWindow.refreshContents();
	2577	+ }
	2578	+ }
	2579	+
2336	2580	//if (parent != null)
2337	2581	//parent.refreshEditWindow();
2338	2582	}
..	..	@@ -2412,7 +2656,8 @@
2412	2656	private static final int editSelf = 1;
2413	2657	private static final int editChild = 2;
2414	2658
2415		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2416	2661	{
2417	2662	if (level == 0)
2418	2663	{
..	..	@@ -2420,7 +2665,8 @@
2420	2665	return;
2421	2666
2422	2667	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2668	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2669	+ level + 1))
2424	2670	{
2425	2671	selectee = (Object3D) e.nextElement();
2426	2672	}
..	..	@@ -2428,19 +2674,22 @@
2428	2674	} else
2429	2675	{
2430	2676	//super.
2431		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2432	2679	}
2433	2680	}
2434	2681
2435		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2436	2684	{
2437	2685	doSomething = 0;
2438	2686	if (level == 0)
2439	2687	{
2440		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2441	2689	}
2442	2690	if (//super.
2443		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2444	2693	{
2445	2694	doSomething = 1;
2446	2695	return true;
..	..	@@ -2450,7 +2699,7 @@
2450	2699	}
2451	2700	}
2452	2701
2453		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2454	2703	{
2455	2704	if (selection == null)
2456	2705	{
..	..	@@ -2463,7 +2712,8 @@
2463	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2713	{
2465	2714	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2467	2717	{
2468	2718	childToDrag = selectee;
2469	2719	doSomething = 2;
..	..	@@ -2475,13 +2725,15 @@
2475	2725	return retval;
2476	2726	}
2477	2727
2478		- void doEditDrag(ClickInfo info)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2479	2730	{
2480	2731	switch (doSomething)
2481	2732	{
2482	2733	case 1: // '\001'
2483	2734	//super.
2484		- doEditDrag0(info);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2485	2737	break;
2486	2738
2487	2739	case 2: // '\002'
..	..	@@ -2494,11 +2746,13 @@
2494	2746	{
2495	2747	//sel.hitSomething = childToDrag.hitSomething;
2496	2748	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2498	2751	} else
2499	2752	{
2500	2753	//super.
2501		- doEditDrag0(info);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2502	2756	}
2503	2757	}
2504	2758	break;
..	..	@@ -2516,6 +2770,9 @@
2516	2770	{
2517	2771	deselectAll();
2518	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2519	2776	ClickInfo newInfo = new ClickInfo();
2520	2777	newInfo.flags = info.flags;
2521	2778	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2865,18 @@
2608	2865	void GenNormalsS(boolean crease)
2609	2866	{
2610	2867	selection.GenNormals(crease);
	2868	+// for (int i=0; i<selection.size(); i++)
	2869	+// {
	2870	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2871	+// selectee.GenNormals(crease);
	2872	+// }
	2873	+
	2874	+ //Touch();
	2875	+ }
	2876	+
	2877	+ void GenNormalsMeshS()
	2878	+ {
	2879	+ selection.GenNormalsMesh();
2611	2880	// for (int i=0; i<selection.size(); i++)
2612	2881	// {
2613	2882	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +3017,24 @@
2748	3017	if (child == null)
2749	3018	continue;
2750	3019	child.GenNormals(crease);
	3020	+// Children().release(i);
	3021	+ }
	3022	+ blockloop = false;
	3023	+ }
	3024	+
	3025	+ void GenNormalsMesh()
	3026	+ {
	3027	+ if (blockloop)
	3028	+ return;
	3029	+
	3030	+ blockloop = true;
	3031	+ GenNormalsMesh0();
	3032	+ for (int i = 0; i < Children().Size(); i++)
	3033	+ {
	3034	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3035	+ if (child == null)
	3036	+ continue;
	3037	+ child.GenNormalsMesh();
2751	3038	// Children().release(i);
2752	3039	}
2753	3040	blockloop = false;
..	..	@@ -2905,7 +3192,8 @@
2905	3192	{
2906	3193	if (bRep != null)
2907	3194	{
2908		- bRep.GenUV();
	3195	+ bRep.GenUV(); //1);
	3196	+ //bRep.UnfoldUV();
2909	3197	Touch();
2910	3198	}
2911	3199	}
..	..	@@ -2919,11 +3207,20 @@
2919	3207	}
2920	3208	}
2921	3209
	3210	+ void GenNormalsMesh0()
	3211	+ {
	3212	+ if (bRep != null)
	3213	+ {
	3214	+ bRep.GenerateNormalsMesh();
	3215	+ Touch();
	3216	+ }
	3217	+ }
	3218	+
2922	3219	void GenNormalsMINE0()
2923	3220	{
2924	3221	if (bRep != null)
2925	3222	{
2926		- bRep.GenerateNormalsMINE();
	3223	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3224	Touch();
2928	3225	}
2929	3226	}
..	..	@@ -2980,6 +3277,120 @@
2980	3277	blockloop = false;
2981	3278	}
2982	3279
	3280	+ public void ResetTransform(int mask)
	3281	+ {
	3282	+ Object3D obj = this;
	3283	+
	3284	+ if (mask == -1)
	3285	+ {
	3286	+ if (obj instanceof Camera) // jan 2014
	3287	+ {
	3288	+ LA.matIdentity(obj.toParent);
	3289	+ LA.matIdentity(obj.fromParent);
	3290	+ }
	3291	+ else
	3292	+ {
	3293	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3294	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3295	+ }
	3296	+ return;
	3297	+ }
	3298	+
	3299	+ if ((mask&2) != 0) // Scale/rotation
	3300	+ {
	3301	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3302	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3303	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3304	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3305	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3306	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3307	+ }
	3308	+ if ((mask&1) != 0) // Translation
	3309	+ {
	3310	+ if (obj.toParent != null)
	3311	+ {
	3312	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3313	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3314	+ }
	3315	+ }
	3316	+ }
	3317	+
	3318	+ public void TextureRatioTransform(int axis)
	3319	+ {
	3320	+ cTexture tex = GetTextures();
	3321	+
	3322	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3323	+
	3324	+ try
	3325	+ {
	3326	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3327	+ }
	3328	+ catch (Exception e)
	3329	+ {
	3330	+ System.err.println("FAIL TextureRatio: " + this);
	3331	+ }
	3332	+
	3333	+ LA.matIdentity(Object3D.mat);
	3334	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3335	+
	3336	+ if (toParent == null)
	3337	+ {
	3338	+ toParent = LA.newMatrix();
	3339	+ fromParent = LA.newMatrix();
	3340	+ }
	3341	+
	3342	+ ResetTransform(2);
	3343	+
	3344	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3345	+ LA.matInvert(fromParent, toParent);
	3346	+ }
	3347	+
	3348	+ void TextureRatio(int axis)
	3349	+ {
	3350	+ if (blockloop)
	3351	+ return;
	3352	+
	3353	+ blockloop = true;
	3354	+
	3355	+ TextureRatioTransform(axis);
	3356	+
	3357	+ for (int i=Size(); --i>=0;)
	3358	+ {
	3359	+ Object3D v = get(i);
	3360	+
	3361	+ v.TextureRatio(axis);
	3362	+ }
	3363	+
	3364	+ blockloop = false;
	3365	+ }
	3366	+
	3367	+ void TransformChildren()
	3368	+ {
	3369	+ if (toParent != null)
	3370	+ {
	3371	+ for (int i=Size(); --i>=0;)
	3372	+ {
	3373	+ Object3D v = get(i);
	3374	+
	3375	+ if (v.toParent == null)
	3376	+ {
	3377	+ v.toParent = LA.newMatrix();
	3378	+ v.fromParent = LA.newMatrix();
	3379	+ }
	3380	+
	3381	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3382	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3383	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3384	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3385	+ }
	3386	+
	3387	+ toParent = null; // LA.matIdentity(toParent);
	3388	+ fromParent = null; // LA.matIdentity(fromParent);
	3389	+
	3390	+ Touch();
	3391	+ }
	3392	+ }
	3393	+
2983	3394	void TransformGeometry()
2984	3395	{
2985	3396	Object3D obj = this;
..	..	@@ -3201,9 +3612,11 @@
3201	3612
3202	3613	BoundaryRep sup = bRep.support;
3203	3614	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3615	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3616	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3617	+
	3618	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3619	+
3207	3620	bRep = temprep;
3208	3621	bRep.support = sup;
3209	3622	Touch();
..	..	@@ -3304,15 +3717,47 @@
3304	3717
3305	3718	void ClearMaterials()
3306	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3307	3725	ClearMaterial();
3308		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3309	3727	{
3310		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3311	3729	if (child == null)
3312	3730	continue;
3313	3731	child.ClearMaterials();
3314		- release(i);
3315	3732	}
	3733	+
	3734	+ blockloop = false;
	3735	+ }
	3736	+
	3737	+ void ClearVersionList()
	3738	+ {
	3739	+ this.versionlist = null;
	3740	+ this.versionindex = -1;
	3741	+ this.versiontable = null;
	3742	+ }
	3743	+
	3744	+ void ClearVersions()
	3745	+ {
	3746	+ if (blockloop)
	3747	+ return;
	3748	+
	3749	+ blockloop = true;
	3750	+
	3751	+ ClearVersionList();
	3752	+ for (int i = 0; i < Size(); i++)
	3753	+ {
	3754	+ Object3D child = (Object3D) get(i);
	3755	+ if (child == null)
	3756	+ continue;
	3757	+ child.ClearVersions();
	3758	+ }
	3759	+
	3760	+ blockloop = false;
3316	3761	}
3317	3762
3318	3763	void FlipV(boolean flip)
..	..	@@ -3340,7 +3785,8 @@
3340	3785	if (blockloop)
3341	3786	return;
3342	3787
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3788	+ if (//marked \|\| // does not make sense
	3789	+ (bRep != null \|\| material != null)) // borderline...
3344	3790	live = h;
3345	3791
3346	3792	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3807,8 @@
3361	3807	return;
3362	3808
3363	3809	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3810	+ if (//marked \|\| // does not make sense
	3811	+ (bRep != null \|\| material != null)) // borderline...
3365	3812	link2master = h;
3366	3813
3367	3814	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3828,8 @@
3381	3828	if (blockloop)
3382	3829	return;
3383	3830
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3831	+ if (//marked \|\| // does not make sense
	3832	+ (bRep != null \|\| material != null)) // borderline...
3385	3833	hide = h;
3386	3834
3387	3835	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3849,7 @@
3401	3849	if (blockloop)
3402	3850	return;
3403	3851
3404		- if (bRep != null && material != null) // borderline...
	3852	+ if (bRep != null \|\| material != null) // borderline...
3405	3853	marked = h;
3406	3854
3407	3855	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3859,46 @@
3411	3859	continue;
3412	3860	blockloop = true;
3413	3861	child.MarkLeaves(h);
	3862	+ blockloop = false;
	3863	+ // release(i);
	3864	+ }
	3865	+ }
	3866	+
	3867	+ void RewindLeaves(boolean h)
	3868	+ {
	3869	+ if (blockloop)
	3870	+ return;
	3871	+
	3872	+ if (bRep != null \|\| material != null) // borderline...
	3873	+ rewind = h;
	3874	+
	3875	+ for (int i = 0; i < Size(); i++)
	3876	+ {
	3877	+ Object3D child = (Object3D) get(i); // reserve(i);
	3878	+ if (child == null)
	3879	+ continue;
	3880	+ blockloop = true;
	3881	+ child.RewindLeaves(h);
	3882	+ blockloop = false;
	3883	+ // release(i);
	3884	+ }
	3885	+ }
	3886	+
	3887	+ void RandomLeaves(boolean h)
	3888	+ {
	3889	+ if (blockloop)
	3890	+ return;
	3891	+
	3892	+ if (bRep != null \|\| material != null) // borderline...
	3893	+ random = h;
	3894	+
	3895	+ for (int i = 0; i < Size(); i++)
	3896	+ {
	3897	+ Object3D child = (Object3D) get(i); // reserve(i);
	3898	+ if (child == null)
	3899	+ continue;
	3900	+ blockloop = true;
	3901	+ child.RandomLeaves(h);
3414	3902	blockloop = false;
3415	3903	// release(i);
3416	3904	}
..	..	@@ -3725,7 +4213,7 @@
3725	4213	if (child == null)
3726	4214	continue;
3727	4215
3728		- if (GrafreeD.RENDERME > 0)
	4216	+ if (Grafreed.RENDERME > 0)
3729	4217	{
3730	4218	if (child instanceof Merge)
3731	4219	((Merge)child).renderme();
..	..	@@ -3876,7 +4364,7 @@
3876	4364	if (child == null)
3877	4365	continue;
3878	4366
3879		- if (GrafreeD.RENDERME > 0)
	4367	+ if (Grafreed.RENDERME > 0)
3880	4368	{
3881	4369	if (child instanceof Merge)
3882	4370	((Merge)child).renderme();
..	..	@@ -4071,7 +4559,7 @@
4071	4559	if (child == null)
4072	4560	continue;
4073	4561
4074		- if (GrafreeD.RENDERME > 0)
	4562	+ if (Grafreed.RENDERME > 0)
4075	4563	{
4076	4564	if (child instanceof Merge)
4077	4565	((Merge)child).renderme();
..	..	@@ -4184,6 +4672,55 @@
4184	4672	{
4185	4673	blockloop = true;
4186	4674	get(i).RepairShadow();
	4675	+ blockloop = false;
	4676	+ }
	4677	+ }
	4678	+
	4679	+ void RepairSOV()
	4680	+ {
	4681	+ if (blockloop)
	4682	+ return;
	4683	+
	4684	+ String texname = this.GetPigmentTexture();
	4685	+
	4686	+ if (texname.startsWith("sov"))
	4687	+ {
	4688	+ String[] s = texname.split("/");
	4689	+
	4690	+ String[] sname = s[1].split("Color.pn");
	4691	+
	4692	+ texname = sname[0];
	4693	+
	4694	+ if (sname.length > 1)
	4695	+ {
	4696	+ texname += "Color.jpg";
	4697	+ }
	4698	+
	4699	+ this.SetPigmentTexture("sov/" + texname);
	4700	+ }
	4701	+
	4702	+ texname = this.GetBumpTexture();
	4703	+
	4704	+ if (texname.startsWith("sov"))
	4705	+ {
	4706	+ String[] s = texname.split("/");
	4707	+
	4708	+ String[] sname = s[1].split("Bump.pn");
	4709	+
	4710	+ texname = sname[0];
	4711	+
	4712	+ if (sname.length > 1)
	4713	+ {
	4714	+ texname += "Bump.jpg";
	4715	+ }
	4716	+
	4717	+ this.SetBumpTexture("sov/" + texname);
	4718	+ }
	4719	+
	4720	+ for (int i=0; i<Size(); i++)
	4721	+ {
	4722	+ blockloop = true;
	4723	+ get(i).RepairSOV();
4187	4724	blockloop = false;
4188	4725	}
4189	4726	}
..	..	@@ -4678,7 +5215,7 @@
4678	5215
4679	5216	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5217	{
4681		- if (hide)
	5218	+ if (hide \|\| dontselect)
4682	5219	return null;
4683	5220
4684	5221	if (count <= 0)
..	..	@@ -4702,9 +5239,17 @@
4702	5239	}
4703	5240	}
4704	5241
	5242	+ ObjEditor GetWindow()
	5243	+ {
	5244	+ if (editWindow != null)
	5245	+ return editWindow;
	5246	+
	5247	+ return manipWindow;
	5248	+ }
	5249	+
4705	5250	cTreePath Select(int indexcount, boolean deselect)
4706	5251	{
4707		- if (hide)
	5252	+ if (hide \|\| dontselect)
4708	5253	return null;
4709	5254
4710	5255	if (count <= 0)
..	..	@@ -4738,10 +5283,11 @@
4738	5283	if (leaf != null)
4739	5284	{
4740	5285	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5286	+ ObjEditor window = GetWindow();
	5287	+ if (window != null)
4742	5288	{
4743	5289	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5290	+ window.Select(tp, deselect, true);
4745	5291	}
4746	5292
4747	5293	return tp;
..	..	@@ -4758,6 +5304,7 @@
4758	5304
4759	5305	if (child == null)
4760	5306	continue;
	5307	+
4761	5308	if (child.HasTransparency() && child.size() != 0)
4762	5309	{
4763	5310	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5314,10 @@
4767	5314	if (leaf != null)
4768	5315	{
4769	5316	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5317	+ ObjEditor window = GetWindow();
	5318	+ if (window != null)
4771	5319	{
4772		- editWindow.Select(tp, deselect, true);
	5320	+ window.Select(tp, deselect, true);
4773	5321	}
4774	5322
4775	5323	return tp;
..	..	@@ -5094,6 +5642,51 @@
5094	5642	blockloop = false;
5095	5643	}
5096	5644
	5645	+ void ResetSelectable()
	5646	+ {
	5647	+ if (blockloop)
	5648	+ return;
	5649	+
	5650	+ blockloop = true;
	5651	+
	5652	+ keepdontselect = dontselect;
	5653	+ dontselect = true;
	5654	+
	5655	+ Object3D child;
	5656	+ int nb = Size();
	5657	+ for (int i = 0; i < nb; i++)
	5658	+ {
	5659	+ child = (Object3D) get(i);
	5660	+ if (child == null)
	5661	+ continue;
	5662	+ child.ResetSelectable();
	5663	+ }
	5664	+
	5665	+ blockloop = false;
	5666	+ }
	5667	+
	5668	+ void RestoreSelectable()
	5669	+ {
	5670	+ if (blockloop)
	5671	+ return;
	5672	+
	5673	+ blockloop = true;
	5674	+
	5675	+ dontselect = keepdontselect;
	5676	+
	5677	+ Object3D child;
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ child = (Object3D) get(i);
	5682	+ if (child == null)
	5683	+ continue;
	5684	+ child.RestoreSelectable();
	5685	+ }
	5686	+
	5687	+ blockloop = false;
	5688	+ }
	5689	+
5097	5690	boolean IsSelected()
5098	5691	{
5099	5692	if (parent == null)
..	..	@@ -5154,12 +5747,41 @@
5154	5747	if (fullname == null)
5155	5748	return "";
5156	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5157	5755	// System.out.println("Fullname = " + fullname);
5158	5756
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5757	+ // Does not work on Windows due to C:
	5758	+// if (fullname.name.indexOf(":") == -1)
	5759	+// return fullname.name;
	5760	+//
	5761	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5762
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5763	+ String[] split = fullname.name.split(":");
	5764	+
	5765	+ if (split.length == 0)
	5766	+ {
	5767	+ return fullname.pigment = "";
	5768	+ }
	5769	+
	5770	+ if (split.length <= 2)
	5771	+ {
	5772	+ if (fullname.name.endsWith(":"))
	5773	+ {
	5774	+ // Windows
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5776	+ }
	5777	+
	5778	+ return fullname.pigment = split[0];
	5779	+ }
	5780	+
	5781	+ // Windows
	5782	+ assert(split.length == 4);
	5783	+
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5163	5785	}
5164	5786
5165	5787	static String GetBump(cTexture fullname)
..	..	@@ -5167,11 +5789,44 @@
5167	5789	if (fullname == null)
5168	5790	return "";
5169	5791
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
	5796	+
5170	5797	// 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());
	5798	+ // Does not work on Windows due to C:
	5799	+// if (fullname.name.indexOf(":") == -1)
	5800	+// return "";
	5801	+//
	5802	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5803	+ String[] split = fullname.name.split(":");
	5804	+
	5805	+ if (split.length == 0)
	5806	+ {
	5807	+ return fullname.bump = "";
	5808	+ }
	5809	+
	5810	+ if (split.length == 1)
	5811	+ {
	5812	+ return fullname.bump = "";
	5813	+ }
	5814	+
	5815	+ if (split.length == 2)
	5816	+ {
	5817	+ if (fullname.name.endsWith(":"))
	5818	+ {
	5819	+ // Windows
	5820	+ return fullname.bump = "";
	5821	+ }
	5822	+
	5823	+ return fullname.bump = split[1];
	5824	+ }
	5825	+
	5826	+ // Windows
	5827	+ assert(split.length == 4);
	5828	+
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5175	5830	}
5176	5831
5177	5832	String GetPigmentTexture()
..	..	@@ -5245,7 +5900,7 @@
5245	5900	System.out.print("; textures = " + textures);
5246	5901	System.out.println("; usedtextures = " + usedtextures);
5247	5902
5248		- if (GetTextures() == null)
	5903	+ if (GetTextures() == null) // What is that??
5249	5904	GetTextures().name = ":";
5250	5905
5251	5906	String texname = tex;
..	..	@@ -5254,6 +5909,9 @@
5254	5909	texname = "";
5255	5910
5256	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5257	5915	Touch();
5258	5916	}
5259	5917
..	..	@@ -5278,6 +5936,43 @@
5278	5936	}
5279	5937	}
5280	5938
	5939	+ UUID GetUUID()
	5940	+ {
	5941	+ if (uuid == null)
	5942	+ {
	5943	+ // Serial
	5944	+ uuid = UUID.randomUUID();
	5945	+ }
	5946	+
	5947	+ return uuid;
	5948	+ }
	5949	+
	5950	+ Object3D GetObject(UUID uid)
	5951	+ {
	5952	+ if (blockloop)
	5953	+ return null;
	5954	+
	5955	+ if (GetUUID().equals(uid))
	5956	+ return this;
	5957	+
	5958	+ int nb = Size();
	5959	+ for (int i = 0; i < nb; i++)
	5960	+ {
	5961	+ Object3D child = (Object3D) get(i);
	5962	+
	5963	+ if (child == null)
	5964	+ continue;
	5965	+
	5966	+ blockloop = true;
	5967	+ Object3D obj = child.GetObject(uid);
	5968	+ blockloop = false;
	5969	+ if (obj != null)
	5970	+ return obj;
	5971	+ }
	5972	+
	5973	+ return null;
	5974	+ }
	5975	+
5281	5976	void SetBumpTexture(String tex)
5282	5977	{
5283	5978	if (GetTextures() == null)
..	..	@@ -5289,6 +5984,8 @@
5289	5984	texname = "";
5290	5985
5291	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5987	+
	5988	+ GetTextures().bump = null;
5292	5989
5293	5990	Touch();
5294	5991	}
..	..	@@ -5314,6 +6011,38 @@
5314	6011	}
5315	6012	}
5316	6013
	6014	+ void EmbedTextures(boolean embed)
	6015	+ {
	6016	+ if (blockloop)
	6017	+ return;
	6018	+
	6019	+ //if (GetTextures() != null)
	6020	+ if (embed)
	6021	+ CameraPane.EmbedTextures(GetTextures());
	6022	+ else
	6023	+ {
	6024	+ GetTextures().pigmentdata = null;
	6025	+ GetTextures().bumpdata = null;
	6026	+ GetTextures().pw = 0;
	6027	+ GetTextures().ph = 0;
	6028	+ GetTextures().bw = 0;
	6029	+ GetTextures().bh = 0;
	6030	+ }
	6031	+
	6032	+ int nb = Size();
	6033	+ for (int i = 0; i < nb; i++)
	6034	+ {
	6035	+ Object3D child = (Object3D) get(i);
	6036	+
	6037	+ if (child == null)
	6038	+ continue;
	6039	+
	6040	+ blockloop = true;
	6041	+ child.EmbedTextures(embed);
	6042	+ blockloop = false;
	6043	+ }
	6044	+ }
	6045	+
5317	6046	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	6047	{
5319	6048	Draw(display, root, selected, blocked);
..	..	@@ -5322,12 +6051,28 @@
5322	6051	boolean NeedSupport()
5323	6052	{
5324	6053	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	6054	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	6055	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	6056	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	6057	}
5329	6058
5330	6059	static boolean DEBUG_SELECTION = false;
	6060	+
	6061	+ boolean IsLive()
	6062	+ {
	6063	+ if (live)
	6064	+ return true;
	6065	+
	6066	+ if (parent == null)
	6067	+ return false;
	6068	+
	6069	+ return parent.IsLive();
	6070	+ }
	6071	+
	6072	+ boolean IsDynamic()
	6073	+ {
	6074	+ return live && bRep != null;
	6075	+ }
5331	6076
5332	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	6078	{
..	..	@@ -5339,7 +6084,7 @@
5339	6084	}
5340	6085
5341	6086	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	6087	+ (hide \|\| dontselect))
5343	6088	return;
5344	6089
5345	6090	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +6116,7 @@
5371	6116	return;
5372	6117	}
5373	6118
5374		- javax.media.opengl.GL gl = display.GetGL();
	6119	+ //javax.media.opengl.GL gl = display.GetGL();
5375	6120
5376	6121	/*
5377	6122	if (touched)
..	..	@@ -5389,8 +6134,11 @@
5389	6134	if (support != null)
5390	6135	support = support;
5391	6136
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);
	6137	+ boolean usecalllists = !IsDynamic() &&
	6138	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6139	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6140	+
	6141	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5394	6142
5395	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	6144	{
..	..	@@ -5400,8 +6148,9 @@
5400	6148	// usecalllists &= !(parent instanceof RandomNode);
5401	6149	// usecalllists = false;
5402	6150
5403		- if (GetBRep() != null)
5404		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5405	6154	//System.out.println("draw " + this);
5406	6155	//new Exception().printStackTrace();
5407	6156
..	..	@@ -5410,10 +6159,12 @@
5410	6159	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	6160
5412	6161	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6162	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6163	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	6164	{
5415	6165	Globals.lighttouched = true;
5416	6166	} // all panes...
	6167	+
5417	6168	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	6169	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	6170	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5421,9 +6172,9 @@
5421	6172	if (!(this instanceof Composite))
5422	6173	touched = false;
5423	6174	//if (displaylist == -1 && usecalllists)
5424		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5425	6176	{
5426		- bRep.displaylist = gl.glGenLists(1);
	6177	+ bRep.displaylist = display.GenList();
5427	6178	assert(bRep.displaylist != 0);
5428	6179	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	6180	//System.out.println("\tgen list " + list);
..	..	@@ -5432,17 +6183,19 @@
5432	6183
5433	6184	//System.out.println("\tnew list " + list);
5434	6185	//gl.glDrawBuffer(gl.GL_NONE);
5435		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5436	6187	{
5437	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6189	+ display.NewList(bRep.displaylist);
5439	6190	}
	6191	+
5440	6192	CallList(display, root, selected, blocked);
	6193	+
5441	6194	// compiled = true;
5442		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5443	6196	{
5444	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	6198	+ display.EndList();
5446	6199	}
5447	6200	//gl.glDrawBuffer(gl.GL_BACK);
5448	6201	// XXX touched = false;
..	..	@@ -5490,7 +6243,7 @@
5490	6243	if (display.DrawMode() == iCameraPane.SHADOW)
5491	6244	{
5492	6245	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6246	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	6247	{
5495	6248	//System.out.print("CULLED");
5496	6249	culled = true;
..	..	@@ -5498,7 +6251,7 @@
5498	6251	}
5499	6252	else
5500	6253	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6254	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	6255	culled = true;
5503	6256
5504	6257	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6291,8 @@
5538	6291	{
5539	6292	if (GetBRep() != null)
5540	6293	{
5541		- CameraPane.NextIndex(this, gl);
	6294	+ display.NextIndex();
	6295	+
5542	6296	// vertex color conflict : gl.glCallList(list);
5543	6297	DrawNode(display, root, selected);
5544	6298	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6333,28 @@
5579	6333	tex = GetTextures();
5580	6334	}
5581	6335
5582		- display.BindTextures(tex, texres);
	6336	+ boolean failedPigment = false;
	6337	+ boolean failedBump = false;
	6338	+
	6339	+ try
	6340	+ {
	6341	+ display.BindPigmentTexture(tex, texres);
	6342	+ }
	6343	+ catch (Exception e)
	6344	+ {
	6345	+ System.err.println("FAILED: " + this);
	6346	+ failedPigment = true;
	6347	+ }
	6348	+
	6349	+ try
	6350	+ {
	6351	+ display.BindBumpTexture(tex, texres);
	6352	+ }
	6353	+ catch (Exception e)
	6354	+ {
	6355	+ //System.err.println("FAILED: " + this);
	6356	+ failedBump = true;
	6357	+ }
5583	6358
5584	6359	if (!compiled)
5585	6360	{
..	..	@@ -5595,13 +6370,17 @@
5595	6370
5596	6371	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6372	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6373	+ display.CallList(bRep.displaylist);
5599	6374	// june 2013 drawSelf(display, root, selected);
5600	6375	}
5601	6376	}
5602	6377	}
5603	6378
5604		- display.ReleaseTextures(tex);
	6379	+ if (!failedBump)
	6380	+ display.ReleaseBumpTexture(tex);
	6381	+
	6382	+ if (!failedPigment)
	6383	+ display.ReleasePigmentTexture(tex);
5605	6384
5606	6385	display.PopMaterial(this, selected);
5607	6386	}
..	..	@@ -5730,6 +6509,9 @@
5730	6509
5731	6510	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6511	{
	6512	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6513	+ return;
	6514	+
5733	6515	if (hide)
5734	6516	return;
5735	6517	// shadow optimisation
..	..	@@ -5855,6 +6637,9 @@
5855	6637	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6638	return; // no shadow for transparent objects
5857	6639
	6640	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6641	+ return;
	6642	+
5858	6643	if (hide)
5859	6644	return;
5860	6645
..	..	@@ -5895,9 +6680,10 @@
5895	6680	return;
5896	6681	}
5897	6682
	6683	+ //bRep.GenUV(1/material.diffuseness);
5898	6684	// bRep.lock = true;
5899	6685
5900		- javax.media.opengl.GL gl = display.GetGL();
	6686	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6687
5902	6688	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6689	{
..	..	@@ -5914,23 +6700,7 @@
5914	6700
5915	6701	bRep.getMinMax(min, max, 100);
5916	6702
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();
	6703	+ display.DrawBox(min, max);
5934	6704
5935	6705	return;
5936	6706	}
..	..	@@ -5984,178 +6754,19 @@
5984	6754	new Exception().printStackTrace();
5985	6755	return;
5986	6756	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6757	+
	6758	+ if (dontselect)
5990	6759	{
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;
	6760	+ //bRep.GenerateNormalsMINE();
6122	6761	}
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		- }
	6762	+
	6763	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6764	} else // catch (Error e)
6154	6765	{
6155	6766	// TRIANGLE ARRAY
6156	6767	if (IsOpaque()) // Static())
6157	6768	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6769	+ display.StartTriangles();
6159	6770	int facecount = bRep.FaceCount();
6160	6771	for (int i = 0; i < facecount; i++)
6161	6772	{
..	..	@@ -6220,7 +6831,7 @@
6220	6831
6221	6832	display.DrawFace(this, p, q, r, face);
6222	6833	}
6223		- gl.glEnd();
	6834	+ display.EndTriangles();
6224	6835	}
6225	6836	else
6226	6837	{
..	..	@@ -6249,8 +6860,8 @@
6249	6860	//System.out.println("SORT");
6250	6861
6251	6862	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6863	+
	6864	+ display.StartTriangles();
6254	6865	for (int i = 0; i < facecount; i++)
6255	6866	{
6256	6867	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6875,12 @@
6264	6875
6265	6876	display.DrawFace(this, p, q, r, face);
6266	6877	}
6267		- gl.glEnd();
	6878	+ display.EndTriangles();
6268	6879	}
6269	6880
6270	6881	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6882	{
	6883	+ /*
6272	6884	gl.glDisable(gl.GL_LIGHTING);
6273	6885	float[] colorV = new float[3];
6274	6886
..	..	@@ -6347,6 +6959,7 @@
6347	6959	// gl.glEnd();
6348	6960	}
6349	6961	}
	6962	+ */
6350	6963	}
6351	6964	}
6352	6965
..	..	@@ -6405,22 +7018,6 @@
6405	7018	void Print(Vertex v)
6406	7019	{
6407	7020	//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	7021	}
6425	7022
6426	7023	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6946,20 +7543,23 @@
6946	7543	}
6947	7544	}
6948	7545
6949		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7546	+ static ClickInfo clickInfo = new ClickInfo();
	7547	+
	7548	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7549	+ Point outPt, Rectangle outRec)
6950	7550	{
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;
	7551	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7552	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7553	+ double[][] toscreen = clickInfo.toScreen;
6954	7554	if (toscreen == null)
6955	7555	{
6956		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6957	7557	}
6958	7558	cVector vec = in;
6959	7559	LA.xformPos(in, toscreen, in);
6960	7560	//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();
	7561	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7562	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6963	7563	outPt.x = hc + (int) vec.x;
6964	7564	outPt.y = vc - (int) vec.y;
6965	7565	outRec.x = outPt.x - 3;
..	..	@@ -6967,15 +7567,18 @@
6967	7567	outRec.width = outRec.height = 6;
6968	7568	}
6969	7569
6970		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
6971	7572	{
6972	7573	Point pt = new Point(0, 0);
6973	7574	Rectangle rec = new Rectangle();
6974		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
6975	7577	return rec;
6976	7578	}
6977	7579
6978		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
6979	7582	{
6980	7583	if (level == 0)
6981	7584	{
..	..	@@ -6984,16 +7587,19 @@
6984	7587	{
6985	7588	cVector origin = new cVector();
6986	7589	//LA.xformPos(origin, toParent, origin);
6987		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6988	7594	Rectangle boundary = new Rectangle();
6989	7595	boundary.x = spot.x - 30;
6990	7596	boundary.y = spot.y - 30;
6991	7597	boundary.width = spot.width + 60;
6992	7598	boundary.height = spot.height + 60;
6993		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
6994	7600	int spotw = spot.x + spot.width;
6995	7601	int spoth = spot.y + spot.height;
6996		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6997	7603	// if (CameraPane.Xmin > spot.x)
6998	7604	// {
6999	7605	// CameraPane.Xmin = spot.x;
..	..	@@ -7010,11 +7616,33 @@
7010	7616	// {
7011	7617	// CameraPane.Ymax = spoth;
7012	7618	// }
7013		- spot.translate(32, 32);
	7619	+// if (CameraPane.Xmin > spot.x)
	7620	+// {
	7621	+// CameraPane.Xmin = spot.x;
	7622	+// }
	7623	+// if (CameraPane.Xmax < spotw)
	7624	+// {
	7625	+// CameraPane.Xmax = spotw;
	7626	+// }
	7627	+// if (CameraPane.Ymin > spot.y)
	7628	+// {
	7629	+// CameraPane.Ymin = spot.y;
	7630	+// }
	7631	+// if (CameraPane.Ymax < spoth)
	7632	+// {
	7633	+// CameraPane.Ymax = spoth;
	7634	+// }
	7635	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7636	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7637	+ spot.translate(32, 0);
	7638	+ clickInfo.g.setColor(Color.yellow);
	7639	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7640	+
	7641	+ spot.translate(32, 64);
7014	7642	spotw = spot.x + spot.width;
7015	7643	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7644	+ clickInfo.g.setColor(Color.cyan);
	7645	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7646	// if (CameraPane.Xmin > spot.x)
7019	7647	// {
7020	7648	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,29 +7659,9 @@
7031	7659	// {
7032	7660	// CameraPane.Ymax = spoth;
7033	7661	// }
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);
	7662	+ clickInfo.g.setColor(Color.green);
	7663	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7664	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7057	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7666	// if (CameraPane.Xmin > boundary.x)
7059	7667	// {
..	..	@@ -7075,7 +7683,8 @@
7075	7683	}
7076	7684	}
7077	7685
7078		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
7079	7688	{
7080	7689	if (level == 0)
7081	7690	{
..	..	@@ -7084,10 +7693,10 @@
7084	7693
7085	7694	boolean retval = false;
7086	7695
7087		- startX = info.x;
7088		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7089	7698
7090		- hitSomething = 0;
	7699	+ hitSomething = -1;
7091	7700	cVector origin = new cVector();
7092	7701	//LA.xformPos(origin, toParent, origin);
7093	7702	Rectangle spot = new Rectangle();
..	..	@@ -7095,22 +7704,53 @@
7095	7704	{
7096	7705	centerPt = new Point(0, 0);
7097	7706	}
7098		- calcHotSpot(origin, info, centerPt, spot);
7099		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7100	7710	{
7101	7711	hitSomething = hitCenter;
7102	7712	retval = true;
7103	7713	}
7104	7714	spot.translate(32, 0);
7105		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7106	7716	{
7107	7717	hitSomething = hitRotate;
7108	7718	retval = true;
7109	7719	}
7110	7720	spot.translate(0, 32);
7111		- if (spot.contains(info.x, info.y))
	7721	+ spot.translate(32, 0);
	7722	+ spot.translate(0, 32);
	7723	+ if (spot.contains(clickInfo.x, clickInfo.y))
7112	7724	{
7113	7725	hitSomething = hitScale;
	7726	+
	7727	+ double scale = 0.005f * clickInfo.camera.Distance();
	7728	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7729	+ double sign = 1;
	7730	+ if (hScale < 0)
	7731	+ {
	7732	+ sign = -1;
	7733	+ }
	7734	+ hScale = signMath.pow(signhScale, scale * 50);
	7735	+ if (hScale < 0.01)
	7736	+ {
	7737	+ //hScale = 0.01;
	7738	+ }
	7739	+
	7740	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7741	+ sign = 1;
	7742	+ if (vScale < 0)
	7743	+ {
	7744	+ sign = -1;
	7745	+ }
	7746	+ vScale = signMath.pow(signvScale, scale * 50);
	7747	+ if (vScale < 0.01)
	7748	+ {
	7749	+ //vScale = 0.01;
	7750	+ }
	7751	+
	7752	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7753	+
7114	7754	retval = true;
7115	7755	}
7116	7756
..	..	@@ -7120,7 +7760,7 @@
7120	7760	}
7121	7761
7122	7762	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7764	//System.out.println("modified = " + modified);
7125	7765	//new Exception().printStackTrace();
7126	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7788,8 @@
7148	7788	return true;
7149	7789	}
7150	7790
7151		- void doEditDrag0(ClickInfo info)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7152	7793	{
7153	7794	if (hitSomething == 0)
7154	7795	{
..	..	@@ -7162,7 +7803,8 @@
7162	7803
7163	7804	//System.out.println("hitSomething = " + hitSomething);
7164	7805
7165		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
	7807	+
7166	7808	cVector xlate = new cVector();
7167	7809	//cVector xlate2 = new cVector();
7168	7810	switch (hitSomething)
..	..	@@ -7175,7 +7817,9 @@
7175	7817
7176	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7819
7178		- if (modified)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7179	7823	{
7180	7824	//assert(false);
7181	7825	/*
..	..	@@ -7195,8 +7839,8 @@
7195	7839	toParent[3][i] = xlate.get(i);
7196	7840	LA.matInvert(toParent, fromParent);
7197	7841	*/
7198		- cVector delta = LA.newVector(0, 0, startY - info.y);
7199		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7842	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7843	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7200	7844
7201	7845	LA.matCopy(startMat, toParent);
7202	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7205,7 +7849,7 @@
7205	7849	} else
7206	7850	{
7207	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7208		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7209	7853	cVector away = new cVector();
7210	7854	//cVector right2 = new cVector();
7211	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7222,19 +7866,19 @@
7222	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7867	// if (!CameraPane.LOCALTRANSFORM)
7224	7868	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7226	7870	// if (!CameraPane.LOCALTRANSFORM)
7227	7871	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7872	//LA.vecCross(up, cVector.Z, right2);
7229	7873
7230		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7231	7875
7232	7876	//System.out.println("DELTA0 = " + delta);
7233	7877	//System.out.println("AWAY = " + info.camera.away);
7234	7878	//System.out.println("UP = " + info.camera.up);
7235	7879	if (away.z > 0)
7236	7880	{
7237		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7238	7882	{
7239	7883	delta.x = -delta.x;
7240	7884	} else
..	..	@@ -7249,7 +7893,7 @@
7249	7893	//System.out.println("DELTA1 = " + delta);
7250	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7251	7895	//System.out.println("DELTA2 = " + delta);
7252		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7253	7897	LA.matCopy(startMat, toParent);
7254	7898	//System.out.println("DELTA3 = " + delta);
7255	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7259,8 +7903,8 @@
7259	7903	break;
7260	7904
7261	7905	case hitRotate: // rotate
7262		- int dx = info.x - centerPt.x;
7263		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7264	7908	double angle = (double) Math.atan2(dx, dy);
7265	7909	angle = -(1.570796 - angle);
7266	7910
..	..	@@ -7269,6 +7913,7 @@
7269	7913
7270	7914	if (modified)
7271	7915	{
	7916	+ // Rotate 45 degrees
7272	7917	angle /= (Math.PI / 4);
7273	7918	angle = Math.floor(angle + 0.5);
7274	7919	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7927,7 @@
7282	7927	}
7283	7928	/**/
7284	7929
7285		- switch (info.pane.RenderCamera().viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7286	7931	{
7287	7932	case 1: // '\001'
7288	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7309,26 +7954,30 @@
7309	7954	break;
7310	7955
7311	7956	case hitScale: // scale
7312		- double hScale = (double) (info.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7958	+ double sign = 1;
	7959	+ if (hScale < 0)
	7960	+ {
	7961	+ sign = -1;
	7962	+ }
	7963	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7964	if (hScale < 0.01)
7314	7965	{
7315		- hScale = 0.01;
	7966	+ //hScale = 0.01;
7316	7967	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
	7968	+
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7970	+ sign = 1;
	7971	+ if (vScale < 0)
7319	7972	{
7320		- hScale = 0.01;
	7973	+ sign = -1;
7321	7974	}
7322		- double vScale = (double) (info.y - centerPt.y) / 32;
	7975	+ vScale = signMath.pow(signvScale, scale * 50);
7323	7976	if (vScale < 0.01)
7324	7977	{
7325		- vScale = 0.01;
	7978	+ //vScale = 0.01;
7326	7979	}
7327		- vScale = Math.pow(vScale, scale * 50);
7328		- if (vScale < 0.01)
7329		- {
7330		- vScale = 0.01;
7331		- }
	7980	+
7332	7981	LA.matCopy(startMat, toParent);
7333	7982	/**/
7334	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7338,39 +7987,56 @@
7338	7987	}
7339	7988	/**/
7340	7989
7341		- switch (info.pane.RenderCamera().viewCode)
	7990	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7991	+
	7992	+ if (totalScale < 0.01)
	7993	+ {
	7994	+ totalScale = 0.01;
	7995	+ }
	7996	+
	7997	+ switch (clickInfo.pane.RenderCamera().viewCode)
7342	7998	{
7343	7999	case 3: // '\001'
7344		- if (modified)
	8000	+ if (modified \|\| opposite)
7345	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7346	8005	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7348	8007	} // vScale, 1);
7349	8008	else
7350	8009	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	8010	+ // EXCEPTION!
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7352	8012	} // vScale, 1);
7353	8013	break;
7354	8014
7355	8015	case 2: // '\002'
7356		- if (modified)
	8016	+ if (modified \|\| opposite)
7357	8017	{
7358		- //LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	8018	+ if (modified) // && opposite)
	8019	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8020	+ else
	8021	+ //LA.matScale(toParent, hScale, 1, vScale);
	8022	+ LA.matScale(toParent, 1, totalScale, 1);
7360	8023	} else
7361	8024	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	8025	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	8026	}
7364	8027	break;
7365	8028
7366	8029	case 1: // '\003'
7367		- if (modified)
	8030	+ if (modified \|\| opposite)
7368	8031	{
7369		- //LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	8032	+ if (modified) // && opposite)
	8033	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8034	+ else
	8035	+ //LA.matScale(toParent, hScale, vScale, 1);
	8036	+ LA.matScale(toParent, 1, 1, totalScale);
7371	8037	} else
7372	8038	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	8039	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	8040	}
7375	8041	break;
7376	8042	}
..	..	@@ -7404,7 +8070,7 @@
7404	8070	} // NEW ...
7405	8071
7406	8072
7407		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7408	8074	}
7409	8075
7410	8076	boolean overflow = false;
..	..	@@ -7503,14 +8169,22 @@
7503	8169	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	8170	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	8171	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8172	+
	8173	+ String objname;
	8174	+
7506	8175	if (false) //parent != null)
7507	8176	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8177	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	8178	} else
7510	8179	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8180	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	8181	} // + super.toString();
7513	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8183	+
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
	8186	+
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7514	8188	}
7515	8189
7516	8190	public int hashCode()
..	..	@@ -7566,6 +8240,7 @@
7566	8240	objectUI.closeUI();
7567	8241	if (editWindow != null)
7568	8242	{
	8243	+ editWindow.ctrlPanel.FlushUI();
7569	8244	editWindow.refreshContents();
7570	8245	} // ? new
7571	8246	objectUI = null;
..	..	@@ -7574,6 +8249,10 @@
7574	8249	{
7575	8250	editWindow = null;
7576	8251	} // ?
	8252	+ }
	8253	+ else
	8254	+ {
	8255	+ //editWindow.closeUI();
7577	8256	}
7578	8257	}
7579	8258
..	..	@@ -7586,7 +8265,7 @@
7586	8265	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	8266
7588	8267	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	8268	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	8269
7591	8270	double[][] toParent; // dynamic matrix
7592	8271	double[][] fromParent;
..	..	@@ -7701,7 +8380,7 @@
7701	8380	{
7702	8381	assert(bRep != null);
7703	8382	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8383	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8384	}
7706	8385	else
7707	8386	{
..	..	@@ -7732,6 +8411,10 @@
7732	8411	}
7733	8412
7734	8413	transient ObjEditor editWindow;
	8414	+ transient ObjEditor manipWindow;
	8415	+
	8416	+ transient boolean pinned;
	8417	+
7735	8418	transient ObjectUI objectUI;
7736	8419	public static int povDepth = 0;
7737	8420	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8433,9 @@
7750	8433	private static cVector edge2 = new cVector();
7751	8434	//private static cVector norm = new cVector();
7752	8435	/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;
	8436	+ static final int hitCenter = 1;
	8437	+ static final int hitScale = 2;
	8438	+ static final int hitRotate = 3;
7756	8439	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8440	/transient/ private Point centerPt;
7758	8441	/transient/ private int startX;