~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,13 +14,57 @@
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;
	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	+
	56	+ void InitOthers()
	57	+ {
	58	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	59	+ {
	60	+ projectedVertices = new Object3D.cVector2[3];
	61	+ }
	62	+ for (int i = 0; i < 3; i++)
	63	+ {
	64	+ projectedVertices[i] = new cVector2(); // Others
	65	+ }
	66	+ projectedVertices[0].x = 100; // bump
	67	+ }
23	68
24	69	void MinMax(cVector minima, cVector maxima)
25	70	{
..	..	@@ -86,64 +131,245 @@
86	131
87	132	// transient boolean reduced; // for morph reduction
88	133
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-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
91	136
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	137	+ transient Object3D transientsupport; // for cloning
	138	+ transient boolean transientlink2master;
94	139
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	140	+ void SaveSupports()
107	141	{
108		- 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	+ }
109	165	}
110		-
111		- for (int i = 0; i < Size(); i++)
	166	+
	167	+ void RestoreSupports()
112	168	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- 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	+
116	300	blockloop = true;
117		- child.SaveSupports();
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
118	307	blockloop = false;
119	308	}
120		-}
121	309
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
126	314
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
133		- {
134		- bRep.RestoreSupports();
135		- }
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142	315	blockloop = true;
143		- 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	+
144	353	blockloop = false;
145	354	}
146		-}
	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	+ }
147	373
148	374	// MOCAP SUPPORT
149	375	double tx,ty,tz,rx,ry,rz;
..	..	@@ -285,8 +511,9 @@
285	511	return parent.GetName() + "#";
286	512	}
287	513
288		- boolean timeline = false;
289	514	boolean live = false;
	515	+ transient boolean keepdontselect;
	516	+ boolean dontselect = false;
290	517	boolean hide = false;
291	518	boolean link2master = false; // performs reset support/master at each frame
292	519	boolean marked = false; // animation node
..	..	@@ -296,6 +523,8 @@
296	523	boolean random = false;
297	524	boolean speedup = false;
298	525	boolean rewind = false;
	526	+
	527	+ float NORMALPUSH = 0;
299	528
300	529	Object3D support;
301	530
..	..	@@ -352,11 +581,11 @@
352	581	}
353	582	}
354	583
355		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
356	585
357	586	int MemorySize()
358	587	{
359		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
360	589	{
361	590	try
362	591	{
..	..	@@ -416,16 +645,16 @@
416	645	{
417	646	Object3D copy = this;
418	647
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	648	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	649
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	650	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	651	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	652	+ parentcam = Globals.theRenderer.Cameras()[1];
424	653	}
425	654
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	655	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	656	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	657	+ parentcam = Globals.theRenderer.Cameras()[0];
429	658	}
430	659
431	660	if (this == parentcam)
..	..	@@ -433,7 +662,7 @@
433	662	//assert(this instanceof Camera);
434	663
435	664	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	665	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	666	}
438	667
439	668	copy.marked ^= true;
..	..	@@ -453,7 +682,7 @@
453	682	//assert(this instanceof Camera);
454	683
455	684	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	685	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	686	}
458	687
459	688	copy.Touch(); // display list issue
..	..	@@ -466,12 +695,14 @@
466	695	toParent = LA.newMatrix();
467	696	fromParent = LA.newMatrix();
468	697	}
	698	+
469	699	if (toParentMarked == null)
470	700	{
471	701	if (maxcount != 1)
472	702	{
473		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
474	704	}
	705	+
475	706	toParentMarked = LA.newMatrix();
476	707	fromParentMarked = LA.newMatrix();
477	708	}
..	..	@@ -588,7 +819,7 @@
588	819	return;
589	820	}
590	821
591		- if (CameraPane.fromscript)
	822	+ if (Globals.fromscript)
592	823	{
593	824	transformcount = 0;
594	825	return;
..	..	@@ -746,7 +977,7 @@
746	977
747	978	int GetTransformCount()
748	979	{
749		- // marde pour serialization de Texture
	980	+ // patch pour serialization de Texture
750	981	resetmaxcount();
751	982	resettransformcount();
752	983	resetstep();
..	..	@@ -759,7 +990,7 @@
759	990	if (step == 0)
760	991	step = 1;
761	992	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	993	+ maxcount = 128; // 2048; // 4;
763	994	// if (acceleration == 0)
764	995	// acceleration = 10;
765	996	if (delay == 0) // serial
..	..	@@ -780,9 +1011,12 @@
780	1011	// factor = CameraPane.STEP;
781	1012	// }
782	1013
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	1014	+ if (marked && Globals.isLIVE() && live &&
	1015	+ //TEMP21aug2018
	1016	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	1017	+ currentframe != Globals.framecount)
784	1018	{
785		- currentframe = CameraPane.framecount;
	1019	+ currentframe = Globals.framecount;
786	1020
787	1021	// System.err.println("transformcount = " + transformcount);
788	1022	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +1025,8 @@
791	1025
792	1026	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	1027
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1028	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1029	+ (step == 1 && changedir))
795	1030	{
796	1031	countdown = 1;
797	1032	delay = speedup?8:1;
..	..	@@ -863,6 +1098,10 @@
863	1098	if (material == null \|\| material.multiply)
864	1099	return true;
865	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.
866	1105	return material.opacity > 0.99;
867	1106	}
868	1107
..	..	@@ -894,6 +1133,11 @@
894	1133	fromParent = null; // LA.newMatrix();
895	1134	bRep = null; // new BoundaryRep();
896	1135
	1136	+ if (oname != null && oname.equals("LeftHand"))
	1137	+ {
	1138	+ name = oname;
	1139	+ }
	1140	+
897	1141	/*
898	1142	float hue = (float)Math.random();
899	1143	Color col;
..	..	@@ -936,7 +1180,7 @@
936	1180
937	1181	public Object clone()
938	1182	{
939		- return GrafreeD.clone(this);
	1183	+ return Grafreed.clone(this);
940	1184	}
941	1185
942	1186	Object3D copyExpand()
..	..	@@ -1258,6 +1502,7 @@
1258	1502	toParent = LA.newMatrix();
1259	1503	fromParent = LA.newMatrix();
1260	1504	}
	1505	+
1261	1506	LA.matCopy(other.toParent, toParent);
1262	1507	LA.matCopy(other.fromParent, fromParent);
1263	1508
..	..	@@ -1452,7 +1697,7 @@
1452	1697	BoundaryRep.SEUIL = other.material.cameralight;
1453	1698
1454	1699	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1700	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1701	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1702	}
1458	1703
..	..	@@ -1711,7 +1956,7 @@
1711	1956	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1957	o.bRep = transientrep;
1713	1958	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1959	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1960	o.CreateMaterial();
1716	1961	o.SetAttributes(this, -1);
1717	1962	//parent
..	..	@@ -1724,7 +1969,7 @@
1724	1969	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1970	o.bRep = bRep;
1726	1971	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1972	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1973	o.CreateMaterial();
1729	1974	//o.overwriteThis(this, -1);
1730	1975	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +2056,15 @@
1811	2056	if (obj.name == null)
1812	2057	continue; // can't be a null one
1813	2058
	2059	+ // Try perfect match first.
1814	2060	if (n.equals(obj.name))
1815	2061	{
1816	2062	theobj = obj;
1817	2063	count++;
1818	2064	}
1819	2065	}
	2066	+
	2067	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	2068
1821	2069	if (count != 1)
1822	2070	for (int i=Size(); --i>=0;)
..	..	@@ -2131,21 +2379,9 @@
2131	2379	if (/parent != null &&/ material == null)
2132	2380	{
2133	2381	material = new cMaterial(GetMaterial());
2134		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2135		- {
2136		- projectedVertices = new Object3D.cVector2[3];
2137		- }
2138		- for (int i = 0; i < 3; i++)
2139		- {
2140		- projectedVertices[i] = new cVector2(); // Others
2141		- }
2142		- projectedVertices[0].x = 100; // bump
2143	2382
2144		- if (this instanceof Camera)
2145		- {
2146		- material.shift = 90;
2147		- }
2148		-
	2383	+ InitOthers();
	2384	+
2149	2385	material.multiply = multiply;
2150	2386
2151	2387	if (multiply)
..	..	@@ -2283,12 +2519,22 @@
2283	2519	}
2284	2520	*/
2285	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	+ }
2286	2531	}
2287	2532
2288	2533	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2534	{
2290	2535	if (newWindow)
2291	2536	{
	2537	+ new Exception().printStackTrace();
2292	2538	System.exit(0);
2293	2539	if (parent != null)
2294	2540	{
..	..	@@ -2323,6 +2569,14 @@
2323	2569	{
2324	2570	editWindow.refreshContents();
2325	2571	}
	2572	+ else
	2573	+ {
	2574	+ if (manipWindow != null)
	2575	+ {
	2576	+ manipWindow.refreshContents();
	2577	+ }
	2578	+ }
	2579	+
2326	2580	//if (parent != null)
2327	2581	//parent.refreshEditWindow();
2328	2582	}
..	..	@@ -2402,7 +2656,8 @@
2402	2656	private static final int editSelf = 1;
2403	2657	private static final int editChild = 2;
2404	2658
2405		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2406	2661	{
2407	2662	if (level == 0)
2408	2663	{
..	..	@@ -2410,7 +2665,8 @@
2410	2665	return;
2411	2666
2412	2667	Object3D selectee;
2413		- 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))
2414	2670	{
2415	2671	selectee = (Object3D) e.nextElement();
2416	2672	}
..	..	@@ -2418,19 +2674,22 @@
2418	2674	} else
2419	2675	{
2420	2676	//super.
2421		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2422	2679	}
2423	2680	}
2424	2681
2425		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2426	2684	{
2427	2685	doSomething = 0;
2428	2686	if (level == 0)
2429	2687	{
2430		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2431	2689	}
2432	2690	if (//super.
2433		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2434	2693	{
2435	2694	doSomething = 1;
2436	2695	return true;
..	..	@@ -2440,7 +2699,7 @@
2440	2699	}
2441	2700	}
2442	2701
2443		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2444	2703	{
2445	2704	if (selection == null)
2446	2705	{
..	..	@@ -2453,7 +2712,8 @@
2453	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2454	2713	{
2455	2714	Object3D selectee = (Object3D) e.nextElement();
2456		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2457	2717	{
2458	2718	childToDrag = selectee;
2459	2719	doSomething = 2;
..	..	@@ -2465,13 +2725,15 @@
2465	2725	return retval;
2466	2726	}
2467	2727
2468		- void doEditDrag(ClickInfo info)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2469	2730	{
2470	2731	switch (doSomething)
2471	2732	{
2472	2733	case 1: // '\001'
2473	2734	//super.
2474		- doEditDrag0(info);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2475	2737	break;
2476	2738
2477	2739	case 2: // '\002'
..	..	@@ -2484,11 +2746,13 @@
2484	2746	{
2485	2747	//sel.hitSomething = childToDrag.hitSomething;
2486	2748	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2488	2751	} else
2489	2752	{
2490	2753	//super.
2491		- doEditDrag0(info);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2492	2756	}
2493	2757	}
2494	2758	break;
..	..	@@ -2506,6 +2770,9 @@
2506	2770	{
2507	2771	deselectAll();
2508	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2509	2776	ClickInfo newInfo = new ClickInfo();
2510	2777	newInfo.flags = info.flags;
2511	2778	newInfo.bounds = info.bounds;
..	..	@@ -2598,6 +2865,18 @@
2598	2865	void GenNormalsS(boolean crease)
2599	2866	{
2600	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();
2601	2880	// for (int i=0; i<selection.size(); i++)
2602	2881	// {
2603	2882	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +3017,24 @@
2738	3017	if (child == null)
2739	3018	continue;
2740	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();
2741	3038	// Children().release(i);
2742	3039	}
2743	3040	blockloop = false;
..	..	@@ -2895,7 +3192,8 @@
2895	3192	{
2896	3193	if (bRep != null)
2897	3194	{
2898		- bRep.GenUV();
	3195	+ bRep.GenUV(); //1);
	3196	+ //bRep.UnfoldUV();
2899	3197	Touch();
2900	3198	}
2901	3199	}
..	..	@@ -2909,11 +3207,20 @@
2909	3207	}
2910	3208	}
2911	3209
	3210	+ void GenNormalsMesh0()
	3211	+ {
	3212	+ if (bRep != null)
	3213	+ {
	3214	+ bRep.GenerateNormalsMesh();
	3215	+ Touch();
	3216	+ }
	3217	+ }
	3218	+
2912	3219	void GenNormalsMINE0()
2913	3220	{
2914	3221	if (bRep != null)
2915	3222	{
2916		- bRep.GenerateNormalsMINE();
	3223	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2917	3224	Touch();
2918	3225	}
2919	3226	}
..	..	@@ -2970,6 +3277,120 @@
2970	3277	blockloop = false;
2971	3278	}
2972	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	+
2973	3394	void TransformGeometry()
2974	3395	{
2975	3396	Object3D obj = this;
..	..	@@ -3191,9 +3612,11 @@
3191	3612
3192	3613	BoundaryRep sup = bRep.support;
3193	3614	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3615	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3616	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3617	+
	3618	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3619	+
3197	3620	bRep = temprep;
3198	3621	bRep.support = sup;
3199	3622	Touch();
..	..	@@ -3294,15 +3717,47 @@
3294	3717
3295	3718	void ClearMaterials()
3296	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3297	3725	ClearMaterial();
3298		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3299	3727	{
3300		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3301	3729	if (child == null)
3302	3730	continue;
3303	3731	child.ClearMaterials();
3304		- release(i);
3305	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;
3306	3761	}
3307	3762
3308	3763	void FlipV(boolean flip)
..	..	@@ -3330,7 +3785,8 @@
3330	3785	if (blockloop)
3331	3786	return;
3332	3787
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3788	+ if (//marked \|\| // does not make sense
	3789	+ (bRep != null \|\| material != null)) // borderline...
3334	3790	live = h;
3335	3791
3336	3792	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3807,8 @@
3351	3807	return;
3352	3808
3353	3809	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3810	+ if (//marked \|\| // does not make sense
	3811	+ (bRep != null \|\| material != null)) // borderline...
3355	3812	link2master = h;
3356	3813
3357	3814	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3828,8 @@
3371	3828	if (blockloop)
3372	3829	return;
3373	3830
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3831	+ if (//marked \|\| // does not make sense
	3832	+ (bRep != null \|\| material != null)) // borderline...
3375	3833	hide = h;
3376	3834
3377	3835	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3849,7 @@
3391	3849	if (blockloop)
3392	3850	return;
3393	3851
3394		- if (bRep != null && material != null) // borderline...
	3852	+ if (bRep != null \|\| material != null) // borderline...
3395	3853	marked = h;
3396	3854
3397	3855	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3859,46 @@
3401	3859	continue;
3402	3860	blockloop = true;
3403	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);
3404	3902	blockloop = false;
3405	3903	// release(i);
3406	3904	}
..	..	@@ -3715,7 +4213,7 @@
3715	4213	if (child == null)
3716	4214	continue;
3717	4215
3718		- if (GrafreeD.RENDERME > 0)
	4216	+ if (Grafreed.RENDERME > 0)
3719	4217	{
3720	4218	if (child instanceof Merge)
3721	4219	((Merge)child).renderme();
..	..	@@ -3866,7 +4364,7 @@
3866	4364	if (child == null)
3867	4365	continue;
3868	4366
3869		- if (GrafreeD.RENDERME > 0)
	4367	+ if (Grafreed.RENDERME > 0)
3870	4368	{
3871	4369	if (child instanceof Merge)
3872	4370	((Merge)child).renderme();
..	..	@@ -4061,7 +4559,7 @@
4061	4559	if (child == null)
4062	4560	continue;
4063	4561
4064		- if (GrafreeD.RENDERME > 0)
	4562	+ if (Grafreed.RENDERME > 0)
4065	4563	{
4066	4564	if (child instanceof Merge)
4067	4565	((Merge)child).renderme();
..	..	@@ -4158,6 +4656,71 @@
4158	4656	}
4159	4657	blockloop = true;
4160	4658	get(i).RepairParent();
	4659	+ blockloop = false;
	4660	+ }
	4661	+ }
	4662	+
	4663	+ void RepairShadow()
	4664	+ {
	4665	+ if (blockloop)
	4666	+ return;
	4667	+
	4668	+ if (this.material != null)
	4669	+ this.InitOthers();
	4670	+
	4671	+ for (int i=0; i<Size(); i++)
	4672	+ {
	4673	+ blockloop = true;
	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();
4161	4724	blockloop = false;
4162	4725	}
4163	4726	}
..	..	@@ -4652,7 +5215,7 @@
4652	5215
4653	5216	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	5217	{
4655		- if (hide)
	5218	+ if (hide \|\| dontselect)
4656	5219	return null;
4657	5220
4658	5221	if (count <= 0)
..	..	@@ -4676,9 +5239,17 @@
4676	5239	}
4677	5240	}
4678	5241
	5242	+ ObjEditor GetWindow()
	5243	+ {
	5244	+ if (editWindow != null)
	5245	+ return editWindow;
	5246	+
	5247	+ return manipWindow;
	5248	+ }
	5249	+
4679	5250	cTreePath Select(int indexcount, boolean deselect)
4680	5251	{
4681		- if (hide)
	5252	+ if (hide \|\| dontselect)
4682	5253	return null;
4683	5254
4684	5255	if (count <= 0)
..	..	@@ -4712,10 +5283,11 @@
4712	5283	if (leaf != null)
4713	5284	{
4714	5285	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5286	+ ObjEditor window = GetWindow();
	5287	+ if (window != null)
4716	5288	{
4717	5289	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5290	+ window.Select(tp, deselect, true);
4719	5291	}
4720	5292
4721	5293	return tp;
..	..	@@ -4732,6 +5304,7 @@
4732	5304
4733	5305	if (child == null)
4734	5306	continue;
	5307	+
4735	5308	if (child.HasTransparency() && child.size() != 0)
4736	5309	{
4737	5310	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5314,10 @@
4741	5314	if (leaf != null)
4742	5315	{
4743	5316	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5317	+ ObjEditor window = GetWindow();
	5318	+ if (window != null)
4745	5319	{
4746		- editWindow.Select(tp, deselect, true);
	5320	+ window.Select(tp, deselect, true);
4747	5321	}
4748	5322
4749	5323	return tp;
..	..	@@ -4828,7 +5402,7 @@
4828	5402	return globalTransform;
4829	5403	}
4830	5404
4831		- void PreprocessOcclusion(CameraPane cp)
	5405	+ void PreprocessOcclusion(iCameraPane cp)
4832	5406	{
4833	5407	/*
4834	5408	if (AOdone)
..	..	@@ -4975,7 +5549,8 @@
4975	5549	} else //
4976	5550	if (editWindow != null)
4977	5551	{
4978		- editWindow.cameraView.lighttouched = true;
	5552	+ //editWindow.cameraView.lighttouched = true;
	5553	+ Globals.lighttouched = true;
4979	5554	}
4980	5555	}
4981	5556
..	..	@@ -5067,6 +5642,51 @@
5067	5642	blockloop = false;
5068	5643	}
5069	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	+
5070	5690	boolean IsSelected()
5071	5691	{
5072	5692	if (parent == null)
..	..	@@ -5127,12 +5747,41 @@
5127	5747	if (fullname == null)
5128	5748	return "";
5129	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5130	5755	// System.out.println("Fullname = " + fullname);
5131	5756
5132		- if (fullname.name.indexOf(":") == -1)
5133		- 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(":"));
5134	5762
5135		- 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];
5136	5785	}
5137	5786
5138	5787	static String GetBump(cTexture fullname)
..	..	@@ -5140,11 +5789,44 @@
5140	5789	if (fullname == null)
5141	5790	return "";
5142	5791
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
	5796	+
5143	5797	// System.out.println("Fullname = " + fullname);
5144		- if (fullname.name.indexOf(":") == -1)
5145		- return "";
5146		-
5147		- 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];
5148	5830	}
5149	5831
5150	5832	String GetPigmentTexture()
..	..	@@ -5218,7 +5900,7 @@
5218	5900	System.out.print("; textures = " + textures);
5219	5901	System.out.println("; usedtextures = " + usedtextures);
5220	5902
5221		- if (GetTextures() == null)
	5903	+ if (GetTextures() == null) // What is that??
5222	5904	GetTextures().name = ":";
5223	5905
5224	5906	String texname = tex;
..	..	@@ -5227,6 +5909,9 @@
5227	5909	texname = "";
5228	5910
5229	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5230	5915	Touch();
5231	5916	}
5232	5917
..	..	@@ -5251,6 +5936,43 @@
5251	5936	}
5252	5937	}
5253	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	+
5254	5976	void SetBumpTexture(String tex)
5255	5977	{
5256	5978	if (GetTextures() == null)
..	..	@@ -5262,6 +5984,8 @@
5262	5984	texname = "";
5263	5985
5264	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5987	+
	5988	+ GetTextures().bump = null;
5265	5989
5266	5990	Touch();
5267	5991	}
..	..	@@ -5287,25 +6011,70 @@
5287	6011	}
5288	6012	}
5289	6013
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	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	+
	6046	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	6047	{
5292	6048	Draw(display, root, selected, blocked);
5293	6049	}
5294	6050
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	6051	boolean NeedSupport()
5300	6052	{
5301	6053	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	6054	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	6055	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	6056	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	6057	}
5306	6058
	6059	+ static boolean DEBUG_SELECTION = false;
5307	6060
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	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	+ }
	6076	+
	6077	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	6078	{
5310	6079	Invariants(); // june 2013
5311	6080
..	..	@@ -5314,8 +6083,8 @@
5314	6083	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	6084	}
5316	6085
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	6086	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	6087	+ (hide \|\| dontselect))
5319	6088	return;
5320	6089
5321	6090	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +6102,7 @@
5333	6102	if (this instanceof Checker)
5334	6103	return;
5335	6104
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	6105	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	6106	return;
5338	6107
5339	6108	if (count <= 0)
..	..	@@ -5341,13 +6110,13 @@
5341	6110	return;
5342	6111	}
5343	6112
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	6113	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	6114	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	6115	{
5347	6116	return;
5348	6117	}
5349	6118
5350		- javax.media.opengl.GL gl = display.GetGL();
	6119	+ //javax.media.opengl.GL gl = display.GetGL();
5351	6120
5352	6121	/*
5353	6122	if (touched)
..	..	@@ -5365,8 +6134,11 @@
5365	6134	if (support != null)
5366	6135	support = support;
5367	6136
5368		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5369		- 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.
5370	6142
5371	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	6144	{
..	..	@@ -5376,30 +6148,33 @@
5376	6148	// usecalllists &= !(parent instanceof RandomNode);
5377	6149	// usecalllists = false;
5378	6150
5379		- if (GetBRep() != null)
5380		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5381	6154	//System.out.println("draw " + this);
5382	6155	//new Exception().printStackTrace();
5383	6156
5384	6157	boolean compiled = false;
5385	6158
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6159	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	6160
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6161	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	6162	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6163	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	6164	{
5391		- display.lighttouched = true;
	6165	+ Globals.lighttouched = true;
5392	6166	} // all panes...
5393		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5394		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	6167	+
	6168	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	6169	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	6170	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	6171	{
5397	6172	if (!(this instanceof Composite))
5398	6173	touched = false;
5399	6174	//if (displaylist == -1 && usecalllists)
5400		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5401	6176	{
5402		- bRep.displaylist = gl.glGenLists(1);
	6177	+ bRep.displaylist = display.GenList();
5403	6178	assert(bRep.displaylist != 0);
5404	6179	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	6180	//System.out.println("\tgen list " + list);
..	..	@@ -5408,21 +6183,23 @@
5408	6183
5409	6184	//System.out.println("\tnew list " + list);
5410	6185	//gl.glDrawBuffer(gl.GL_NONE);
5411		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5412	6187	{
5413	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6189	+ display.NewList(bRep.displaylist);
5415	6190	}
	6191	+
5416	6192	CallList(display, root, selected, blocked);
	6193	+
5417	6194	// compiled = true;
5418		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5419	6196	{
5420	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	6198	+ display.EndList();
5422	6199	}
5423	6200	//gl.glDrawBuffer(gl.GL_BACK);
5424	6201	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	6202	+ Globals.lighttouched = true; // all panes...
5426	6203	}
5427	6204
5428	6205	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +6238,12 @@
5461	6238
5462	6239	// frustum culling
5463	6240	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	6241	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	6242	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	6243	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	6244	{
5468	6245	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6246	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	6247	{
5471	6248	//System.out.print("CULLED");
5472	6249	culled = true;
..	..	@@ -5474,7 +6251,7 @@
5474	6251	}
5475	6252	else
5476	6253	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6254	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	6255	culled = true;
5479	6256
5480	6257	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +6287,12 @@
5510	6287
5511	6288
5512	6289	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6290	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	6291	{
5515	6292	if (GetBRep() != null)
5516	6293	{
5517		- CameraPane.NextIndex(this, gl);
	6294	+ display.NextIndex();
	6295	+
5518	6296	// vertex color conflict : gl.glCallList(list);
5519	6297	DrawNode(display, root, selected);
5520	6298	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +6314,7 @@
5536	6314	color[2] /= 2;
5537	6315	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	6316	*/
5539		- if (material != null)
5540		- {
5541		- materialstack[materialdepth] = material;
5542		- selectedstack[materialdepth] = selected;
5543		- cStatic.objectstack[materialdepth++] = this;
5544		- //System.out.println("material " + material);
5545		- //Applet3D.tracein(this, selected);
5546		- display.vector2buffer = projectedVertices;
5547		- if (this instanceof Camera)
5548		- {
5549		- display.options1[0] = material.shift;
5550		- //System.out.println("shift " + material.shift);
5551		- display.options1[1] = material.lightarea;
5552		- display.options1[2] = material.shadowbias;
5553		- display.options1[3] = material.aniso;
5554		- display.options1[4] = material.anisoV;
5555		- display.options2[0] = material.opacity;
5556		- display.options2[1] = material.diffuse;
5557		- display.options2[2] = material.factor;
5558		-
5559		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5560		- display.options4[0] = material.cameralight/0.2f;
5561		- display.options4[1] = material.subsurface;
5562		- display.options4[2] = material.sheen;
5563		-
5564		- // if (display.CURRENTANTIALIAS > 0)
5565		- // display.options3[3] /= 4;
5566		-
5567		- /*
5568		- System.out.println("Focus = " + display.options1[0]);
5569		- System.out.println("Aperture = " + display.options1[1]);
5570		- System.out.println("ShadowBlur = " + display.options1[2]);
5571		- System.out.println("Antialiasing = " + display.options1[3]);
5572		- System.out.println("Fog = " + display.options2[0]);
5573		- System.out.println("Intensity = " + display.options2[1]);
5574		- System.out.println("Elevation = " + display.options2[2]);
5575		- /**/
5576		- } else
5577		- {
5578		- material.Draw(display, selected);
5579		- }
5580		- } else
5581		- {
5582		- if (selected && CameraPane.flash)
5583		- {
5584		- display.modelParams4[1] = 100;
5585		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5586		- }
5587		- }
	6317	+ display.PushMaterial(this, selected);
5588	6318
5589	6319	//System.out.println("call list " + list);
5590	6320	//System.out.println();
..	..	@@ -5603,7 +6333,28 @@
5603	6333	tex = GetTextures();
5604	6334	}
5605	6335
5606		- 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	+ }
5607	6358
5608	6359	if (!compiled)
5609	6360	{
..	..	@@ -5619,30 +6370,19 @@
5619	6370
5620	6371	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6372	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6373	+ display.CallList(bRep.displaylist);
5623	6374	// june 2013 drawSelf(display, root, selected);
5624	6375	}
5625	6376	}
5626	6377	}
5627	6378
5628		- display.ReleaseTextures(tex);
5629		-
5630		- //if (parent != null && parent.GetMaterial() != null)
5631		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5632		- if (material != null)
5633		- {
5634		- materialdepth -= 1;
5635		- if (materialdepth > 0)
5636		- {
5637		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5638		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5639		- }
5640		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5641		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5642		- {
5643		- display.modelParams4[1] = GetMaterial().cameralight;
5644		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5645		- }
	6379	+ if (!failedBump)
	6380	+ display.ReleaseBumpTexture(tex);
	6381	+
	6382	+ if (!failedPigment)
	6383	+ display.ReleasePigmentTexture(tex);
	6384	+
	6385	+ display.PopMaterial(this, selected);
5646	6386	}
5647	6387
5648	6388	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6424,7 @@
5684	6424	// resetMasterNode();
5685	6425	}
5686	6426
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6427	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6428	{
5689	6429	if (GetBRep() == null)
5690	6430	{
..	..	@@ -5767,8 +6507,11 @@
5767	6507	boolean flipV = false; // true;
5768	6508	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6509
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6510	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6511	{
	6512	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6513	+ return;
	6514	+
5772	6515	if (hide)
5773	6516	return;
5774	6517	// shadow optimisation
..	..	@@ -5826,16 +6569,7 @@
5826	6569	// // ??????????????????????????? Touch();
5827	6570	// }
5828	6571
5829		- if (material != null)
5830		- {
5831		- materialstack[materialdepth] = material;
5832		- selectedstack[materialdepth] = selected;
5833		- cStatic.objectstack[materialdepth++] = this;
5834		- //System.out.println("material " + material);
5835		- //Applet3D.tracein("selected ", selected);
5836		- display.vector2buffer = projectedVertices;
5837		- material.Draw(display, selected);
5838		- }
	6572	+display.PushMaterial2(this, selected);
5839	6573
5840	6574	Object3D child;
5841	6575	boolean sel;
..	..	@@ -5887,19 +6621,7 @@
5887	6621	*/
5888	6622	//depth += 1;
5889	6623
5890		- if (material != null)
5891		- {
5892		- materialdepth -= 1;
5893		- if (materialdepth > 0)
5894		- {
5895		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5896		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5897		- }
5898		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5899		- //else
5900		- //material.Draw(display, false);
5901		- }
5902		-
	6624	+display.PopMaterial2(this);
5903	6625	/*
5904	6626	display.ReleaseTextures(tex);
5905	6627	*/
..	..	@@ -5910,10 +6632,13 @@
5910	6632
5911	6633	//static cVector min,max;
5912	6634
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6635	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6636	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6637	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6638	return; // no shadow for transparent objects
	6639	+
	6640	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6641	+ return;
5917	6642
5918	6643	if (hide)
5919	6644	return;
..	..	@@ -5955,11 +6680,12 @@
5955	6680	return;
5956	6681	}
5957	6682
	6683	+ //bRep.GenUV(1/material.diffuseness);
5958	6684	// bRep.lock = true;
5959	6685
5960		- javax.media.opengl.GL gl = display.GetGL();
	6686	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6687
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6688	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6689	{
5964	6690	int fc = bRep.FaceCount();
5965	6691	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6700,7 @@
5974	6700
5975	6701	bRep.getMinMax(min, max, 100);
5976	6702
5977		- gl.glBegin(gl.GL_LINES);
5978		-
5979		- gl.glVertex3d(min.x, min.y, min.z);
5980		- gl.glVertex3d(min.x, min.y, max.z);
5981		- gl.glVertex3d(min.x, min.y, min.z);
5982		- gl.glVertex3d(min.x, max.y, min.z);
5983		- gl.glVertex3d(min.x, min.y, min.z);
5984		- gl.glVertex3d(max.x, min.y, min.z);
5985		-
5986		- gl.glVertex3d(max.x, max.y, max.z);
5987		- gl.glVertex3d(min.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, max.y, max.z);
5989		- gl.glVertex3d(max.x, min.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, max.z);
5991		- gl.glVertex3d(max.x, max.y, min.z);
5992		-
5993		- gl.glEnd();
	6703	+ display.DrawBox(min, max);
5994	6704
5995	6705	return;
5996	6706	}
..	..	@@ -6034,7 +6744,7 @@
6034	6744	{
6035	6745	//throw new Error();
6036	6746
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6747	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6748
6039	6749	int[] strips = bRep.getRawIndices();
6040	6750
..	..	@@ -6044,178 +6754,19 @@
6044	6754	new Exception().printStackTrace();
6045	6755	return;
6046	6756	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6757	+
	6758	+ if (dontselect)
6050	6759	{
6051		- float[] v = bRep.getRawVertices();
6052		- float[] n = bRep.getRawNormals();
6053		- float[] c = bRep.getRawColors();
6054		- float[] uv = bRep.getRawUVMap();
6055		-
6056		- int count2 = 0;
6057		- int count3 = 0;
6058		-
6059		- if (n.length > 0)
6060		- {
6061		- for (int i = 0; i < strips.length; i++)
6062		- {
6063		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6064		-
6065		- /*
6066		- boolean locked = false;
6067		- float eps = 0.1f;
6068		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6069		-
6070		- int dot = 0;
6071		-
6072		- if ((dot&1) == 0)
6073		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6074		-
6075		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6076		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6077		- else
6078		- {
6079		- locked = true;
6080		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6081		- }
6082		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6083		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6084		- if (hasnorm)
6085		- {
6086		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6087		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6088		- }
6089		-
6090		- if ((dot&4) == 0)
6091		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6092		-
6093		- if (wrap \|\| !locked && (dot&8) != 0)
6094		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6095		- else
6096		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6097		-
6098		- f.dot = dot;
6099		- */
6100		-
6101		- if (!selectmode)
6102		- {
6103		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6104		- {
6105		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6106		- } else
6107		- {
6108		- gl.glNormal3f(0, 0, 1);
6109		- }
6110		-
6111		- if (c != null)
6112		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6113		- {
6114		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6115		- }
6116		- }
6117		- if (flipV)
6118		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6119		- else
6120		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6121		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6122		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6123		-
6124		- count2 += 2;
6125		- count3 += 3;
6126		- if (!selectmode)
6127		- {
6128		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6129		- {
6130		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6131		- } else
6132		- {
6133		- gl.glNormal3f(0, 0, 1);
6134		- }
6135		- if (c != null)
6136		- {
6137		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6138		- }
6139		- }
6140		- if (flipV)
6141		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6142		- else
6143		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6144		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6145		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6146		-
6147		- count2 += 2;
6148		- count3 += 3;
6149		- for (int j = 0; j < strips[i] - 2; j++)
6150		- {
6151		- //gl.glTexCoord2d(...);
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		-
6167		- if (flipV)
6168		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6169		- else
6170		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6171		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6172		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6173		- count2 += 2;
6174		- count3 += 3;
6175		- }
6176		-
6177		- gl.glEnd();
6178		- }
6179		- }
6180		-
6181		- assert count3 == v.length;
	6760	+ //bRep.GenerateNormalsMINE();
6182	6761	}
6183		- else // !trimmed
6184		- {
6185		- int count = 0;
6186		- for (int i = 0; i < strips.length; i++)
6187		- {
6188		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6189		-
6190		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6191		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6192		-
6193		- drawVertex(gl, p, selectmode);
6194		- drawVertex(gl, q, selectmode);
6195		-
6196		- for (int j = 0; j < strips[i] - 2; j++)
6197		- {
6198		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6199		-
6200		-// if (j%2 == 0)
6201		-// drawFace(p, q, r, display, null);
6202		-// else
6203		-// drawFace(p, r, q, display, null);
6204		-
6205		-// p = q;
6206		-// q = r;
6207		- drawVertex(gl, r, selectmode);
6208		- }
6209		-
6210		- gl.glEnd();
6211		- }
6212		- }
	6762	+
	6763	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6764	} else // catch (Error e)
6214	6765	{
6215	6766	// TRIANGLE ARRAY
6216	6767	if (IsOpaque()) // Static())
6217	6768	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6769	+ display.StartTriangles();
6219	6770	int facecount = bRep.FaceCount();
6220	6771	for (int i = 0; i < facecount; i++)
6221	6772	{
..	..	@@ -6278,9 +6829,9 @@
6278	6829	// // r.norm.dot(v3) > -0.5)
6279	6830	// // continue;
6280	6831
6281		- drawFace(p, q, r, display, face);
	6832	+ display.DrawFace(this, p, q, r, face);
6282	6833	}
6283		- gl.glEnd();
	6834	+ display.EndTriangles();
6284	6835	}
6285	6836	else
6286	6837	{
..	..	@@ -6309,8 +6860,8 @@
6309	6860	//System.out.println("SORT");
6310	6861
6311	6862	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6863	+
	6864	+ display.StartTriangles();
6314	6865	for (int i = 0; i < facecount; i++)
6315	6866	{
6316	6867	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6873,14 @@
6322	6873	Vertex q = bRep.GetVertex(face.q);
6323	6874	Vertex r = bRep.GetVertex(face.r);
6324	6875
6325		- drawFace(p, q, r, display, face);
	6876	+ display.DrawFace(this, p, q, r, face);
6326	6877	}
6327		- gl.glEnd();
	6878	+ display.EndTriangles();
6328	6879	}
6329	6880
6330	6881	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6882	{
	6883	+ /*
6332	6884	gl.glDisable(gl.GL_LIGHTING);
6333	6885	float[] colorV = new float[3];
6334	6886
..	..	@@ -6407,6 +6959,7 @@
6407	6959	// gl.glEnd();
6408	6960	}
6409	6961	}
	6962	+ */
6410	6963	}
6411	6964	}
6412	6965
..	..	@@ -6451,7 +7004,7 @@
6451	7004	center.add(r);
6452	7005	center.mul(1.0/3);
6453	7006
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	7007	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	7008
6456	7009	distance = center.dot(center);
6457	7010	}
..	..	@@ -6462,347 +7015,11 @@
6462	7015
6463	7016	transient FaceCompare[] facescompare = null;
6464	7017
6465		- void SetColor(CameraPane display, Vertex p0)
6466		- {
6467		- if (display.RENDERPROGRAM == 0)
6468		- {
6469		- float r = 0;
6470		- if (bRep != null)
6471		- {
6472		- if (bRep.stripified)
6473		- {
6474		- r = 1;
6475		- }
6476		- }
6477		- float g = 0;
6478		- if (bRep != null)
6479		- {
6480		- if (bRep.trimmed)
6481		- {
6482		- g = 1;
6483		- }
6484		- }
6485		- float b = 0;
6486		- if (support != null && link2master)
6487		- {
6488		- b = 1;
6489		- }
6490		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6491		- return;
6492		- }
6493		-
6494		- if (display.drawMode != CameraPane.SHADOW)
6495		- return;
6496		-
6497		- javax.media.opengl.GL gl = display.GetGL();
6498		-// if (true) return;
6499		-// float ao = p.AO;
6500		-//
6501		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6502		-// // ao = 1;
6503		-//
6504		-// gl.glColor4f(ao, ao, ao, 1);
6505		-
6506		-// CameraPane.selectedpoint.
6507		-// getAverage(cStatic.point1, true);
6508		- if (CameraPane.pointflow == null) // !random) // live)
6509		- {
6510		- return;
6511		- }
6512		-
6513		- cStatic.point1.set(0,0,0);
6514		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6515		-
6516		- cStatic.point1.sub(p0);
6517		-
6518		-
6519		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6520		-// {
6521		-// return;
6522		-// }
6523		-
6524		- //if (true)
6525		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6526		- {
6527		- return;
6528		- }
6529		-
6530		- float[] colorV = new float[3];
6531		-
6532		- if (false) // marked)
6533		- {
6534		- // debug rigging weights
6535		- for (int object = 0; object < p0.vertexlinks.length; object++)
6536		- {
6537		- float weight = p0.weights[object] / p0.totalweight;
6538		-
6539		- // if (weight < 0.1)
6540		- // {
6541		- // assert(weight == 0);
6542		- // continue;
6543		- // }
6544		-
6545		- if (p0.vertexlinks[object] == -1)
6546		- continue;
6547		-
6548		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6549		-
6550		- int color = //1 << object; //
6551		- //p.vertexlinks.length;
6552		- support.bRep.supports[p0.closestsupport].links[object];
6553		- colorV[2] += (color & 1) * weight;
6554		- colorV[1] += ((color & 2) >> 1) * weight;
6555		- colorV[0] += ((color & 4) >> 2) * weight;
6556		- }
6557		- }
6558		- else
6559		- {
6560		- if (drawingstarted)
6561		- {
6562		- // find next point
6563		- if (bRep.GetVertex(0).faceindices == null)
6564		- {
6565		- bRep.InitFaceIndices();
6566		- }
6567		-
6568		- double ymin = p0.y;
6569		-
6570		- Vertex newp = p0;
6571		-
6572		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6573		- {
6574		- int fi = p0.faceindices[fii];
6575		-
6576		- if (fi == -1)
6577		- break;
6578		-
6579		- Face f = bRep.GetFace(fi);
6580		-
6581		- Vertex p = bRep.GetVertex(f.p);
6582		- Vertex q = bRep.GetVertex(f.q);
6583		- Vertex r = bRep.GetVertex(f.r);
6584		-
6585		- int swap = (int)(Math.random()*3);
6586		-
6587		-// for (int s=swap; --s>=0;)
6588		-// {
6589		-// Vertex t = p;
6590		-// p = q;
6591		-// q = r;
6592		-// r = t;
6593		-// }
6594		- if (ymin > p.y)
6595		- {
6596		- ymin = p.y;
6597		- newp = p;
6598		-// break;
6599		- }
6600		- if (ymin > q.y)
6601		- {
6602		- ymin = q.y;
6603		- newp = q;
6604		-// break;
6605		- }
6606		- if (ymin > r.y)
6607		- {
6608		- ymin = r.y;
6609		- newp = r;
6610		-// break;
6611		- }
6612		- }
6613		-
6614		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6615		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6616		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6617		-
6618		- drawingstarted = false;
6619		-
6620		- // return;
6621		- }
6622		-
6623		- if (false) // CameraPane.DRAW
6624		- {
6625		- p0.AO = colorV[0] = 2;
6626		- colorV[1] = 2;
6627		- colorV[2] = 2;
6628		- }
6629		-
6630		- CameraPane.pointflow.add(p0);
6631		- CameraPane.pointflow.Touch();
6632		- }
6633		-
6634		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6635		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6636		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6637		- }
6638		-
6639	7018	void Print(Vertex v)
6640	7019	{
6641	7020	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	7021	}
6643	7022
6644		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6645		- {
6646		- if (!selectmode)
6647		- {
6648		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6649		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6650		-
6651		- if (flipV)
6652		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6653		- else
6654		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6655		- }
6656		-
6657		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6658		- }
6659		-
6660		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6661		- CameraPane display, Face face)
6662		- {
6663		- if (pv.y == -10000 \|\|
6664		- qv.y == -10000 \|\|
6665		- rv.y == -10000)
6666		- return;
6667		-
6668		-// float b = f.nbiterations & 1;
6669		-// float g = (f.nbiterations>>1) & 1;
6670		-// float r = (f.nbiterations>>2) & 1;
6671		-//
6672		-// //if (f.weight == 10000)
6673		-// //{
6674		-// // r = 1; g = b = 0;
6675		-// //}
6676		-// //else
6677		-// //{
6678		-// // assert(f.weight < 10000);
6679		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6680		-// if (r<0)
6681		-// assert(r>=0);
6682		-// //}
6683		-
6684		- javax.media.opengl.GL gl = display.GetGL();
6685		-
6686		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6687		-
6688		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6689		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6690		- {
6691		- //gl.glBegin(gl.GL_TRIANGLES);
6692		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6693		- if (!hasnorm)
6694		- {
6695		- // System.out.println("FUCK!!");
6696		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6697		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6698		- LA.vecCross(v0, v1, v2);
6699		- LA.vecNormalize(v2);
6700		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6701		- }
6702		-
6703		- if (hasnorm)
6704		- {
6705		-// if (!pv.norm.normalized())
6706		-// assert(pv.norm.normalized());
6707		-
6708		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6709		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6710		- }
6711		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6712		- SetColor(display, pv);
6713		- //gl.glColor4f(r, g, b, 1);
6714		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6715		- if (flipV)
6716		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6717		- else
6718		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6719		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6720		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6721		-// Print(pv);
6722		- if (hasnorm)
6723		- {
6724		-// assert(qv.norm.normalized());
6725		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6726		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6727		- }
6728		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6729		- // boolean locked = false;
6730		- // float eps = 0.1f;
6731		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6732		-
6733		- // int dot = 0; //*/ (int)f.dot;
6734		-
6735		- // if ((dot&1) == 0)
6736		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6737		-
6738		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6739		- if (flipV)
6740		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6741		- else
6742		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6743		- // else
6744		- // {
6745		- // locked = true;
6746		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6747		- // }
6748		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6749		- SetColor(display, qv);
6750		- //gl.glColor4f(r, g, b, 1);
6751		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6752		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6753		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6754		-// Print(qv);
6755		- if (hasnorm)
6756		- {
6757		-// assert(rv.norm.normalized());
6758		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6759		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6760		- }
6761		-
6762		- // if ((dot&4) == 0)
6763		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6764		-
6765		- // if (wrap \|\| !locked && (dot&8) != 0)
6766		- if (flipV)
6767		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6768		- else
6769		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6770		- // else
6771		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6772		-
6773		- // f.dot = dot;
6774		-
6775		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6776		- SetColor(display, rv);
6777		- //gl.glColor4f(r, g, b, 1);
6778		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6779		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6780		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6781		-// Print(rv);
6782		- //gl.glEnd();
6783		- }
6784		- else
6785		- {
6786		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6787		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6788		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6789		-
6790		- }
6791		-
6792		- if (false) // (attributes & WIREFRAME) != 0)
6793		- {
6794		- gl.glDisable(gl.GL_LIGHTING);
6795		-
6796		- gl.glBegin(gl.GL_LINE_LOOP);
6797		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6798		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6799		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6800		- gl.glEnd();
6801		-
6802		- gl.glEnable(gl.GL_LIGHTING);
6803		- }
6804		- }
6805		-
6806	7023	void drawSelf(ClickInfo info, int level, boolean select)
6807	7024	{
6808	7025	if (bRep == null)
..	..	@@ -7326,20 +7543,23 @@
7326	7543	}
7327	7544	}
7328	7545
7329		- 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)
7330	7550	{
7331		- int hc = info.bounds.x + info.bounds.width / 2;
7332		- int vc = info.bounds.y + info.bounds.height / 2;
7333		- 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;
7334	7554	if (toscreen == null)
7335	7555	{
7336		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7337	7557	}
7338	7558	cVector vec = in;
7339	7559	LA.xformPos(in, toscreen, in);
7340	7560	//System.out.println("Distance = " + info.camera.Distance());
7341		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7342		- 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();
7343	7563	outPt.x = hc + (int) vec.x;
7344	7564	outPt.y = vc - (int) vec.y;
7345	7565	outRec.x = outPt.x - 3;
..	..	@@ -7347,15 +7567,18 @@
7347	7567	outRec.width = outRec.height = 6;
7348	7568	}
7349	7569
7350		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
7351	7572	{
7352	7573	Point pt = new Point(0, 0);
7353	7574	Rectangle rec = new Rectangle();
7354		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
7355	7577	return rec;
7356	7578	}
7357	7579
7358		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
7359	7582	{
7360	7583	if (level == 0)
7361	7584	{
..	..	@@ -7364,98 +7587,104 @@
7364	7587	{
7365	7588	cVector origin = new cVector();
7366	7589	//LA.xformPos(origin, toParent, origin);
7367		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7368	7594	Rectangle boundary = new Rectangle();
7369	7595	boundary.x = spot.x - 30;
7370	7596	boundary.y = spot.y - 30;
7371	7597	boundary.width = spot.width + 60;
7372	7598	boundary.height = spot.height + 60;
7373		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
7374	7600	int spotw = spot.x + spot.width;
7375	7601	int spoth = spot.y + spot.height;
7376		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7377		- if (CameraPane.Xmin > spot.x)
7378		- {
7379		- CameraPane.Xmin = spot.x;
7380		- }
7381		- if (CameraPane.Xmax < spotw)
7382		- {
7383		- CameraPane.Xmax = spotw;
7384		- }
7385		- if (CameraPane.Ymin > spot.y)
7386		- {
7387		- CameraPane.Ymin = spot.y;
7388		- }
7389		- if (CameraPane.Ymax < spoth)
7390		- {
7391		- CameraPane.Ymax = spoth;
7392		- }
7393		- spot.translate(32, 32);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7603	+// if (CameraPane.Xmin > spot.x)
	7604	+// {
	7605	+// CameraPane.Xmin = spot.x;
	7606	+// }
	7607	+// if (CameraPane.Xmax < spotw)
	7608	+// {
	7609	+// CameraPane.Xmax = spotw;
	7610	+// }
	7611	+// if (CameraPane.Ymin > spot.y)
	7612	+// {
	7613	+// CameraPane.Ymin = spot.y;
	7614	+// }
	7615	+// if (CameraPane.Ymax < spoth)
	7616	+// {
	7617	+// CameraPane.Ymax = spoth;
	7618	+// }
	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);
7394	7642	spotw = spot.x + spot.width;
7395	7643	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
7397		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7398		- if (CameraPane.Xmin > spot.x)
7399		- {
7400		- CameraPane.Xmin = spot.x;
7401		- }
7402		- if (CameraPane.Xmax < spotw)
7403		- {
7404		- CameraPane.Xmax = spotw;
7405		- }
7406		- if (CameraPane.Ymin > spot.y)
7407		- {
7408		- CameraPane.Ymin = spot.y;
7409		- }
7410		- if (CameraPane.Ymax < spoth)
7411		- {
7412		- CameraPane.Ymax = spoth;
7413		- }
7414		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7415		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7416		- spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
7418		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7419		- if (CameraPane.Xmin > spot.x)
7420		- {
7421		- CameraPane.Xmin = spot.x;
7422		- }
7423		- if (CameraPane.Xmax < spotw)
7424		- {
7425		- CameraPane.Xmax = spotw;
7426		- }
7427		- if (CameraPane.Ymin > spot.y)
7428		- {
7429		- CameraPane.Ymin = spot.y;
7430		- }
7431		- if (CameraPane.Ymax < spoth)
7432		- {
7433		- CameraPane.Ymax = spoth;
7434		- }
7435		- info.g.drawArc(boundary.x, boundary.y,
7436		- boundary.width, boundary.height, 0, 360);
	7644	+ clickInfo.g.setColor(Color.cyan);
	7645	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7646	+// if (CameraPane.Xmin > spot.x)
	7647	+// {
	7648	+// CameraPane.Xmin = spot.x;
	7649	+// }
	7650	+// if (CameraPane.Xmax < spotw)
	7651	+// {
	7652	+// CameraPane.Xmax = spotw;
	7653	+// }
	7654	+// if (CameraPane.Ymin > spot.y)
	7655	+// {
	7656	+// CameraPane.Ymin = spot.y;
	7657	+// }
	7658	+// if (CameraPane.Ymax < spoth)
	7659	+// {
	7660	+// CameraPane.Ymax = spoth;
	7661	+// }
	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);
7437	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7438		- if (CameraPane.Xmin > boundary.x)
7439		- {
7440		- CameraPane.Xmin = boundary.x;
7441		- }
7442		- if (CameraPane.Xmax < boundary.x + boundary.width)
7443		- {
7444		- CameraPane.Xmax = boundary.x + boundary.width;
7445		- }
7446		- if (CameraPane.Ymin > boundary.y)
7447		- {
7448		- CameraPane.Ymin = boundary.y;
7449		- }
7450		- if (CameraPane.Ymax < boundary.y + boundary.height)
7451		- {
7452		- CameraPane.Ymax = boundary.y + boundary.height;
7453		- }
	7666	+// if (CameraPane.Xmin > boundary.x)
	7667	+// {
	7668	+// CameraPane.Xmin = boundary.x;
	7669	+// }
	7670	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7671	+// {
	7672	+// CameraPane.Xmax = boundary.x + boundary.width;
	7673	+// }
	7674	+// if (CameraPane.Ymin > boundary.y)
	7675	+// {
	7676	+// CameraPane.Ymin = boundary.y;
	7677	+// }
	7678	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7679	+// {
	7680	+// CameraPane.Ymax = boundary.y + boundary.height;
	7681	+// }
7454	7682	return;
7455	7683	}
7456	7684	}
7457	7685
7458		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
7459	7688	{
7460	7689	if (level == 0)
7461	7690	{
..	..	@@ -7464,10 +7693,10 @@
7464	7693
7465	7694	boolean retval = false;
7466	7695
7467		- startX = info.x;
7468		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7469	7698
7470		- hitSomething = 0;
	7699	+ hitSomething = -1;
7471	7700	cVector origin = new cVector();
7472	7701	//LA.xformPos(origin, toParent, origin);
7473	7702	Rectangle spot = new Rectangle();
..	..	@@ -7475,22 +7704,53 @@
7475	7704	{
7476	7705	centerPt = new Point(0, 0);
7477	7706	}
7478		- calcHotSpot(origin, info, centerPt, spot);
7479		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7480	7710	{
7481	7711	hitSomething = hitCenter;
7482	7712	retval = true;
7483	7713	}
7484	7714	spot.translate(32, 0);
7485		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7486	7716	{
7487	7717	hitSomething = hitRotate;
7488	7718	retval = true;
7489	7719	}
7490	7720	spot.translate(0, 32);
7491		- 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))
7492	7724	{
7493	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	+
7494	7754	retval = true;
7495	7755	}
7496	7756
..	..	@@ -7500,7 +7760,7 @@
7500	7760	}
7501	7761
7502	7762	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7764	//System.out.println("modified = " + modified);
7505	7765	//new Exception().printStackTrace();
7506	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7788,8 @@
7528	7788	return true;
7529	7789	}
7530	7790
7531		- void doEditDrag0(ClickInfo info)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7532	7793	{
7533	7794	if (hitSomething == 0)
7534	7795	{
..	..	@@ -7542,7 +7803,8 @@
7542	7803
7543	7804	//System.out.println("hitSomething = " + hitSomething);
7544	7805
7545		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
	7807	+
7546	7808	cVector xlate = new cVector();
7547	7809	//cVector xlate2 = new cVector();
7548	7810	switch (hitSomething)
..	..	@@ -7553,9 +7815,11 @@
7553	7815
7554	7816	case hitCenter: // Translate
7555	7817
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7818	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7819
7558		- if (modified)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7559	7823	{
7560	7824	//assert(false);
7561	7825	/*
..	..	@@ -7575,8 +7839,8 @@
7575	7839	toParent[3][i] = xlate.get(i);
7576	7840	LA.matInvert(toParent, fromParent);
7577	7841	*/
7578		- cVector delta = LA.newVector(0, 0, startY - info.y);
7579		- 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);
7580	7844
7581	7845	LA.matCopy(startMat, toParent);
7582	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7585,7 +7849,7 @@
7585	7849	} else
7586	7850	{
7587	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7588		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7589	7853	cVector away = new cVector();
7590	7854	//cVector right2 = new cVector();
7591	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7601,20 +7865,20 @@
7601	7865	}
7602	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7867	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7605		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7868	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7606	7870	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7871	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7872	//LA.vecCross(up, cVector.Z, right2);
7609	7873
7610		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7611	7875
7612	7876	//System.out.println("DELTA0 = " + delta);
7613	7877	//System.out.println("AWAY = " + info.camera.away);
7614	7878	//System.out.println("UP = " + info.camera.up);
7615	7879	if (away.z > 0)
7616	7880	{
7617		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7618	7882	{
7619	7883	delta.x = -delta.x;
7620	7884	} else
..	..	@@ -7629,7 +7893,7 @@
7629	7893	//System.out.println("DELTA1 = " + delta);
7630	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7631	7895	//System.out.println("DELTA2 = " + delta);
7632		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7633	7897	LA.matCopy(startMat, toParent);
7634	7898	//System.out.println("DELTA3 = " + delta);
7635	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7639,8 +7903,8 @@
7639	7903	break;
7640	7904
7641	7905	case hitRotate: // rotate
7642		- int dx = info.x - centerPt.x;
7643		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7644	7908	double angle = (double) Math.atan2(dx, dy);
7645	7909	angle = -(1.570796 - angle);
7646	7910
..	..	@@ -7649,6 +7913,7 @@
7649	7913
7650	7914	if (modified)
7651	7915	{
	7916	+ // Rotate 45 degrees
7652	7917	angle /= (Math.PI / 4);
7653	7918	angle = Math.floor(angle + 0.5);
7654	7919	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7927,7 @@
7662	7927	}
7663	7928	/**/
7664	7929
7665		- switch (info.pane.renderCamera.viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7666	7931	{
7667	7932	case 1: // '\001'
7668	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7689,26 +7954,30 @@
7689	7954	break;
7690	7955
7691	7956	case hitScale: // scale
7692		- 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);
7693	7964	if (hScale < 0.01)
7694	7965	{
7695		- hScale = 0.01;
	7966	+ //hScale = 0.01;
7696	7967	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
	7968	+
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7970	+ sign = 1;
	7971	+ if (vScale < 0)
7699	7972	{
7700		- hScale = 0.01;
	7973	+ sign = -1;
7701	7974	}
7702		- double vScale = (double) (info.y - centerPt.y) / 32;
	7975	+ vScale = signMath.pow(signvScale, scale * 50);
7703	7976	if (vScale < 0.01)
7704	7977	{
7705		- vScale = 0.01;
	7978	+ //vScale = 0.01;
7706	7979	}
7707		- vScale = Math.pow(vScale, scale * 50);
7708		- if (vScale < 0.01)
7709		- {
7710		- vScale = 0.01;
7711		- }
	7980	+
7712	7981	LA.matCopy(startMat, toParent);
7713	7982	/**/
7714	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7718,39 +7987,56 @@
7718	7987	}
7719	7988	/**/
7720	7989
7721		- 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)
7722	7998	{
7723	7999	case 3: // '\001'
7724		- if (modified)
	8000	+ if (modified \|\| opposite)
7725	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7726	8005	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7728	8007	} // vScale, 1);
7729	8008	else
7730	8009	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	8010	+ // EXCEPTION!
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7732	8012	} // vScale, 1);
7733	8013	break;
7734	8014
7735	8015	case 2: // '\002'
7736		- if (modified)
	8016	+ if (modified \|\| opposite)
7737	8017	{
7738		- //LA.matScale(toParent, hScale, 1, vScale);
7739		- 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);
7740	8023	} else
7741	8024	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	8025	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	8026	}
7744	8027	break;
7745	8028
7746	8029	case 1: // '\003'
7747		- if (modified)
	8030	+ if (modified \|\| opposite)
7748	8031	{
7749		- //LA.matScale(toParent, hScale, vScale, 1);
7750		- 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);
7751	8037	} else
7752	8038	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	8039	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	8040	}
7755	8041	break;
7756	8042	}
..	..	@@ -7784,7 +8070,7 @@
7784	8070	} // NEW ...
7785	8071
7786	8072
7787		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7788	8074	}
7789	8075
7790	8076	boolean overflow = false;
..	..	@@ -7883,14 +8169,22 @@
7883	8169	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	8170	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	8171	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8172	+
	8173	+ String objname;
	8174	+
7886	8175	if (false) //parent != null)
7887	8176	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8177	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	8178	} else
7890	8179	{
7891		- 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) ":"") / "";
7892	8181	} // + super.toString();
7893	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()
7894	8188	}
7895	8189
7896	8190	public int hashCode()
..	..	@@ -7946,6 +8240,7 @@
7946	8240	objectUI.closeUI();
7947	8241	if (editWindow != null)
7948	8242	{
	8243	+ editWindow.ctrlPanel.FlushUI();
7949	8244	editWindow.refreshContents();
7950	8245	} // ? new
7951	8246	objectUI = null;
..	..	@@ -7954,6 +8249,10 @@
7954	8249	{
7955	8250	editWindow = null;
7956	8251	} // ?
	8252	+ }
	8253	+ else
	8254	+ {
	8255	+ //editWindow.closeUI();
7957	8256	}
7958	8257	}
7959	8258
..	..	@@ -7966,7 +8265,7 @@
7966	8265	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	8266
7968	8267	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	8268	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	8269
7971	8270	double[][] toParent; // dynamic matrix
7972	8271	double[][] fromParent;
..	..	@@ -8081,7 +8380,7 @@
8081	8380	{
8082	8381	assert(bRep != null);
8083	8382	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8383	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8384	}
8086	8385	else
8087	8386	{
..	..	@@ -8112,6 +8411,10 @@
8112	8411	}
8113	8412
8114	8413	transient ObjEditor editWindow;
	8414	+ transient ObjEditor manipWindow;
	8415	+
	8416	+ transient boolean pinned;
	8417	+
8115	8418	transient ObjectUI objectUI;
8116	8419	public static int povDepth = 0;
8117	8420	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8433,9 @@
8130	8433	private static cVector edge2 = new cVector();
8131	8434	//private static cVector norm = new cVector();
8132	8435	/transient private/ int hitSomething;
8133		- private static final int hitCenter = 1;
8134		- private static final int hitScale = 2;
8135		- private static final int hitRotate = 3;
	8436	+ static final int hitCenter = 1;
	8437	+ static final int hitScale = 2;
	8438	+ static final int hitRotate = 3;
8136	8439	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8440	/transient/ private Point centerPt;
8138	8441	/transient/ private int startX;
..	..	@@ -8164,6 +8467,8 @@
8164	8467	{
8165	8468	Object3D targ = this;
8166	8469
	8470	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8471	+
8167	8472	if (obj.material != null)
8168	8473	{
8169	8474	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))