~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -25,30 +25,108 @@
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;
	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	+ }
42	119
43	120	int VersionCount()
44	121	{
45	122	int count = 0;
46	123
47		- for (int i = versionlist.length; --i >= 0;)
48		- {
49		- if (versionlist[i] != null)
50		- count++;
51		- }
	124	+ if (versionlist != null)
	125	+ for (int i = versionlist.length; --i >= 0;)
	126	+ {
	127	+ if (versionlist[i] != null)
	128	+ count++;
	129	+ }
52	130
53	131	return count;
54	132	}
..	..	@@ -64,6 +142,7 @@
64	142	projectedVertices[i] = new cVector2(); // Others
65	143	}
66	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
67	146	}
68	147
69	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -143,7 +222,7 @@
143	222	return;
144	223
145	224	transientsupport = support;
146		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
147	226
148	227	support = null;
149	228	link2master = false;
..	..	@@ -190,8 +269,39 @@
190	269	}
191	270	}
192	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	+
193	300	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
194	301	{
	302	+ if (blockloop)
	303	+ return;
	304	+
195	305	Object3D o;
196	306
197	307	boolean isnew = false;
..	..	@@ -215,7 +325,7 @@
215	325	hashtable.put(GetUUID(), o);
216	326	}
217	327
218		- if (!blockloop)
	328	+ //if (!blockloop)
219	329	{
220	330	blockloop = true;
221	331
..	..	@@ -227,7 +337,7 @@
227	337	blockloop = false;
228	338	}
229	339
230		- if (isnew)
	340	+ //if (isnew)
231	341	ExtractBigData(o);
232	342	}
233	343
..	..	@@ -338,15 +448,15 @@
338	448
339	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
340	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
341	454	if (!hashtable.containsKey(GetUUID()))
342	455	return;
343	456
344	457	Object3D o = hashtable.get(GetUUID());
345	458
346	459	RestoreBigData(o);
347		-
348		- if (blockloop)
349		- return;
350	460
351	461	blockloop = true;
352	462
..	..	@@ -363,6 +473,7 @@
363	473	void RestoreBigData(Object3D o)
364	474	{
365	475	//System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
366	477
367	478	this.bRep = o.bRep;
368	479	if (this.support != null && o.transientrep != null)
..	..	@@ -524,7 +635,10 @@
524	635	transient boolean keepdontselect;
525	636	boolean dontselect = false;
526	637	boolean hide = false;
527		- 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	+
528	642	boolean marked = false; // animation node
529	643	boolean skip = false; // centroid issue
530	644	boolean skipmocap = false; // mocap data
..	..	@@ -532,6 +646,9 @@
532	646	boolean random = false;
533	647	boolean speedup = false;
534	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
535	652
536	653	float NORMALPUSH = 0;
537	654
..	..	@@ -550,7 +667,7 @@
550	667	{
551	668	sorted = true;
552	669
553		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
554	671	{
555	672	Object3D obji = get(i);
556	673	Object3D objj = get(i+1);
..	..	@@ -574,7 +691,7 @@
574	691	{
575	692	sorted = true;
576	693
577		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
578	695	{
579	696	Object3D obji = get(i);
580	697	Object3D objj = get(i+1);
..	..	@@ -911,7 +1028,7 @@
911	1028
912	1029	void Step()
913	1030	{
914		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
915	1032	resetmaxcount();
916	1033	resettransformcount();
917	1034	resetstep();
..	..	@@ -1104,24 +1221,28 @@
1104	1221	{
1105	1222	// return true;
1106	1223
1107		- if (material == null \|\| material.multiply)
1108		- 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;
1109	1232
1110		- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1111		- return false;
1112		-
1113		- // Transparent objects are dynamic because we have to sort the triangles.
1114		- return material.opacity > 0.99;
	1233	+ return !sort;
1115	1234	}
1116	1235
1117	1236	boolean IsOpaque()
1118	1237	{
1119	1238	// return true;
1120	1239
1121		- if (material == null \|\| material.multiply)
1122		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
1123	1244
1124		- return material.opacity > 0.99;
	1245	+ return !sort;
1125	1246	}
1126	1247
1127	1248	Object3D()
..	..	@@ -1199,8 +1320,10 @@
1199	1320
1200	1321	// will share the geometry
1201	1322	assert (!(this instanceof Composite));
1202		- return deepCopy(); // Never called for Composite
1203		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
1204	1327	}
1205	1328
1206	1329	boolean HasLoops()
..	..	@@ -1208,6 +1331,30 @@
1208	1331	return false;
1209	1332	}
1210	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	+
1211	1358	boolean IsInfinite()
1212	1359	{
1213	1360	if (blockloop)
..	..	@@ -1278,78 +1425,16 @@
1278	1425	return;
1279	1426
1280	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1281	1431	//System.out.println("COPY " + this + " to " + other);
1282	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1283	1434
1284		- other.parent = parent;
1285		- if (toParent != null)
1286		- {
1287		- other.toParent = LA.newMatrix();
1288		- other.fromParent = LA.newMatrix();
1289		- LA.matCopy(toParent, other.toParent);
1290		- LA.matCopy(fromParent, other.fromParent);
1291		- if (toParentMarked != null)
1292		- {
1293		- other.toParentMarked = LA.newMatrix();
1294		- other.fromParentMarked = LA.newMatrix();
1295		- LA.matCopy(toParentMarked, other.toParentMarked);
1296		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1297		- }
1298		- }
1299		- else
1300		- {
1301		- if (other.toParent == null)
1302		-// assert(other.toParent == null);
1303		-// new Exception().printStackTrace();
1304		- System.err.println("null parent: " + other);
1305		- }
1306		- /*
1307		- double ident[][] = LA.newMatrix();
1308		- if (bRep == null)
1309		- other.bRep = null;
1310		- else
1311		- other.bRep = new BoundaryRep(bRep, ident);
1312		- */
1313		- // Really new...
1314	1435	other.bRep = bRep; // Share the geometry
1315	1436
1316	1437	other.support = support; // Share the support
1317		-
1318		- //other.editWindow = null;
1319		- if (name == null)
1320		- other.name = null;
1321		- else
1322		- other.name = new String(name);
1323		-
1324		- if (material != null)
1325		- {
1326		- other.material = new cMaterial(material);
1327		- } else
1328		- {
1329		- other.material = null;
1330		- }
1331		-
1332		- other.GetTextures().name = GetTextures().name;
1333		-
1334		- CopyExtraMaterial(other);
1335		-
1336		- other.touched = touched;
1337		- other.softtouched = softtouched;
1338		-
1339		- other.random = random;
1340		- other.link2master = link2master;
1341		- other.transformcount = transformcount;
1342		- other.marked = marked;
1343		- other.skip = skip;
1344		- other.count = count;
1345		- other.flipV = flipV;
1346		- other.live = live;
1347		- other.rewind = rewind;
1348		- other.hide = hide;
1349		- other.texres = texres;
1350		- other.speedup = speedup;
1351		- other.height = height;
1352		- other.depth = depth;
1353	1438
1354	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1355	1440	// {
..	..	@@ -1405,17 +1490,24 @@
1405	1490	if ((mask & GEOMETRY) != 0)
1406	1491	{
1407	1492	if (bRep != null)
1408		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1409		- else
1410		- assert(other.bRep == null);
1411		-
1412		- if (bRep != null)
1413	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1414	1495	CameraPane.RemoveList(bRep.displaylist);
1415	1496	bRep.displaylist = 0; // june 2013 -1;
1416	1497	}
1417	1498	else
1418		- 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;
1419	1511	}
1420	1512
1421	1513	/* Use a MASK = GEO/MAT
..	..	@@ -3211,7 +3303,10 @@
3211	3303	{
3212	3304	if (bRep != null)
3213	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3214	3307	bRep.GenerateNormals(crease);
	3308	+ if (!bRep.trimmed)
	3309	+ bRep.MergeNormals();
3215	3310	Touch();
3216	3311	}
3217	3312	}
..	..	@@ -3322,6 +3417,18 @@
3322	3417	obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3323	3418	}
3324	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;
3325	3432	}
3326	3433
3327	3434	public void TextureRatioTransform(int axis)
..	..	@@ -3615,6 +3722,7 @@
3615	3722	if (bRep != null)
3616	3723	{
3617	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3618	3726	System.out.println("Reducing " + this);
3619	3727	if (name != null && name.contains("lockpickstraps"))
3620	3728	name = name;
..	..	@@ -3945,6 +4053,7 @@
3945	4053
3946	4054	void RevertMeshes()
3947	4055	{
	4056	+ // BLOCKLOOP
3948	4057	if (this instanceof cMesh)
3949	4058	{
3950	4059	((cMesh)this).Revert();
..	..	@@ -3975,11 +4084,6 @@
3975	4084	Touch();
3976	4085	}
3977	4086
3978		- ResetRecur();
3979		- }
3980		-
3981		- void ResetRecur()
3982		- {
3983	4087	for (int i = 0; i < size(); i++)
3984	4088	{
3985	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4002,11 +4106,6 @@
4002	4106	Step();
4003	4107	Touch();
4004	4108
4005		- StepRecur();
4006		- }
4007		-
4008		- void StepRecur()
4009		- {
4010	4109	for (int i = 0; i < size(); i++)
4011	4110	{
4012	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4193,8 +4292,8 @@
4193	4292	Touch();
4194	4293	}
4195	4294
4196		- transient cVector min = new cVector();
4197		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
4198	4297
4199	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
4200	4299	{
..	..	@@ -4210,15 +4309,15 @@
4210	4309	if (blockloop)
4211	4310	return;
4212	4311
4213		- if (min == null) // ???
	4312	+ if (min == null)
4214	4313	{
4215	4314	min = new cVector();
4216	4315	max = new cVector();
4217	4316	}
4218	4317
4219		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
4220	4319	{
4221		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
4222	4321	if (child == null)
4223	4322	continue;
4224	4323
..	..	@@ -4237,21 +4336,21 @@
4237	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4238	4337	//if (child.hide)
4239	4338	{
4240		- release(i);
	4339	+ //release(i);
4241	4340	continue;
4242	4341	}
4243	4342
4244	4343	blockloop = true;
4245	4344	child.getBounds(min, max, true); // xform);
4246	4345	blockloop = false;
4247		- release(i);
	4346	+ //release(i);
4248	4347
4249	4348	MinMax(minima, maxima);
4250	4349	}
4251	4350
4252	4351	if (bRep != null)
4253	4352	{
4254		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
4255	4354	}
4256	4355
4257	4356	if (false) // xform)
..	..	@@ -6060,7 +6159,7 @@
6060	6159	boolean NeedSupport()
6061	6160	{
6062	6161	return
6063		- 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
6064	6163	// PROBLEM with CROWD!!
6065	6164	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
6066	6165	}
..	..	@@ -6083,6 +6182,15 @@
6083	6182	return live && bRep != null;
6084	6183	}
6085	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	+
6086	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6087	6195	{
6088	6196	Invariants(); // june 2013
..	..	@@ -6090,6 +6198,29 @@
6090	6198	if (support != null)
6091	6199	{
6092	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	+ }
6093	6224	}
6094	6225
6095	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -6144,7 +6275,7 @@
6144	6275	support = support;
6145	6276
6146	6277	boolean usecalllists = !IsDynamic() &&
6147		- IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6278	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6148	6279	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6149	6280
6150	6281	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -6155,7 +6286,8 @@
6155	6286	bRep.displaylist = 0;
6156	6287	}
6157	6288	// usecalllists &= !(parent instanceof RandomNode);
6158		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
6159	6291
6160	6292	if (display.DrawMode() == display.SHADOW)
6161	6293	//GetBRep() != null)
..	..	@@ -6211,8 +6343,8 @@
6211	6343	Globals.lighttouched = true; // all panes...
6212	6344	}
6213	6345
6214		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
6215		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
6216	6348
6217	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
6218	6350	{
..	..	@@ -6251,7 +6383,7 @@
6251	6383	{
6252	6384	if (display.DrawMode() == iCameraPane.SHADOW)
6253	6385	{
6254		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
6255	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6256	6388	{
6257	6389	//System.out.print("CULLED");
..	..	@@ -6313,6 +6445,20 @@
6313	6445	{
6314	6446	drawSelf(display, root, selected, blocked);
6315	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	+// }
6316	6462	} else
6317	6463	{
6318	6464	/*
..	..	@@ -6345,13 +6491,14 @@
6345	6491	boolean failedPigment = false;
6346	6492	boolean failedBump = false;
6347	6493
	6494	+ CameraPane.lastObject = this;
6348	6495	try
6349	6496	{
6350	6497	display.BindPigmentTexture(tex, texres);
6351	6498	}
6352	6499	catch (Exception e)
6353	6500	{
6354		- System.err.println("FAILED: " + this);
	6501	+ // System.err.println("FAILED: " + this);
6355	6502	failedPigment = true;
6356	6503	}
6357	6504
..	..	@@ -6382,6 +6529,20 @@
6382	6529	display.CallList(bRep.displaylist);
6383	6530	// june 2013 drawSelf(display, root, selected);
6384	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	+// }
6385	6546	}
6386	6547	}
6387	6548
..	..	@@ -6435,16 +6596,17 @@
6435	6596
6436	6597	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6437	6598	{
6438		- if (GetBRep() == null)
6439		- {
6440		- drawSelf(display, root, selected, blocked);
6441		- } else
	6599	+ if (GetBRep() != null)
6442	6600	{
6443	6601	DrawNode(display, root, selected);
6444	6602	if (this instanceof BezierPatch)
6445	6603	{
6446	6604	//drawSelf(display, root, selected);
6447	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
6448	6610	}
6449	6611	}
6450	6612
..	..	@@ -6694,7 +6856,7 @@
6694	6856
6695	6857	//javax.media.opengl.GL gl = display.GetGL();
6696	6858
6697		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
6698	6860	{
6699	6861	int fc = bRep.FaceCount();
6700	6862	int vc = bRep.VertexCount();
..	..	@@ -6856,7 +7018,7 @@
6856	7018	facescompare[k] = new FaceCompare(k);
6857	7019	}
6858	7020
6859		- center = new cVector();
	7021	+ centertriangle = new cVector();
6860	7022	}
6861	7023	else
6862	7024	{
..	..	@@ -6979,7 +7141,7 @@
6979	7141	*/
6980	7142	}
6981	7143
6982		- transient cVector center;
	7144	+ transient cVector centertriangle;
6983	7145
6984	7146	class FaceCompare implements Comparable
6985	7147	{
..	..	@@ -7008,14 +7170,14 @@
7008	7170	Vertex q = bRep.GetVertex(face.q);
7009	7171	Vertex r = bRep.GetVertex(face.r);
7010	7172
7011		- center.set(p);
7012		- center.add(q);
7013		- center.add(r);
7014		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
7015	7177
7016		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
7017	7179
7018		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
7019	7181	}
7020	7182
7021	7183	return distance;
..	..	@@ -8190,15 +8352,15 @@
8190	8352	} // + super.toString();
8191	8353	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
8192	8354
8193		-// if (!Globals.ADVANCED)
8194		-// return objname;
	8355	+ if (!Globals.ADVANCED)
	8356	+ return objname;
8195	8357
8196		- return objname + " " + System.identityHashCode(this); // + GetUUID()
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
8197	8359	}
8198	8360
8199	8361	public int hashCode()
8200	8362	{
8201		- // Fuck Vector...
	8363	+ // Do not use Vector...
8202	8364	return System.identityHashCode(this);
8203	8365	}
8204	8366
..	..	@@ -8438,8 +8600,8 @@
8438	8600	private static cVector2 qq2 = new cVector2();
8439	8601	private static cVector2 rr2 = new cVector2();
8440	8602	private static cVector2 ss2 = new cVector2();
8441		- private static cVector edge1 = new cVector();
8442		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
8443	8605	//private static cVector norm = new cVector();
8444	8606	/transient private/ int hitSomething;
8445	8607	static final int hitCenter = 1;
..	..	@@ -8637,7 +8799,275 @@
8637	8799
8638	8800	Touch();
8639	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
8640	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	+ }
8641	9071
8642	9072	public int Size()
8643	9073	{