~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,14 +14,123 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
22	24
	25	+ // Use GetUUID for backward compatibility with null.
	26	+ private UUID uuid = UUID.randomUUID();
	27	+
	28	+ // TEMPORARY for versions. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
	34	+ //
	35	+
	36	+ String skyboxname;
	37	+ String skyboxext;
	38	+
	39	+ Object3D[] versionlist;
	40	+ int versionindex = -1;
	41	+
	42	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	43	+
	44	+ transient int tabIndex; // Tabs can change between sessions.
	45	+
23	46	ScriptNode scriptnode;
24	47
	48	+ void deepCopyNode(Object3D other)
	49	+ {
	50	+ other.skyboxname = skyboxname;
	51	+ other.skyboxext = skyboxext;
	52	+
	53	+ if (toParent != null)
	54	+ {
	55	+ other.toParent = LA.newMatrix();
	56	+ other.fromParent = LA.newMatrix();
	57	+ LA.matCopy(toParent, other.toParent);
	58	+ LA.matCopy(fromParent, other.fromParent);
	59	+ if (toParentMarked != null)
	60	+ {
	61	+ other.toParentMarked = LA.newMatrix();
	62	+ other.fromParentMarked = LA.newMatrix();
	63	+ LA.matCopy(toParentMarked, other.toParentMarked);
	64	+ LA.matCopy(fromParentMarked, other.fromParentMarked);
	65	+ }
	66	+ }
	67	+ else
	68	+ {
	69	+ if (other.toParent == null)
	70	+// assert(other.toParent == null);
	71	+// new Exception().printStackTrace();
	72	+ System.err.println("null parent: " + other);
	73	+ }
	74	+
	75	+ /*
	76	+ double ident[][] = LA.newMatrix();
	77	+ if (bRep == null)
	78	+ other.bRep = null;
	79	+ else
	80	+ other.bRep = new BoundaryRep(bRep, ident);
	81	+ */
	82	+ // Really new...
	83	+ //other.editWindow = null;
	84	+ if (name == null)
	85	+ other.name = null;
	86	+ else
	87	+ other.name = new String(name);
	88	+
	89	+ if (material != null)
	90	+ {
	91	+ other.material = new cMaterial(material);
	92	+ } else
	93	+ {
	94	+ other.material = null;
	95	+ }
	96	+
	97	+ other.GetTextures().name = GetTextures().name;
	98	+
	99	+ CopyExtraMaterial(other);
	100	+
	101	+ other.touched = touched;
	102	+ other.softtouched = softtouched;
	103	+
	104	+ other.random = random;
	105	+ other.link2master = Link2Support();
	106	+ other.transformcount = transformcount;
	107	+ other.marked = marked;
	108	+ other.skip = skip;
	109	+ other.count = count;
	110	+ other.flipV = flipV;
	111	+ other.live = live;
	112	+ other.rewind = rewind;
	113	+ other.hide = hide;
	114	+ other.texres = texres;
	115	+ other.speedup = speedup;
	116	+ other.height = height;
	117	+ other.depth = depth;
	118	+ }
	119	+
	120	+ int VersionCount()
	121	+ {
	122	+ int count = 0;
	123	+
	124	+ if (versionlist != null)
	125	+ for (int i = versionlist.length; --i >= 0;)
	126	+ {
	127	+ if (versionlist[i] != null)
	128	+ count++;
	129	+ }
	130	+
	131	+ return count;
	132	+ }
	133	+
25	134	void InitOthers()
26	135	{
27	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -33,6 +142,7 @@
33	142	projectedVertices[i] = new cVector2(); // Others
34	143	}
35	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
36	146	}
37	147
38	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -100,64 +210,286 @@
100	210
101	211	// transient boolean reduced; // for morph reduction
102	212
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	213	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	214	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	215
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	216	+ transient Object3D transientsupport; // for cloning
	217	+ transient boolean transientlink2master;
108	218
109		-void SaveSupports()
110		-{
111		- if (blockloop)
112		- return;
113		-
114		- transientsupport = support;
115		- transientlink2master = link2master;
116		-
117		- support = null;
118		- link2master = false;
119		-
120		- if (bRep != null)
	219	+ void SaveSupports()
121	220	{
122		- bRep.SaveSupports();
	221	+ if (blockloop)
	222	+ return;
	223	+
	224	+ transientsupport = support;
	225	+ transientlink2master = Link2Support();
	226	+
	227	+ support = null;
	228	+ link2master = false;
	229	+
	230	+ if (bRep != null)
	231	+ {
	232	+ bRep.SaveSupports();
	233	+ }
	234	+
	235	+ for (int i = 0; i < Size(); i++)
	236	+ {
	237	+ Object3D child = (Object3D) get(i);
	238	+ if (child == null)
	239	+ continue;
	240	+ blockloop = true;
	241	+ child.SaveSupports();
	242	+ blockloop = false;
	243	+ }
123	244	}
124		-
125		- for (int i = 0; i < Size(); i++)
	245	+
	246	+ void RestoreSupports()
126	247	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	248	+ if (blockloop)
	249	+ return;
	250	+
	251	+ support = transientsupport;
	252	+ link2master = transientlink2master;
	253	+ transientsupport = null;
	254	+ transientlink2master = false;
	255	+
	256	+ if (bRep != null)
	257	+ {
	258	+ bRep.RestoreSupports();
	259	+ }
	260	+
	261	+ for (int i = 0; i < Size(); i++)
	262	+ {
	263	+ Object3D child = (Object3D) get(i);
	264	+ if (child == null)
	265	+ continue;
	266	+ blockloop = true;
	267	+ child.RestoreSupports();
	268	+ blockloop = false;
	269	+ }
	270	+ }
	271	+
	272	+ boolean HasBigData()
	273	+ {
	274	+ if (blockloop)
	275	+ return false;
	276	+
	277	+ if (bRep != null)
	278	+ {
	279	+ return true;
	280	+ }
	281	+
130	282	blockloop = true;
131		- child.SaveSupports();
	283	+
	284	+ for (int i = 0; i < Size(); i++)
	285	+ {
	286	+ Object3D child = (Object3D) get(i);
	287	+ if (child == null)
	288	+ continue;
	289	+ if (child.HasBigData())
	290	+ {
	291	+ blockloop = false;
	292	+ return true;
	293	+ }
	294	+ }
	295	+
	296	+ blockloop = false;
	297	+ return false;
	298	+ }
	299	+
	300	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	301	+ {
	302	+ if (blockloop)
	303	+ return;
	304	+
	305	+ Object3D o;
	306	+
	307	+ boolean isnew = false;
	308	+
	309	+ if (hashtable.containsKey(GetUUID()))
	310	+ {
	311	+ o = hashtable.get(GetUUID());
	312	+
	313	+ Grafreed.Assert(this.bRep == o.bRep);
	314	+ //if (this.bRep != null)
	315	+ // assert(this.bRep.support == o.transientrep);
	316	+ if (this.support != null)
	317	+ assert(this.support.bRep == o.transientrep);
	318	+ }
	319	+ else
	320	+ {
	321	+ isnew = true;
	322	+
	323	+ o = new Object3D("copy of " + this.name);
	324	+
	325	+ hashtable.put(GetUUID(), o);
	326	+ }
	327	+
	328	+ //if (!blockloop)
	329	+ {
	330	+ blockloop = true;
	331	+
	332	+ for (int i=0; i<Size(); i++)
	333	+ {
	334	+ get(i).ExtractBigData(hashtable);
	335	+ }
	336	+
	337	+ blockloop = false;
	338	+ }
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
	342	+ }
	343	+
	344	+ void ExtractBigData(Object3D o)
	345	+ {
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
	348	+ if (o.bRep != null)
	349	+ Grafreed.Assert(o.bRep == this.bRep);
	350	+
	351	+ o.bRep = this.bRep;
	352	+// July 2019 if (this.bRep != null)
	353	+// {
	354	+// o.transientrep = this.bRep.support;
	355	+// o.bRep.support = null;
	356	+// }
	357	+ o.selection = this.selection;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
	360	+
	361	+ if (this.support != null)
	362	+ {
	363	+ if (o.transientrep != null)
	364	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	365	+
	366	+ o.transientrep = this.support.bRep;
	367	+ this.support.bRep = null;
	368	+ }
	369	+
	370	+ // o.support = this.support;
	371	+ // o.fileparent = this.fileparent;
	372	+ // if (this.bRep != null)
	373	+ // o.bRep = this.bRep.support;
	374	+
	375	+ this.bRep = null;
	376	+ // if (this.bRep != null)
	377	+ // this.bRep.support = null;
	378	+ // this.support = null;
	379	+ // this.fileparent = null;
	380	+ }
	381	+
	382	+// Object3D GetObject(java.util.UUID uuid)
	383	+// {
	384	+// if (this.uuid.equals(uuid))
	385	+// return this;
	386	+//
	387	+// if (blockloop)
	388	+// return null;
	389	+//
	390	+// blockloop = true;
	391	+//
	392	+// for (int i=0; i<Size(); i++)
	393	+// {
	394	+// Object3D o = get(i).GetObject(uuid);
	395	+//
	396	+// if (o != null)
	397	+// return o;
	398	+// }
	399	+//
	400	+// blockloop = false;
	401	+//
	402	+// return null;
	403	+// }
	404	+
	405	+ transient boolean tag;
	406	+
	407	+ void TagObjects(Object3D o, boolean tag)
	408	+ {
	409	+ if (blockloop)
	410	+ return;
	411	+
	412	+ o.tag = tag;
	413	+
	414	+ if (o == this)
	415	+ return;
	416	+
	417	+ blockloop = true;
	418	+
	419	+ for (int i=0; i<Size(); i++)
	420	+ {
	421	+ get(i).TagObjects(o, tag);
	422	+ }
	423	+
132	424	blockloop = false;
133	425	}
134		-}
135	426
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
	427	+ boolean HasTags()
	428	+ {
	429	+ if (blockloop)
	430	+ return false;
140	431
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
147		- {
148		- bRep.RestoreSupports();
149		- }
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156	432	blockloop = true;
157		- child.RestoreSupports();
	433	+
	434	+ boolean hasTags = false;
	435	+
	436	+ for (int i=0; i<Size(); i++)
	437	+ {
	438	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	439	+
	440	+ if (hasTags)
	441	+ break;
	442	+ }
	443	+
	444	+ blockloop = false;
	445	+
	446	+ return hasTags;
	447	+ }
	448	+
	449	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	450	+ {
	451	+ if (blockloop)
	452	+ return;
	453	+
	454	+ if (!hashtable.containsKey(GetUUID()))
	455	+ return;
	456	+
	457	+ Object3D o = hashtable.get(GetUUID());
	458	+
	459	+ RestoreBigData(o);
	460	+
	461	+ blockloop = true;
	462	+
	463	+ //hashtable.remove(GetUUID());
	464	+
	465	+ for (int i=0; i<Size(); i++)
	466	+ {
	467	+ get(i).RestoreBigData(hashtable);
	468	+ }
	469	+
158	470	blockloop = false;
159	471	}
160		-}
	472	+
	473	+ void RestoreBigData(Object3D o)
	474	+ {
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
	478	+ this.bRep = o.bRep;
	479	+ if (this.support != null && o.transientrep != null)
	480	+ {
	481	+ this.support.bRep = o.transientrep;
	482	+ }
	483	+
	484	+ this.selection = o.selection;
	485	+
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
	488	+// July 2019 if (this.bRep != null)
	489	+// this.bRep.support = o.transientrep;
	490	+ // this.support = o.support;
	491	+ // this.fileparent = o.fileparent;
	492	+ }
161	493
162	494	// MOCAP SUPPORT
163	495	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,8 +632,13 @@
300	632	}
301	633
302	634	boolean live = false;
	635	+ transient boolean keepdontselect;
	636	+ boolean dontselect = false;
303	637	boolean hide = false;
304		- boolean link2master = false; // performs reset support/master at each frame
	638	+
	639	+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
	640	+ boolean link2support = false; // (cannot rename due to serialization)
	641	+
305	642	boolean marked = false; // animation node
306	643	boolean skip = false; // centroid issue
307	644	boolean skipmocap = false; // mocap data
..	..	@@ -309,6 +646,9 @@
309	646	boolean random = false;
310	647	boolean speedup = false;
311	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
312	652
313	653	float NORMALPUSH = 0;
314	654
..	..	@@ -327,7 +667,7 @@
327	667	{
328	668	sorted = true;
329	669
330		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
331	671	{
332	672	Object3D obji = get(i);
333	673	Object3D objj = get(i+1);
..	..	@@ -351,7 +691,7 @@
351	691	{
352	692	sorted = true;
353	693
354		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
355	695	{
356	696	Object3D obji = get(i);
357	697	Object3D objj = get(i+1);
..	..	@@ -367,11 +707,11 @@
367	707	}
368	708	}
369	709
370		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
371	711
372	712	int MemorySize()
373	713	{
374		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
375	715	{
376	716	try
377	717	{
..	..	@@ -481,12 +821,14 @@
481	821	toParent = LA.newMatrix();
482	822	fromParent = LA.newMatrix();
483	823	}
	824	+
484	825	if (toParentMarked == null)
485	826	{
486	827	if (maxcount != 1)
487	828	{
488		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
489	830	}
	831	+
490	832	toParentMarked = LA.newMatrix();
491	833	fromParentMarked = LA.newMatrix();
492	834	}
..	..	@@ -686,7 +1028,7 @@
686	1028
687	1029	void Step()
688	1030	{
689		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
690	1032	resetmaxcount();
691	1033	resettransformcount();
692	1034	resetstep();
..	..	@@ -774,7 +1116,7 @@
774	1116	if (step == 0)
775	1117	step = 1;
776	1118	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	1119	+ maxcount = 128; // 2048; // 4;
778	1120	// if (acceleration == 0)
779	1121	// acceleration = 10;
780	1122	if (delay == 0) // serial
..	..	@@ -797,9 +1139,11 @@
797	1139
798	1140	if (marked && Globals.isLIVE() && live &&
799	1141	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	1142	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	1143	currentframe != Globals.framecount)
802	1144	{
	1145	+ Globals.lighttouched = true;
	1146	+
803	1147	currentframe = Globals.framecount;
804	1148
805	1149	// System.err.println("transformcount = " + transformcount);
..	..	@@ -809,7 +1153,8 @@
809	1153
810	1154	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	1155
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1156	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1157	+ (step == 1 && changedir))
813	1158	{
814	1159	countdown = 1;
815	1160	delay = speedup?8:1;
..	..	@@ -878,20 +1223,28 @@
878	1223	{
879	1224	// return true;
880	1225
881		- if (material == null \|\| material.multiply)
882		- return true;
	1226	+// if (material == null \|\| material.multiply)
	1227	+// return true;
	1228	+//
	1229	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1230	+// return false;
	1231	+//
	1232	+// // Transparent objects are dynamic because we have to sort the triangles.
	1233	+// return material.opacity > 0.99;
883	1234
884		- return material.opacity > 0.99;
	1235	+ return !sort;
885	1236	}
886	1237
887	1238	boolean IsOpaque()
888	1239	{
889	1240	// return true;
890	1241
891		- if (material == null \|\| material.multiply)
892		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
893	1246
894		- return material.opacity > 0.99;
	1247	+ return !sort;
895	1248	}
896	1249
897	1250	Object3D()
..	..	@@ -912,6 +1265,11 @@
912	1265	fromParent = null; // LA.newMatrix();
913	1266	bRep = null; // new BoundaryRep();
914	1267
	1268	+ if (oname != null && oname.equals("LeftHand"))
	1269	+ {
	1270	+ name = oname;
	1271	+ }
	1272	+
915	1273	/*
916	1274	float hue = (float)Math.random();
917	1275	Color col;
..	..	@@ -954,7 +1312,7 @@
954	1312
955	1313	public Object clone()
956	1314	{
957		- return GrafreeD.clone(this);
	1315	+ return Grafreed.clone(this);
958	1316	}
959	1317
960	1318	Object3D copyExpand()
..	..	@@ -964,8 +1322,10 @@
964	1322
965	1323	// will share the geometry
966	1324	assert (!(this instanceof Composite));
967		- return deepCopy(); // Never called for Composite
968		-
	1325	+
	1326	+ Object3D obj = deepCopy(); // Never called for Composite
	1327	+ obj.count = 2;
	1328	+ return obj;
969	1329	}
970	1330
971	1331	boolean HasLoops()
..	..	@@ -973,6 +1333,30 @@
973	1333	return false;
974	1334	}
975	1335
	1336	+ void ResetUUIDs()
	1337	+ {
	1338	+ if (blockloop)
	1339	+ {
	1340	+ return;
	1341	+ }
	1342	+
	1343	+ this.uuid = null;
	1344	+
	1345	+ blockloop = true;
	1346	+
	1347	+ for (int i = 0; i < Size(); i++)
	1348	+ {
	1349	+ Object3D obj = (Object3D) Children().get(i);
	1350	+
	1351	+ if (obj != null)
	1352	+ {
	1353	+ obj.ResetUUIDs();
	1354	+ }
	1355	+ }
	1356	+
	1357	+ blockloop = false;
	1358	+ }
	1359	+
976	1360	boolean IsInfinite()
977	1361	{
978	1362	if (blockloop)
..	..	@@ -1043,78 +1427,16 @@
1043	1427	return;
1044	1428
1045	1429	blockloop = true;
	1430	+
	1431	+ other.parent = parent;
	1432	+
1046	1433	//System.out.println("COPY " + this + " to " + other);
1047	1434	//new Exception().printStackTrace();
	1435	+ deepCopyNode(other);
1048	1436
1049		- other.parent = parent;
1050		- if (toParent != null)
1051		- {
1052		- other.toParent = LA.newMatrix();
1053		- other.fromParent = LA.newMatrix();
1054		- LA.matCopy(toParent, other.toParent);
1055		- LA.matCopy(fromParent, other.fromParent);
1056		- if (toParentMarked != null)
1057		- {
1058		- other.toParentMarked = LA.newMatrix();
1059		- other.fromParentMarked = LA.newMatrix();
1060		- LA.matCopy(toParentMarked, other.toParentMarked);
1061		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1062		- }
1063		- }
1064		- else
1065		- {
1066		- if (other.toParent == null)
1067		-// assert(other.toParent == null);
1068		-// new Exception().printStackTrace();
1069		- System.err.println("null parent: " + other);
1070		- }
1071		- /*
1072		- double ident[][] = LA.newMatrix();
1073		- if (bRep == null)
1074		- other.bRep = null;
1075		- else
1076		- other.bRep = new BoundaryRep(bRep, ident);
1077		- */
1078		- // Really new...
1079	1437	other.bRep = bRep; // Share the geometry
1080	1438
1081	1439	other.support = support; // Share the support
1082		-
1083		- //other.editWindow = null;
1084		- if (name == null)
1085		- other.name = null;
1086		- else
1087		- other.name = new String(name);
1088		-
1089		- if (material != null)
1090		- {
1091		- other.material = new cMaterial(material);
1092		- } else
1093		- {
1094		- other.material = null;
1095		- }
1096		-
1097		- other.GetTextures().name = GetTextures().name;
1098		-
1099		- CopyExtraMaterial(other);
1100		-
1101		- other.touched = touched;
1102		- other.softtouched = softtouched;
1103		-
1104		- other.random = random;
1105		- other.link2master = link2master;
1106		- other.transformcount = transformcount;
1107		- other.marked = marked;
1108		- other.skip = skip;
1109		- other.count = count;
1110		- other.flipV = flipV;
1111		- other.live = live;
1112		- other.rewind = rewind;
1113		- other.hide = hide;
1114		- other.texres = texres;
1115		- other.speedup = speedup;
1116		- other.height = height;
1117		- other.depth = depth;
1118	1440
1119	1441	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1120	1442	// {
..	..	@@ -1170,17 +1492,24 @@
1170	1492	if ((mask & GEOMETRY) != 0)
1171	1493	{
1172	1494	if (bRep != null)
1173		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1174		- else
1175		- assert(other.bRep == null);
1176		-
1177		- if (bRep != null)
1178	1495	{
	1496	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1179	1497	CameraPane.RemoveList(bRep.displaylist);
1180	1498	bRep.displaylist = 0; // june 2013 -1;
1181	1499	}
1182	1500	else
1183		- bRep = bRep;
	1501	+ {
	1502	+ //assert(other.bRep == null);
	1503	+ bRep = other.bRep;
	1504	+ }
	1505	+
	1506	+// if (bRep != null)
	1507	+// {
	1508	+// CameraPane.RemoveList(bRep.displaylist);
	1509	+// bRep.displaylist = 0; // june 2013 -1;
	1510	+// }
	1511	+// else
	1512	+// bRep = bRep;
1184	1513	}
1185	1514
1186	1515	/* Use a MASK = GEO/MAT
..	..	@@ -1276,6 +1605,7 @@
1276	1605	toParent = LA.newMatrix();
1277	1606	fromParent = LA.newMatrix();
1278	1607	}
	1608	+
1279	1609	LA.matCopy(other.toParent, toParent);
1280	1610	LA.matCopy(other.fromParent, fromParent);
1281	1611
..	..	@@ -1470,7 +1800,7 @@
1470	1800	BoundaryRep.SEUIL = other.material.cameralight;
1471	1801
1472	1802	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1803	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1804	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1805	}
1476	1806
..	..	@@ -1729,7 +2059,7 @@
1729	2059	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	2060	o.bRep = transientrep;
1731	2061	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	2062	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	2063	o.CreateMaterial();
1734	2064	o.SetAttributes(this, -1);
1735	2065	//parent
..	..	@@ -1742,7 +2072,7 @@
1742	2072	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	2073	o.bRep = bRep;
1744	2074	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	2075	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	2076	o.CreateMaterial();
1747	2077	//o.overwriteThis(this, -1);
1748	2078	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +2159,15 @@
1829	2159	if (obj.name == null)
1830	2160	continue; // can't be a null one
1831	2161
	2162	+ // Try perfect match first.
1832	2163	if (n.equals(obj.name))
1833	2164	{
1834	2165	theobj = obj;
1835	2166	count++;
1836	2167	}
1837	2168	}
	2169	+
	2170	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	2171
1839	2172	if (count != 1)
1840	2173	for (int i=Size(); --i>=0;)
..	..	@@ -2152,11 +2485,6 @@
2152	2485
2153	2486	InitOthers();
2154	2487
2155		- if (this instanceof Camera)
2156		- {
2157		- material.shift = 90;
2158		- }
2159		-
2160	2488	material.multiply = multiply;
2161	2489
2162	2490	if (multiply)
..	..	@@ -2294,6 +2622,15 @@
2294	2622	}
2295	2623	*/
2296	2624	}
	2625	+ else
	2626	+ {
	2627	+ //((ObjEditor)editWindow).SetupUI2(null);
	2628	+ if (objectUI != null)
	2629	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2630	+ else
	2631	+ //new Exception().printStackTrace();
	2632	+ System.err.println("objectUI is null");
	2633	+ }
2297	2634	}
2298	2635
2299	2636	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2335,6 +2672,14 @@
2335	2672	{
2336	2673	editWindow.refreshContents();
2337	2674	}
	2675	+ else
	2676	+ {
	2677	+ if (manipWindow != null)
	2678	+ {
	2679	+ manipWindow.refreshContents();
	2680	+ }
	2681	+ }
	2682	+
2338	2683	//if (parent != null)
2339	2684	//parent.refreshEditWindow();
2340	2685	}
..	..	@@ -2414,7 +2759,8 @@
2414	2759	private static final int editSelf = 1;
2415	2760	private static final int editChild = 2;
2416	2761
2417		- void drawEditHandles(ClickInfo info, int level)
	2762	+ void drawEditHandles(//ClickInfo info,
	2763	+ int level)
2418	2764	{
2419	2765	if (level == 0)
2420	2766	{
..	..	@@ -2422,7 +2768,8 @@
2422	2768	return;
2423	2769
2424	2770	Object3D selectee;
2425		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2771	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2772	+ level + 1))
2426	2773	{
2427	2774	selectee = (Object3D) e.nextElement();
2428	2775	}
..	..	@@ -2430,19 +2777,22 @@
2430	2777	} else
2431	2778	{
2432	2779	//super.
2433		- drawEditHandles0(info, level + 1);
	2780	+ drawEditHandles0(//info,
	2781	+ level + 1);
2434	2782	}
2435	2783	}
2436	2784
2437		- boolean doEditClick(ClickInfo info, int level)
	2785	+ boolean doEditClick(//ClickInfo info,
	2786	+ int level)
2438	2787	{
2439	2788	doSomething = 0;
2440	2789	if (level == 0)
2441	2790	{
2442		- return doParentClick(info);
	2791	+ return doParentClick(); //info);
2443	2792	}
2444	2793	if (//super.
2445		- doEditClick0(info, level))
	2794	+ doEditClick0(//info,
	2795	+ level))
2446	2796	{
2447	2797	doSomething = 1;
2448	2798	return true;
..	..	@@ -2452,7 +2802,7 @@
2452	2802	}
2453	2803	}
2454	2804
2455		- boolean doParentClick(ClickInfo info)
	2805	+ boolean doParentClick() //ClickInfo info)
2456	2806	{
2457	2807	if (selection == null)
2458	2808	{
..	..	@@ -2465,7 +2815,8 @@
2465	2815	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2466	2816	{
2467	2817	Object3D selectee = (Object3D) e.nextElement();
2468		- if (selectee.doEditClick(info, 1))
	2818	+ if (selectee.doEditClick(//info,
	2819	+ 1))
2469	2820	{
2470	2821	childToDrag = selectee;
2471	2822	doSomething = 2;
..	..	@@ -2477,13 +2828,15 @@
2477	2828	return retval;
2478	2829	}
2479	2830
2480		- void doEditDrag(ClickInfo info, boolean opposite)
	2831	+ void doEditDrag(//ClickInfo clickInfo,
	2832	+ boolean opposite)
2481	2833	{
2482	2834	switch (doSomething)
2483	2835	{
2484	2836	case 1: // '\001'
2485	2837	//super.
2486		- doEditDrag0(info, opposite);
	2838	+ doEditDrag0(//clickInfo,
	2839	+ opposite);
2487	2840	break;
2488	2841
2489	2842	case 2: // '\002'
..	..	@@ -2496,11 +2849,13 @@
2496	2849	{
2497	2850	//sel.hitSomething = childToDrag.hitSomething;
2498	2851	//childToDrag.doEditDrag(info);
2499		- sel.doEditDrag(info, opposite);
	2852	+ sel.doEditDrag(//clickInfo,
	2853	+ opposite);
2500	2854	} else
2501	2855	{
2502	2856	//super.
2503		- doEditDrag0(info, opposite);
	2857	+ doEditDrag0(//clickInfo,
	2858	+ opposite);
2504	2859	}
2505	2860	}
2506	2861	break;
..	..	@@ -2518,6 +2873,9 @@
2518	2873	{
2519	2874	deselectAll();
2520	2875	}
	2876	+
	2877	+ new Exception().printStackTrace();
	2878	+
2521	2879	ClickInfo newInfo = new ClickInfo();
2522	2880	newInfo.flags = info.flags;
2523	2881	newInfo.bounds = info.bounds;
..	..	@@ -2610,6 +2968,18 @@
2610	2968	void GenNormalsS(boolean crease)
2611	2969	{
2612	2970	selection.GenNormals(crease);
	2971	+// for (int i=0; i<selection.size(); i++)
	2972	+// {
	2973	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2974	+// selectee.GenNormals(crease);
	2975	+// }
	2976	+
	2977	+ //Touch();
	2978	+ }
	2979	+
	2980	+ void GenNormalsMeshS()
	2981	+ {
	2982	+ selection.GenNormalsMesh();
2613	2983	// for (int i=0; i<selection.size(); i++)
2614	2984	// {
2615	2985	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2750,6 +3120,24 @@
2750	3120	if (child == null)
2751	3121	continue;
2752	3122	child.GenNormals(crease);
	3123	+// Children().release(i);
	3124	+ }
	3125	+ blockloop = false;
	3126	+ }
	3127	+
	3128	+ void GenNormalsMesh()
	3129	+ {
	3130	+ if (blockloop)
	3131	+ return;
	3132	+
	3133	+ blockloop = true;
	3134	+ GenNormalsMesh0();
	3135	+ for (int i = 0; i < Children().Size(); i++)
	3136	+ {
	3137	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3138	+ if (child == null)
	3139	+ continue;
	3140	+ child.GenNormalsMesh();
2753	3141	// Children().release(i);
2754	3142	}
2755	3143	blockloop = false;
..	..	@@ -2917,7 +3305,19 @@
2917	3305	{
2918	3306	if (bRep != null)
2919	3307	{
	3308	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
2920	3309	bRep.GenerateNormals(crease);
	3310	+ if (!bRep.trimmed)
	3311	+ bRep.MergeNormals();
	3312	+ Touch();
	3313	+ }
	3314	+ }
	3315	+
	3316	+ void GenNormalsMesh0()
	3317	+ {
	3318	+ if (bRep != null)
	3319	+ {
	3320	+ bRep.GenerateNormalsMesh();
2921	3321	Touch();
2922	3322	}
2923	3323	}
..	..	@@ -2926,7 +3326,7 @@
2926	3326	{
2927	3327	if (bRep != null)
2928	3328	{
2929		- bRep.GenerateNormalsMINE();
	3329	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2930	3330	Touch();
2931	3331	}
2932	3332	}
..	..	@@ -2983,6 +3383,132 @@
2983	3383	blockloop = false;
2984	3384	}
2985	3385
	3386	+ public void ResetTransform(int mask)
	3387	+ {
	3388	+ Object3D obj = this;
	3389	+
	3390	+ if (mask == -1)
	3391	+ {
	3392	+ if (obj instanceof Camera) // jan 2014
	3393	+ {
	3394	+ LA.matIdentity(obj.toParent);
	3395	+ LA.matIdentity(obj.fromParent);
	3396	+ }
	3397	+ else
	3398	+ {
	3399	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3400	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3401	+ }
	3402	+ return;
	3403	+ }
	3404	+
	3405	+ if ((mask&2) != 0) // Scale/rotation
	3406	+ {
	3407	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3408	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3409	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3410	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3411	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3412	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3413	+ }
	3414	+ if ((mask&1) != 0) // Translation
	3415	+ {
	3416	+ if (obj.toParent != null)
	3417	+ {
	3418	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3419	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3420	+ }
	3421	+ }
	3422	+ }
	3423	+
	3424	+ public void Scale(float scale)
	3425	+ {
	3426	+ Object3D obj = this;
	3427	+
	3428	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3429	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3430	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3431	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3432	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3433	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3434	+ }
	3435	+
	3436	+ public void TextureRatioTransform(int axis)
	3437	+ {
	3438	+ cTexture tex = GetTextures();
	3439	+
	3440	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3441	+
	3442	+ try
	3443	+ {
	3444	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3445	+ }
	3446	+ catch (Exception e)
	3447	+ {
	3448	+ System.err.println("FAIL TextureRatio: " + this);
	3449	+ }
	3450	+
	3451	+ LA.matIdentity(Object3D.mat);
	3452	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3453	+
	3454	+ if (toParent == null)
	3455	+ {
	3456	+ toParent = LA.newMatrix();
	3457	+ fromParent = LA.newMatrix();
	3458	+ }
	3459	+
	3460	+ ResetTransform(2);
	3461	+
	3462	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3463	+ LA.matInvert(fromParent, toParent);
	3464	+ }
	3465	+
	3466	+ void TextureRatio(int axis)
	3467	+ {
	3468	+ if (blockloop)
	3469	+ return;
	3470	+
	3471	+ blockloop = true;
	3472	+
	3473	+ TextureRatioTransform(axis);
	3474	+
	3475	+ for (int i=Size(); --i>=0;)
	3476	+ {
	3477	+ Object3D v = get(i);
	3478	+
	3479	+ v.TextureRatio(axis);
	3480	+ }
	3481	+
	3482	+ blockloop = false;
	3483	+ }
	3484	+
	3485	+ void TransformChildren()
	3486	+ {
	3487	+ if (toParent != null)
	3488	+ {
	3489	+ for (int i=Size(); --i>=0;)
	3490	+ {
	3491	+ Object3D v = get(i);
	3492	+
	3493	+ if (v.toParent == null)
	3494	+ {
	3495	+ v.toParent = LA.newMatrix();
	3496	+ v.fromParent = LA.newMatrix();
	3497	+ }
	3498	+
	3499	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3500	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3501	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3502	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3503	+ }
	3504	+
	3505	+ toParent = null; // LA.matIdentity(toParent);
	3506	+ fromParent = null; // LA.matIdentity(fromParent);
	3507	+
	3508	+ Touch();
	3509	+ }
	3510	+ }
	3511	+
2986	3512	void TransformGeometry()
2987	3513	{
2988	3514	Object3D obj = this;
..	..	@@ -3198,15 +3724,18 @@
3198	3724	if (bRep != null)
3199	3725	{
3200	3726	//bRep.RemoveOneTriangle();
	3727	+ System.out.println();
3201	3728	System.out.println("Reducing " + this);
3202	3729	if (name != null && name.contains("lockpickstraps"))
3203	3730	name = name;
3204	3731
3205	3732	BoundaryRep sup = bRep.support;
3206	3733	bRep.support = null;
3207		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3734	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3735	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3736	+
	3737	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3738	+
3210	3739	bRep = temprep;
3211	3740	bRep.support = sup;
3212	3741	Touch();
..	..	@@ -3307,15 +3836,47 @@
3307	3836
3308	3837	void ClearMaterials()
3309	3838	{
	3839	+ if (blockloop)
	3840	+ return;
	3841	+
	3842	+ blockloop = true;
	3843	+
3310	3844	ClearMaterial();
3311		- for (int i = 0; i < size(); i++)
	3845	+ for (int i = 0; i < Size(); i++)
3312	3846	{
3313		- Object3D child = (Object3D) reserve(i);
	3847	+ Object3D child = (Object3D) get(i);
3314	3848	if (child == null)
3315	3849	continue;
3316	3850	child.ClearMaterials();
3317		- release(i);
3318	3851	}
	3852	+
	3853	+ blockloop = false;
	3854	+ }
	3855	+
	3856	+ void ClearVersionList()
	3857	+ {
	3858	+ this.versionlist = null;
	3859	+ this.versionindex = -1;
	3860	+ this.versiontable = null;
	3861	+ }
	3862	+
	3863	+ void ClearVersions()
	3864	+ {
	3865	+ if (blockloop)
	3866	+ return;
	3867	+
	3868	+ blockloop = true;
	3869	+
	3870	+ ClearVersionList();
	3871	+ for (int i = 0; i < Size(); i++)
	3872	+ {
	3873	+ Object3D child = (Object3D) get(i);
	3874	+ if (child == null)
	3875	+ continue;
	3876	+ child.ClearVersions();
	3877	+ }
	3878	+
	3879	+ blockloop = false;
3319	3880	}
3320	3881
3321	3882	void FlipV(boolean flip)
..	..	@@ -3343,7 +3904,8 @@
3343	3904	if (blockloop)
3344	3905	return;
3345	3906
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3907	+ if (//marked \|\| // does not make sense
	3908	+ (bRep != null \|\| material != null)) // borderline...
3347	3909	live = h;
3348	3910
3349	3911	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3926,8 @@
3364	3926	return;
3365	3927
3366	3928	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3929	+ if (//marked \|\| // does not make sense
	3930	+ (bRep != null \|\| material != null)) // borderline...
3368	3931	link2master = h;
3369	3932
3370	3933	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3947,8 @@
3384	3947	if (blockloop)
3385	3948	return;
3386	3949
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3950	+ if (//marked \|\| // does not make sense
	3951	+ (bRep != null \|\| material != null)) // borderline...
3388	3952	hide = h;
3389	3953
3390	3954	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3968,7 @@
3404	3968	if (blockloop)
3405	3969	return;
3406	3970
3407		- if (bRep != null && material != null) // borderline...
	3971	+ if (bRep != null \|\| material != null) // borderline...
3408	3972	marked = h;
3409	3973
3410	3974	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3978,46 @@
3414	3978	continue;
3415	3979	blockloop = true;
3416	3980	child.MarkLeaves(h);
	3981	+ blockloop = false;
	3982	+ // release(i);
	3983	+ }
	3984	+ }
	3985	+
	3986	+ void RewindLeaves(boolean h)
	3987	+ {
	3988	+ if (blockloop)
	3989	+ return;
	3990	+
	3991	+ if (bRep != null \|\| material != null) // borderline...
	3992	+ rewind = h;
	3993	+
	3994	+ for (int i = 0; i < Size(); i++)
	3995	+ {
	3996	+ Object3D child = (Object3D) get(i); // reserve(i);
	3997	+ if (child == null)
	3998	+ continue;
	3999	+ blockloop = true;
	4000	+ child.RewindLeaves(h);
	4001	+ blockloop = false;
	4002	+ // release(i);
	4003	+ }
	4004	+ }
	4005	+
	4006	+ void RandomLeaves(boolean h)
	4007	+ {
	4008	+ if (blockloop)
	4009	+ return;
	4010	+
	4011	+ if (bRep != null \|\| material != null) // borderline...
	4012	+ random = h;
	4013	+
	4014	+ for (int i = 0; i < Size(); i++)
	4015	+ {
	4016	+ Object3D child = (Object3D) get(i); // reserve(i);
	4017	+ if (child == null)
	4018	+ continue;
	4019	+ blockloop = true;
	4020	+ child.RandomLeaves(h);
3417	4021	blockloop = false;
3418	4022	// release(i);
3419	4023	}
..	..	@@ -3451,6 +4055,7 @@
3451	4055
3452	4056	void RevertMeshes()
3453	4057	{
	4058	+ // BLOCKLOOP
3454	4059	if (this instanceof cMesh)
3455	4060	{
3456	4061	((cMesh)this).Revert();
..	..	@@ -3481,11 +4086,6 @@
3481	4086	Touch();
3482	4087	}
3483	4088
3484		- ResetRecur();
3485		- }
3486		-
3487		- void ResetRecur()
3488		- {
3489	4089	for (int i = 0; i < size(); i++)
3490	4090	{
3491	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3508,11 +4108,6 @@
3508	4108	Step();
3509	4109	Touch();
3510	4110
3511		- StepRecur();
3512		- }
3513		-
3514		- void StepRecur()
3515		- {
3516	4111	for (int i = 0; i < size(); i++)
3517	4112	{
3518	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3699,8 +4294,8 @@
3699	4294	Touch();
3700	4295	}
3701	4296
3702		- transient cVector min = new cVector();
3703		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
3704	4299
3705	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
3706	4301	{
..	..	@@ -3716,19 +4311,19 @@
3716	4311	if (blockloop)
3717	4312	return;
3718	4313
3719		- if (min == null) // ???
	4314	+ if (min == null)
3720	4315	{
3721	4316	min = new cVector();
3722	4317	max = new cVector();
3723	4318	}
3724	4319
3725		- for (int i = 0; i<size(); i++)
	4320	+ for (int i = 0; i<Size(); i++)
3726	4321	{
3727		- Object3D child = (Object3D) reserve(i);
	4322	+ Object3D child = (Object3D) get(i); //reserve(i);
3728	4323	if (child == null)
3729	4324	continue;
3730	4325
3731		- if (GrafreeD.RENDERME > 0)
	4326	+ if (Grafreed.RENDERME > 0)
3732	4327	{
3733	4328	if (child instanceof Merge)
3734	4329	((Merge)child).renderme();
..	..	@@ -3743,21 +4338,21 @@
3743	4338	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3744	4339	//if (child.hide)
3745	4340	{
3746		- release(i);
	4341	+ //release(i);
3747	4342	continue;
3748	4343	}
3749	4344
3750	4345	blockloop = true;
3751	4346	child.getBounds(min, max, true); // xform);
3752	4347	blockloop = false;
3753		- release(i);
	4348	+ //release(i);
3754	4349
3755	4350	MinMax(minima, maxima);
3756	4351	}
3757	4352
3758	4353	if (bRep != null)
3759	4354	{
3760		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
3761	4356	}
3762	4357
3763	4358	if (false) // xform)
..	..	@@ -3879,7 +4474,7 @@
3879	4474	if (child == null)
3880	4475	continue;
3881	4476
3882		- if (GrafreeD.RENDERME > 0)
	4477	+ if (Grafreed.RENDERME > 0)
3883	4478	{
3884	4479	if (child instanceof Merge)
3885	4480	((Merge)child).renderme();
..	..	@@ -4074,7 +4669,7 @@
4074	4669	if (child == null)
4075	4670	continue;
4076	4671
4077		- if (GrafreeD.RENDERME > 0)
	4672	+ if (Grafreed.RENDERME > 0)
4078	4673	{
4079	4674	if (child instanceof Merge)
4080	4675	((Merge)child).renderme();
..	..	@@ -4187,6 +4782,55 @@
4187	4782	{
4188	4783	blockloop = true;
4189	4784	get(i).RepairShadow();
	4785	+ blockloop = false;
	4786	+ }
	4787	+ }
	4788	+
	4789	+ void RepairSOV()
	4790	+ {
	4791	+ if (blockloop)
	4792	+ return;
	4793	+
	4794	+ String texname = this.GetPigmentTexture();
	4795	+
	4796	+ if (texname.startsWith("sov"))
	4797	+ {
	4798	+ String[] s = texname.split("/");
	4799	+
	4800	+ String[] sname = s[1].split("Color.pn");
	4801	+
	4802	+ texname = sname[0];
	4803	+
	4804	+ if (sname.length > 1)
	4805	+ {
	4806	+ texname += "Color.jpg";
	4807	+ }
	4808	+
	4809	+ this.SetPigmentTexture("sov/" + texname);
	4810	+ }
	4811	+
	4812	+ texname = this.GetBumpTexture();
	4813	+
	4814	+ if (texname.startsWith("sov"))
	4815	+ {
	4816	+ String[] s = texname.split("/");
	4817	+
	4818	+ String[] sname = s[1].split("Bump.pn");
	4819	+
	4820	+ texname = sname[0];
	4821	+
	4822	+ if (sname.length > 1)
	4823	+ {
	4824	+ texname += "Bump.jpg";
	4825	+ }
	4826	+
	4827	+ this.SetBumpTexture("sov/" + texname);
	4828	+ }
	4829	+
	4830	+ for (int i=0; i<Size(); i++)
	4831	+ {
	4832	+ blockloop = true;
	4833	+ get(i).RepairSOV();
4190	4834	blockloop = false;
4191	4835	}
4192	4836	}
..	..	@@ -4681,7 +5325,7 @@
4681	5325
4682	5326	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	5327	{
4684		- if (hide)
	5328	+ if (hide \|\| dontselect)
4685	5329	return null;
4686	5330
4687	5331	if (count <= 0)
..	..	@@ -4705,9 +5349,17 @@
4705	5349	}
4706	5350	}
4707	5351
	5352	+ ObjEditor GetWindow()
	5353	+ {
	5354	+ if (editWindow != null)
	5355	+ return editWindow;
	5356	+
	5357	+ return manipWindow;
	5358	+ }
	5359	+
4708	5360	cTreePath Select(int indexcount, boolean deselect)
4709	5361	{
4710		- if (hide)
	5362	+ if (hide \|\| dontselect)
4711	5363	return null;
4712	5364
4713	5365	if (count <= 0)
..	..	@@ -4741,10 +5393,11 @@
4741	5393	if (leaf != null)
4742	5394	{
4743	5395	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5396	+ ObjEditor window = GetWindow();
	5397	+ if (window != null)
4745	5398	{
4746	5399	//System.out.println("editWindow = " + editWindow + " vs " + this);
4747		- editWindow.Select(tp, deselect, true);
	5400	+ window.Select(tp, deselect, true);
4748	5401	}
4749	5402
4750	5403	return tp;
..	..	@@ -4761,6 +5414,7 @@
4761	5414
4762	5415	if (child == null)
4763	5416	continue;
	5417	+
4764	5418	if (child.HasTransparency() && child.size() != 0)
4765	5419	{
4766	5420	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4770,9 +5424,10 @@
4770	5424	if (leaf != null)
4771	5425	{
4772	5426	cTreePath tp = new cTreePath(this, leaf);
4773		- if (editWindow != null)
	5427	+ ObjEditor window = GetWindow();
	5428	+ if (window != null)
4774	5429	{
4775		- editWindow.Select(tp, deselect, true);
	5430	+ window.Select(tp, deselect, true);
4776	5431	}
4777	5432
4778	5433	return tp;
..	..	@@ -5097,6 +5752,51 @@
5097	5752	blockloop = false;
5098	5753	}
5099	5754
	5755	+ void ResetSelectable()
	5756	+ {
	5757	+ if (blockloop)
	5758	+ return;
	5759	+
	5760	+ blockloop = true;
	5761	+
	5762	+ keepdontselect = dontselect;
	5763	+ dontselect = true;
	5764	+
	5765	+ Object3D child;
	5766	+ int nb = Size();
	5767	+ for (int i = 0; i < nb; i++)
	5768	+ {
	5769	+ child = (Object3D) get(i);
	5770	+ if (child == null)
	5771	+ continue;
	5772	+ child.ResetSelectable();
	5773	+ }
	5774	+
	5775	+ blockloop = false;
	5776	+ }
	5777	+
	5778	+ void RestoreSelectable()
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ blockloop = true;
	5784	+
	5785	+ dontselect = keepdontselect;
	5786	+
	5787	+ Object3D child;
	5788	+ int nb = Size();
	5789	+ for (int i = 0; i < nb; i++)
	5790	+ {
	5791	+ child = (Object3D) get(i);
	5792	+ if (child == null)
	5793	+ continue;
	5794	+ child.RestoreSelectable();
	5795	+ }
	5796	+
	5797	+ blockloop = false;
	5798	+ }
	5799	+
5100	5800	boolean IsSelected()
5101	5801	{
5102	5802	if (parent == null)
..	..	@@ -5157,6 +5857,11 @@
5157	5857	if (fullname == null)
5158	5858	return "";
5159	5859
	5860	+ if (fullname.pigment != null)
	5861	+ {
	5862	+ return fullname.pigment;
	5863	+ }
	5864	+
5160	5865	// System.out.println("Fullname = " + fullname);
5161	5866
5162	5867	// Does not work on Windows due to C:
..	..	@@ -5169,7 +5874,7 @@
5169	5874
5170	5875	if (split.length == 0)
5171	5876	{
5172		- return "";
	5877	+ return fullname.pigment = "";
5173	5878	}
5174	5879
5175	5880	if (split.length <= 2)
..	..	@@ -5177,22 +5882,27 @@
5177	5882	if (fullname.name.endsWith(":"))
5178	5883	{
5179	5884	// Windows
5180		- return fullname.name.substring(0, fullname.name.length()-1);
	5885	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5181	5886	}
5182	5887
5183		- return split[0];
	5888	+ return fullname.pigment = split[0];
5184	5889	}
5185	5890
5186	5891	// Windows
5187	5892	assert(split.length == 4);
5188	5893
5189		- return split[0] + ":" + split[1];
	5894	+ return fullname.pigment = split[0] + ":" + split[1];
5190	5895	}
5191	5896
5192	5897	static String GetBump(cTexture fullname)
5193	5898	{
5194	5899	if (fullname == null)
5195	5900	return "";
	5901	+
	5902	+ if (fullname.bump != null)
	5903	+ {
	5904	+ return fullname.bump;
	5905	+ }
5196	5906
5197	5907	// System.out.println("Fullname = " + fullname);
5198	5908	// Does not work on Windows due to C:
..	..	@@ -5204,12 +5914,12 @@
5204	5914
5205	5915	if (split.length == 0)
5206	5916	{
5207		- return "";
	5917	+ return fullname.bump = "";
5208	5918	}
5209	5919
5210	5920	if (split.length == 1)
5211	5921	{
5212		- return "";
	5922	+ return fullname.bump = "";
5213	5923	}
5214	5924
5215	5925	if (split.length == 2)
..	..	@@ -5217,16 +5927,16 @@
5217	5927	if (fullname.name.endsWith(":"))
5218	5928	{
5219	5929	// Windows
5220		- return "";
	5930	+ return fullname.bump = "";
5221	5931	}
5222	5932
5223		- return split[1];
	5933	+ return fullname.bump = split[1];
5224	5934	}
5225	5935
5226	5936	// Windows
5227	5937	assert(split.length == 4);
5228	5938
5229		- return split[2] + ":" + split[3];
	5939	+ return fullname.bump = split[2] + ":" + split[3];
5230	5940	}
5231	5941
5232	5942	String GetPigmentTexture()
..	..	@@ -5309,6 +6019,9 @@
5309	6019	texname = "";
5310	6020
5311	6021	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6022	+
	6023	+ GetTextures().pigment = null;
	6024	+
5312	6025	Touch();
5313	6026	}
5314	6027
..	..	@@ -5333,6 +6046,43 @@
5333	6046	}
5334	6047	}
5335	6048
	6049	+ UUID GetUUID()
	6050	+ {
	6051	+ if (uuid == null)
	6052	+ {
	6053	+ // Serial
	6054	+ uuid = UUID.randomUUID();
	6055	+ }
	6056	+
	6057	+ return uuid;
	6058	+ }
	6059	+
	6060	+ Object3D GetObject(UUID uid)
	6061	+ {
	6062	+ if (blockloop)
	6063	+ return null;
	6064	+
	6065	+ if (GetUUID().equals(uid))
	6066	+ return this;
	6067	+
	6068	+ int nb = Size();
	6069	+ for (int i = 0; i < nb; i++)
	6070	+ {
	6071	+ Object3D child = (Object3D) get(i);
	6072	+
	6073	+ if (child == null)
	6074	+ continue;
	6075	+
	6076	+ blockloop = true;
	6077	+ Object3D obj = child.GetObject(uid);
	6078	+ blockloop = false;
	6079	+ if (obj != null)
	6080	+ return obj;
	6081	+ }
	6082	+
	6083	+ return null;
	6084	+ }
	6085	+
5336	6086	void SetBumpTexture(String tex)
5337	6087	{
5338	6088	if (GetTextures() == null)
..	..	@@ -5344,6 +6094,8 @@
5344	6094	texname = "";
5345	6095
5346	6096	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	6097	+
	6098	+ GetTextures().bump = null;
5347	6099
5348	6100	Touch();
5349	6101	}
..	..	@@ -5369,6 +6121,38 @@
5369	6121	}
5370	6122	}
5371	6123
	6124	+ void EmbedTextures(boolean embed)
	6125	+ {
	6126	+ if (blockloop)
	6127	+ return;
	6128	+
	6129	+ //if (GetTextures() != null)
	6130	+ if (embed)
	6131	+ CameraPane.EmbedTextures(GetTextures());
	6132	+ else
	6133	+ {
	6134	+ GetTextures().pigmentdata = null;
	6135	+ GetTextures().bumpdata = null;
	6136	+ GetTextures().pw = 0;
	6137	+ GetTextures().ph = 0;
	6138	+ GetTextures().bw = 0;
	6139	+ GetTextures().bh = 0;
	6140	+ }
	6141	+
	6142	+ int nb = Size();
	6143	+ for (int i = 0; i < nb; i++)
	6144	+ {
	6145	+ Object3D child = (Object3D) get(i);
	6146	+
	6147	+ if (child == null)
	6148	+ continue;
	6149	+
	6150	+ blockloop = true;
	6151	+ child.EmbedTextures(embed);
	6152	+ blockloop = false;
	6153	+ }
	6154	+ }
	6155	+
5372	6156	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5373	6157	{
5374	6158	Draw(display, root, selected, blocked);
..	..	@@ -5377,12 +6161,37 @@
5377	6161	boolean NeedSupport()
5378	6162	{
5379	6163	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	6164	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5381	6165	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	6166	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	6167	}
5384	6168
5385	6169	static boolean DEBUG_SELECTION = false;
	6170	+
	6171	+ boolean IsLive()
	6172	+ {
	6173	+ if (live)
	6174	+ return true;
	6175	+
	6176	+ if (parent == null)
	6177	+ return false;
	6178	+
	6179	+ return parent.IsLive();
	6180	+ }
	6181	+
	6182	+ boolean IsDynamic()
	6183	+ {
	6184	+ return live && bRep != null;
	6185	+ }
	6186	+
	6187	+ boolean Link2Support()
	6188	+ {
	6189	+ return link2master \|\| link2support;
	6190	+ }
	6191	+
	6192	+ static cVector minima = new cVector();
	6193	+ static cVector maxima = new cVector();
	6194	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
5386	6195
5387	6196	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	6197	{
..	..	@@ -5393,8 +6202,31 @@
5393	6202	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5394	6203	}
5395	6204
	6205	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6206	+ {
	6207	+ getBounds(minima, maxima, true);
	6208	+ center.x = (minima.x + maxima.x) / 2;
	6209	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6210	+ center.z = (minima.z + maxima.z) / 2;
	6211	+
	6212	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6213	+
	6214	+ IntersectResult res = new IntersectResult();
	6215	+ res.t = Double.POSITIVE_INFINITY;
	6216	+
	6217	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6218	+ {
	6219	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6220	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6221	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6222	+
	6223	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6224	+ LA.matInvert(toParent, fromParent);
	6225	+ }
	6226	+ }
	6227	+
5396	6228	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	6229	+ (hide \|\| dontselect))
5398	6230	return;
5399	6231
5400	6232	if (name != null && name.contains("sclera"))
..	..	@@ -5444,8 +6276,11 @@
5444	6276	if (support != null)
5445	6277	support = support;
5446	6278
5447		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5448		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ boolean usecalllists = !IsDynamic() &&
	6280	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6281	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6282	+
	6283	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5449	6284
5450	6285	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	6286	{
..	..	@@ -5453,10 +6288,12 @@
5453	6288	bRep.displaylist = 0;
5454	6289	}
5455	6290	// usecalllists &= !(parent instanceof RandomNode);
5456		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
5457	6293
5458		- if (GetBRep() != null)
5459		- usecalllists = usecalllists;
	6294	+ if (display.DrawMode() == display.SHADOW)
	6295	+ //GetBRep() != null)
	6296	+ usecalllists = !!usecalllists;
5460	6297	//System.out.println("draw " + this);
5461	6298	//new Exception().printStackTrace();
5462	6299
..	..	@@ -5465,10 +6302,12 @@
5465	6302	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	6303
5467	6304	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6305	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5469	6307	{
5470	6308	Globals.lighttouched = true;
5471	6309	} // all panes...
	6310	+
5472	6311	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	6312	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	6313	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5476,7 +6315,7 @@
5476	6315	if (!(this instanceof Composite))
5477	6316	touched = false;
5478	6317	//if (displaylist == -1 && usecalllists)
5479		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6318	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5480	6319	{
5481	6320	bRep.displaylist = display.GenList();
5482	6321	assert(bRep.displaylist != 0);
..	..	@@ -5487,7 +6326,7 @@
5487	6326
5488	6327	//System.out.println("\tnew list " + list);
5489	6328	//gl.glDrawBuffer(gl.GL_NONE);
5490		- if (usecalllists)
	6329	+ if (usecalllists && bRep.displaylist > 0)
5491	6330	{
5492	6331	// System.err.println("new list " + bRep.displaylist + " for " + this);
5493	6332	display.NewList(bRep.displaylist);
..	..	@@ -5496,7 +6335,7 @@
5496	6335	CallList(display, root, selected, blocked);
5497	6336
5498	6337	// compiled = true;
5499		- if (usecalllists)
	6338	+ if (usecalllists && bRep.displaylist > 0)
5500	6339	{
5501	6340	// System.err.println("end list " + bRep.displaylist + " for " + this);
5502	6341	display.EndList();
..	..	@@ -5506,8 +6345,8 @@
5506	6345	Globals.lighttouched = true; // all panes...
5507	6346	}
5508	6347
5509		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5510		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
5511	6350
5512	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
5513	6352	{
..	..	@@ -5546,7 +6385,7 @@
5546	6385	{
5547	6386	if (display.DrawMode() == iCameraPane.SHADOW)
5548	6387	{
5549		- if (!link2master // tricky to cull in shadow mode.
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
5550	6389	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5551	6390	{
5552	6391	//System.out.print("CULLED");
..	..	@@ -5596,6 +6435,7 @@
5596	6435	if (GetBRep() != null)
5597	6436	{
5598	6437	display.NextIndex();
	6438	+
5599	6439	// vertex color conflict : gl.glCallList(list);
5600	6440	DrawNode(display, root, selected);
5601	6441	if (this instanceof BezierPatch)
..	..	@@ -5607,6 +6447,20 @@
5607	6447	{
5608	6448	drawSelf(display, root, selected, blocked);
5609	6449	}
	6450	+
	6451	+// if (!(this instanceof Composite))
	6452	+// {
	6453	+// for (int i = 0; i < size(); i++)
	6454	+// {
	6455	+// Object3D child = (Object3D) reserve(i);
	6456	+// if (child == null)
	6457	+// continue;
	6458	+//
	6459	+// child.draw(display, root, selected, blocked);
	6460	+//
	6461	+// release(i);
	6462	+// }
	6463	+// }
5610	6464	} else
5611	6465	{
5612	6466	/*
..	..	@@ -5636,7 +6490,29 @@
5636	6490	tex = GetTextures();
5637	6491	}
5638	6492
5639		- display.BindTextures(tex, texres);
	6493	+ boolean failedPigment = false;
	6494	+ boolean failedBump = false;
	6495	+
	6496	+ CameraPane.lastObject = this;
	6497	+ try
	6498	+ {
	6499	+ display.BindPigmentTexture(tex, texres);
	6500	+ }
	6501	+ catch (Exception e)
	6502	+ {
	6503	+ // System.err.println("FAILED: " + this);
	6504	+ failedPigment = true;
	6505	+ }
	6506	+
	6507	+ try
	6508	+ {
	6509	+ display.BindBumpTexture(tex, texres);
	6510	+ }
	6511	+ catch (Exception e)
	6512	+ {
	6513	+ //System.err.println("FAILED: " + this);
	6514	+ failedBump = true;
	6515	+ }
5640	6516
5641	6517	if (!compiled)
5642	6518	{
..	..	@@ -5656,9 +6532,27 @@
5656	6532	// june 2013 drawSelf(display, root, selected);
5657	6533	}
5658	6534	}
	6535	+
	6536	+ assert (!(this instanceof Composite));
	6537	+ {
	6538	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6539	+// {
	6540	+// Object3D child = (Object3D) reserve(i);
	6541	+// if (child == null)
	6542	+// continue;
	6543	+//
	6544	+// child.draw(display, root, selected, blocked);
	6545	+//
	6546	+// release(i);
	6547	+// }
	6548	+ }
5659	6549	}
5660	6550
5661		- display.ReleaseTextures(tex);
	6551	+ if (!failedBump)
	6552	+ display.ReleaseBumpTexture(tex);
	6553	+
	6554	+ if (!failedPigment)
	6555	+ display.ReleasePigmentTexture(tex);
5662	6556
5663	6557	display.PopMaterial(this, selected);
5664	6558	}
..	..	@@ -5704,16 +6598,17 @@
5704	6598
5705	6599	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5706	6600	{
5707		- if (GetBRep() == null)
5708		- {
5709		- drawSelf(display, root, selected, blocked);
5710		- } else
	6601	+ if (GetBRep() != null)
5711	6602	{
5712	6603	DrawNode(display, root, selected);
5713	6604	if (this instanceof BezierPatch)
5714	6605	{
5715	6606	//drawSelf(display, root, selected);
5716	6607	}
	6608	+ }
	6609	+ else
	6610	+ {
	6611	+ drawSelf(display, root, selected, blocked);
5717	6612	}
5718	6613	}
5719	6614
..	..	@@ -5787,6 +6682,9 @@
5787	6682
5788	6683	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6684	{
	6685	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6686	+ return;
	6687	+
5790	6688	if (hide)
5791	6689	return;
5792	6690	// shadow optimisation
..	..	@@ -5912,6 +6810,9 @@
5912	6810	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6811	return; // no shadow for transparent objects
5914	6812
	6813	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6814	+ return;
	6815	+
5915	6816	if (hide)
5916	6817	return;
5917	6818
..	..	@@ -5957,7 +6858,8 @@
5957	6858
5958	6859	//javax.media.opengl.GL gl = display.GetGL();
5959	6860
5960		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
5961	6863	{
5962	6864	int fc = bRep.FaceCount();
5963	6865	int vc = bRep.VertexCount();
..	..	@@ -6025,6 +6927,11 @@
6025	6927	// dec 2012
6026	6928	new Exception().printStackTrace();
6027	6929	return;
	6930	+ }
	6931	+
	6932	+ if (dontselect)
	6933	+ {
	6934	+ //bRep.GenerateNormalsMINE();
6028	6935	}
6029	6936
6030	6937	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6114,7 +7021,7 @@
6114	7021	facescompare[k] = new FaceCompare(k);
6115	7022	}
6116	7023
6117		- center = new cVector();
	7024	+ centertriangle = new cVector();
6118	7025	}
6119	7026	else
6120	7027	{
..	..	@@ -6237,7 +7144,7 @@
6237	7144	*/
6238	7145	}
6239	7146
6240		- transient cVector center;
	7147	+ transient cVector centertriangle;
6241	7148
6242	7149	class FaceCompare implements Comparable
6243	7150	{
..	..	@@ -6266,14 +7173,14 @@
6266	7173	Vertex q = bRep.GetVertex(face.q);
6267	7174	Vertex r = bRep.GetVertex(face.r);
6268	7175
6269		- center.set(p);
6270		- center.add(q);
6271		- center.add(r);
6272		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
6273	7180
6274		- center.sub(Globals.theRenderer.EyeCamera().location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6275	7182
6276		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
6277	7184	}
6278	7185
6279	7186	return distance;
..	..	@@ -6810,20 +7717,23 @@
6810	7717	}
6811	7718	}
6812	7719
6813		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7720	+ static ClickInfo clickInfo = new ClickInfo();
	7721	+
	7722	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7723	+ Point outPt, Rectangle outRec)
6814	7724	{
6815		- int hc = info.bounds.x + info.bounds.width / 2;
6816		- int vc = info.bounds.y + info.bounds.height / 2;
6817		- double[][] toscreen = info.toScreen;
	7725	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7726	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7727	+ double[][] toscreen = clickInfo.toScreen;
6818	7728	if (toscreen == null)
6819	7729	{
6820		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7730	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6821	7731	}
6822	7732	cVector vec = in;
6823	7733	LA.xformPos(in, toscreen, in);
6824	7734	//System.out.println("Distance = " + info.camera.Distance());
6825		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6826		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7735	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7736	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6827	7737	outPt.x = hc + (int) vec.x;
6828	7738	outPt.y = vc - (int) vec.y;
6829	7739	outRec.x = outPt.x - 3;
..	..	@@ -6831,15 +7741,18 @@
6831	7741	outRec.width = outRec.height = 6;
6832	7742	}
6833	7743
6834		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7744	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7745	+ )
6835	7746	{
6836	7747	Point pt = new Point(0, 0);
6837	7748	Rectangle rec = new Rectangle();
6838		- calcHotSpot(in, info, pt, rec);
	7749	+ calcHotSpot(in, //clickInfo,
	7750	+ pt, rec);
6839	7751	return rec;
6840	7752	}
6841	7753
6842		- void drawEditHandles0(ClickInfo info, int level)
	7754	+ void drawEditHandles0(//ClickInfo clickInfo,
	7755	+ int level)
6843	7756	{
6844	7757	if (level == 0)
6845	7758	{
..	..	@@ -6848,16 +7761,19 @@
6848	7761	{
6849	7762	cVector origin = new cVector();
6850	7763	//LA.xformPos(origin, toParent, origin);
6851		- Rectangle spot = calcHotSpot(origin, info);
	7764	+ if (this.clickInfo == null)
	7765	+ this.clickInfo = new ClickInfo();
	7766	+
	7767	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6852	7768	Rectangle boundary = new Rectangle();
6853	7769	boundary.x = spot.x - 30;
6854	7770	boundary.y = spot.y - 30;
6855	7771	boundary.width = spot.width + 60;
6856	7772	boundary.height = spot.height + 60;
6857		- info.g.setColor(Color.red);
	7773	+ clickInfo.g.setColor(Color.white);
6858	7774	int spotw = spot.x + spot.width;
6859	7775	int spoth = spot.y + spot.height;
6860		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7776	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6861	7777	// if (CameraPane.Xmin > spot.x)
6862	7778	// {
6863	7779	// CameraPane.Xmin = spot.x;
..	..	@@ -6874,11 +7790,33 @@
6874	7790	// {
6875	7791	// CameraPane.Ymax = spoth;
6876	7792	// }
6877		- spot.translate(32, 32);
	7793	+// if (CameraPane.Xmin > spot.x)
	7794	+// {
	7795	+// CameraPane.Xmin = spot.x;
	7796	+// }
	7797	+// if (CameraPane.Xmax < spotw)
	7798	+// {
	7799	+// CameraPane.Xmax = spotw;
	7800	+// }
	7801	+// if (CameraPane.Ymin > spot.y)
	7802	+// {
	7803	+// CameraPane.Ymin = spot.y;
	7804	+// }
	7805	+// if (CameraPane.Ymax < spoth)
	7806	+// {
	7807	+// CameraPane.Ymax = spoth;
	7808	+// }
	7809	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7810	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7811	+ spot.translate(32, 0);
	7812	+ clickInfo.g.setColor(Color.yellow);
	7813	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7814	+
	7815	+ spot.translate(32, 64);
6878	7816	spotw = spot.x + spot.width;
6879	7817	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
6881		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7818	+ clickInfo.g.setColor(Color.cyan);
	7819	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7820	// if (CameraPane.Xmin > spot.x)
6883	7821	// {
6884	7822	// CameraPane.Xmin = spot.x;
..	..	@@ -6895,29 +7833,9 @@
6895	7833	// {
6896	7834	// CameraPane.Ymax = spoth;
6897	7835	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6900		- spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
6902		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6903		-// if (CameraPane.Xmin > spot.x)
6904		-// {
6905		-// CameraPane.Xmin = spot.x;
6906		-// }
6907		-// if (CameraPane.Xmax < spotw)
6908		-// {
6909		-// CameraPane.Xmax = spotw;
6910		-// }
6911		-// if (CameraPane.Ymin > spot.y)
6912		-// {
6913		-// CameraPane.Ymin = spot.y;
6914		-// }
6915		-// if (CameraPane.Ymax < spoth)
6916		-// {
6917		-// CameraPane.Ymax = spoth;
6918		-// }
6919		- info.g.drawArc(boundary.x, boundary.y,
6920		- boundary.width, boundary.height, 0, 360);
	7836	+ clickInfo.g.setColor(Color.green);
	7837	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7838	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6921	7839	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6922	7840	// if (CameraPane.Xmin > boundary.x)
6923	7841	// {
..	..	@@ -6939,7 +7857,8 @@
6939	7857	}
6940	7858	}
6941	7859
6942		- boolean doEditClick0(ClickInfo info, int level)
	7860	+ boolean doEditClick0(//ClickInfo clickInfo,
	7861	+ int level)
6943	7862	{
6944	7863	if (level == 0)
6945	7864	{
..	..	@@ -6948,10 +7867,10 @@
6948	7867
6949	7868	boolean retval = false;
6950	7869
6951		- startX = info.x;
6952		- startY = info.y;
	7870	+ startX = clickInfo.x;
	7871	+ startY = clickInfo.y;
6953	7872
6954		- hitSomething = 0;
	7873	+ hitSomething = -1;
6955	7874	cVector origin = new cVector();
6956	7875	//LA.xformPos(origin, toParent, origin);
6957	7876	Rectangle spot = new Rectangle();
..	..	@@ -6959,22 +7878,53 @@
6959	7878	{
6960	7879	centerPt = new Point(0, 0);
6961	7880	}
6962		- calcHotSpot(origin, info, centerPt, spot);
6963		- if (spot.contains(info.x, info.y))
	7881	+ calcHotSpot(origin, //info,
	7882	+ centerPt, spot);
	7883	+ if (spot.contains(clickInfo.x, clickInfo.y))
6964	7884	{
6965	7885	hitSomething = hitCenter;
6966	7886	retval = true;
6967	7887	}
6968	7888	spot.translate(32, 0);
6969		- if (spot.contains(info.x, info.y))
	7889	+ if (spot.contains(clickInfo.x, clickInfo.y))
6970	7890	{
6971	7891	hitSomething = hitRotate;
6972	7892	retval = true;
6973	7893	}
6974	7894	spot.translate(0, 32);
6975		- if (spot.contains(info.x, info.y))
	7895	+ spot.translate(32, 0);
	7896	+ spot.translate(0, 32);
	7897	+ if (spot.contains(clickInfo.x, clickInfo.y))
6976	7898	{
6977	7899	hitSomething = hitScale;
	7900	+
	7901	+ double scale = 0.005f * clickInfo.camera.Distance();
	7902	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7903	+ double sign = 1;
	7904	+ if (hScale < 0)
	7905	+ {
	7906	+ sign = -1;
	7907	+ }
	7908	+ hScale = signMath.pow(signhScale, scale * 50);
	7909	+ if (hScale < 0.01)
	7910	+ {
	7911	+ //hScale = 0.01;
	7912	+ }
	7913	+
	7914	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7915	+ sign = 1;
	7916	+ if (vScale < 0)
	7917	+ {
	7918	+ sign = -1;
	7919	+ }
	7920	+ vScale = signMath.pow(signvScale, scale * 50);
	7921	+ if (vScale < 0.01)
	7922	+ {
	7923	+ //vScale = 0.01;
	7924	+ }
	7925	+
	7926	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7927	+
6978	7928	retval = true;
6979	7929	}
6980	7930
..	..	@@ -6984,7 +7934,7 @@
6984	7934	}
6985	7935
6986	7936	//System.out.println("info.modifiers = " + info.modifiers);
6987		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7937	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6988	7938	//System.out.println("modified = " + modified);
6989	7939	//new Exception().printStackTrace();
6990	7940	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7012,7 +7962,8 @@
7012	7962	return true;
7013	7963	}
7014	7964
7015		- void doEditDrag0(ClickInfo info, boolean opposite)
	7965	+ void doEditDrag0(//ClickInfo info,
	7966	+ boolean opposite)
7016	7967	{
7017	7968	if (hitSomething == 0)
7018	7969	{
..	..	@@ -7026,7 +7977,8 @@
7026	7977
7027	7978	//System.out.println("hitSomething = " + hitSomething);
7028	7979
7029		- double scale = 0.005f * info.camera.Distance();
	7980	+ double scale = 0.005f * clickInfo.camera.Distance();
	7981	+
7030	7982	cVector xlate = new cVector();
7031	7983	//cVector xlate2 = new cVector();
7032	7984	switch (hitSomething)
..	..	@@ -7039,7 +7991,9 @@
7039	7991
7040	7992	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7041	7993
7042		- if (modified \|\| opposite)
	7994	+ // Modified could snap
	7995	+ if (//modified \|\|
	7996	+ opposite)
7043	7997	{
7044	7998	//assert(false);
7045	7999	/*
..	..	@@ -7059,8 +8013,8 @@
7059	8013	toParent[3][i] = xlate.get(i);
7060	8014	LA.matInvert(toParent, fromParent);
7061	8015	*/
7062		- cVector delta = LA.newVector(0, 0, startY - info.y);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8016	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8017	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	8018
7065	8019	LA.matCopy(startMat, toParent);
7066	8020	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7069,7 +8023,7 @@
7069	8023	} else
7070	8024	{
7071	8025	//LA.xformDir(delta, info.camera.fromScreen, delta);
7072		- cVector up = new cVector(info.camera.up);
	8026	+ cVector up = new cVector(clickInfo.camera.up);
7073	8027	cVector away = new cVector();
7074	8028	//cVector right2 = new cVector();
7075	8029	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7086,19 +8040,19 @@
7086	8040	LA.xformDir(up, ClickInfo.matbuffer, up);
7087	8041	// if (!CameraPane.LOCALTRANSFORM)
7088	8042	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7089		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8043	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7090	8044	// if (!CameraPane.LOCALTRANSFORM)
7091	8045	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7092	8046	//LA.vecCross(up, cVector.Z, right2);
7093	8047
7094		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8048	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7095	8049
7096	8050	//System.out.println("DELTA0 = " + delta);
7097	8051	//System.out.println("AWAY = " + info.camera.away);
7098	8052	//System.out.println("UP = " + info.camera.up);
7099	8053	if (away.z > 0)
7100	8054	{
7101		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8055	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7102	8056	{
7103	8057	delta.x = -delta.x;
7104	8058	} else
..	..	@@ -7113,7 +8067,7 @@
7113	8067	//System.out.println("DELTA1 = " + delta);
7114	8068	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7115	8069	//System.out.println("DELTA2 = " + delta);
7116		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8070	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7117	8071	LA.matCopy(startMat, toParent);
7118	8072	//System.out.println("DELTA3 = " + delta);
7119	8073	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7123,8 +8077,8 @@
7123	8077	break;
7124	8078
7125	8079	case hitRotate: // rotate
7126		- int dx = info.x - centerPt.x;
7127		- int dy = -(info.y - centerPt.y);
	8080	+ int dx = clickInfo.x - centerPt.x;
	8081	+ int dy = -(clickInfo.y - centerPt.y);
7128	8082	double angle = (double) Math.atan2(dx, dy);
7129	8083	angle = -(1.570796 - angle);
7130	8084
..	..	@@ -7133,7 +8087,7 @@
7133	8087
7134	8088	if (modified)
7135	8089	{
7136		- // Rotate 90 degrees
	8090	+ // Rotate 45 degrees
7137	8091	angle /= (Math.PI / 4);
7138	8092	angle = Math.floor(angle + 0.5);
7139	8093	angle *= (Math.PI / 4);
..	..	@@ -7147,7 +8101,7 @@
7147	8101	}
7148	8102	/**/
7149	8103
7150		- switch (info.pane.RenderCamera().viewCode)
	8104	+ switch (clickInfo.pane.RenderCamera().viewCode)
7151	8105	{
7152	8106	case 1: // '\001'
7153	8107	LA.matZRotate(toParent, angle);
..	..	@@ -7174,26 +8128,30 @@
7174	8128	break;
7175	8129
7176	8130	case hitScale: // scale
7177		- double hScale = (double) (info.x - centerPt.x) / 32;
	8131	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	8132	+ double sign = 1;
	8133	+ if (hScale < 0)
	8134	+ {
	8135	+ sign = -1;
	8136	+ }
	8137	+ hScale = signMath.pow(signhScale, scale * 50);
7178	8138	if (hScale < 0.01)
7179	8139	{
7180		- hScale = 0.01;
	8140	+ //hScale = 0.01;
7181	8141	}
7182		- hScale = Math.pow(hScale, scale * 50);
7183		- if (hScale < 0.01)
	8142	+
	8143	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	8144	+ sign = 1;
	8145	+ if (vScale < 0)
7184	8146	{
7185		- hScale = 0.01;
	8147	+ sign = -1;
7186	8148	}
7187		- double vScale = (double) (info.y - centerPt.y) / 32;
	8149	+ vScale = signMath.pow(signvScale, scale * 50);
7188	8150	if (vScale < 0.01)
7189	8151	{
7190		- vScale = 0.01;
	8152	+ //vScale = 0.01;
7191	8153	}
7192		- vScale = Math.pow(vScale, scale * 50);
7193		- if (vScale < 0.01)
7194		- {
7195		- vScale = 0.01;
7196		- }
	8154	+
7197	8155	LA.matCopy(startMat, toParent);
7198	8156	/**/
7199	8157	for (int i = 0; i < 3; i++)
..	..	@@ -7203,39 +8161,56 @@
7203	8161	}
7204	8162	/**/
7205	8163
7206		- switch (info.pane.RenderCamera().viewCode)
	8164	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	8165	+
	8166	+ if (totalScale < 0.01)
	8167	+ {
	8168	+ totalScale = 0.01;
	8169	+ }
	8170	+
	8171	+ switch (clickInfo.pane.RenderCamera().viewCode)
7207	8172	{
7208	8173	case 3: // '\001'
7209		- if (modified)
	8174	+ if (modified \|\| opposite)
7210	8175	{
	8176	+ if (modified) // && opposite)
	8177	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8178	+ else
7211	8179	//LA.matScale(toParent, 1, hScale, vScale);
7212		- LA.matScale(toParent, vScale, 1, 1);
	8180	+ LA.matScale(toParent, totalScale, 1, 1);
7213	8181	} // vScale, 1);
7214	8182	else
7215	8183	{
7216		- LA.matScale(toParent, vScale, vScale, vScale);
	8184	+ // EXCEPTION!
	8185	+ LA.matScale(toParent, 1, totalScale, totalScale);
7217	8186	} // vScale, 1);
7218	8187	break;
7219	8188
7220	8189	case 2: // '\002'
7221		- if (modified)
	8190	+ if (modified \|\| opposite)
7222	8191	{
7223		- //LA.matScale(toParent, hScale, 1, vScale);
7224		- LA.matScale(toParent, 1, vScale, 1);
	8192	+ if (modified) // && opposite)
	8193	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8194	+ else
	8195	+ //LA.matScale(toParent, hScale, 1, vScale);
	8196	+ LA.matScale(toParent, 1, totalScale, 1);
7225	8197	} else
7226	8198	{
7227		- LA.matScale(toParent, vScale, 1, vScale);
	8199	+ LA.matScale(toParent, totalScale, 1, totalScale);
7228	8200	}
7229	8201	break;
7230	8202
7231	8203	case 1: // '\003'
7232		- if (modified)
	8204	+ if (modified \|\| opposite)
7233	8205	{
7234		- //LA.matScale(toParent, hScale, vScale, 1);
7235		- LA.matScale(toParent, 1, 1, vScale);
	8206	+ if (modified) // && opposite)
	8207	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8208	+ else
	8209	+ //LA.matScale(toParent, hScale, vScale, 1);
	8210	+ LA.matScale(toParent, 1, 1, totalScale);
7236	8211	} else
7237	8212	{
7238		- LA.matScale(toParent, vScale, vScale, 1);
	8213	+ LA.matScale(toParent, totalScale, totalScale, 1);
7239	8214	}
7240	8215	break;
7241	8216	}
..	..	@@ -7269,7 +8244,7 @@
7269	8244	} // NEW ...
7270	8245
7271	8246
7272		- info.pane.repaint();
	8247	+ clickInfo.pane.repaint();
7273	8248	}
7274	8249
7275	8250	boolean overflow = false;
..	..	@@ -7368,19 +8343,27 @@
7368	8343	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369	8344	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370	8345	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8346	+
	8347	+ String objname;
	8348	+
7371	8349	if (false) //parent != null)
7372	8350	{
7373		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8351	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374	8352	} else
7375	8353	{
7376		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8354	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7377	8355	} // + super.toString();
7378	8356	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8357	+
	8358	+ if (!Globals.ADVANCED)
	8359	+ return objname;
	8360	+
	8361	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7379	8362	}
7380	8363
7381	8364	public int hashCode()
7382	8365	{
7383		- // Fuck Vector...
	8366	+ // Do not use Vector...
7384	8367	return System.identityHashCode(this);
7385	8368	}
7386	8369
..	..	@@ -7441,6 +8424,10 @@
7441	8424	editWindow = null;
7442	8425	} // ?
7443	8426	}
	8427	+ else
	8428	+ {
	8429	+ //editWindow.closeUI();
	8430	+ }
7444	8431	}
7445	8432
7446	8433	boolean root; // patch for edit windows
..	..	@@ -7452,7 +8439,7 @@
7452	8439	/transient/ cVector2[] projectedVertices = new cVector2[0];
7453	8440
7454	8441	Object3D /Composite/ parent;
7455		- Object3D /Composite/ fileparent;
	8442	+ Object3D /Composite/ fileparent; // In the case of FileObject
7456	8443
7457	8444	double[][] toParent; // dynamic matrix
7458	8445	double[][] fromParent;
..	..	@@ -7567,7 +8554,7 @@
7567	8554	{
7568	8555	assert(bRep != null);
7569	8556	if (!(support instanceof GenericJoint)) // support.bRep != null)
7570		- GrafreeD.Assert(support.bRep == bRep.support);
	8557	+ Grafreed.Assert(support.bRep == bRep.support);
7571	8558	}
7572	8559	else
7573	8560	{
..	..	@@ -7598,6 +8585,10 @@
7598	8585	}
7599	8586
7600	8587	transient ObjEditor editWindow;
	8588	+ transient ObjEditor manipWindow;
	8589	+
	8590	+ transient boolean pinned;
	8591	+
7601	8592	transient ObjectUI objectUI;
7602	8593	public static int povDepth = 0;
7603	8594	private static cVector tbMin = new cVector();
..	..	@@ -7612,13 +8603,13 @@
7612	8603	private static cVector2 qq2 = new cVector2();
7613	8604	private static cVector2 rr2 = new cVector2();
7614	8605	private static cVector2 ss2 = new cVector2();
7615		- private static cVector edge1 = new cVector();
7616		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
7617	8608	//private static cVector norm = new cVector();
7618	8609	/transient private/ int hitSomething;
7619		- private static final int hitCenter = 1;
7620		- private static final int hitScale = 2;
7621		- private static final int hitRotate = 3;
	8610	+ static final int hitCenter = 1;
	8611	+ static final int hitScale = 2;
	8612	+ static final int hitRotate = 3;
7622	8613	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7623	8614	/transient/ private Point centerPt;
7624	8615	/transient/ private int startX;
..	..	@@ -7811,7 +8802,275 @@
7811	8802
7812	8803	Touch();
7813	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
7814	8809
	8810	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8811	+ {
	8812	+ boolean success = false;
	8813	+
	8814	+ if (bRep.stripified)
	8815	+ {
	8816	+ int[] strips = bRep.getRawIndices();
	8817	+
	8818	+ // TRIANGLE STRIP ARRAY
	8819	+ if (bRep.trimmed)
	8820	+ {
	8821	+ float[] v = bRep.getRawVertices();
	8822	+
	8823	+ int count3 = 0;
	8824	+
	8825	+ if (v.length > 0)
	8826	+ {
	8827	+ for (int i = 0; i < strips.length; i++)
	8828	+ {
	8829	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8833	+ count3 += 3;
	8834	+
	8835	+ for (int j = 0; j < strips[i] - 2; j++)
	8836	+ {
	8837	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8838	+ count3 += 3;
	8839	+
	8840	+ if (j%2 == 0)
	8841	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8842	+ else
	8843	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8844	+
	8845	+ s1.set(s2);
	8846	+ s2.set(s3);
	8847	+ }
	8848	+ }
	8849	+ }
	8850	+
	8851	+ assert count3 == v.length;
	8852	+ }
	8853	+ else // !trimmed
	8854	+ {
	8855	+ int count = 0;
	8856	+ for (int i = 0; i < strips.length; i++)
	8857	+ {
	8858	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8859	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8860	+
	8861	+ for (int j = 0; j < strips[i] - 2; j++)
	8862	+ {
	8863	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8864	+
	8865	+ if (j%2 == 0)
	8866	+ success \|= intersectTriangle(ray, result, p, q, r);
	8867	+ else
	8868	+ success \|= intersectTriangle(ray, result, p, r, q);
	8869	+
	8870	+ p = q;
	8871	+ q = r;
	8872	+ }
	8873	+ }
	8874	+ }
	8875	+ } else // catch (Error e)
	8876	+ {
	8877	+ int facecount = bRep.FaceCount();
	8878	+ for (int i = 0; i < facecount; i++)
	8879	+ {
	8880	+ Face face = bRep.GetFace(i);
	8881	+
	8882	+ Vertex p = bRep.GetVertex(face.p);
	8883	+ Vertex q = bRep.GetVertex(face.q);
	8884	+ Vertex r = bRep.GetVertex(face.r);
	8885	+
	8886	+ success \|= intersectTriangle(ray, result, p, q, r);
	8887	+ }
	8888	+ }
	8889	+
	8890	+ return success;
	8891	+ }
	8892	+
	8893	+ static cVector eye = new cVector();
	8894	+ static cVector dir = new cVector();
	8895	+
	8896	+ transient BBox bbox = null;
	8897	+
	8898	+ boolean intersect(Ray ray, IntersectResult result)
	8899	+ {
	8900	+ double eyex = ray.eyePoint.x;
	8901	+ double eyey = ray.eyePoint.y;
	8902	+ double eyez = ray.eyePoint.z;
	8903	+
	8904	+ double dirx = ray.viewDirection.x;
	8905	+ double diry = ray.viewDirection.y;
	8906	+ double dirz = ray.viewDirection.z;
	8907	+
	8908	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8909	+ {
	8910	+ eye.x = eyex;
	8911	+ eye.y = eyey;
	8912	+ eye.z = eyez;
	8913	+ dir.x = dirx;
	8914	+ dir.y = diry;
	8915	+ dir.z = dirz;
	8916	+
	8917	+ LA.xformPos(eye, this.fromParent, eye);
	8918	+ LA.xformDir(dir, this.fromParent, dir);
	8919	+
	8920	+ ray.eyePoint.x = eye.x;
	8921	+ ray.eyePoint.y = eye.y;
	8922	+ ray.eyePoint.z = eye.z;
	8923	+
	8924	+ ray.viewDirection.x = dir.x;
	8925	+ ray.viewDirection.y = dir.y;
	8926	+ ray.viewDirection.z = dir.z;
	8927	+ }
	8928	+
	8929	+ boolean success = false;
	8930	+
	8931	+ boolean touch = false;
	8932	+
	8933	+ if (bRep != null && Link2Support())
	8934	+ {
	8935	+ if (bbox == null)
	8936	+ {
	8937	+ bbox = new BBox();
	8938	+
	8939	+ cVector min = new cVector();
	8940	+ cVector max = new cVector();
	8941	+
	8942	+ this.getBounds(min, max, true);
	8943	+
	8944	+ bbox.min.x = min.x;
	8945	+ bbox.min.y = min.y;
	8946	+ bbox.min.z = min.z;
	8947	+
	8948	+ bbox.max.x = max.x;
	8949	+ bbox.max.y = max.y;
	8950	+ bbox.max.z = max.z;
	8951	+ }
	8952	+
	8953	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8954	+ {
	8955	+ success \|= intersectMesh(ray, result);
	8956	+ }
	8957	+ else
	8958	+ {
	8959	+ //this.hide = true;
	8960	+ touch = true;
	8961	+ }
	8962	+ }
	8963	+
	8964	+ for (int i=0; i<size(); i++)
	8965	+ {
	8966	+ Object3D child = (Object3D) reserve(i);
	8967	+
	8968	+ if (child == null)
	8969	+ continue;
	8970	+
	8971	+ success \|= child.intersect(ray, result);
	8972	+ release(i);
	8973	+ }
	8974	+
	8975	+ ray.eyePoint.x = eyex;
	8976	+ ray.eyePoint.y = eyey;
	8977	+ ray.eyePoint.z = eyez;
	8978	+
	8979	+ ray.viewDirection.x = dirx;
	8980	+ ray.viewDirection.y = diry;
	8981	+ ray.viewDirection.z = dirz;
	8982	+
	8983	+// if (touch)
	8984	+// this.Touch(); // refresh display list
	8985	+
	8986	+ return success;
	8987	+ }
	8988	+
	8989	+ static Vector3d edge1 = new Vector3d();
	8990	+ static Vector3d edge2 = new Vector3d();
	8991	+ static Vector3d P = new Vector3d();
	8992	+ static Vector3d T = new Vector3d();
	8993	+ static Vector3d Q = new Vector3d();
	8994	+
	8995	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8996	+ {
	8997	+ if (false)
	8998	+ {
	8999	+ result.t = 0;
	9000	+ return true;
	9001	+ }
	9002	+
	9003	+ /*
	9004	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9005	+
	9006	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9007	+ */
	9008	+
	9009	+ // Calculate edges of the triangle
	9010	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9011	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9012	+
	9013	+ // Calculate the determinant (U parameter)
	9014	+ P.cross(ray.viewDirection, edge2);
	9015	+ double det = edge1.dot(P);
	9016	+
	9017	+ if (det > -1e-9 && det < 1e-9)
	9018	+ {
	9019	+ return false;
	9020	+ } // Ray lies in plane of triangle
	9021	+
	9022	+ double invDet = 1 / det;
	9023	+
	9024	+ // Calculate distance from vertex1 to ray origin
	9025	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9026	+
	9027	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9028	+
	9029	+ if (U < 0.f \|\| U > 1.f)
	9030	+ {
	9031	+ return false;
	9032	+ } // Intersection lies outside of the triangle
	9033	+
	9034	+ // Calculate V parameter
	9035	+ Q.cross(T, edge1);
	9036	+
	9037	+ double V = ray.viewDirection.dot(Q) * invDet;
	9038	+
	9039	+ if (V < 0.f \|\| (U + V) > 1.f)
	9040	+ {
	9041	+ return false;
	9042	+ } // Intersection lies outside of the triangle
	9043	+
	9044	+ double t = edge2.dot(Q) * invDet;
	9045	+
	9046	+ if (t > 1e-9) // Triangle and ray intersects
	9047	+ {
	9048	+ //result.isIntersected = true;
	9049	+ //result.id = id;
	9050	+
	9051	+ if (false) // isShadow)
	9052	+ {
	9053	+ result.t = t;
	9054	+ return true;
	9055	+ } else if (t < result.t)
	9056	+ {
	9057	+ result.object = this;
	9058	+
	9059	+ result.t = t;
	9060	+
	9061	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9062	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9063	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9064	+
	9065	+ result.n.cross(edge1, edge2);
	9066	+ result.n.normalize();
	9067	+ }
	9068	+
	9069	+ return true;
	9070	+ }
	9071	+
	9072	+ return false;
	9073	+ }
7815	9074
7816	9075	public int Size()
7817	9076	{