~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -25,19 +25,112 @@
25	25	// Use GetUUID for backward compatibility with null.
26	26	private UUID uuid = UUID.randomUUID();
27	27
28		- // TEMPORARY for mocap undo. No need to be transient.
	28	+ // TEMPORARY for versions. No need to be transient.
29	29	mocap.reader.BVHReader.BVHResult savebvh;
30	30	Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
31	34	//
32	35
33	36	String skyboxname;
34	37	String skyboxext;
35	38
36		- Object3D versionlist[];
	39	+ Object3D[] versionlist;
37	40	int versionindex = -1;
38	41
	42	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	43	+
	44	+ transient int tabIndex; // Tabs can change between sessions.
	45	+
39	46	ScriptNode scriptnode;
40	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	+
41	134	void InitOthers()
42	135	{
43	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -49,6 +142,7 @@
49	142	projectedVertices[i] = new cVector2(); // Others
50	143	}
51	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
52	146	}
53	147
54	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -128,7 +222,7 @@
128	222	return;
129	223
130	224	transientsupport = support;
131		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
132	226
133	227	support = null;
134	228	link2master = false;
..	..	@@ -175,9 +269,42 @@
175	269	}
176	270	}
177	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	+
178	300	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
179	301	{
	302	+ if (blockloop)
	303	+ return;
	304	+
180	305	Object3D o;
	306	+
	307	+ boolean isnew = false;
181	308
182	309	if (hashtable.containsKey(GetUUID()))
183	310	{
..	..	@@ -191,12 +318,14 @@
191	318	}
192	319	else
193	320	{
	321	+ isnew = true;
	322	+
194	323	o = new Object3D("copy of " + this.name);
195	324
196	325	hashtable.put(GetUUID(), o);
197	326	}
198	327
199		- if (!blockloop)
	328	+ //if (!blockloop)
200	329	{
201	330	blockloop = true;
202	331
..	..	@@ -207,12 +336,15 @@
207	336
208	337	blockloop = false;
209	338	}
210		-
211		- ExtractBigData(o);
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
212	342	}
213	343
214	344	void ExtractBigData(Object3D o)
215	345	{
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
216	348	if (o.bRep != null)
217	349	Grafreed.Assert(o.bRep == this.bRep);
218	350
..	..	@@ -223,8 +355,8 @@
223	355	// o.bRep.support = null;
224	356	// }
225	357	o.selection = this.selection;
226		- o.versionlist = this.versionlist;
227		- o.versionindex = this.versionindex;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
228	360
229	361	if (this.support != null)
230	362	{
..	..	@@ -269,18 +401,62 @@
269	401	//
270	402	// return null;
271	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	+ }
272	448
273	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
274	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
275	454	if (!hashtable.containsKey(GetUUID()))
276	455	return;
277	456
278	457	Object3D o = hashtable.get(GetUUID());
279	458
280	459	RestoreBigData(o);
281		-
282		- if (blockloop)
283		- return;
284	460
285	461	blockloop = true;
286	462
..	..	@@ -296,6 +472,9 @@
296	472
297	473	void RestoreBigData(Object3D o)
298	474	{
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
299	478	this.bRep = o.bRep;
300	479	if (this.support != null && o.transientrep != null)
301	480	{
..	..	@@ -304,8 +483,8 @@
304	483
305	484	this.selection = o.selection;
306	485
307		- this.versionlist = o.versionlist;
308		- this.versionindex = o.versionindex;
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
309	488	// July 2019 if (this.bRep != null)
310	489	// this.bRep.support = o.transientrep;
311	490	// this.support = o.support;
..	..	@@ -456,7 +635,10 @@
456	635	transient boolean keepdontselect;
457	636	boolean dontselect = false;
458	637	boolean hide = false;
459		- 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	+
460	642	boolean marked = false; // animation node
461	643	boolean skip = false; // centroid issue
462	644	boolean skipmocap = false; // mocap data
..	..	@@ -464,6 +646,9 @@
464	646	boolean random = false;
465	647	boolean speedup = false;
466	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
467	652
468	653	float NORMALPUSH = 0;
469	654
..	..	@@ -482,7 +667,7 @@
482	667	{
483	668	sorted = true;
484	669
485		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
486	671	{
487	672	Object3D obji = get(i);
488	673	Object3D objj = get(i+1);
..	..	@@ -506,7 +691,7 @@
506	691	{
507	692	sorted = true;
508	693
509		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
510	695	{
511	696	Object3D obji = get(i);
512	697	Object3D objj = get(i+1);
..	..	@@ -522,11 +707,11 @@
522	707	}
523	708	}
524	709
525		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
526	711
527	712	int MemorySize()
528	713	{
529		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
530	715	{
531	716	try
532	717	{
..	..	@@ -641,7 +826,7 @@
641	826	{
642	827	if (maxcount != 1)
643	828	{
644		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
645	830	}
646	831
647	832	toParentMarked = LA.newMatrix();
..	..	@@ -843,7 +1028,7 @@
843	1028
844	1029	void Step()
845	1030	{
846		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
847	1032	resetmaxcount();
848	1033	resettransformcount();
849	1034	resetstep();
..	..	@@ -957,6 +1142,8 @@
957	1142	(Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
958	1143	currentframe != Globals.framecount)
959	1144	{
	1145	+ Globals.lighttouched = true;
	1146	+
960	1147	currentframe = Globals.framecount;
961	1148
962	1149	// System.err.println("transformcount = " + transformcount);
..	..	@@ -1036,24 +1223,28 @@
1036	1223	{
1037	1224	// return true;
1038	1225
1039		- if (material == null \|\| material.multiply)
1040		- return true;
	1226	+// if (material == null \|\| material.multiply)
	1227	+// return true;
	1228	+//
	1229	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1230	+// return false;
	1231	+//
	1232	+// // Transparent objects are dynamic because we have to sort the triangles.
	1233	+// return material.opacity > 0.99;
1041	1234
1042		- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1043		- return false;
1044		-
1045		- // Transparent objects are dynamic because we have to sort the triangles.
1046		- return material.opacity > 0.99;
	1235	+ return !sort;
1047	1236	}
1048	1237
1049	1238	boolean IsOpaque()
1050	1239	{
1051	1240	// return true;
1052	1241
1053		- if (material == null \|\| material.multiply)
1054		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
1055	1246
1056		- return material.opacity > 0.99;
	1247	+ return !sort;
1057	1248	}
1058	1249
1059	1250	Object3D()
..	..	@@ -1131,8 +1322,10 @@
1131	1322
1132	1323	// will share the geometry
1133	1324	assert (!(this instanceof Composite));
1134		- return deepCopy(); // Never called for Composite
1135		-
	1325	+
	1326	+ Object3D obj = deepCopy(); // Never called for Composite
	1327	+ obj.count = 2;
	1328	+ return obj;
1136	1329	}
1137	1330
1138	1331	boolean HasLoops()
..	..	@@ -1140,6 +1333,30 @@
1140	1333	return false;
1141	1334	}
1142	1335
	1336	+ void ResetUUIDs()
	1337	+ {
	1338	+ if (blockloop)
	1339	+ {
	1340	+ return;
	1341	+ }
	1342	+
	1343	+ this.uuid = null;
	1344	+
	1345	+ blockloop = true;
	1346	+
	1347	+ for (int i = 0; i < Size(); i++)
	1348	+ {
	1349	+ Object3D obj = (Object3D) Children().get(i);
	1350	+
	1351	+ if (obj != null)
	1352	+ {
	1353	+ obj.ResetUUIDs();
	1354	+ }
	1355	+ }
	1356	+
	1357	+ blockloop = false;
	1358	+ }
	1359	+
1143	1360	boolean IsInfinite()
1144	1361	{
1145	1362	if (blockloop)
..	..	@@ -1210,78 +1427,16 @@
1210	1427	return;
1211	1428
1212	1429	blockloop = true;
	1430	+
	1431	+ other.parent = parent;
	1432	+
1213	1433	//System.out.println("COPY " + this + " to " + other);
1214	1434	//new Exception().printStackTrace();
	1435	+ deepCopyNode(other);
1215	1436
1216		- other.parent = parent;
1217		- if (toParent != null)
1218		- {
1219		- other.toParent = LA.newMatrix();
1220		- other.fromParent = LA.newMatrix();
1221		- LA.matCopy(toParent, other.toParent);
1222		- LA.matCopy(fromParent, other.fromParent);
1223		- if (toParentMarked != null)
1224		- {
1225		- other.toParentMarked = LA.newMatrix();
1226		- other.fromParentMarked = LA.newMatrix();
1227		- LA.matCopy(toParentMarked, other.toParentMarked);
1228		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1229		- }
1230		- }
1231		- else
1232		- {
1233		- if (other.toParent == null)
1234		-// assert(other.toParent == null);
1235		-// new Exception().printStackTrace();
1236		- System.err.println("null parent: " + other);
1237		- }
1238		- /*
1239		- double ident[][] = LA.newMatrix();
1240		- if (bRep == null)
1241		- other.bRep = null;
1242		- else
1243		- other.bRep = new BoundaryRep(bRep, ident);
1244		- */
1245		- // Really new...
1246	1437	other.bRep = bRep; // Share the geometry
1247	1438
1248	1439	other.support = support; // Share the support
1249		-
1250		- //other.editWindow = null;
1251		- if (name == null)
1252		- other.name = null;
1253		- else
1254		- other.name = new String(name);
1255		-
1256		- if (material != null)
1257		- {
1258		- other.material = new cMaterial(material);
1259		- } else
1260		- {
1261		- other.material = null;
1262		- }
1263		-
1264		- other.GetTextures().name = GetTextures().name;
1265		-
1266		- CopyExtraMaterial(other);
1267		-
1268		- other.touched = touched;
1269		- other.softtouched = softtouched;
1270		-
1271		- other.random = random;
1272		- other.link2master = link2master;
1273		- other.transformcount = transformcount;
1274		- other.marked = marked;
1275		- other.skip = skip;
1276		- other.count = count;
1277		- other.flipV = flipV;
1278		- other.live = live;
1279		- other.rewind = rewind;
1280		- other.hide = hide;
1281		- other.texres = texres;
1282		- other.speedup = speedup;
1283		- other.height = height;
1284		- other.depth = depth;
1285	1440
1286	1441	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1287	1442	// {
..	..	@@ -1337,17 +1492,24 @@
1337	1492	if ((mask & GEOMETRY) != 0)
1338	1493	{
1339	1494	if (bRep != null)
1340		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1341		- else
1342		- assert(other.bRep == null);
1343		-
1344		- if (bRep != null)
1345	1495	{
	1496	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1346	1497	CameraPane.RemoveList(bRep.displaylist);
1347	1498	bRep.displaylist = 0; // june 2013 -1;
1348	1499	}
1349	1500	else
1350		- bRep = bRep;
	1501	+ {
	1502	+ //assert(other.bRep == null);
	1503	+ bRep = other.bRep;
	1504	+ }
	1505	+
	1506	+// if (bRep != null)
	1507	+// {
	1508	+// CameraPane.RemoveList(bRep.displaylist);
	1509	+// bRep.displaylist = 0; // june 2013 -1;
	1510	+// }
	1511	+// else
	1512	+// bRep = bRep;
1351	1513	}
1352	1514
1353	1515	/* Use a MASK = GEO/MAT
..	..	@@ -2323,11 +2485,6 @@
2323	2485
2324	2486	InitOthers();
2325	2487
2326		- if (this instanceof Camera)
2327		- {
2328		- material.shift = 90;
2329		- }
2330		-
2331	2488	material.multiply = multiply;
2332	2489
2333	2490	if (multiply)
..	..	@@ -3148,7 +3305,10 @@
3148	3305	{
3149	3306	if (bRep != null)
3150	3307	{
	3308	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3151	3309	bRep.GenerateNormals(crease);
	3310	+ if (!bRep.trimmed)
	3311	+ bRep.MergeNormals();
3152	3312	Touch();
3153	3313	}
3154	3314	}
..	..	@@ -3223,6 +3383,105 @@
3223	3383	blockloop = false;
3224	3384	}
3225	3385
	3386	+ public void ResetTransform(int mask)
	3387	+ {
	3388	+ Object3D obj = this;
	3389	+
	3390	+ if (mask == -1)
	3391	+ {
	3392	+ if (obj instanceof Camera) // jan 2014
	3393	+ {
	3394	+ LA.matIdentity(obj.toParent);
	3395	+ LA.matIdentity(obj.fromParent);
	3396	+ }
	3397	+ else
	3398	+ {
	3399	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3400	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3401	+ }
	3402	+ return;
	3403	+ }
	3404	+
	3405	+ if ((mask&2) != 0) // Scale/rotation
	3406	+ {
	3407	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3408	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3409	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3410	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3411	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3412	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3413	+ }
	3414	+ if ((mask&1) != 0) // Translation
	3415	+ {
	3416	+ if (obj.toParent != null)
	3417	+ {
	3418	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3419	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3420	+ }
	3421	+ }
	3422	+ }
	3423	+
	3424	+ public void Scale(float scale)
	3425	+ {
	3426	+ Object3D obj = this;
	3427	+
	3428	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3429	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3430	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3431	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3432	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3433	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3434	+ }
	3435	+
	3436	+ public void TextureRatioTransform(int axis)
	3437	+ {
	3438	+ cTexture tex = GetTextures();
	3439	+
	3440	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3441	+
	3442	+ try
	3443	+ {
	3444	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3445	+ }
	3446	+ catch (Exception e)
	3447	+ {
	3448	+ System.err.println("FAIL TextureRatio: " + this);
	3449	+ }
	3450	+
	3451	+ LA.matIdentity(Object3D.mat);
	3452	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3453	+
	3454	+ if (toParent == null)
	3455	+ {
	3456	+ toParent = LA.newMatrix();
	3457	+ fromParent = LA.newMatrix();
	3458	+ }
	3459	+
	3460	+ ResetTransform(2);
	3461	+
	3462	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3463	+ LA.matInvert(fromParent, toParent);
	3464	+ }
	3465	+
	3466	+ void TextureRatio(int axis)
	3467	+ {
	3468	+ if (blockloop)
	3469	+ return;
	3470	+
	3471	+ blockloop = true;
	3472	+
	3473	+ TextureRatioTransform(axis);
	3474	+
	3475	+ for (int i=Size(); --i>=0;)
	3476	+ {
	3477	+ Object3D v = get(i);
	3478	+
	3479	+ v.TextureRatio(axis);
	3480	+ }
	3481	+
	3482	+ blockloop = false;
	3483	+ }
	3484	+
3226	3485	void TransformChildren()
3227	3486	{
3228	3487	if (toParent != null)
..	..	@@ -3465,6 +3724,7 @@
3465	3724	if (bRep != null)
3466	3725	{
3467	3726	//bRep.RemoveOneTriangle();
	3727	+ System.out.println();
3468	3728	System.out.println("Reducing " + this);
3469	3729	if (name != null && name.contains("lockpickstraps"))
3470	3730	name = name;
..	..	@@ -3576,15 +3836,47 @@
3576	3836
3577	3837	void ClearMaterials()
3578	3838	{
	3839	+ if (blockloop)
	3840	+ return;
	3841	+
	3842	+ blockloop = true;
	3843	+
3579	3844	ClearMaterial();
3580		- for (int i = 0; i < size(); i++)
	3845	+ for (int i = 0; i < Size(); i++)
3581	3846	{
3582		- Object3D child = (Object3D) reserve(i);
	3847	+ Object3D child = (Object3D) get(i);
3583	3848	if (child == null)
3584	3849	continue;
3585	3850	child.ClearMaterials();
3586		- release(i);
3587	3851	}
	3852	+
	3853	+ blockloop = false;
	3854	+ }
	3855	+
	3856	+ void ClearVersionList()
	3857	+ {
	3858	+ this.versionlist = null;
	3859	+ this.versionindex = -1;
	3860	+ this.versiontable = null;
	3861	+ }
	3862	+
	3863	+ void ClearVersions()
	3864	+ {
	3865	+ if (blockloop)
	3866	+ return;
	3867	+
	3868	+ blockloop = true;
	3869	+
	3870	+ ClearVersionList();
	3871	+ for (int i = 0; i < Size(); i++)
	3872	+ {
	3873	+ Object3D child = (Object3D) get(i);
	3874	+ if (child == null)
	3875	+ continue;
	3876	+ child.ClearVersions();
	3877	+ }
	3878	+
	3879	+ blockloop = false;
3588	3880	}
3589	3881
3590	3882	void FlipV(boolean flip)
..	..	@@ -3763,6 +4055,7 @@
3763	4055
3764	4056	void RevertMeshes()
3765	4057	{
	4058	+ // BLOCKLOOP
3766	4059	if (this instanceof cMesh)
3767	4060	{
3768	4061	((cMesh)this).Revert();
..	..	@@ -3793,11 +4086,6 @@
3793	4086	Touch();
3794	4087	}
3795	4088
3796		- ResetRecur();
3797		- }
3798		-
3799		- void ResetRecur()
3800		- {
3801	4089	for (int i = 0; i < size(); i++)
3802	4090	{
3803	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3820,11 +4108,6 @@
3820	4108	Step();
3821	4109	Touch();
3822	4110
3823		- StepRecur();
3824		- }
3825		-
3826		- void StepRecur()
3827		- {
3828	4111	for (int i = 0; i < size(); i++)
3829	4112	{
3830	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4011,8 +4294,8 @@
4011	4294	Touch();
4012	4295	}
4013	4296
4014		- transient cVector min = new cVector();
4015		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
4016	4299
4017	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
4018	4301	{
..	..	@@ -4028,15 +4311,15 @@
4028	4311	if (blockloop)
4029	4312	return;
4030	4313
4031		- if (min == null) // ???
	4314	+ if (min == null)
4032	4315	{
4033	4316	min = new cVector();
4034	4317	max = new cVector();
4035	4318	}
4036	4319
4037		- for (int i = 0; i<size(); i++)
	4320	+ for (int i = 0; i<Size(); i++)
4038	4321	{
4039		- Object3D child = (Object3D) reserve(i);
	4322	+ Object3D child = (Object3D) get(i); //reserve(i);
4040	4323	if (child == null)
4041	4324	continue;
4042	4325
..	..	@@ -4055,21 +4338,21 @@
4055	4338	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4056	4339	//if (child.hide)
4057	4340	{
4058		- release(i);
	4341	+ //release(i);
4059	4342	continue;
4060	4343	}
4061	4344
4062	4345	blockloop = true;
4063	4346	child.getBounds(min, max, true); // xform);
4064	4347	blockloop = false;
4065		- release(i);
	4348	+ //release(i);
4066	4349
4067	4350	MinMax(minima, maxima);
4068	4351	}
4069	4352
4070	4353	if (bRep != null)
4071	4354	{
4072		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
4073	4356	}
4074	4357
4075	4358	if (false) // xform)
..	..	@@ -5878,7 +6161,7 @@
5878	6161	boolean NeedSupport()
5879	6162	{
5880	6163	return
5881		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
	6164	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5882	6165	// PROBLEM with CROWD!!
5883	6166	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5884	6167	}
..	..	@@ -5896,6 +6179,20 @@
5896	6179	return parent.IsLive();
5897	6180	}
5898	6181
	6182	+ boolean IsDynamic()
	6183	+ {
	6184	+ return live && bRep != null;
	6185	+ }
	6186	+
	6187	+ boolean Link2Support()
	6188	+ {
	6189	+ return link2master \|\| link2support;
	6190	+ }
	6191	+
	6192	+ static cVector minima = new cVector();
	6193	+ static cVector maxima = new cVector();
	6194	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6195	+
5899	6196	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5900	6197	{
5901	6198	Invariants(); // june 2013
..	..	@@ -5903,6 +6200,29 @@
5903	6200	if (support != null)
5904	6201	{
5905	6202	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6203	+ }
	6204	+
	6205	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6206	+ {
	6207	+ getBounds(minima, maxima, true);
	6208	+ center.x = (minima.x + maxima.x) / 2;
	6209	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6210	+ center.z = (minima.z + maxima.z) / 2;
	6211	+
	6212	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6213	+
	6214	+ IntersectResult res = new IntersectResult();
	6215	+ res.t = Double.POSITIVE_INFINITY;
	6216	+
	6217	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6218	+ {
	6219	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6220	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6221	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6222	+
	6223	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6224	+ LA.matInvert(toParent, fromParent);
	6225	+ }
5906	6226	}
5907	6227
5908	6228	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5956,7 +6276,8 @@
5956	6276	if (support != null)
5957	6277	support = support;
5958	6278
5959		- boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ boolean usecalllists = !IsDynamic() &&
	6280	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5960	6281	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5961	6282
5962	6283	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -5967,7 +6288,8 @@
5967	6288	bRep.displaylist = 0;
5968	6289	}
5969	6290	// usecalllists &= !(parent instanceof RandomNode);
5970		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
5971	6293
5972	6294	if (display.DrawMode() == display.SHADOW)
5973	6295	//GetBRep() != null)
..	..	@@ -5981,7 +6303,7 @@
5981	6303
5982	6304	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5983	6305	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5984		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5985	6307	{
5986	6308	Globals.lighttouched = true;
5987	6309	} // all panes...
..	..	@@ -6023,8 +6345,8 @@
6023	6345	Globals.lighttouched = true; // all panes...
6024	6346	}
6025	6347
6026		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
6027		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
6028	6350
6029	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
6030	6352	{
..	..	@@ -6063,7 +6385,7 @@
6063	6385	{
6064	6386	if (display.DrawMode() == iCameraPane.SHADOW)
6065	6387	{
6066		- if (!link2master // tricky to cull in shadow mode.
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
6067	6389	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6068	6390	{
6069	6391	//System.out.print("CULLED");
..	..	@@ -6125,6 +6447,20 @@
6125	6447	{
6126	6448	drawSelf(display, root, selected, blocked);
6127	6449	}
	6450	+
	6451	+// if (!(this instanceof Composite))
	6452	+// {
	6453	+// for (int i = 0; i < size(); i++)
	6454	+// {
	6455	+// Object3D child = (Object3D) reserve(i);
	6456	+// if (child == null)
	6457	+// continue;
	6458	+//
	6459	+// child.draw(display, root, selected, blocked);
	6460	+//
	6461	+// release(i);
	6462	+// }
	6463	+// }
6128	6464	} else
6129	6465	{
6130	6466	/*
..	..	@@ -6157,13 +6493,14 @@
6157	6493	boolean failedPigment = false;
6158	6494	boolean failedBump = false;
6159	6495
	6496	+ CameraPane.lastObject = this;
6160	6497	try
6161	6498	{
6162	6499	display.BindPigmentTexture(tex, texres);
6163	6500	}
6164	6501	catch (Exception e)
6165	6502	{
6166		- System.err.println("FAILED: " + this);
	6503	+ // System.err.println("FAILED: " + this);
6167	6504	failedPigment = true;
6168	6505	}
6169	6506
..	..	@@ -6194,6 +6531,20 @@
6194	6531	display.CallList(bRep.displaylist);
6195	6532	// june 2013 drawSelf(display, root, selected);
6196	6533	}
	6534	+ }
	6535	+
	6536	+ assert (!(this instanceof Composite));
	6537	+ {
	6538	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6539	+// {
	6540	+// Object3D child = (Object3D) reserve(i);
	6541	+// if (child == null)
	6542	+// continue;
	6543	+//
	6544	+// child.draw(display, root, selected, blocked);
	6545	+//
	6546	+// release(i);
	6547	+// }
6197	6548	}
6198	6549	}
6199	6550
..	..	@@ -6247,16 +6598,17 @@
6247	6598
6248	6599	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6249	6600	{
6250		- if (GetBRep() == null)
6251		- {
6252		- drawSelf(display, root, selected, blocked);
6253		- } else
	6601	+ if (GetBRep() != null)
6254	6602	{
6255	6603	DrawNode(display, root, selected);
6256	6604	if (this instanceof BezierPatch)
6257	6605	{
6258	6606	//drawSelf(display, root, selected);
6259	6607	}
	6608	+ }
	6609	+ else
	6610	+ {
	6611	+ drawSelf(display, root, selected, blocked);
6260	6612	}
6261	6613	}
6262	6614
..	..	@@ -6506,7 +6858,8 @@
6506	6858
6507	6859	//javax.media.opengl.GL gl = display.GetGL();
6508	6860
6509		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
6510	6863	{
6511	6864	int fc = bRep.FaceCount();
6512	6865	int vc = bRep.VertexCount();
..	..	@@ -6668,7 +7021,7 @@
6668	7021	facescompare[k] = new FaceCompare(k);
6669	7022	}
6670	7023
6671		- center = new cVector();
	7024	+ centertriangle = new cVector();
6672	7025	}
6673	7026	else
6674	7027	{
..	..	@@ -6791,7 +7144,7 @@
6791	7144	*/
6792	7145	}
6793	7146
6794		- transient cVector center;
	7147	+ transient cVector centertriangle;
6795	7148
6796	7149	class FaceCompare implements Comparable
6797	7150	{
..	..	@@ -6820,14 +7173,14 @@
6820	7173	Vertex q = bRep.GetVertex(face.q);
6821	7174	Vertex r = bRep.GetVertex(face.r);
6822	7175
6823		- center.set(p);
6824		- center.add(q);
6825		- center.add(r);
6826		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
6827	7180
6828		- center.sub(Globals.theRenderer.EyeCamera().location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6829	7182
6830		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
6831	7184	}
6832	7185
6833	7186	return distance;
..	..	@@ -7638,7 +7991,9 @@
7638	7991
7639	7992	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7640	7993
7641		- if (modified \|\| opposite)
	7994	+ // Modified could snap
	7995	+ if (//modified \|\|
	7996	+ opposite)
7642	7997	{
7643	7998	//assert(false);
7644	7999	/*
..	..	@@ -7732,7 +8087,7 @@
7732	8087
7733	8088	if (modified)
7734	8089	{
7735		- // Rotate 90 degrees
	8090	+ // Rotate 45 degrees
7736	8091	angle /= (Math.PI / 4);
7737	8092	angle = Math.floor(angle + 0.5);
7738	8093	angle *= (Math.PI / 4);
..	..	@@ -7818,7 +8173,7 @@
7818	8173	case 3: // '\001'
7819	8174	if (modified \|\| opposite)
7820	8175	{
7821		- if (modified && opposite)
	8176	+ if (modified) // && opposite)
7822	8177	LA.matScale(toParent, totalScale, totalScale, totalScale);
7823	8178	else
7824	8179	//LA.matScale(toParent, 1, hScale, vScale);
..	..	@@ -7834,7 +8189,7 @@
7834	8189	case 2: // '\002'
7835	8190	if (modified \|\| opposite)
7836	8191	{
7837		- if (modified && opposite)
	8192	+ if (modified) // && opposite)
7838	8193	LA.matScale(toParent, totalScale, totalScale, totalScale);
7839	8194	else
7840	8195	//LA.matScale(toParent, hScale, 1, vScale);
..	..	@@ -7848,7 +8203,7 @@
7848	8203	case 1: // '\003'
7849	8204	if (modified \|\| opposite)
7850	8205	{
7851		- if (modified && opposite)
	8206	+ if (modified) // && opposite)
7852	8207	LA.matScale(toParent, totalScale, totalScale, totalScale);
7853	8208	else
7854	8209	//LA.matScale(toParent, hScale, vScale, 1);
..	..	@@ -8003,12 +8358,12 @@
8003	8358	if (!Globals.ADVANCED)
8004	8359	return objname;
8005	8360
8006		- return objname + " " + System.identityHashCode(this);
	8361	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
8007	8362	}
8008	8363
8009	8364	public int hashCode()
8010	8365	{
8011		- // Fuck Vector...
	8366	+ // Do not use Vector...
8012	8367	return System.identityHashCode(this);
8013	8368	}
8014	8369
..	..	@@ -8248,8 +8603,8 @@
8248	8603	private static cVector2 qq2 = new cVector2();
8249	8604	private static cVector2 rr2 = new cVector2();
8250	8605	private static cVector2 ss2 = new cVector2();
8251		- private static cVector edge1 = new cVector();
8252		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
8253	8608	//private static cVector norm = new cVector();
8254	8609	/transient private/ int hitSomething;
8255	8610	static final int hitCenter = 1;
..	..	@@ -8447,7 +8802,275 @@
8447	8802
8448	8803	Touch();
8449	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
8450	8809
	8810	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8811	+ {
	8812	+ boolean success = false;
	8813	+
	8814	+ if (bRep.stripified)
	8815	+ {
	8816	+ int[] strips = bRep.getRawIndices();
	8817	+
	8818	+ // TRIANGLE STRIP ARRAY
	8819	+ if (bRep.trimmed)
	8820	+ {
	8821	+ float[] v = bRep.getRawVertices();
	8822	+
	8823	+ int count3 = 0;
	8824	+
	8825	+ if (v.length > 0)
	8826	+ {
	8827	+ for (int i = 0; i < strips.length; i++)
	8828	+ {
	8829	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8833	+ count3 += 3;
	8834	+
	8835	+ for (int j = 0; j < strips[i] - 2; j++)
	8836	+ {
	8837	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8838	+ count3 += 3;
	8839	+
	8840	+ if (j%2 == 0)
	8841	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8842	+ else
	8843	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8844	+
	8845	+ s1.set(s2);
	8846	+ s2.set(s3);
	8847	+ }
	8848	+ }
	8849	+ }
	8850	+
	8851	+ assert count3 == v.length;
	8852	+ }
	8853	+ else // !trimmed
	8854	+ {
	8855	+ int count = 0;
	8856	+ for (int i = 0; i < strips.length; i++)
	8857	+ {
	8858	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8859	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8860	+
	8861	+ for (int j = 0; j < strips[i] - 2; j++)
	8862	+ {
	8863	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8864	+
	8865	+ if (j%2 == 0)
	8866	+ success \|= intersectTriangle(ray, result, p, q, r);
	8867	+ else
	8868	+ success \|= intersectTriangle(ray, result, p, r, q);
	8869	+
	8870	+ p = q;
	8871	+ q = r;
	8872	+ }
	8873	+ }
	8874	+ }
	8875	+ } else // catch (Error e)
	8876	+ {
	8877	+ int facecount = bRep.FaceCount();
	8878	+ for (int i = 0; i < facecount; i++)
	8879	+ {
	8880	+ Face face = bRep.GetFace(i);
	8881	+
	8882	+ Vertex p = bRep.GetVertex(face.p);
	8883	+ Vertex q = bRep.GetVertex(face.q);
	8884	+ Vertex r = bRep.GetVertex(face.r);
	8885	+
	8886	+ success \|= intersectTriangle(ray, result, p, q, r);
	8887	+ }
	8888	+ }
	8889	+
	8890	+ return success;
	8891	+ }
	8892	+
	8893	+ static cVector eye = new cVector();
	8894	+ static cVector dir = new cVector();
	8895	+
	8896	+ transient BBox bbox = null;
	8897	+
	8898	+ boolean intersect(Ray ray, IntersectResult result)
	8899	+ {
	8900	+ double eyex = ray.eyePoint.x;
	8901	+ double eyey = ray.eyePoint.y;
	8902	+ double eyez = ray.eyePoint.z;
	8903	+
	8904	+ double dirx = ray.viewDirection.x;
	8905	+ double diry = ray.viewDirection.y;
	8906	+ double dirz = ray.viewDirection.z;
	8907	+
	8908	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8909	+ {
	8910	+ eye.x = eyex;
	8911	+ eye.y = eyey;
	8912	+ eye.z = eyez;
	8913	+ dir.x = dirx;
	8914	+ dir.y = diry;
	8915	+ dir.z = dirz;
	8916	+
	8917	+ LA.xformPos(eye, this.fromParent, eye);
	8918	+ LA.xformDir(dir, this.fromParent, dir);
	8919	+
	8920	+ ray.eyePoint.x = eye.x;
	8921	+ ray.eyePoint.y = eye.y;
	8922	+ ray.eyePoint.z = eye.z;
	8923	+
	8924	+ ray.viewDirection.x = dir.x;
	8925	+ ray.viewDirection.y = dir.y;
	8926	+ ray.viewDirection.z = dir.z;
	8927	+ }
	8928	+
	8929	+ boolean success = false;
	8930	+
	8931	+ boolean touch = false;
	8932	+
	8933	+ if (bRep != null && Link2Support())
	8934	+ {
	8935	+ if (bbox == null)
	8936	+ {
	8937	+ bbox = new BBox();
	8938	+
	8939	+ cVector min = new cVector();
	8940	+ cVector max = new cVector();
	8941	+
	8942	+ this.getBounds(min, max, true);
	8943	+
	8944	+ bbox.min.x = min.x;
	8945	+ bbox.min.y = min.y;
	8946	+ bbox.min.z = min.z;
	8947	+
	8948	+ bbox.max.x = max.x;
	8949	+ bbox.max.y = max.y;
	8950	+ bbox.max.z = max.z;
	8951	+ }
	8952	+
	8953	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8954	+ {
	8955	+ success \|= intersectMesh(ray, result);
	8956	+ }
	8957	+ else
	8958	+ {
	8959	+ //this.hide = true;
	8960	+ touch = true;
	8961	+ }
	8962	+ }
	8963	+
	8964	+ for (int i=0; i<size(); i++)
	8965	+ {
	8966	+ Object3D child = (Object3D) reserve(i);
	8967	+
	8968	+ if (child == null)
	8969	+ continue;
	8970	+
	8971	+ success \|= child.intersect(ray, result);
	8972	+ release(i);
	8973	+ }
	8974	+
	8975	+ ray.eyePoint.x = eyex;
	8976	+ ray.eyePoint.y = eyey;
	8977	+ ray.eyePoint.z = eyez;
	8978	+
	8979	+ ray.viewDirection.x = dirx;
	8980	+ ray.viewDirection.y = diry;
	8981	+ ray.viewDirection.z = dirz;
	8982	+
	8983	+// if (touch)
	8984	+// this.Touch(); // refresh display list
	8985	+
	8986	+ return success;
	8987	+ }
	8988	+
	8989	+ static Vector3d edge1 = new Vector3d();
	8990	+ static Vector3d edge2 = new Vector3d();
	8991	+ static Vector3d P = new Vector3d();
	8992	+ static Vector3d T = new Vector3d();
	8993	+ static Vector3d Q = new Vector3d();
	8994	+
	8995	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8996	+ {
	8997	+ if (false)
	8998	+ {
	8999	+ result.t = 0;
	9000	+ return true;
	9001	+ }
	9002	+
	9003	+ /*
	9004	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9005	+
	9006	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9007	+ */
	9008	+
	9009	+ // Calculate edges of the triangle
	9010	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9011	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9012	+
	9013	+ // Calculate the determinant (U parameter)
	9014	+ P.cross(ray.viewDirection, edge2);
	9015	+ double det = edge1.dot(P);
	9016	+
	9017	+ if (det > -1e-9 && det < 1e-9)
	9018	+ {
	9019	+ return false;
	9020	+ } // Ray lies in plane of triangle
	9021	+
	9022	+ double invDet = 1 / det;
	9023	+
	9024	+ // Calculate distance from vertex1 to ray origin
	9025	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9026	+
	9027	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9028	+
	9029	+ if (U < 0.f \|\| U > 1.f)
	9030	+ {
	9031	+ return false;
	9032	+ } // Intersection lies outside of the triangle
	9033	+
	9034	+ // Calculate V parameter
	9035	+ Q.cross(T, edge1);
	9036	+
	9037	+ double V = ray.viewDirection.dot(Q) * invDet;
	9038	+
	9039	+ if (V < 0.f \|\| (U + V) > 1.f)
	9040	+ {
	9041	+ return false;
	9042	+ } // Intersection lies outside of the triangle
	9043	+
	9044	+ double t = edge2.dot(Q) * invDet;
	9045	+
	9046	+ if (t > 1e-9) // Triangle and ray intersects
	9047	+ {
	9048	+ //result.isIntersected = true;
	9049	+ //result.id = id;
	9050	+
	9051	+ if (false) // isShadow)
	9052	+ {
	9053	+ result.t = t;
	9054	+ return true;
	9055	+ } else if (t < result.t)
	9056	+ {
	9057	+ result.object = this;
	9058	+
	9059	+ result.t = t;
	9060	+
	9061	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9062	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9063	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9064	+
	9065	+ result.n.cross(edge1, edge2);
	9066	+ result.n.normalize();
	9067	+ }
	9068	+
	9069	+ return true;
	9070	+ }
	9071	+
	9072	+ return false;
	9073	+ }
8451	9074
8452	9075	public int Size()
8453	9076	{