~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,21 +22,115 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo. No need to be transient.
	28	+ // TEMPORARY for versions. No need to be transient.
28	29	mocap.reader.BVHReader.BVHResult savebvh;
29	30	Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
30	34	//
31	35
32	36	String skyboxname;
33	37	String skyboxext;
34	38
35		- Object3D versions[];
	39	+ Object3D[] versionlist;
36	40	int versionindex = -1;
37	41
	42	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	43	+
	44	+ int tabIndex;
	45	+
38	46	ScriptNode scriptnode;
39	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	+
40	134	void InitOthers()
41	135	{
42	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -48,6 +142,7 @@
48	142	projectedVertices[i] = new cVector2(); // Others
49	143	}
50	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
51	146	}
52	147
53	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -127,7 +222,7 @@
127	222	return;
128	223
129	224	transientsupport = support;
130		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
131	226
132	227	support = null;
133	228	link2master = false;
..	..	@@ -174,9 +269,42 @@
174	269	}
175	270	}
176	271
	272	+ boolean HasBigData()
	273	+ {
	274	+ if (blockloop)
	275	+ return false;
	276	+
	277	+ if (bRep != null)
	278	+ {
	279	+ return true;
	280	+ }
	281	+
	282	+ blockloop = true;
	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	+
177	300	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
178	301	{
	302	+ if (blockloop)
	303	+ return;
	304	+
179	305	Object3D o;
	306	+
	307	+ boolean isnew = false;
180	308
181	309	if (hashtable.containsKey(GetUUID()))
182	310	{
..	..	@@ -190,12 +318,14 @@
190	318	}
191	319	else
192	320	{
	321	+ isnew = true;
	322	+
193	323	o = new Object3D("copy of " + this.name);
194	324
195	325	hashtable.put(GetUUID(), o);
196	326	}
197	327
198		- if (!blockloop)
	328	+ //if (!blockloop)
199	329	{
200	330	blockloop = true;
201	331
..	..	@@ -206,12 +336,15 @@
206	336
207	337	blockloop = false;
208	338	}
209		-
210		- ExtractBigData(o);
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
211	342	}
212	343
213	344	void ExtractBigData(Object3D o)
214	345	{
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
215	348	if (o.bRep != null)
216	349	Grafreed.Assert(o.bRep == this.bRep);
217	350
..	..	@@ -222,8 +355,8 @@
222	355	// o.bRep.support = null;
223	356	// }
224	357	o.selection = this.selection;
225		- o.versions = this.versions;
226		- o.versionindex = this.versionindex;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
227	360
228	361	if (this.support != null)
229	362	{
..	..	@@ -246,17 +379,84 @@
246	379	// this.fileparent = null;
247	380	}
248	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	+
	424	+ blockloop = false;
	425	+ }
	426	+
	427	+ boolean HasTags()
	428	+ {
	429	+ if (blockloop)
	430	+ return false;
	431	+
	432	+ blockloop = true;
	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	+
249	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
250	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
251	454	if (!hashtable.containsKey(GetUUID()))
252	455	return;
253	456
254	457	Object3D o = hashtable.get(GetUUID());
255	458
256	459	RestoreBigData(o);
257		-
258		- if (blockloop)
259		- return;
260	460
261	461	blockloop = true;
262	462
..	..	@@ -272,6 +472,9 @@
272	472
273	473	void RestoreBigData(Object3D o)
274	474	{
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
275	478	this.bRep = o.bRep;
276	479	if (this.support != null && o.transientrep != null)
277	480	{
..	..	@@ -280,8 +483,8 @@
280	483
281	484	this.selection = o.selection;
282	485
283		- this.versions = o.versions;
284		- this.versionindex = o.versionindex;
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
285	488	// July 2019 if (this.bRep != null)
286	489	// this.bRep.support = o.transientrep;
287	490	// this.support = o.support;
..	..	@@ -432,7 +635,10 @@
432	635	transient boolean keepdontselect;
433	636	boolean dontselect = false;
434	637	boolean hide = false;
435		- 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	+
436	642	boolean marked = false; // animation node
437	643	boolean skip = false; // centroid issue
438	644	boolean skipmocap = false; // mocap data
..	..	@@ -440,6 +646,9 @@
440	646	boolean random = false;
441	647	boolean speedup = false;
442	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
443	652
444	653	float NORMALPUSH = 0;
445	654
..	..	@@ -458,7 +667,7 @@
458	667	{
459	668	sorted = true;
460	669
461		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
462	671	{
463	672	Object3D obji = get(i);
464	673	Object3D objj = get(i+1);
..	..	@@ -482,7 +691,7 @@
482	691	{
483	692	sorted = true;
484	693
485		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
486	695	{
487	696	Object3D obji = get(i);
488	697	Object3D objj = get(i+1);
..	..	@@ -498,11 +707,11 @@
498	707	}
499	708	}
500	709
501		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
502	711
503	712	int MemorySize()
504	713	{
505		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
506	715	{
507	716	try
508	717	{
..	..	@@ -617,7 +826,7 @@
617	826	{
618	827	if (maxcount != 1)
619	828	{
620		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
621	830	}
622	831
623	832	toParentMarked = LA.newMatrix();
..	..	@@ -819,7 +1028,7 @@
819	1028
820	1029	void Step()
821	1030	{
822		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
823	1032	resetmaxcount();
824	1033	resettransformcount();
825	1034	resetstep();
..	..	@@ -1012,24 +1221,28 @@
1012	1221	{
1013	1222	// return true;
1014	1223
1015		- if (material == null \|\| material.multiply)
1016		- 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;
1017	1232
1018		- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1019		- return false;
1020		-
1021		- // Transparent objects are dynamic because we have to sort the triangles.
1022		- return material.opacity > 0.99;
	1233	+ return !sort;
1023	1234	}
1024	1235
1025	1236	boolean IsOpaque()
1026	1237	{
1027	1238	// return true;
1028	1239
1029		- if (material == null \|\| material.multiply)
1030		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
1031	1244
1032		- return material.opacity > 0.99;
	1245	+ return !sort;
1033	1246	}
1034	1247
1035	1248	Object3D()
..	..	@@ -1107,8 +1320,10 @@
1107	1320
1108	1321	// will share the geometry
1109	1322	assert (!(this instanceof Composite));
1110		- return deepCopy(); // Never called for Composite
1111		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
1112	1327	}
1113	1328
1114	1329	boolean HasLoops()
..	..	@@ -1116,6 +1331,30 @@
1116	1331	return false;
1117	1332	}
1118	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	+
1119	1358	boolean IsInfinite()
1120	1359	{
1121	1360	if (blockloop)
..	..	@@ -1186,78 +1425,16 @@
1186	1425	return;
1187	1426
1188	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1189	1431	//System.out.println("COPY " + this + " to " + other);
1190	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1191	1434
1192		- other.parent = parent;
1193		- if (toParent != null)
1194		- {
1195		- other.toParent = LA.newMatrix();
1196		- other.fromParent = LA.newMatrix();
1197		- LA.matCopy(toParent, other.toParent);
1198		- LA.matCopy(fromParent, other.fromParent);
1199		- if (toParentMarked != null)
1200		- {
1201		- other.toParentMarked = LA.newMatrix();
1202		- other.fromParentMarked = LA.newMatrix();
1203		- LA.matCopy(toParentMarked, other.toParentMarked);
1204		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1205		- }
1206		- }
1207		- else
1208		- {
1209		- if (other.toParent == null)
1210		-// assert(other.toParent == null);
1211		-// new Exception().printStackTrace();
1212		- System.err.println("null parent: " + other);
1213		- }
1214		- /*
1215		- double ident[][] = LA.newMatrix();
1216		- if (bRep == null)
1217		- other.bRep = null;
1218		- else
1219		- other.bRep = new BoundaryRep(bRep, ident);
1220		- */
1221		- // Really new...
1222	1435	other.bRep = bRep; // Share the geometry
1223	1436
1224	1437	other.support = support; // Share the support
1225		-
1226		- //other.editWindow = null;
1227		- if (name == null)
1228		- other.name = null;
1229		- else
1230		- other.name = new String(name);
1231		-
1232		- if (material != null)
1233		- {
1234		- other.material = new cMaterial(material);
1235		- } else
1236		- {
1237		- other.material = null;
1238		- }
1239		-
1240		- other.GetTextures().name = GetTextures().name;
1241		-
1242		- CopyExtraMaterial(other);
1243		-
1244		- other.touched = touched;
1245		- other.softtouched = softtouched;
1246		-
1247		- other.random = random;
1248		- other.link2master = link2master;
1249		- other.transformcount = transformcount;
1250		- other.marked = marked;
1251		- other.skip = skip;
1252		- other.count = count;
1253		- other.flipV = flipV;
1254		- other.live = live;
1255		- other.rewind = rewind;
1256		- other.hide = hide;
1257		- other.texres = texres;
1258		- other.speedup = speedup;
1259		- other.height = height;
1260		- other.depth = depth;
1261	1438
1262	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1263	1440	// {
..	..	@@ -1313,17 +1490,24 @@
1313	1490	if ((mask & GEOMETRY) != 0)
1314	1491	{
1315	1492	if (bRep != null)
1316		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1317		- else
1318		- assert(other.bRep == null);
1319		-
1320		- if (bRep != null)
1321	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1322	1495	CameraPane.RemoveList(bRep.displaylist);
1323	1496	bRep.displaylist = 0; // june 2013 -1;
1324	1497	}
1325	1498	else
1326		- 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;
1327	1511	}
1328	1512
1329	1513	/* Use a MASK = GEO/MAT
..	..	@@ -2299,11 +2483,6 @@
2299	2483
2300	2484	InitOthers();
2301	2485
2302		- if (this instanceof Camera)
2303		- {
2304		- material.shift = 90;
2305		- }
2306		-
2307	2486	material.multiply = multiply;
2308	2487
2309	2488	if (multiply)
..	..	@@ -2444,6 +2623,11 @@
2444	2623	else
2445	2624	{
2446	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");
2447	2631	}
2448	2632	}
2449	2633
..	..	@@ -3119,7 +3303,10 @@
3119	3303	{
3120	3304	if (bRep != null)
3121	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3122	3307	bRep.GenerateNormals(crease);
	3308	+ if (!bRep.trimmed)
	3309	+ bRep.MergeNormals();
3123	3310	Touch();
3124	3311	}
3125	3312	}
..	..	@@ -3194,6 +3381,105 @@
3194	3381	blockloop = false;
3195	3382	}
3196	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	+
3197	3483	void TransformChildren()
3198	3484	{
3199	3485	if (toParent != null)
..	..	@@ -3436,6 +3722,7 @@
3436	3722	if (bRep != null)
3437	3723	{
3438	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3439	3726	System.out.println("Reducing " + this);
3440	3727	if (name != null && name.contains("lockpickstraps"))
3441	3728	name = name;
..	..	@@ -3547,15 +3834,47 @@
3547	3834
3548	3835	void ClearMaterials()
3549	3836	{
	3837	+ if (blockloop)
	3838	+ return;
	3839	+
	3840	+ blockloop = true;
	3841	+
3550	3842	ClearMaterial();
3551		- for (int i = 0; i < size(); i++)
	3843	+ for (int i = 0; i < Size(); i++)
3552	3844	{
3553		- Object3D child = (Object3D) reserve(i);
	3845	+ Object3D child = (Object3D) get(i);
3554	3846	if (child == null)
3555	3847	continue;
3556	3848	child.ClearMaterials();
3557		- release(i);
3558	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;
3559	3878	}
3560	3879
3561	3880	void FlipV(boolean flip)
..	..	@@ -3734,6 +4053,7 @@
3734	4053
3735	4054	void RevertMeshes()
3736	4055	{
	4056	+ // BLOCKLOOP
3737	4057	if (this instanceof cMesh)
3738	4058	{
3739	4059	((cMesh)this).Revert();
..	..	@@ -3764,11 +4084,6 @@
3764	4084	Touch();
3765	4085	}
3766	4086
3767		- ResetRecur();
3768		- }
3769		-
3770		- void ResetRecur()
3771		- {
3772	4087	for (int i = 0; i < size(); i++)
3773	4088	{
3774	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3791,11 +4106,6 @@
3791	4106	Step();
3792	4107	Touch();
3793	4108
3794		- StepRecur();
3795		- }
3796		-
3797		- void StepRecur()
3798		- {
3799	4109	for (int i = 0; i < size(); i++)
3800	4110	{
3801	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3982,8 +4292,8 @@
3982	4292	Touch();
3983	4293	}
3984	4294
3985		- transient cVector min = new cVector();
3986		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
3987	4297
3988	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
3989	4299	{
..	..	@@ -3999,15 +4309,15 @@
3999	4309	if (blockloop)
4000	4310	return;
4001	4311
4002		- if (min == null) // ???
	4312	+ if (min == null)
4003	4313	{
4004	4314	min = new cVector();
4005	4315	max = new cVector();
4006	4316	}
4007	4317
4008		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
4009	4319	{
4010		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
4011	4321	if (child == null)
4012	4322	continue;
4013	4323
..	..	@@ -4026,21 +4336,21 @@
4026	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4027	4337	//if (child.hide)
4028	4338	{
4029		- release(i);
	4339	+ //release(i);
4030	4340	continue;
4031	4341	}
4032	4342
4033	4343	blockloop = true;
4034	4344	child.getBounds(min, max, true); // xform);
4035	4345	blockloop = false;
4036		- release(i);
	4346	+ //release(i);
4037	4347
4038	4348	MinMax(minima, maxima);
4039	4349	}
4040	4350
4041	4351	if (bRep != null)
4042	4352	{
4043		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
4044	4354	}
4045	4355
4046	4356	if (false) // xform)
..	..	@@ -5545,6 +5855,11 @@
5545	5855	if (fullname == null)
5546	5856	return "";
5547	5857
	5858	+ if (fullname.pigment != null)
	5859	+ {
	5860	+ return fullname.pigment;
	5861	+ }
	5862	+
5548	5863	// System.out.println("Fullname = " + fullname);
5549	5864
5550	5865	// Does not work on Windows due to C:
..	..	@@ -5557,7 +5872,7 @@
5557	5872
5558	5873	if (split.length == 0)
5559	5874	{
5560		- return "";
	5875	+ return fullname.pigment = "";
5561	5876	}
5562	5877
5563	5878	if (split.length <= 2)
..	..	@@ -5565,22 +5880,27 @@
5565	5880	if (fullname.name.endsWith(":"))
5566	5881	{
5567	5882	// Windows
5568		- return fullname.name.substring(0, fullname.name.length()-1);
	5883	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5569	5884	}
5570	5885
5571		- return split[0];
	5886	+ return fullname.pigment = split[0];
5572	5887	}
5573	5888
5574	5889	// Windows
5575	5890	assert(split.length == 4);
5576	5891
5577		- return split[0] + ":" + split[1];
	5892	+ return fullname.pigment = split[0] + ":" + split[1];
5578	5893	}
5579	5894
5580	5895	static String GetBump(cTexture fullname)
5581	5896	{
5582	5897	if (fullname == null)
5583	5898	return "";
	5899	+
	5900	+ if (fullname.bump != null)
	5901	+ {
	5902	+ return fullname.bump;
	5903	+ }
5584	5904
5585	5905	// System.out.println("Fullname = " + fullname);
5586	5906	// Does not work on Windows due to C:
..	..	@@ -5592,12 +5912,12 @@
5592	5912
5593	5913	if (split.length == 0)
5594	5914	{
5595		- return "";
	5915	+ return fullname.bump = "";
5596	5916	}
5597	5917
5598	5918	if (split.length == 1)
5599	5919	{
5600		- return "";
	5920	+ return fullname.bump = "";
5601	5921	}
5602	5922
5603	5923	if (split.length == 2)
..	..	@@ -5605,16 +5925,16 @@
5605	5925	if (fullname.name.endsWith(":"))
5606	5926	{
5607	5927	// Windows
5608		- return "";
	5928	+ return fullname.bump = "";
5609	5929	}
5610	5930
5611		- return split[1];
	5931	+ return fullname.bump = split[1];
5612	5932	}
5613	5933
5614	5934	// Windows
5615	5935	assert(split.length == 4);
5616	5936
5617		- return split[2] + ":" + split[3];
	5937	+ return fullname.bump = split[2] + ":" + split[3];
5618	5938	}
5619	5939
5620	5940	String GetPigmentTexture()
..	..	@@ -5697,6 +6017,9 @@
5697	6017	texname = "";
5698	6018
5699	6019	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6020	+
	6021	+ GetTextures().pigment = null;
	6022	+
5700	6023	Touch();
5701	6024	}
5702	6025
..	..	@@ -5770,6 +6093,8 @@
5770	6093
5771	6094	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5772	6095
	6096	+ GetTextures().bump = null;
	6097	+
5773	6098	Touch();
5774	6099	}
5775	6100
..	..	@@ -5834,7 +6159,7 @@
5834	6159	boolean NeedSupport()
5835	6160	{
5836	6161	return
5837		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
	6162	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5838	6163	// PROBLEM with CROWD!!
5839	6164	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5840	6165	}
..	..	@@ -5852,6 +6177,20 @@
5852	6177	return parent.IsLive();
5853	6178	}
5854	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();
	6193	+
5855	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5856	6195	{
5857	6196	Invariants(); // june 2013
..	..	@@ -5859,6 +6198,29 @@
5859	6198	if (support != null)
5860	6199	{
5861	6200	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6201	+ }
	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	+ }
5862	6224	}
5863	6225
5864	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5912,7 +6274,8 @@
5912	6274	if (support != null)
5913	6275	support = support;
5914	6276
5915		- boolean usecalllists = !IsLive() && 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);
5916	6279	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5917	6280
5918	6281	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -5923,7 +6286,8 @@
5923	6286	bRep.displaylist = 0;
5924	6287	}
5925	6288	// usecalllists &= !(parent instanceof RandomNode);
5926		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
5927	6291
5928	6292	if (display.DrawMode() == display.SHADOW)
5929	6293	//GetBRep() != null)
..	..	@@ -5979,8 +6343,8 @@
5979	6343	Globals.lighttouched = true; // all panes...
5980	6344	}
5981	6345
5982		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5983		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
5984	6348
5985	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
5986	6350	{
..	..	@@ -6019,7 +6383,7 @@
6019	6383	{
6020	6384	if (display.DrawMode() == iCameraPane.SHADOW)
6021	6385	{
6022		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
6023	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6024	6388	{
6025	6389	//System.out.print("CULLED");
..	..	@@ -6081,6 +6445,20 @@
6081	6445	{
6082	6446	drawSelf(display, root, selected, blocked);
6083	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	+// }
6084	6462	} else
6085	6463	{
6086	6464	/*
..	..	@@ -6113,13 +6491,14 @@
6113	6491	boolean failedPigment = false;
6114	6492	boolean failedBump = false;
6115	6493
	6494	+ CameraPane.lastObject = this;
6116	6495	try
6117	6496	{
6118	6497	display.BindPigmentTexture(tex, texres);
6119	6498	}
6120	6499	catch (Exception e)
6121	6500	{
6122		- System.err.println("FAILED: " + this);
	6501	+ // System.err.println("FAILED: " + this);
6123	6502	failedPigment = true;
6124	6503	}
6125	6504
..	..	@@ -6150,6 +6529,20 @@
6150	6529	display.CallList(bRep.displaylist);
6151	6530	// june 2013 drawSelf(display, root, selected);
6152	6531	}
	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	+// }
6153	6546	}
6154	6547	}
6155	6548
..	..	@@ -6203,16 +6596,17 @@
6203	6596
6204	6597	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6205	6598	{
6206		- if (GetBRep() == null)
6207		- {
6208		- drawSelf(display, root, selected, blocked);
6209		- } else
	6599	+ if (GetBRep() != null)
6210	6600	{
6211	6601	DrawNode(display, root, selected);
6212	6602	if (this instanceof BezierPatch)
6213	6603	{
6214	6604	//drawSelf(display, root, selected);
6215	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
6216	6610	}
6217	6611	}
6218	6612
..	..	@@ -6462,7 +6856,7 @@
6462	6856
6463	6857	//javax.media.opengl.GL gl = display.GetGL();
6464	6858
6465		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
6466	6860	{
6467	6861	int fc = bRep.FaceCount();
6468	6862	int vc = bRep.VertexCount();
..	..	@@ -6624,7 +7018,7 @@
6624	7018	facescompare[k] = new FaceCompare(k);
6625	7019	}
6626	7020
6627		- center = new cVector();
	7021	+ centertriangle = new cVector();
6628	7022	}
6629	7023	else
6630	7024	{
..	..	@@ -6747,7 +7141,7 @@
6747	7141	*/
6748	7142	}
6749	7143
6750		- transient cVector center;
	7144	+ transient cVector centertriangle;
6751	7145
6752	7146	class FaceCompare implements Comparable
6753	7147	{
..	..	@@ -6776,14 +7170,14 @@
6776	7170	Vertex q = bRep.GetVertex(face.q);
6777	7171	Vertex r = bRep.GetVertex(face.r);
6778	7172
6779		- center.set(p);
6780		- center.add(q);
6781		- center.add(r);
6782		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
6783	7177
6784		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6785	7179
6786		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
6787	7181	}
6788	7182
6789	7183	return distance;
..	..	@@ -7373,7 +7767,7 @@
7373	7767	boundary.y = spot.y - 30;
7374	7768	boundary.width = spot.width + 60;
7375	7769	boundary.height = spot.height + 60;
7376		- clickInfo.g.setColor(Color.red);
	7770	+ clickInfo.g.setColor(Color.white);
7377	7771	int spotw = spot.x + spot.width;
7378	7772	int spoth = spot.y + spot.height;
7379	7773	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7393,7 +7787,29 @@
7393	7787	// {
7394	7788	// CameraPane.Ymax = spoth;
7395	7789	// }
7396		- 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);
7397	7813	spotw = spot.x + spot.width;
7398	7814	spoth = spot.y + spot.height;
7399	7815	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7414,28 +7830,7 @@
7414	7830	// {
7415	7831	// CameraPane.Ymax = spoth;
7416	7832	// }
7417		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7418		- //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7419		- spot.translate(0, -32);
7420		- clickInfo.g.setColor(Color.yellow);
7421		- clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7422	7833	clickInfo.g.setColor(Color.green);
7423		-// if (CameraPane.Xmin > spot.x)
7424		-// {
7425		-// CameraPane.Xmin = spot.x;
7426		-// }
7427		-// if (CameraPane.Xmax < spotw)
7428		-// {
7429		-// CameraPane.Xmax = spotw;
7430		-// }
7431		-// if (CameraPane.Ymin > spot.y)
7432		-// {
7433		-// CameraPane.Ymin = spot.y;
7434		-// }
7435		-// if (CameraPane.Ymax < spoth)
7436		-// {
7437		-// CameraPane.Ymax = spoth;
7438		-// }
7439	7834	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7440	7835	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7441	7836	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7494,12 +7889,14 @@
7494	7889	retval = true;
7495	7890	}
7496	7891	spot.translate(0, 32);
	7892	+ spot.translate(32, 0);
	7893	+ spot.translate(0, 32);
7497	7894	if (spot.contains(clickInfo.x, clickInfo.y))
7498	7895	{
7499	7896	hitSomething = hitScale;
7500	7897
7501	7898	double scale = 0.005f * clickInfo.camera.Distance();
7502		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7899	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7503	7900	double sign = 1;
7504	7901	if (hScale < 0)
7505	7902	{
..	..	@@ -7511,7 +7908,7 @@
7511	7908	//hScale = 0.01;
7512	7909	}
7513	7910
7514		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7911	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7515	7912	sign = 1;
7516	7913	if (vScale < 0)
7517	7914	{
..	..	@@ -7591,7 +7988,9 @@
7591	7988
7592	7989	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7593	7990
7594		- if (modified \|\| opposite)
	7991	+ // Modified could snap
	7992	+ if (//modified \|\|
	7993	+ opposite)
7595	7994	{
7596	7995	//assert(false);
7597	7996	/*
..	..	@@ -7685,7 +8084,7 @@
7685	8084
7686	8085	if (modified)
7687	8086	{
7688		- // Rotate 90 degrees
	8087	+ // Rotate 45 degrees
7689	8088	angle /= (Math.PI / 4);
7690	8089	angle = Math.floor(angle + 0.5);
7691	8090	angle *= (Math.PI / 4);
..	..	@@ -7726,7 +8125,7 @@
7726	8125	break;
7727	8126
7728	8127	case hitScale: // scale
7729		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	8128	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7730	8129	double sign = 1;
7731	8130	if (hScale < 0)
7732	8131	{
..	..	@@ -7738,7 +8137,7 @@
7738	8137	//hScale = 0.01;
7739	8138	}
7740	8139
7741		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	8140	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7742	8141	sign = 1;
7743	8142	if (vScale < 0)
7744	8143	{
..	..	@@ -7771,21 +8170,27 @@
7771	8170	case 3: // '\001'
7772	8171	if (modified \|\| opposite)
7773	8172	{
	8173	+ if (modified) // && opposite)
	8174	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8175	+ else
7774	8176	//LA.matScale(toParent, 1, hScale, vScale);
7775		- LA.matScale(toParent, totalScale, 1, 1);
	8177	+ LA.matScale(toParent, totalScale, 1, 1);
7776	8178	} // vScale, 1);
7777	8179	else
7778	8180	{
7779	8181	// EXCEPTION!
7780		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8182	+ LA.matScale(toParent, 1, totalScale, totalScale);
7781	8183	} // vScale, 1);
7782	8184	break;
7783	8185
7784	8186	case 2: // '\002'
7785	8187	if (modified \|\| opposite)
7786	8188	{
7787		- //LA.matScale(toParent, hScale, 1, vScale);
7788		- LA.matScale(toParent, 1, totalScale, 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);
7789	8194	} else
7790	8195	{
7791	8196	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7795,8 +8200,11 @@
7795	8200	case 1: // '\003'
7796	8201	if (modified \|\| opposite)
7797	8202	{
7798		- //LA.matScale(toParent, hScale, vScale, 1);
7799		- LA.matScale(toParent, 1, 1, totalScale);
	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);
7800	8208	} else
7801	8209	{
7802	8210	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7947,12 +8355,12 @@
7947	8355	if (!Globals.ADVANCED)
7948	8356	return objname;
7949	8357
7950		- return objname + " " + System.identityHashCode(this);
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7951	8359	}
7952	8360
7953	8361	public int hashCode()
7954	8362	{
7955		- // Fuck Vector...
	8363	+ // Do not use Vector...
7956	8364	return System.identityHashCode(this);
7957	8365	}
7958	8366
..	..	@@ -8192,8 +8600,8 @@
8192	8600	private static cVector2 qq2 = new cVector2();
8193	8601	private static cVector2 rr2 = new cVector2();
8194	8602	private static cVector2 ss2 = new cVector2();
8195		- private static cVector edge1 = new cVector();
8196		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
8197	8605	//private static cVector norm = new cVector();
8198	8606	/transient private/ int hitSomething;
8199	8607	static final int hitCenter = 1;
..	..	@@ -8391,7 +8799,275 @@
8391	8799
8392	8800	Touch();
8393	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
8394	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	+ }
8395	9071
8396	9072	public int Size()
8397	9073	{