~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	+ int tabIndex;
	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,7 +1139,7 @@
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	{
803	1145	currentframe = Globals.framecount;
..	..	@@ -809,7 +1151,8 @@
809	1151
810	1152	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	1153
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1154	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1155	+ (step == 1 && changedir))
813	1156	{
814	1157	countdown = 1;
815	1158	delay = speedup?8:1;
..	..	@@ -878,20 +1221,28 @@
878	1221	{
879	1222	// return true;
880	1223
881		- if (material == null \|\| material.multiply)
882		- return true;
	1224	+// if (material == null \|\| material.multiply)
	1225	+// return true;
	1226	+//
	1227	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1228	+// return false;
	1229	+//
	1230	+// // Transparent objects are dynamic because we have to sort the triangles.
	1231	+// return material.opacity > 0.99;
883	1232
884		- return material.opacity > 0.99;
	1233	+ return !sort;
885	1234	}
886	1235
887	1236	boolean IsOpaque()
888	1237	{
889	1238	// return true;
890	1239
891		- if (material == null \|\| material.multiply)
892		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
893	1244
894		- return material.opacity > 0.99;
	1245	+ return !sort;
895	1246	}
896	1247
897	1248	Object3D()
..	..	@@ -912,6 +1263,11 @@
912	1263	fromParent = null; // LA.newMatrix();
913	1264	bRep = null; // new BoundaryRep();
914	1265
	1266	+ if (oname != null && oname.equals("LeftHand"))
	1267	+ {
	1268	+ name = oname;
	1269	+ }
	1270	+
915	1271	/*
916	1272	float hue = (float)Math.random();
917	1273	Color col;
..	..	@@ -964,8 +1320,10 @@
964	1320
965	1321	// will share the geometry
966	1322	assert (!(this instanceof Composite));
967		- return deepCopy(); // Never called for Composite
968		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
969	1327	}
970	1328
971	1329	boolean HasLoops()
..	..	@@ -973,6 +1331,30 @@
973	1331	return false;
974	1332	}
975	1333
	1334	+ void ResetUUIDs()
	1335	+ {
	1336	+ if (blockloop)
	1337	+ {
	1338	+ return;
	1339	+ }
	1340	+
	1341	+ this.uuid = null;
	1342	+
	1343	+ blockloop = true;
	1344	+
	1345	+ for (int i = 0; i < Size(); i++)
	1346	+ {
	1347	+ Object3D obj = (Object3D) Children().get(i);
	1348	+
	1349	+ if (obj != null)
	1350	+ {
	1351	+ obj.ResetUUIDs();
	1352	+ }
	1353	+ }
	1354	+
	1355	+ blockloop = false;
	1356	+ }
	1357	+
976	1358	boolean IsInfinite()
977	1359	{
978	1360	if (blockloop)
..	..	@@ -1043,78 +1425,16 @@
1043	1425	return;
1044	1426
1045	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1046	1431	//System.out.println("COPY " + this + " to " + other);
1047	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1048	1434
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	1435	other.bRep = bRep; // Share the geometry
1080	1436
1081	1437	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	1438
1119	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1120	1440	// {
..	..	@@ -1170,17 +1490,24 @@
1170	1490	if ((mask & GEOMETRY) != 0)
1171	1491	{
1172	1492	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	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1179	1495	CameraPane.RemoveList(bRep.displaylist);
1180	1496	bRep.displaylist = 0; // june 2013 -1;
1181	1497	}
1182	1498	else
1183		- bRep = bRep;
	1499	+ {
	1500	+ //assert(other.bRep == null);
	1501	+ bRep = other.bRep;
	1502	+ }
	1503	+
	1504	+// if (bRep != null)
	1505	+// {
	1506	+// CameraPane.RemoveList(bRep.displaylist);
	1507	+// bRep.displaylist = 0; // june 2013 -1;
	1508	+// }
	1509	+// else
	1510	+// bRep = bRep;
1184	1511	}
1185	1512
1186	1513	/* Use a MASK = GEO/MAT
..	..	@@ -1276,6 +1603,7 @@
1276	1603	toParent = LA.newMatrix();
1277	1604	fromParent = LA.newMatrix();
1278	1605	}
	1606	+
1279	1607	LA.matCopy(other.toParent, toParent);
1280	1608	LA.matCopy(other.fromParent, fromParent);
1281	1609
..	..	@@ -1470,7 +1798,7 @@
1470	1798	BoundaryRep.SEUIL = other.material.cameralight;
1471	1799
1472	1800	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1801	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1802	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1803	}
1476	1804
..	..	@@ -1829,12 +2157,15 @@
1829	2157	if (obj.name == null)
1830	2158	continue; // can't be a null one
1831	2159
	2160	+ // Try perfect match first.
1832	2161	if (n.equals(obj.name))
1833	2162	{
1834	2163	theobj = obj;
1835	2164	count++;
1836	2165	}
1837	2166	}
	2167	+
	2168	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	2169
1839	2170	if (count != 1)
1840	2171	for (int i=Size(); --i>=0;)
..	..	@@ -2152,11 +2483,6 @@
2152	2483
2153	2484	InitOthers();
2154	2485
2155		- if (this instanceof Camera)
2156		- {
2157		- material.shift = 90;
2158		- }
2159		-
2160	2486	material.multiply = multiply;
2161	2487
2162	2488	if (multiply)
..	..	@@ -2294,6 +2620,15 @@
2294	2620	}
2295	2621	*/
2296	2622	}
	2623	+ else
	2624	+ {
	2625	+ //((ObjEditor)editWindow).SetupUI2(null);
	2626	+ if (objectUI != null)
	2627	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2628	+ else
	2629	+ //new Exception().printStackTrace();
	2630	+ System.err.println("objectUI is null");
	2631	+ }
2297	2632	}
2298	2633
2299	2634	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2335,6 +2670,14 @@
2335	2670	{
2336	2671	editWindow.refreshContents();
2337	2672	}
	2673	+ else
	2674	+ {
	2675	+ if (manipWindow != null)
	2676	+ {
	2677	+ manipWindow.refreshContents();
	2678	+ }
	2679	+ }
	2680	+
2338	2681	//if (parent != null)
2339	2682	//parent.refreshEditWindow();
2340	2683	}
..	..	@@ -2414,7 +2757,8 @@
2414	2757	private static final int editSelf = 1;
2415	2758	private static final int editChild = 2;
2416	2759
2417		- void drawEditHandles(ClickInfo info, int level)
	2760	+ void drawEditHandles(//ClickInfo info,
	2761	+ int level)
2418	2762	{
2419	2763	if (level == 0)
2420	2764	{
..	..	@@ -2422,7 +2766,8 @@
2422	2766	return;
2423	2767
2424	2768	Object3D selectee;
2425		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2769	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2770	+ level + 1))
2426	2771	{
2427	2772	selectee = (Object3D) e.nextElement();
2428	2773	}
..	..	@@ -2430,19 +2775,22 @@
2430	2775	} else
2431	2776	{
2432	2777	//super.
2433		- drawEditHandles0(info, level + 1);
	2778	+ drawEditHandles0(//info,
	2779	+ level + 1);
2434	2780	}
2435	2781	}
2436	2782
2437		- boolean doEditClick(ClickInfo info, int level)
	2783	+ boolean doEditClick(//ClickInfo info,
	2784	+ int level)
2438	2785	{
2439	2786	doSomething = 0;
2440	2787	if (level == 0)
2441	2788	{
2442		- return doParentClick(info);
	2789	+ return doParentClick(); //info);
2443	2790	}
2444	2791	if (//super.
2445		- doEditClick0(info, level))
	2792	+ doEditClick0(//info,
	2793	+ level))
2446	2794	{
2447	2795	doSomething = 1;
2448	2796	return true;
..	..	@@ -2452,7 +2800,7 @@
2452	2800	}
2453	2801	}
2454	2802
2455		- boolean doParentClick(ClickInfo info)
	2803	+ boolean doParentClick() //ClickInfo info)
2456	2804	{
2457	2805	if (selection == null)
2458	2806	{
..	..	@@ -2465,7 +2813,8 @@
2465	2813	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2466	2814	{
2467	2815	Object3D selectee = (Object3D) e.nextElement();
2468		- if (selectee.doEditClick(info, 1))
	2816	+ if (selectee.doEditClick(//info,
	2817	+ 1))
2469	2818	{
2470	2819	childToDrag = selectee;
2471	2820	doSomething = 2;
..	..	@@ -2477,13 +2826,15 @@
2477	2826	return retval;
2478	2827	}
2479	2828
2480		- void doEditDrag(ClickInfo info, boolean opposite)
	2829	+ void doEditDrag(//ClickInfo clickInfo,
	2830	+ boolean opposite)
2481	2831	{
2482	2832	switch (doSomething)
2483	2833	{
2484	2834	case 1: // '\001'
2485	2835	//super.
2486		- doEditDrag0(info, opposite);
	2836	+ doEditDrag0(//clickInfo,
	2837	+ opposite);
2487	2838	break;
2488	2839
2489	2840	case 2: // '\002'
..	..	@@ -2496,11 +2847,13 @@
2496	2847	{
2497	2848	//sel.hitSomething = childToDrag.hitSomething;
2498	2849	//childToDrag.doEditDrag(info);
2499		- sel.doEditDrag(info, opposite);
	2850	+ sel.doEditDrag(//clickInfo,
	2851	+ opposite);
2500	2852	} else
2501	2853	{
2502	2854	//super.
2503		- doEditDrag0(info, opposite);
	2855	+ doEditDrag0(//clickInfo,
	2856	+ opposite);
2504	2857	}
2505	2858	}
2506	2859	break;
..	..	@@ -2518,6 +2871,9 @@
2518	2871	{
2519	2872	deselectAll();
2520	2873	}
	2874	+
	2875	+ new Exception().printStackTrace();
	2876	+
2521	2877	ClickInfo newInfo = new ClickInfo();
2522	2878	newInfo.flags = info.flags;
2523	2879	newInfo.bounds = info.bounds;
..	..	@@ -2610,6 +2966,18 @@
2610	2966	void GenNormalsS(boolean crease)
2611	2967	{
2612	2968	selection.GenNormals(crease);
	2969	+// for (int i=0; i<selection.size(); i++)
	2970	+// {
	2971	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2972	+// selectee.GenNormals(crease);
	2973	+// }
	2974	+
	2975	+ //Touch();
	2976	+ }
	2977	+
	2978	+ void GenNormalsMeshS()
	2979	+ {
	2980	+ selection.GenNormalsMesh();
2613	2981	// for (int i=0; i<selection.size(); i++)
2614	2982	// {
2615	2983	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2750,6 +3118,24 @@
2750	3118	if (child == null)
2751	3119	continue;
2752	3120	child.GenNormals(crease);
	3121	+// Children().release(i);
	3122	+ }
	3123	+ blockloop = false;
	3124	+ }
	3125	+
	3126	+ void GenNormalsMesh()
	3127	+ {
	3128	+ if (blockloop)
	3129	+ return;
	3130	+
	3131	+ blockloop = true;
	3132	+ GenNormalsMesh0();
	3133	+ for (int i = 0; i < Children().Size(); i++)
	3134	+ {
	3135	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3136	+ if (child == null)
	3137	+ continue;
	3138	+ child.GenNormalsMesh();
2753	3139	// Children().release(i);
2754	3140	}
2755	3141	blockloop = false;
..	..	@@ -2917,7 +3303,19 @@
2917	3303	{
2918	3304	if (bRep != null)
2919	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
2920	3307	bRep.GenerateNormals(crease);
	3308	+ if (!bRep.trimmed)
	3309	+ bRep.MergeNormals();
	3310	+ Touch();
	3311	+ }
	3312	+ }
	3313	+
	3314	+ void GenNormalsMesh0()
	3315	+ {
	3316	+ if (bRep != null)
	3317	+ {
	3318	+ bRep.GenerateNormalsMesh();
2921	3319	Touch();
2922	3320	}
2923	3321	}
..	..	@@ -2926,7 +3324,7 @@
2926	3324	{
2927	3325	if (bRep != null)
2928	3326	{
2929		- bRep.GenerateNormalsMINE();
	3327	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2930	3328	Touch();
2931	3329	}
2932	3330	}
..	..	@@ -2983,6 +3381,132 @@
2983	3381	blockloop = false;
2984	3382	}
2985	3383
	3384	+ public void ResetTransform(int mask)
	3385	+ {
	3386	+ Object3D obj = this;
	3387	+
	3388	+ if (mask == -1)
	3389	+ {
	3390	+ if (obj instanceof Camera) // jan 2014
	3391	+ {
	3392	+ LA.matIdentity(obj.toParent);
	3393	+ LA.matIdentity(obj.fromParent);
	3394	+ }
	3395	+ else
	3396	+ {
	3397	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3398	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3399	+ }
	3400	+ return;
	3401	+ }
	3402	+
	3403	+ if ((mask&2) != 0) // Scale/rotation
	3404	+ {
	3405	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3406	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3407	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3408	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3409	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3410	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3411	+ }
	3412	+ if ((mask&1) != 0) // Translation
	3413	+ {
	3414	+ if (obj.toParent != null)
	3415	+ {
	3416	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3417	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3418	+ }
	3419	+ }
	3420	+ }
	3421	+
	3422	+ public void Scale(int scale)
	3423	+ {
	3424	+ Object3D obj = this;
	3425	+
	3426	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3427	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3428	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3429	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3430	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3431	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3432	+ }
	3433	+
	3434	+ public void TextureRatioTransform(int axis)
	3435	+ {
	3436	+ cTexture tex = GetTextures();
	3437	+
	3438	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3439	+
	3440	+ try
	3441	+ {
	3442	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3443	+ }
	3444	+ catch (Exception e)
	3445	+ {
	3446	+ System.err.println("FAIL TextureRatio: " + this);
	3447	+ }
	3448	+
	3449	+ LA.matIdentity(Object3D.mat);
	3450	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3451	+
	3452	+ if (toParent == null)
	3453	+ {
	3454	+ toParent = LA.newMatrix();
	3455	+ fromParent = LA.newMatrix();
	3456	+ }
	3457	+
	3458	+ ResetTransform(2);
	3459	+
	3460	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3461	+ LA.matInvert(fromParent, toParent);
	3462	+ }
	3463	+
	3464	+ void TextureRatio(int axis)
	3465	+ {
	3466	+ if (blockloop)
	3467	+ return;
	3468	+
	3469	+ blockloop = true;
	3470	+
	3471	+ TextureRatioTransform(axis);
	3472	+
	3473	+ for (int i=Size(); --i>=0;)
	3474	+ {
	3475	+ Object3D v = get(i);
	3476	+
	3477	+ v.TextureRatio(axis);
	3478	+ }
	3479	+
	3480	+ blockloop = false;
	3481	+ }
	3482	+
	3483	+ void TransformChildren()
	3484	+ {
	3485	+ if (toParent != null)
	3486	+ {
	3487	+ for (int i=Size(); --i>=0;)
	3488	+ {
	3489	+ Object3D v = get(i);
	3490	+
	3491	+ if (v.toParent == null)
	3492	+ {
	3493	+ v.toParent = LA.newMatrix();
	3494	+ v.fromParent = LA.newMatrix();
	3495	+ }
	3496	+
	3497	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3498	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3499	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3500	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3501	+ }
	3502	+
	3503	+ toParent = null; // LA.matIdentity(toParent);
	3504	+ fromParent = null; // LA.matIdentity(fromParent);
	3505	+
	3506	+ Touch();
	3507	+ }
	3508	+ }
	3509	+
2986	3510	void TransformGeometry()
2987	3511	{
2988	3512	Object3D obj = this;
..	..	@@ -3198,6 +3722,7 @@
3198	3722	if (bRep != null)
3199	3723	{
3200	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3201	3726	System.out.println("Reducing " + this);
3202	3727	if (name != null && name.contains("lockpickstraps"))
3203	3728	name = name;
..	..	@@ -3206,7 +3731,9 @@
3206	3731	bRep.support = null;
3207	3732	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3733	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3734	+
	3735	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3736	+
3210	3737	bRep = temprep;
3211	3738	bRep.support = sup;
3212	3739	Touch();
..	..	@@ -3307,15 +3834,47 @@
3307	3834
3308	3835	void ClearMaterials()
3309	3836	{
	3837	+ if (blockloop)
	3838	+ return;
	3839	+
	3840	+ blockloop = true;
	3841	+
3310	3842	ClearMaterial();
3311		- for (int i = 0; i < size(); i++)
	3843	+ for (int i = 0; i < Size(); i++)
3312	3844	{
3313		- Object3D child = (Object3D) reserve(i);
	3845	+ Object3D child = (Object3D) get(i);
3314	3846	if (child == null)
3315	3847	continue;
3316	3848	child.ClearMaterials();
3317		- release(i);
3318	3849	}
	3850	+
	3851	+ blockloop = false;
	3852	+ }
	3853	+
	3854	+ void ClearVersionList()
	3855	+ {
	3856	+ this.versionlist = null;
	3857	+ this.versionindex = -1;
	3858	+ this.versiontable = null;
	3859	+ }
	3860	+
	3861	+ void ClearVersions()
	3862	+ {
	3863	+ if (blockloop)
	3864	+ return;
	3865	+
	3866	+ blockloop = true;
	3867	+
	3868	+ ClearVersionList();
	3869	+ for (int i = 0; i < Size(); i++)
	3870	+ {
	3871	+ Object3D child = (Object3D) get(i);
	3872	+ if (child == null)
	3873	+ continue;
	3874	+ child.ClearVersions();
	3875	+ }
	3876	+
	3877	+ blockloop = false;
3319	3878	}
3320	3879
3321	3880	void FlipV(boolean flip)
..	..	@@ -3343,7 +3902,8 @@
3343	3902	if (blockloop)
3344	3903	return;
3345	3904
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3905	+ if (//marked \|\| // does not make sense
	3906	+ (bRep != null \|\| material != null)) // borderline...
3347	3907	live = h;
3348	3908
3349	3909	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3924,8 @@
3364	3924	return;
3365	3925
3366	3926	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3927	+ if (//marked \|\| // does not make sense
	3928	+ (bRep != null \|\| material != null)) // borderline...
3368	3929	link2master = h;
3369	3930
3370	3931	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3945,8 @@
3384	3945	if (blockloop)
3385	3946	return;
3386	3947
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3948	+ if (//marked \|\| // does not make sense
	3949	+ (bRep != null \|\| material != null)) // borderline...
3388	3950	hide = h;
3389	3951
3390	3952	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3966,7 @@
3404	3966	if (blockloop)
3405	3967	return;
3406	3968
3407		- if (bRep != null && material != null) // borderline...
	3969	+ if (bRep != null \|\| material != null) // borderline...
3408	3970	marked = h;
3409	3971
3410	3972	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3976,46 @@
3414	3976	continue;
3415	3977	blockloop = true;
3416	3978	child.MarkLeaves(h);
	3979	+ blockloop = false;
	3980	+ // release(i);
	3981	+ }
	3982	+ }
	3983	+
	3984	+ void RewindLeaves(boolean h)
	3985	+ {
	3986	+ if (blockloop)
	3987	+ return;
	3988	+
	3989	+ if (bRep != null \|\| material != null) // borderline...
	3990	+ rewind = h;
	3991	+
	3992	+ for (int i = 0; i < Size(); i++)
	3993	+ {
	3994	+ Object3D child = (Object3D) get(i); // reserve(i);
	3995	+ if (child == null)
	3996	+ continue;
	3997	+ blockloop = true;
	3998	+ child.RewindLeaves(h);
	3999	+ blockloop = false;
	4000	+ // release(i);
	4001	+ }
	4002	+ }
	4003	+
	4004	+ void RandomLeaves(boolean h)
	4005	+ {
	4006	+ if (blockloop)
	4007	+ return;
	4008	+
	4009	+ if (bRep != null \|\| material != null) // borderline...
	4010	+ random = h;
	4011	+
	4012	+ for (int i = 0; i < Size(); i++)
	4013	+ {
	4014	+ Object3D child = (Object3D) get(i); // reserve(i);
	4015	+ if (child == null)
	4016	+ continue;
	4017	+ blockloop = true;
	4018	+ child.RandomLeaves(h);
3417	4019	blockloop = false;
3418	4020	// release(i);
3419	4021	}
..	..	@@ -3451,6 +4053,7 @@
3451	4053
3452	4054	void RevertMeshes()
3453	4055	{
	4056	+ // BLOCKLOOP
3454	4057	if (this instanceof cMesh)
3455	4058	{
3456	4059	((cMesh)this).Revert();
..	..	@@ -3481,11 +4084,6 @@
3481	4084	Touch();
3482	4085	}
3483	4086
3484		- ResetRecur();
3485		- }
3486		-
3487		- void ResetRecur()
3488		- {
3489	4087	for (int i = 0; i < size(); i++)
3490	4088	{
3491	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3508,11 +4106,6 @@
3508	4106	Step();
3509	4107	Touch();
3510	4108
3511		- StepRecur();
3512		- }
3513		-
3514		- void StepRecur()
3515		- {
3516	4109	for (int i = 0; i < size(); i++)
3517	4110	{
3518	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3699,8 +4292,8 @@
3699	4292	Touch();
3700	4293	}
3701	4294
3702		- transient cVector min = new cVector();
3703		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
3704	4297
3705	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
3706	4299	{
..	..	@@ -3716,15 +4309,15 @@
3716	4309	if (blockloop)
3717	4310	return;
3718	4311
3719		- if (min == null) // ???
	4312	+ if (min == null)
3720	4313	{
3721	4314	min = new cVector();
3722	4315	max = new cVector();
3723	4316	}
3724	4317
3725		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
3726	4319	{
3727		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
3728	4321	if (child == null)
3729	4322	continue;
3730	4323
..	..	@@ -3743,21 +4336,21 @@
3743	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3744	4337	//if (child.hide)
3745	4338	{
3746		- release(i);
	4339	+ //release(i);
3747	4340	continue;
3748	4341	}
3749	4342
3750	4343	blockloop = true;
3751	4344	child.getBounds(min, max, true); // xform);
3752	4345	blockloop = false;
3753		- release(i);
	4346	+ //release(i);
3754	4347
3755	4348	MinMax(minima, maxima);
3756	4349	}
3757	4350
3758	4351	if (bRep != null)
3759	4352	{
3760		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
3761	4354	}
3762	4355
3763	4356	if (false) // xform)
..	..	@@ -4187,6 +4780,55 @@
4187	4780	{
4188	4781	blockloop = true;
4189	4782	get(i).RepairShadow();
	4783	+ blockloop = false;
	4784	+ }
	4785	+ }
	4786	+
	4787	+ void RepairSOV()
	4788	+ {
	4789	+ if (blockloop)
	4790	+ return;
	4791	+
	4792	+ String texname = this.GetPigmentTexture();
	4793	+
	4794	+ if (texname.startsWith("sov"))
	4795	+ {
	4796	+ String[] s = texname.split("/");
	4797	+
	4798	+ String[] sname = s[1].split("Color.pn");
	4799	+
	4800	+ texname = sname[0];
	4801	+
	4802	+ if (sname.length > 1)
	4803	+ {
	4804	+ texname += "Color.jpg";
	4805	+ }
	4806	+
	4807	+ this.SetPigmentTexture("sov/" + texname);
	4808	+ }
	4809	+
	4810	+ texname = this.GetBumpTexture();
	4811	+
	4812	+ if (texname.startsWith("sov"))
	4813	+ {
	4814	+ String[] s = texname.split("/");
	4815	+
	4816	+ String[] sname = s[1].split("Bump.pn");
	4817	+
	4818	+ texname = sname[0];
	4819	+
	4820	+ if (sname.length > 1)
	4821	+ {
	4822	+ texname += "Bump.jpg";
	4823	+ }
	4824	+
	4825	+ this.SetBumpTexture("sov/" + texname);
	4826	+ }
	4827	+
	4828	+ for (int i=0; i<Size(); i++)
	4829	+ {
	4830	+ blockloop = true;
	4831	+ get(i).RepairSOV();
4190	4832	blockloop = false;
4191	4833	}
4192	4834	}
..	..	@@ -4681,7 +5323,7 @@
4681	5323
4682	5324	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	5325	{
4684		- if (hide)
	5326	+ if (hide \|\| dontselect)
4685	5327	return null;
4686	5328
4687	5329	if (count <= 0)
..	..	@@ -4705,9 +5347,17 @@
4705	5347	}
4706	5348	}
4707	5349
	5350	+ ObjEditor GetWindow()
	5351	+ {
	5352	+ if (editWindow != null)
	5353	+ return editWindow;
	5354	+
	5355	+ return manipWindow;
	5356	+ }
	5357	+
4708	5358	cTreePath Select(int indexcount, boolean deselect)
4709	5359	{
4710		- if (hide)
	5360	+ if (hide \|\| dontselect)
4711	5361	return null;
4712	5362
4713	5363	if (count <= 0)
..	..	@@ -4741,10 +5391,11 @@
4741	5391	if (leaf != null)
4742	5392	{
4743	5393	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5394	+ ObjEditor window = GetWindow();
	5395	+ if (window != null)
4745	5396	{
4746	5397	//System.out.println("editWindow = " + editWindow + " vs " + this);
4747		- editWindow.Select(tp, deselect, true);
	5398	+ window.Select(tp, deselect, true);
4748	5399	}
4749	5400
4750	5401	return tp;
..	..	@@ -4761,6 +5412,7 @@
4761	5412
4762	5413	if (child == null)
4763	5414	continue;
	5415	+
4764	5416	if (child.HasTransparency() && child.size() != 0)
4765	5417	{
4766	5418	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4770,9 +5422,10 @@
4770	5422	if (leaf != null)
4771	5423	{
4772	5424	cTreePath tp = new cTreePath(this, leaf);
4773		- if (editWindow != null)
	5425	+ ObjEditor window = GetWindow();
	5426	+ if (window != null)
4774	5427	{
4775		- editWindow.Select(tp, deselect, true);
	5428	+ window.Select(tp, deselect, true);
4776	5429	}
4777	5430
4778	5431	return tp;
..	..	@@ -5097,6 +5750,51 @@
5097	5750	blockloop = false;
5098	5751	}
5099	5752
	5753	+ void ResetSelectable()
	5754	+ {
	5755	+ if (blockloop)
	5756	+ return;
	5757	+
	5758	+ blockloop = true;
	5759	+
	5760	+ keepdontselect = dontselect;
	5761	+ dontselect = true;
	5762	+
	5763	+ Object3D child;
	5764	+ int nb = Size();
	5765	+ for (int i = 0; i < nb; i++)
	5766	+ {
	5767	+ child = (Object3D) get(i);
	5768	+ if (child == null)
	5769	+ continue;
	5770	+ child.ResetSelectable();
	5771	+ }
	5772	+
	5773	+ blockloop = false;
	5774	+ }
	5775	+
	5776	+ void RestoreSelectable()
	5777	+ {
	5778	+ if (blockloop)
	5779	+ return;
	5780	+
	5781	+ blockloop = true;
	5782	+
	5783	+ dontselect = keepdontselect;
	5784	+
	5785	+ Object3D child;
	5786	+ int nb = Size();
	5787	+ for (int i = 0; i < nb; i++)
	5788	+ {
	5789	+ child = (Object3D) get(i);
	5790	+ if (child == null)
	5791	+ continue;
	5792	+ child.RestoreSelectable();
	5793	+ }
	5794	+
	5795	+ blockloop = false;
	5796	+ }
	5797	+
5100	5798	boolean IsSelected()
5101	5799	{
5102	5800	if (parent == null)
..	..	@@ -5157,6 +5855,11 @@
5157	5855	if (fullname == null)
5158	5856	return "";
5159	5857
	5858	+ if (fullname.pigment != null)
	5859	+ {
	5860	+ return fullname.pigment;
	5861	+ }
	5862	+
5160	5863	// System.out.println("Fullname = " + fullname);
5161	5864
5162	5865	// Does not work on Windows due to C:
..	..	@@ -5169,7 +5872,7 @@
5169	5872
5170	5873	if (split.length == 0)
5171	5874	{
5172		- return "";
	5875	+ return fullname.pigment = "";
5173	5876	}
5174	5877
5175	5878	if (split.length <= 2)
..	..	@@ -5177,22 +5880,27 @@
5177	5880	if (fullname.name.endsWith(":"))
5178	5881	{
5179	5882	// Windows
5180		- return fullname.name.substring(0, fullname.name.length()-1);
	5883	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5181	5884	}
5182	5885
5183		- return split[0];
	5886	+ return fullname.pigment = split[0];
5184	5887	}
5185	5888
5186	5889	// Windows
5187	5890	assert(split.length == 4);
5188	5891
5189		- return split[0] + ":" + split[1];
	5892	+ return fullname.pigment = split[0] + ":" + split[1];
5190	5893	}
5191	5894
5192	5895	static String GetBump(cTexture fullname)
5193	5896	{
5194	5897	if (fullname == null)
5195	5898	return "";
	5899	+
	5900	+ if (fullname.bump != null)
	5901	+ {
	5902	+ return fullname.bump;
	5903	+ }
5196	5904
5197	5905	// System.out.println("Fullname = " + fullname);
5198	5906	// Does not work on Windows due to C:
..	..	@@ -5204,12 +5912,12 @@
5204	5912
5205	5913	if (split.length == 0)
5206	5914	{
5207		- return "";
	5915	+ return fullname.bump = "";
5208	5916	}
5209	5917
5210	5918	if (split.length == 1)
5211	5919	{
5212		- return "";
	5920	+ return fullname.bump = "";
5213	5921	}
5214	5922
5215	5923	if (split.length == 2)
..	..	@@ -5217,16 +5925,16 @@
5217	5925	if (fullname.name.endsWith(":"))
5218	5926	{
5219	5927	// Windows
5220		- return "";
	5928	+ return fullname.bump = "";
5221	5929	}
5222	5930
5223		- return split[1];
	5931	+ return fullname.bump = split[1];
5224	5932	}
5225	5933
5226	5934	// Windows
5227	5935	assert(split.length == 4);
5228	5936
5229		- return split[2] + ":" + split[3];
	5937	+ return fullname.bump = split[2] + ":" + split[3];
5230	5938	}
5231	5939
5232	5940	String GetPigmentTexture()
..	..	@@ -5309,6 +6017,9 @@
5309	6017	texname = "";
5310	6018
5311	6019	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6020	+
	6021	+ GetTextures().pigment = null;
	6022	+
5312	6023	Touch();
5313	6024	}
5314	6025
..	..	@@ -5333,6 +6044,43 @@
5333	6044	}
5334	6045	}
5335	6046
	6047	+ UUID GetUUID()
	6048	+ {
	6049	+ if (uuid == null)
	6050	+ {
	6051	+ // Serial
	6052	+ uuid = UUID.randomUUID();
	6053	+ }
	6054	+
	6055	+ return uuid;
	6056	+ }
	6057	+
	6058	+ Object3D GetObject(UUID uid)
	6059	+ {
	6060	+ if (blockloop)
	6061	+ return null;
	6062	+
	6063	+ if (GetUUID().equals(uid))
	6064	+ return this;
	6065	+
	6066	+ int nb = Size();
	6067	+ for (int i = 0; i < nb; i++)
	6068	+ {
	6069	+ Object3D child = (Object3D) get(i);
	6070	+
	6071	+ if (child == null)
	6072	+ continue;
	6073	+
	6074	+ blockloop = true;
	6075	+ Object3D obj = child.GetObject(uid);
	6076	+ blockloop = false;
	6077	+ if (obj != null)
	6078	+ return obj;
	6079	+ }
	6080	+
	6081	+ return null;
	6082	+ }
	6083	+
5336	6084	void SetBumpTexture(String tex)
5337	6085	{
5338	6086	if (GetTextures() == null)
..	..	@@ -5344,6 +6092,8 @@
5344	6092	texname = "";
5345	6093
5346	6094	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	6095	+
	6096	+ GetTextures().bump = null;
5347	6097
5348	6098	Touch();
5349	6099	}
..	..	@@ -5369,6 +6119,38 @@
5369	6119	}
5370	6120	}
5371	6121
	6122	+ void EmbedTextures(boolean embed)
	6123	+ {
	6124	+ if (blockloop)
	6125	+ return;
	6126	+
	6127	+ //if (GetTextures() != null)
	6128	+ if (embed)
	6129	+ CameraPane.EmbedTextures(GetTextures());
	6130	+ else
	6131	+ {
	6132	+ GetTextures().pigmentdata = null;
	6133	+ GetTextures().bumpdata = null;
	6134	+ GetTextures().pw = 0;
	6135	+ GetTextures().ph = 0;
	6136	+ GetTextures().bw = 0;
	6137	+ GetTextures().bh = 0;
	6138	+ }
	6139	+
	6140	+ int nb = Size();
	6141	+ for (int i = 0; i < nb; i++)
	6142	+ {
	6143	+ Object3D child = (Object3D) get(i);
	6144	+
	6145	+ if (child == null)
	6146	+ continue;
	6147	+
	6148	+ blockloop = true;
	6149	+ child.EmbedTextures(embed);
	6150	+ blockloop = false;
	6151	+ }
	6152	+ }
	6153	+
5372	6154	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5373	6155	{
5374	6156	Draw(display, root, selected, blocked);
..	..	@@ -5377,12 +6159,37 @@
5377	6159	boolean NeedSupport()
5378	6160	{
5379	6161	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	6162	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5381	6163	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	6164	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	6165	}
5384	6166
5385	6167	static boolean DEBUG_SELECTION = false;
	6168	+
	6169	+ boolean IsLive()
	6170	+ {
	6171	+ if (live)
	6172	+ return true;
	6173	+
	6174	+ if (parent == null)
	6175	+ return false;
	6176	+
	6177	+ return parent.IsLive();
	6178	+ }
	6179	+
	6180	+ boolean IsDynamic()
	6181	+ {
	6182	+ return live && bRep != null;
	6183	+ }
	6184	+
	6185	+ boolean Link2Support()
	6186	+ {
	6187	+ return link2master \|\| link2support;
	6188	+ }
	6189	+
	6190	+ static cVector minima = new cVector();
	6191	+ static cVector maxima = new cVector();
	6192	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
5386	6193
5387	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	6195	{
..	..	@@ -5393,8 +6200,31 @@
5393	6200	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5394	6201	}
5395	6202
	6203	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6204	+ {
	6205	+ getBounds(minima, maxima, true);
	6206	+ center.x = (minima.x + maxima.x) / 2;
	6207	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6208	+ center.z = (minima.z + maxima.z) / 2;
	6209	+
	6210	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6211	+
	6212	+ IntersectResult res = new IntersectResult();
	6213	+ res.t = Double.POSITIVE_INFINITY;
	6214	+
	6215	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6216	+ {
	6217	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6218	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6219	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6220	+
	6221	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6222	+ LA.matInvert(toParent, fromParent);
	6223	+ }
	6224	+ }
	6225	+
5396	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	6227	+ (hide \|\| dontselect))
5398	6228	return;
5399	6229
5400	6230	if (name != null && name.contains("sclera"))
..	..	@@ -5444,8 +6274,11 @@
5444	6274	if (support != null)
5445	6275	support = support;
5446	6276
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);
	6277	+ boolean usecalllists = !IsDynamic() &&
	6278	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6280	+
	6281	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5449	6282
5450	6283	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	6284	{
..	..	@@ -5453,10 +6286,12 @@
5453	6286	bRep.displaylist = 0;
5454	6287	}
5455	6288	// usecalllists &= !(parent instanceof RandomNode);
5456		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
5457	6291
5458		- if (GetBRep() != null)
5459		- usecalllists = usecalllists;
	6292	+ if (display.DrawMode() == display.SHADOW)
	6293	+ //GetBRep() != null)
	6294	+ usecalllists = !!usecalllists;
5460	6295	//System.out.println("draw " + this);
5461	6296	//new Exception().printStackTrace();
5462	6297
..	..	@@ -5465,10 +6300,12 @@
5465	6300	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	6301
5467	6302	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6303	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6304	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5469	6305	{
5470	6306	Globals.lighttouched = true;
5471	6307	} // all panes...
	6308	+
5472	6309	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	6310	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	6311	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5476,7 +6313,7 @@
5476	6313	if (!(this instanceof Composite))
5477	6314	touched = false;
5478	6315	//if (displaylist == -1 && usecalllists)
5479		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6316	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5480	6317	{
5481	6318	bRep.displaylist = display.GenList();
5482	6319	assert(bRep.displaylist != 0);
..	..	@@ -5487,7 +6324,7 @@
5487	6324
5488	6325	//System.out.println("\tnew list " + list);
5489	6326	//gl.glDrawBuffer(gl.GL_NONE);
5490		- if (usecalllists)
	6327	+ if (usecalllists && bRep.displaylist > 0)
5491	6328	{
5492	6329	// System.err.println("new list " + bRep.displaylist + " for " + this);
5493	6330	display.NewList(bRep.displaylist);
..	..	@@ -5496,7 +6333,7 @@
5496	6333	CallList(display, root, selected, blocked);
5497	6334
5498	6335	// compiled = true;
5499		- if (usecalllists)
	6336	+ if (usecalllists && bRep.displaylist > 0)
5500	6337	{
5501	6338	// System.err.println("end list " + bRep.displaylist + " for " + this);
5502	6339	display.EndList();
..	..	@@ -5506,8 +6343,8 @@
5506	6343	Globals.lighttouched = true; // all panes...
5507	6344	}
5508	6345
5509		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5510		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
5511	6348
5512	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
5513	6350	{
..	..	@@ -5546,7 +6383,7 @@
5546	6383	{
5547	6384	if (display.DrawMode() == iCameraPane.SHADOW)
5548	6385	{
5549		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
5550	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5551	6388	{
5552	6389	//System.out.print("CULLED");
..	..	@@ -5596,6 +6433,7 @@
5596	6433	if (GetBRep() != null)
5597	6434	{
5598	6435	display.NextIndex();
	6436	+
5599	6437	// vertex color conflict : gl.glCallList(list);
5600	6438	DrawNode(display, root, selected);
5601	6439	if (this instanceof BezierPatch)
..	..	@@ -5607,6 +6445,20 @@
5607	6445	{
5608	6446	drawSelf(display, root, selected, blocked);
5609	6447	}
	6448	+
	6449	+// if (!(this instanceof Composite))
	6450	+// {
	6451	+// for (int i = 0; i < size(); i++)
	6452	+// {
	6453	+// Object3D child = (Object3D) reserve(i);
	6454	+// if (child == null)
	6455	+// continue;
	6456	+//
	6457	+// child.draw(display, root, selected, blocked);
	6458	+//
	6459	+// release(i);
	6460	+// }
	6461	+// }
5610	6462	} else
5611	6463	{
5612	6464	/*
..	..	@@ -5636,7 +6488,29 @@
5636	6488	tex = GetTextures();
5637	6489	}
5638	6490
5639		- display.BindTextures(tex, texres);
	6491	+ boolean failedPigment = false;
	6492	+ boolean failedBump = false;
	6493	+
	6494	+ CameraPane.lastObject = this;
	6495	+ try
	6496	+ {
	6497	+ display.BindPigmentTexture(tex, texres);
	6498	+ }
	6499	+ catch (Exception e)
	6500	+ {
	6501	+ // System.err.println("FAILED: " + this);
	6502	+ failedPigment = true;
	6503	+ }
	6504	+
	6505	+ try
	6506	+ {
	6507	+ display.BindBumpTexture(tex, texres);
	6508	+ }
	6509	+ catch (Exception e)
	6510	+ {
	6511	+ //System.err.println("FAILED: " + this);
	6512	+ failedBump = true;
	6513	+ }
5640	6514
5641	6515	if (!compiled)
5642	6516	{
..	..	@@ -5656,9 +6530,27 @@
5656	6530	// june 2013 drawSelf(display, root, selected);
5657	6531	}
5658	6532	}
	6533	+
	6534	+ assert (!(this instanceof Composite));
	6535	+ {
	6536	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6537	+// {
	6538	+// Object3D child = (Object3D) reserve(i);
	6539	+// if (child == null)
	6540	+// continue;
	6541	+//
	6542	+// child.draw(display, root, selected, blocked);
	6543	+//
	6544	+// release(i);
	6545	+// }
	6546	+ }
5659	6547	}
5660	6548
5661		- display.ReleaseTextures(tex);
	6549	+ if (!failedBump)
	6550	+ display.ReleaseBumpTexture(tex);
	6551	+
	6552	+ if (!failedPigment)
	6553	+ display.ReleasePigmentTexture(tex);
5662	6554
5663	6555	display.PopMaterial(this, selected);
5664	6556	}
..	..	@@ -5704,16 +6596,17 @@
5704	6596
5705	6597	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5706	6598	{
5707		- if (GetBRep() == null)
5708		- {
5709		- drawSelf(display, root, selected, blocked);
5710		- } else
	6599	+ if (GetBRep() != null)
5711	6600	{
5712	6601	DrawNode(display, root, selected);
5713	6602	if (this instanceof BezierPatch)
5714	6603	{
5715	6604	//drawSelf(display, root, selected);
5716	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
5717	6610	}
5718	6611	}
5719	6612
..	..	@@ -5787,6 +6680,9 @@
5787	6680
5788	6681	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6682	{
	6683	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6684	+ return;
	6685	+
5790	6686	if (hide)
5791	6687	return;
5792	6688	// shadow optimisation
..	..	@@ -5912,6 +6808,9 @@
5912	6808	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6809	return; // no shadow for transparent objects
5914	6810
	6811	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6812	+ return;
	6813	+
5915	6814	if (hide)
5916	6815	return;
5917	6816
..	..	@@ -5957,7 +6856,7 @@
5957	6856
5958	6857	//javax.media.opengl.GL gl = display.GetGL();
5959	6858
5960		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
5961	6860	{
5962	6861	int fc = bRep.FaceCount();
5963	6862	int vc = bRep.VertexCount();
..	..	@@ -6025,6 +6924,11 @@
6025	6924	// dec 2012
6026	6925	new Exception().printStackTrace();
6027	6926	return;
	6927	+ }
	6928	+
	6929	+ if (dontselect)
	6930	+ {
	6931	+ //bRep.GenerateNormalsMINE();
6028	6932	}
6029	6933
6030	6934	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6114,7 +7018,7 @@
6114	7018	facescompare[k] = new FaceCompare(k);
6115	7019	}
6116	7020
6117		- center = new cVector();
	7021	+ centertriangle = new cVector();
6118	7022	}
6119	7023	else
6120	7024	{
..	..	@@ -6237,7 +7141,7 @@
6237	7141	*/
6238	7142	}
6239	7143
6240		- transient cVector center;
	7144	+ transient cVector centertriangle;
6241	7145
6242	7146	class FaceCompare implements Comparable
6243	7147	{
..	..	@@ -6266,14 +7170,14 @@
6266	7170	Vertex q = bRep.GetVertex(face.q);
6267	7171	Vertex r = bRep.GetVertex(face.r);
6268	7172
6269		- center.set(p);
6270		- center.add(q);
6271		- center.add(r);
6272		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
6273	7177
6274		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6275	7179
6276		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
6277	7181	}
6278	7182
6279	7183	return distance;
..	..	@@ -6810,20 +7714,23 @@
6810	7714	}
6811	7715	}
6812	7716
6813		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7717	+ static ClickInfo clickInfo = new ClickInfo();
	7718	+
	7719	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7720	+ Point outPt, Rectangle outRec)
6814	7721	{
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;
	7722	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7723	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7724	+ double[][] toscreen = clickInfo.toScreen;
6818	7725	if (toscreen == null)
6819	7726	{
6820		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7727	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6821	7728	}
6822	7729	cVector vec = in;
6823	7730	LA.xformPos(in, toscreen, in);
6824	7731	//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();
	7732	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7733	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6827	7734	outPt.x = hc + (int) vec.x;
6828	7735	outPt.y = vc - (int) vec.y;
6829	7736	outRec.x = outPt.x - 3;
..	..	@@ -6831,15 +7738,18 @@
6831	7738	outRec.width = outRec.height = 6;
6832	7739	}
6833	7740
6834		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7741	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7742	+ )
6835	7743	{
6836	7744	Point pt = new Point(0, 0);
6837	7745	Rectangle rec = new Rectangle();
6838		- calcHotSpot(in, info, pt, rec);
	7746	+ calcHotSpot(in, //clickInfo,
	7747	+ pt, rec);
6839	7748	return rec;
6840	7749	}
6841	7750
6842		- void drawEditHandles0(ClickInfo info, int level)
	7751	+ void drawEditHandles0(//ClickInfo clickInfo,
	7752	+ int level)
6843	7753	{
6844	7754	if (level == 0)
6845	7755	{
..	..	@@ -6848,16 +7758,19 @@
6848	7758	{
6849	7759	cVector origin = new cVector();
6850	7760	//LA.xformPos(origin, toParent, origin);
6851		- Rectangle spot = calcHotSpot(origin, info);
	7761	+ if (this.clickInfo == null)
	7762	+ this.clickInfo = new ClickInfo();
	7763	+
	7764	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6852	7765	Rectangle boundary = new Rectangle();
6853	7766	boundary.x = spot.x - 30;
6854	7767	boundary.y = spot.y - 30;
6855	7768	boundary.width = spot.width + 60;
6856	7769	boundary.height = spot.height + 60;
6857		- info.g.setColor(Color.red);
	7770	+ clickInfo.g.setColor(Color.white);
6858	7771	int spotw = spot.x + spot.width;
6859	7772	int spoth = spot.y + spot.height;
6860		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7773	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6861	7774	// if (CameraPane.Xmin > spot.x)
6862	7775	// {
6863	7776	// CameraPane.Xmin = spot.x;
..	..	@@ -6874,11 +7787,33 @@
6874	7787	// {
6875	7788	// CameraPane.Ymax = spoth;
6876	7789	// }
6877		- spot.translate(32, 32);
	7790	+// if (CameraPane.Xmin > spot.x)
	7791	+// {
	7792	+// CameraPane.Xmin = spot.x;
	7793	+// }
	7794	+// if (CameraPane.Xmax < spotw)
	7795	+// {
	7796	+// CameraPane.Xmax = spotw;
	7797	+// }
	7798	+// if (CameraPane.Ymin > spot.y)
	7799	+// {
	7800	+// CameraPane.Ymin = spot.y;
	7801	+// }
	7802	+// if (CameraPane.Ymax < spoth)
	7803	+// {
	7804	+// CameraPane.Ymax = spoth;
	7805	+// }
	7806	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7807	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7808	+ spot.translate(32, 0);
	7809	+ clickInfo.g.setColor(Color.yellow);
	7810	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7811	+
	7812	+ spot.translate(32, 64);
6878	7813	spotw = spot.x + spot.width;
6879	7814	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
6881		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7815	+ clickInfo.g.setColor(Color.cyan);
	7816	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7817	// if (CameraPane.Xmin > spot.x)
6883	7818	// {
6884	7819	// CameraPane.Xmin = spot.x;
..	..	@@ -6895,29 +7830,9 @@
6895	7830	// {
6896	7831	// CameraPane.Ymax = spoth;
6897	7832	// }
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);
	7833	+ clickInfo.g.setColor(Color.green);
	7834	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7835	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6921	7836	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6922	7837	// if (CameraPane.Xmin > boundary.x)
6923	7838	// {
..	..	@@ -6939,7 +7854,8 @@
6939	7854	}
6940	7855	}
6941	7856
6942		- boolean doEditClick0(ClickInfo info, int level)
	7857	+ boolean doEditClick0(//ClickInfo clickInfo,
	7858	+ int level)
6943	7859	{
6944	7860	if (level == 0)
6945	7861	{
..	..	@@ -6948,10 +7864,10 @@
6948	7864
6949	7865	boolean retval = false;
6950	7866
6951		- startX = info.x;
6952		- startY = info.y;
	7867	+ startX = clickInfo.x;
	7868	+ startY = clickInfo.y;
6953	7869
6954		- hitSomething = 0;
	7870	+ hitSomething = -1;
6955	7871	cVector origin = new cVector();
6956	7872	//LA.xformPos(origin, toParent, origin);
6957	7873	Rectangle spot = new Rectangle();
..	..	@@ -6959,22 +7875,53 @@
6959	7875	{
6960	7876	centerPt = new Point(0, 0);
6961	7877	}
6962		- calcHotSpot(origin, info, centerPt, spot);
6963		- if (spot.contains(info.x, info.y))
	7878	+ calcHotSpot(origin, //info,
	7879	+ centerPt, spot);
	7880	+ if (spot.contains(clickInfo.x, clickInfo.y))
6964	7881	{
6965	7882	hitSomething = hitCenter;
6966	7883	retval = true;
6967	7884	}
6968	7885	spot.translate(32, 0);
6969		- if (spot.contains(info.x, info.y))
	7886	+ if (spot.contains(clickInfo.x, clickInfo.y))
6970	7887	{
6971	7888	hitSomething = hitRotate;
6972	7889	retval = true;
6973	7890	}
6974	7891	spot.translate(0, 32);
6975		- if (spot.contains(info.x, info.y))
	7892	+ spot.translate(32, 0);
	7893	+ spot.translate(0, 32);
	7894	+ if (spot.contains(clickInfo.x, clickInfo.y))
6976	7895	{
6977	7896	hitSomething = hitScale;
	7897	+
	7898	+ double scale = 0.005f * clickInfo.camera.Distance();
	7899	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7900	+ double sign = 1;
	7901	+ if (hScale < 0)
	7902	+ {
	7903	+ sign = -1;
	7904	+ }
	7905	+ hScale = signMath.pow(signhScale, scale * 50);
	7906	+ if (hScale < 0.01)
	7907	+ {
	7908	+ //hScale = 0.01;
	7909	+ }
	7910	+
	7911	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7912	+ sign = 1;
	7913	+ if (vScale < 0)
	7914	+ {
	7915	+ sign = -1;
	7916	+ }
	7917	+ vScale = signMath.pow(signvScale, scale * 50);
	7918	+ if (vScale < 0.01)
	7919	+ {
	7920	+ //vScale = 0.01;
	7921	+ }
	7922	+
	7923	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7924	+
6978	7925	retval = true;
6979	7926	}
6980	7927
..	..	@@ -6984,7 +7931,7 @@
6984	7931	}
6985	7932
6986	7933	//System.out.println("info.modifiers = " + info.modifiers);
6987		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7934	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6988	7935	//System.out.println("modified = " + modified);
6989	7936	//new Exception().printStackTrace();
6990	7937	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7012,7 +7959,8 @@
7012	7959	return true;
7013	7960	}
7014	7961
7015		- void doEditDrag0(ClickInfo info, boolean opposite)
	7962	+ void doEditDrag0(//ClickInfo info,
	7963	+ boolean opposite)
7016	7964	{
7017	7965	if (hitSomething == 0)
7018	7966	{
..	..	@@ -7026,7 +7974,8 @@
7026	7974
7027	7975	//System.out.println("hitSomething = " + hitSomething);
7028	7976
7029		- double scale = 0.005f * info.camera.Distance();
	7977	+ double scale = 0.005f * clickInfo.camera.Distance();
	7978	+
7030	7979	cVector xlate = new cVector();
7031	7980	//cVector xlate2 = new cVector();
7032	7981	switch (hitSomething)
..	..	@@ -7039,7 +7988,9 @@
7039	7988
7040	7989	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7041	7990
7042		- if (modified \|\| opposite)
	7991	+ // Modified could snap
	7992	+ if (//modified \|\|
	7993	+ opposite)
7043	7994	{
7044	7995	//assert(false);
7045	7996	/*
..	..	@@ -7059,8 +8010,8 @@
7059	8010	toParent[3][i] = xlate.get(i);
7060	8011	LA.matInvert(toParent, fromParent);
7061	8012	*/
7062		- cVector delta = LA.newVector(0, 0, startY - info.y);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8013	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8014	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	8015
7065	8016	LA.matCopy(startMat, toParent);
7066	8017	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7069,7 +8020,7 @@
7069	8020	} else
7070	8021	{
7071	8022	//LA.xformDir(delta, info.camera.fromScreen, delta);
7072		- cVector up = new cVector(info.camera.up);
	8023	+ cVector up = new cVector(clickInfo.camera.up);
7073	8024	cVector away = new cVector();
7074	8025	//cVector right2 = new cVector();
7075	8026	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7086,19 +8037,19 @@
7086	8037	LA.xformDir(up, ClickInfo.matbuffer, up);
7087	8038	// if (!CameraPane.LOCALTRANSFORM)
7088	8039	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7089		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8040	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7090	8041	// if (!CameraPane.LOCALTRANSFORM)
7091	8042	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7092	8043	//LA.vecCross(up, cVector.Z, right2);
7093	8044
7094		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8045	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7095	8046
7096	8047	//System.out.println("DELTA0 = " + delta);
7097	8048	//System.out.println("AWAY = " + info.camera.away);
7098	8049	//System.out.println("UP = " + info.camera.up);
7099	8050	if (away.z > 0)
7100	8051	{
7101		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8052	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7102	8053	{
7103	8054	delta.x = -delta.x;
7104	8055	} else
..	..	@@ -7113,7 +8064,7 @@
7113	8064	//System.out.println("DELTA1 = " + delta);
7114	8065	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7115	8066	//System.out.println("DELTA2 = " + delta);
7116		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8067	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7117	8068	LA.matCopy(startMat, toParent);
7118	8069	//System.out.println("DELTA3 = " + delta);
7119	8070	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7123,8 +8074,8 @@
7123	8074	break;
7124	8075
7125	8076	case hitRotate: // rotate
7126		- int dx = info.x - centerPt.x;
7127		- int dy = -(info.y - centerPt.y);
	8077	+ int dx = clickInfo.x - centerPt.x;
	8078	+ int dy = -(clickInfo.y - centerPt.y);
7128	8079	double angle = (double) Math.atan2(dx, dy);
7129	8080	angle = -(1.570796 - angle);
7130	8081
..	..	@@ -7133,7 +8084,7 @@
7133	8084
7134	8085	if (modified)
7135	8086	{
7136		- // Rotate 90 degrees
	8087	+ // Rotate 45 degrees
7137	8088	angle /= (Math.PI / 4);
7138	8089	angle = Math.floor(angle + 0.5);
7139	8090	angle *= (Math.PI / 4);
..	..	@@ -7147,7 +8098,7 @@
7147	8098	}
7148	8099	/**/
7149	8100
7150		- switch (info.pane.RenderCamera().viewCode)
	8101	+ switch (clickInfo.pane.RenderCamera().viewCode)
7151	8102	{
7152	8103	case 1: // '\001'
7153	8104	LA.matZRotate(toParent, angle);
..	..	@@ -7174,26 +8125,30 @@
7174	8125	break;
7175	8126
7176	8127	case hitScale: // scale
7177		- double hScale = (double) (info.x - centerPt.x) / 32;
	8128	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	8129	+ double sign = 1;
	8130	+ if (hScale < 0)
	8131	+ {
	8132	+ sign = -1;
	8133	+ }
	8134	+ hScale = signMath.pow(signhScale, scale * 50);
7178	8135	if (hScale < 0.01)
7179	8136	{
7180		- hScale = 0.01;
	8137	+ //hScale = 0.01;
7181	8138	}
7182		- hScale = Math.pow(hScale, scale * 50);
7183		- if (hScale < 0.01)
	8139	+
	8140	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	8141	+ sign = 1;
	8142	+ if (vScale < 0)
7184	8143	{
7185		- hScale = 0.01;
	8144	+ sign = -1;
7186	8145	}
7187		- double vScale = (double) (info.y - centerPt.y) / 32;
	8146	+ vScale = signMath.pow(signvScale, scale * 50);
7188	8147	if (vScale < 0.01)
7189	8148	{
7190		- vScale = 0.01;
	8149	+ //vScale = 0.01;
7191	8150	}
7192		- vScale = Math.pow(vScale, scale * 50);
7193		- if (vScale < 0.01)
7194		- {
7195		- vScale = 0.01;
7196		- }
	8151	+
7197	8152	LA.matCopy(startMat, toParent);
7198	8153	/**/
7199	8154	for (int i = 0; i < 3; i++)
..	..	@@ -7203,39 +8158,56 @@
7203	8158	}
7204	8159	/**/
7205	8160
7206		- switch (info.pane.RenderCamera().viewCode)
	8161	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	8162	+
	8163	+ if (totalScale < 0.01)
	8164	+ {
	8165	+ totalScale = 0.01;
	8166	+ }
	8167	+
	8168	+ switch (clickInfo.pane.RenderCamera().viewCode)
7207	8169	{
7208	8170	case 3: // '\001'
7209		- if (modified)
	8171	+ if (modified \|\| opposite)
7210	8172	{
	8173	+ if (modified) // && opposite)
	8174	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8175	+ else
7211	8176	//LA.matScale(toParent, 1, hScale, vScale);
7212		- LA.matScale(toParent, vScale, 1, 1);
	8177	+ LA.matScale(toParent, totalScale, 1, 1);
7213	8178	} // vScale, 1);
7214	8179	else
7215	8180	{
7216		- LA.matScale(toParent, vScale, vScale, vScale);
	8181	+ // EXCEPTION!
	8182	+ LA.matScale(toParent, 1, totalScale, totalScale);
7217	8183	} // vScale, 1);
7218	8184	break;
7219	8185
7220	8186	case 2: // '\002'
7221		- if (modified)
	8187	+ if (modified \|\| opposite)
7222	8188	{
7223		- //LA.matScale(toParent, hScale, 1, vScale);
7224		- LA.matScale(toParent, 1, vScale, 1);
	8189	+ if (modified) // && opposite)
	8190	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8191	+ else
	8192	+ //LA.matScale(toParent, hScale, 1, vScale);
	8193	+ LA.matScale(toParent, 1, totalScale, 1);
7225	8194	} else
7226	8195	{
7227		- LA.matScale(toParent, vScale, 1, vScale);
	8196	+ LA.matScale(toParent, totalScale, 1, totalScale);
7228	8197	}
7229	8198	break;
7230	8199
7231	8200	case 1: // '\003'
7232		- if (modified)
	8201	+ if (modified \|\| opposite)
7233	8202	{
7234		- //LA.matScale(toParent, hScale, vScale, 1);
7235		- LA.matScale(toParent, 1, 1, vScale);
	8203	+ if (modified) // && opposite)
	8204	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8205	+ else
	8206	+ //LA.matScale(toParent, hScale, vScale, 1);
	8207	+ LA.matScale(toParent, 1, 1, totalScale);
7236	8208	} else
7237	8209	{
7238		- LA.matScale(toParent, vScale, vScale, 1);
	8210	+ LA.matScale(toParent, totalScale, totalScale, 1);
7239	8211	}
7240	8212	break;
7241	8213	}
..	..	@@ -7269,7 +8241,7 @@
7269	8241	} // NEW ...
7270	8242
7271	8243
7272		- info.pane.repaint();
	8244	+ clickInfo.pane.repaint();
7273	8245	}
7274	8246
7275	8247	boolean overflow = false;
..	..	@@ -7368,19 +8340,27 @@
7368	8340	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369	8341	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370	8342	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8343	+
	8344	+ String objname;
	8345	+
7371	8346	if (false) //parent != null)
7372	8347	{
7373		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8348	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374	8349	} else
7375	8350	{
7376		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8351	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7377	8352	} // + super.toString();
7378	8353	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8354	+
	8355	+ if (!Globals.ADVANCED)
	8356	+ return objname;
	8357	+
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7379	8359	}
7380	8360
7381	8361	public int hashCode()
7382	8362	{
7383		- // Fuck Vector...
	8363	+ // Do not use Vector...
7384	8364	return System.identityHashCode(this);
7385	8365	}
7386	8366
..	..	@@ -7441,6 +8421,10 @@
7441	8421	editWindow = null;
7442	8422	} // ?
7443	8423	}
	8424	+ else
	8425	+ {
	8426	+ //editWindow.closeUI();
	8427	+ }
7444	8428	}
7445	8429
7446	8430	boolean root; // patch for edit windows
..	..	@@ -7452,7 +8436,7 @@
7452	8436	/transient/ cVector2[] projectedVertices = new cVector2[0];
7453	8437
7454	8438	Object3D /Composite/ parent;
7455		- Object3D /Composite/ fileparent;
	8439	+ Object3D /Composite/ fileparent; // In the case of FileObject
7456	8440
7457	8441	double[][] toParent; // dynamic matrix
7458	8442	double[][] fromParent;
..	..	@@ -7598,6 +8582,10 @@
7598	8582	}
7599	8583
7600	8584	transient ObjEditor editWindow;
	8585	+ transient ObjEditor manipWindow;
	8586	+
	8587	+ transient boolean pinned;
	8588	+
7601	8589	transient ObjectUI objectUI;
7602	8590	public static int povDepth = 0;
7603	8591	private static cVector tbMin = new cVector();
..	..	@@ -7612,13 +8600,13 @@
7612	8600	private static cVector2 qq2 = new cVector2();
7613	8601	private static cVector2 rr2 = new cVector2();
7614	8602	private static cVector2 ss2 = new cVector2();
7615		- private static cVector edge1 = new cVector();
7616		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
7617	8605	//private static cVector norm = new cVector();
7618	8606	/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;
	8607	+ static final int hitCenter = 1;
	8608	+ static final int hitScale = 2;
	8609	+ static final int hitRotate = 3;
7622	8610	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7623	8611	/transient/ private Point centerPt;
7624	8612	/transient/ private int startX;
..	..	@@ -7811,7 +8799,275 @@
7811	8799
7812	8800	Touch();
7813	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
7814	8806
	8807	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8808	+ {
	8809	+ boolean success = false;
	8810	+
	8811	+ if (bRep.stripified)
	8812	+ {
	8813	+ int[] strips = bRep.getRawIndices();
	8814	+
	8815	+ // TRIANGLE STRIP ARRAY
	8816	+ if (bRep.trimmed)
	8817	+ {
	8818	+ float[] v = bRep.getRawVertices();
	8819	+
	8820	+ int count3 = 0;
	8821	+
	8822	+ if (v.length > 0)
	8823	+ {
	8824	+ for (int i = 0; i < strips.length; i++)
	8825	+ {
	8826	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8827	+ count3 += 3;
	8828	+
	8829	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ for (int j = 0; j < strips[i] - 2; j++)
	8833	+ {
	8834	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8835	+ count3 += 3;
	8836	+
	8837	+ if (j%2 == 0)
	8838	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8839	+ else
	8840	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8841	+
	8842	+ s1.set(s2);
	8843	+ s2.set(s3);
	8844	+ }
	8845	+ }
	8846	+ }
	8847	+
	8848	+ assert count3 == v.length;
	8849	+ }
	8850	+ else // !trimmed
	8851	+ {
	8852	+ int count = 0;
	8853	+ for (int i = 0; i < strips.length; i++)
	8854	+ {
	8855	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8856	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8857	+
	8858	+ for (int j = 0; j < strips[i] - 2; j++)
	8859	+ {
	8860	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8861	+
	8862	+ if (j%2 == 0)
	8863	+ success \|= intersectTriangle(ray, result, p, q, r);
	8864	+ else
	8865	+ success \|= intersectTriangle(ray, result, p, r, q);
	8866	+
	8867	+ p = q;
	8868	+ q = r;
	8869	+ }
	8870	+ }
	8871	+ }
	8872	+ } else // catch (Error e)
	8873	+ {
	8874	+ int facecount = bRep.FaceCount();
	8875	+ for (int i = 0; i < facecount; i++)
	8876	+ {
	8877	+ Face face = bRep.GetFace(i);
	8878	+
	8879	+ Vertex p = bRep.GetVertex(face.p);
	8880	+ Vertex q = bRep.GetVertex(face.q);
	8881	+ Vertex r = bRep.GetVertex(face.r);
	8882	+
	8883	+ success \|= intersectTriangle(ray, result, p, q, r);
	8884	+ }
	8885	+ }
	8886	+
	8887	+ return success;
	8888	+ }
	8889	+
	8890	+ static cVector eye = new cVector();
	8891	+ static cVector dir = new cVector();
	8892	+
	8893	+ transient BBox bbox = null;
	8894	+
	8895	+ boolean intersect(Ray ray, IntersectResult result)
	8896	+ {
	8897	+ double eyex = ray.eyePoint.x;
	8898	+ double eyey = ray.eyePoint.y;
	8899	+ double eyez = ray.eyePoint.z;
	8900	+
	8901	+ double dirx = ray.viewDirection.x;
	8902	+ double diry = ray.viewDirection.y;
	8903	+ double dirz = ray.viewDirection.z;
	8904	+
	8905	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8906	+ {
	8907	+ eye.x = eyex;
	8908	+ eye.y = eyey;
	8909	+ eye.z = eyez;
	8910	+ dir.x = dirx;
	8911	+ dir.y = diry;
	8912	+ dir.z = dirz;
	8913	+
	8914	+ LA.xformPos(eye, this.fromParent, eye);
	8915	+ LA.xformDir(dir, this.fromParent, dir);
	8916	+
	8917	+ ray.eyePoint.x = eye.x;
	8918	+ ray.eyePoint.y = eye.y;
	8919	+ ray.eyePoint.z = eye.z;
	8920	+
	8921	+ ray.viewDirection.x = dir.x;
	8922	+ ray.viewDirection.y = dir.y;
	8923	+ ray.viewDirection.z = dir.z;
	8924	+ }
	8925	+
	8926	+ boolean success = false;
	8927	+
	8928	+ boolean touch = false;
	8929	+
	8930	+ if (bRep != null && Link2Support())
	8931	+ {
	8932	+ if (bbox == null)
	8933	+ {
	8934	+ bbox = new BBox();
	8935	+
	8936	+ cVector min = new cVector();
	8937	+ cVector max = new cVector();
	8938	+
	8939	+ this.getBounds(min, max, true);
	8940	+
	8941	+ bbox.min.x = min.x;
	8942	+ bbox.min.y = min.y;
	8943	+ bbox.min.z = min.z;
	8944	+
	8945	+ bbox.max.x = max.x;
	8946	+ bbox.max.y = max.y;
	8947	+ bbox.max.z = max.z;
	8948	+ }
	8949	+
	8950	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8951	+ {
	8952	+ success \|= intersectMesh(ray, result);
	8953	+ }
	8954	+ else
	8955	+ {
	8956	+ //this.hide = true;
	8957	+ touch = true;
	8958	+ }
	8959	+ }
	8960	+
	8961	+ for (int i=0; i<size(); i++)
	8962	+ {
	8963	+ Object3D child = (Object3D) reserve(i);
	8964	+
	8965	+ if (child == null)
	8966	+ continue;
	8967	+
	8968	+ success \|= child.intersect(ray, result);
	8969	+ release(i);
	8970	+ }
	8971	+
	8972	+ ray.eyePoint.x = eyex;
	8973	+ ray.eyePoint.y = eyey;
	8974	+ ray.eyePoint.z = eyez;
	8975	+
	8976	+ ray.viewDirection.x = dirx;
	8977	+ ray.viewDirection.y = diry;
	8978	+ ray.viewDirection.z = dirz;
	8979	+
	8980	+// if (touch)
	8981	+// this.Touch(); // refresh display list
	8982	+
	8983	+ return success;
	8984	+ }
	8985	+
	8986	+ static Vector3d edge1 = new Vector3d();
	8987	+ static Vector3d edge2 = new Vector3d();
	8988	+ static Vector3d P = new Vector3d();
	8989	+ static Vector3d T = new Vector3d();
	8990	+ static Vector3d Q = new Vector3d();
	8991	+
	8992	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8993	+ {
	8994	+ if (false)
	8995	+ {
	8996	+ result.t = 0;
	8997	+ return true;
	8998	+ }
	8999	+
	9000	+ /*
	9001	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9002	+
	9003	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9004	+ */
	9005	+
	9006	+ // Calculate edges of the triangle
	9007	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9008	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9009	+
	9010	+ // Calculate the determinant (U parameter)
	9011	+ P.cross(ray.viewDirection, edge2);
	9012	+ double det = edge1.dot(P);
	9013	+
	9014	+ if (det > -1e-9 && det < 1e-9)
	9015	+ {
	9016	+ return false;
	9017	+ } // Ray lies in plane of triangle
	9018	+
	9019	+ double invDet = 1 / det;
	9020	+
	9021	+ // Calculate distance from vertex1 to ray origin
	9022	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9023	+
	9024	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9025	+
	9026	+ if (U < 0.f \|\| U > 1.f)
	9027	+ {
	9028	+ return false;
	9029	+ } // Intersection lies outside of the triangle
	9030	+
	9031	+ // Calculate V parameter
	9032	+ Q.cross(T, edge1);
	9033	+
	9034	+ double V = ray.viewDirection.dot(Q) * invDet;
	9035	+
	9036	+ if (V < 0.f \|\| (U + V) > 1.f)
	9037	+ {
	9038	+ return false;
	9039	+ } // Intersection lies outside of the triangle
	9040	+
	9041	+ double t = edge2.dot(Q) * invDet;
	9042	+
	9043	+ if (t > 1e-9) // Triangle and ray intersects
	9044	+ {
	9045	+ //result.isIntersected = true;
	9046	+ //result.id = id;
	9047	+
	9048	+ if (false) // isShadow)
	9049	+ {
	9050	+ result.t = t;
	9051	+ return true;
	9052	+ } else if (t < result.t)
	9053	+ {
	9054	+ result.object = this;
	9055	+
	9056	+ result.t = t;
	9057	+
	9058	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9059	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9060	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9061	+
	9062	+ result.n.cross(edge1, edge2);
	9063	+ result.n.normalize();
	9064	+ }
	9065	+
	9066	+ return true;
	9067	+ }
	9068	+
	9069	+ return false;
	9070	+ }
7815	9071
7816	9072	public int Size()
7817	9073	{