~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -25,21 +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
39	42	java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
40	43
	44	+ int tabIndex;
	45	+
41	46	ScriptNode scriptnode;
42	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	+
43	134	void InitOthers()
44	135	{
45	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -51,6 +142,7 @@
51	142	projectedVertices[i] = new cVector2(); // Others
52	143	}
53	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
54	146	}
55	147
56	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -130,7 +222,7 @@
130	222	return;
131	223
132	224	transientsupport = support;
133		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
134	226
135	227	support = null;
136	228	link2master = false;
..	..	@@ -177,9 +269,42 @@
177	269	}
178	270	}
179	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	+
180	300	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
181	301	{
	302	+ if (blockloop)
	303	+ return;
	304	+
182	305	Object3D o;
	306	+
	307	+ boolean isnew = false;
183	308
184	309	if (hashtable.containsKey(GetUUID()))
185	310	{
..	..	@@ -193,12 +318,14 @@
193	318	}
194	319	else
195	320	{
	321	+ isnew = true;
	322	+
196	323	o = new Object3D("copy of " + this.name);
197	324
198	325	hashtable.put(GetUUID(), o);
199	326	}
200	327
201		- if (!blockloop)
	328	+ //if (!blockloop)
202	329	{
203	330	blockloop = true;
204	331
..	..	@@ -209,12 +336,15 @@
209	336
210	337	blockloop = false;
211	338	}
212		-
213		- ExtractBigData(o);
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
214	342	}
215	343
216	344	void ExtractBigData(Object3D o)
217	345	{
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
218	348	if (o.bRep != null)
219	349	Grafreed.Assert(o.bRep == this.bRep);
220	350
..	..	@@ -225,8 +355,8 @@
225	355	// o.bRep.support = null;
226	356	// }
227	357	o.selection = this.selection;
228		- o.versionlist = this.versionlist;
229		- o.versionindex = this.versionindex;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
230	360
231	361	if (this.support != null)
232	362	{
..	..	@@ -318,15 +448,15 @@
318	448
319	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
320	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
321	454	if (!hashtable.containsKey(GetUUID()))
322	455	return;
323	456
324	457	Object3D o = hashtable.get(GetUUID());
325	458
326	459	RestoreBigData(o);
327		-
328		- if (blockloop)
329		- return;
330	460
331	461	blockloop = true;
332	462
..	..	@@ -342,6 +472,9 @@
342	472
343	473	void RestoreBigData(Object3D o)
344	474	{
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
345	478	this.bRep = o.bRep;
346	479	if (this.support != null && o.transientrep != null)
347	480	{
..	..	@@ -350,8 +483,8 @@
350	483
351	484	this.selection = o.selection;
352	485
353		- this.versionlist = o.versionlist;
354		- this.versionindex = o.versionindex;
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
355	488	// July 2019 if (this.bRep != null)
356	489	// this.bRep.support = o.transientrep;
357	490	// this.support = o.support;
..	..	@@ -502,7 +635,10 @@
502	635	transient boolean keepdontselect;
503	636	boolean dontselect = false;
504	637	boolean hide = false;
505		- 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	+
506	642	boolean marked = false; // animation node
507	643	boolean skip = false; // centroid issue
508	644	boolean skipmocap = false; // mocap data
..	..	@@ -510,6 +646,9 @@
510	646	boolean random = false;
511	647	boolean speedup = false;
512	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
513	652
514	653	float NORMALPUSH = 0;
515	654
..	..	@@ -528,7 +667,7 @@
528	667	{
529	668	sorted = true;
530	669
531		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
532	671	{
533	672	Object3D obji = get(i);
534	673	Object3D objj = get(i+1);
..	..	@@ -552,7 +691,7 @@
552	691	{
553	692	sorted = true;
554	693
555		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
556	695	{
557	696	Object3D obji = get(i);
558	697	Object3D objj = get(i+1);
..	..	@@ -568,11 +707,11 @@
568	707	}
569	708	}
570	709
571		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
572	711
573	712	int MemorySize()
574	713	{
575		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
576	715	{
577	716	try
578	717	{
..	..	@@ -889,7 +1028,7 @@
889	1028
890	1029	void Step()
891	1030	{
892		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
893	1032	resetmaxcount();
894	1033	resettransformcount();
895	1034	resetstep();
..	..	@@ -1082,24 +1221,28 @@
1082	1221	{
1083	1222	// return true;
1084	1223
1085		- if (material == null \|\| material.multiply)
1086		- 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;
1087	1232
1088		- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1089		- return false;
1090		-
1091		- // Transparent objects are dynamic because we have to sort the triangles.
1092		- return material.opacity > 0.99;
	1233	+ return !sort;
1093	1234	}
1094	1235
1095	1236	boolean IsOpaque()
1096	1237	{
1097	1238	// return true;
1098	1239
1099		- if (material == null \|\| material.multiply)
1100		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
1101	1244
1102		- return material.opacity > 0.99;
	1245	+ return !sort;
1103	1246	}
1104	1247
1105	1248	Object3D()
..	..	@@ -1177,8 +1320,10 @@
1177	1320
1178	1321	// will share the geometry
1179	1322	assert (!(this instanceof Composite));
1180		- return deepCopy(); // Never called for Composite
1181		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
1182	1327	}
1183	1328
1184	1329	boolean HasLoops()
..	..	@@ -1186,6 +1331,30 @@
1186	1331	return false;
1187	1332	}
1188	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	+
1189	1358	boolean IsInfinite()
1190	1359	{
1191	1360	if (blockloop)
..	..	@@ -1256,78 +1425,16 @@
1256	1425	return;
1257	1426
1258	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1259	1431	//System.out.println("COPY " + this + " to " + other);
1260	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1261	1434
1262		- other.parent = parent;
1263		- if (toParent != null)
1264		- {
1265		- other.toParent = LA.newMatrix();
1266		- other.fromParent = LA.newMatrix();
1267		- LA.matCopy(toParent, other.toParent);
1268		- LA.matCopy(fromParent, other.fromParent);
1269		- if (toParentMarked != null)
1270		- {
1271		- other.toParentMarked = LA.newMatrix();
1272		- other.fromParentMarked = LA.newMatrix();
1273		- LA.matCopy(toParentMarked, other.toParentMarked);
1274		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1275		- }
1276		- }
1277		- else
1278		- {
1279		- if (other.toParent == null)
1280		-// assert(other.toParent == null);
1281		-// new Exception().printStackTrace();
1282		- System.err.println("null parent: " + other);
1283		- }
1284		- /*
1285		- double ident[][] = LA.newMatrix();
1286		- if (bRep == null)
1287		- other.bRep = null;
1288		- else
1289		- other.bRep = new BoundaryRep(bRep, ident);
1290		- */
1291		- // Really new...
1292	1435	other.bRep = bRep; // Share the geometry
1293	1436
1294	1437	other.support = support; // Share the support
1295		-
1296		- //other.editWindow = null;
1297		- if (name == null)
1298		- other.name = null;
1299		- else
1300		- other.name = new String(name);
1301		-
1302		- if (material != null)
1303		- {
1304		- other.material = new cMaterial(material);
1305		- } else
1306		- {
1307		- other.material = null;
1308		- }
1309		-
1310		- other.GetTextures().name = GetTextures().name;
1311		-
1312		- CopyExtraMaterial(other);
1313		-
1314		- other.touched = touched;
1315		- other.softtouched = softtouched;
1316		-
1317		- other.random = random;
1318		- other.link2master = link2master;
1319		- other.transformcount = transformcount;
1320		- other.marked = marked;
1321		- other.skip = skip;
1322		- other.count = count;
1323		- other.flipV = flipV;
1324		- other.live = live;
1325		- other.rewind = rewind;
1326		- other.hide = hide;
1327		- other.texres = texres;
1328		- other.speedup = speedup;
1329		- other.height = height;
1330		- other.depth = depth;
1331	1438
1332	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1333	1440	// {
..	..	@@ -1383,17 +1490,24 @@
1383	1490	if ((mask & GEOMETRY) != 0)
1384	1491	{
1385	1492	if (bRep != null)
1386		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1387		- else
1388		- assert(other.bRep == null);
1389		-
1390		- if (bRep != null)
1391	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1392	1495	CameraPane.RemoveList(bRep.displaylist);
1393	1496	bRep.displaylist = 0; // june 2013 -1;
1394	1497	}
1395	1498	else
1396		- 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;
1397	1511	}
1398	1512
1399	1513	/* Use a MASK = GEO/MAT
..	..	@@ -3189,7 +3303,10 @@
3189	3303	{
3190	3304	if (bRep != null)
3191	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3192	3307	bRep.GenerateNormals(crease);
	3308	+ if (!bRep.trimmed)
	3309	+ bRep.MergeNormals();
3193	3310	Touch();
3194	3311	}
3195	3312	}
..	..	@@ -3264,6 +3381,105 @@
3264	3381	blockloop = false;
3265	3382	}
3266	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	+
3267	3483	void TransformChildren()
3268	3484	{
3269	3485	if (toParent != null)
..	..	@@ -3506,6 +3722,7 @@
3506	3722	if (bRep != null)
3507	3723	{
3508	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3509	3726	System.out.println("Reducing " + this);
3510	3727	if (name != null && name.contains("lockpickstraps"))
3511	3728	name = name;
..	..	@@ -3836,6 +4053,7 @@
3836	4053
3837	4054	void RevertMeshes()
3838	4055	{
	4056	+ // BLOCKLOOP
3839	4057	if (this instanceof cMesh)
3840	4058	{
3841	4059	((cMesh)this).Revert();
..	..	@@ -3866,11 +4084,6 @@
3866	4084	Touch();
3867	4085	}
3868	4086
3869		- ResetRecur();
3870		- }
3871		-
3872		- void ResetRecur()
3873		- {
3874	4087	for (int i = 0; i < size(); i++)
3875	4088	{
3876	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3893,11 +4106,6 @@
3893	4106	Step();
3894	4107	Touch();
3895	4108
3896		- StepRecur();
3897		- }
3898		-
3899		- void StepRecur()
3900		- {
3901	4109	for (int i = 0; i < size(); i++)
3902	4110	{
3903	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4084,8 +4292,8 @@
4084	4292	Touch();
4085	4293	}
4086	4294
4087		- transient cVector min = new cVector();
4088		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
4089	4297
4090	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
4091	4299	{
..	..	@@ -4101,15 +4309,15 @@
4101	4309	if (blockloop)
4102	4310	return;
4103	4311
4104		- if (min == null) // ???
	4312	+ if (min == null)
4105	4313	{
4106	4314	min = new cVector();
4107	4315	max = new cVector();
4108	4316	}
4109	4317
4110		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
4111	4319	{
4112		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
4113	4321	if (child == null)
4114	4322	continue;
4115	4323
..	..	@@ -4128,21 +4336,21 @@
4128	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4129	4337	//if (child.hide)
4130	4338	{
4131		- release(i);
	4339	+ //release(i);
4132	4340	continue;
4133	4341	}
4134	4342
4135	4343	blockloop = true;
4136	4344	child.getBounds(min, max, true); // xform);
4137	4345	blockloop = false;
4138		- release(i);
	4346	+ //release(i);
4139	4347
4140	4348	MinMax(minima, maxima);
4141	4349	}
4142	4350
4143	4351	if (bRep != null)
4144	4352	{
4145		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
4146	4354	}
4147	4355
4148	4356	if (false) // xform)
..	..	@@ -5951,7 +6159,7 @@
5951	6159	boolean NeedSupport()
5952	6160	{
5953	6161	return
5954		- 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
5955	6163	// PROBLEM with CROWD!!
5956	6164	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5957	6165	}
..	..	@@ -5969,6 +6177,20 @@
5969	6177	return parent.IsLive();
5970	6178	}
5971	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	+
5972	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5973	6195	{
5974	6196	Invariants(); // june 2013
..	..	@@ -5976,6 +6198,29 @@
5976	6198	if (support != null)
5977	6199	{
5978	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	+ }
5979	6224	}
5980	6225
5981	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -6029,7 +6274,8 @@
6029	6274	if (support != null)
6030	6275	support = support;
6031	6276
6032		- 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);
6033	6279	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6034	6280
6035	6281	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -6040,7 +6286,8 @@
6040	6286	bRep.displaylist = 0;
6041	6287	}
6042	6288	// usecalllists &= !(parent instanceof RandomNode);
6043		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
6044	6291
6045	6292	if (display.DrawMode() == display.SHADOW)
6046	6293	//GetBRep() != null)
..	..	@@ -6096,8 +6343,8 @@
6096	6343	Globals.lighttouched = true; // all panes...
6097	6344	}
6098	6345
6099		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
6100		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
6101	6348
6102	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
6103	6350	{
..	..	@@ -6136,7 +6383,7 @@
6136	6383	{
6137	6384	if (display.DrawMode() == iCameraPane.SHADOW)
6138	6385	{
6139		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
6140	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6141	6388	{
6142	6389	//System.out.print("CULLED");
..	..	@@ -6198,6 +6445,20 @@
6198	6445	{
6199	6446	drawSelf(display, root, selected, blocked);
6200	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	+// }
6201	6462	} else
6202	6463	{
6203	6464	/*
..	..	@@ -6230,13 +6491,14 @@
6230	6491	boolean failedPigment = false;
6231	6492	boolean failedBump = false;
6232	6493
	6494	+ CameraPane.lastObject = this;
6233	6495	try
6234	6496	{
6235	6497	display.BindPigmentTexture(tex, texres);
6236	6498	}
6237	6499	catch (Exception e)
6238	6500	{
6239		- System.err.println("FAILED: " + this);
	6501	+ // System.err.println("FAILED: " + this);
6240	6502	failedPigment = true;
6241	6503	}
6242	6504
..	..	@@ -6267,6 +6529,20 @@
6267	6529	display.CallList(bRep.displaylist);
6268	6530	// june 2013 drawSelf(display, root, selected);
6269	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	+// }
6270	6546	}
6271	6547	}
6272	6548
..	..	@@ -6320,16 +6596,17 @@
6320	6596
6321	6597	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6322	6598	{
6323		- if (GetBRep() == null)
6324		- {
6325		- drawSelf(display, root, selected, blocked);
6326		- } else
	6599	+ if (GetBRep() != null)
6327	6600	{
6328	6601	DrawNode(display, root, selected);
6329	6602	if (this instanceof BezierPatch)
6330	6603	{
6331	6604	//drawSelf(display, root, selected);
6332	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
6333	6610	}
6334	6611	}
6335	6612
..	..	@@ -6579,7 +6856,7 @@
6579	6856
6580	6857	//javax.media.opengl.GL gl = display.GetGL();
6581	6858
6582		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
6583	6860	{
6584	6861	int fc = bRep.FaceCount();
6585	6862	int vc = bRep.VertexCount();
..	..	@@ -6741,7 +7018,7 @@
6741	7018	facescompare[k] = new FaceCompare(k);
6742	7019	}
6743	7020
6744		- center = new cVector();
	7021	+ centertriangle = new cVector();
6745	7022	}
6746	7023	else
6747	7024	{
..	..	@@ -6864,7 +7141,7 @@
6864	7141	*/
6865	7142	}
6866	7143
6867		- transient cVector center;
	7144	+ transient cVector centertriangle;
6868	7145
6869	7146	class FaceCompare implements Comparable
6870	7147	{
..	..	@@ -6893,14 +7170,14 @@
6893	7170	Vertex q = bRep.GetVertex(face.q);
6894	7171	Vertex r = bRep.GetVertex(face.r);
6895	7172
6896		- center.set(p);
6897		- center.add(q);
6898		- center.add(r);
6899		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
6900	7177
6901		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6902	7179
6903		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
6904	7181	}
6905	7182
6906	7183	return distance;
..	..	@@ -8078,12 +8355,12 @@
8078	8355	if (!Globals.ADVANCED)
8079	8356	return objname;
8080	8357
8081		- return objname + " " + System.identityHashCode(this);
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
8082	8359	}
8083	8360
8084	8361	public int hashCode()
8085	8362	{
8086		- // Fuck Vector...
	8363	+ // Do not use Vector...
8087	8364	return System.identityHashCode(this);
8088	8365	}
8089	8366
..	..	@@ -8323,8 +8600,8 @@
8323	8600	private static cVector2 qq2 = new cVector2();
8324	8601	private static cVector2 rr2 = new cVector2();
8325	8602	private static cVector2 ss2 = new cVector2();
8326		- private static cVector edge1 = new cVector();
8327		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
8328	8605	//private static cVector norm = new cVector();
8329	8606	/transient private/ int hitSomething;
8330	8607	static final int hitCenter = 1;
..	..	@@ -8522,7 +8799,275 @@
8522	8799
8523	8800	Touch();
8524	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
8525	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	+ }
8526	9071
8527	9072	public int Size()
8528	9073	{