~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -25,30 +25,106 @@
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
41	44	ScriptNode scriptnode;
42	45
	46	+ void deepCopyNode(Object3D other)
	47	+ {
	48	+ other.skyboxname = skyboxname;
	49	+ other.skyboxext = skyboxext;
	50	+
	51	+ if (toParent != null)
	52	+ {
	53	+ other.toParent = LA.newMatrix();
	54	+ other.fromParent = LA.newMatrix();
	55	+ LA.matCopy(toParent, other.toParent);
	56	+ LA.matCopy(fromParent, other.fromParent);
	57	+ if (toParentMarked != null)
	58	+ {
	59	+ other.toParentMarked = LA.newMatrix();
	60	+ other.fromParentMarked = LA.newMatrix();
	61	+ LA.matCopy(toParentMarked, other.toParentMarked);
	62	+ LA.matCopy(fromParentMarked, other.fromParentMarked);
	63	+ }
	64	+ }
	65	+ else
	66	+ {
	67	+ if (other.toParent == null)
	68	+// assert(other.toParent == null);
	69	+// new Exception().printStackTrace();
	70	+ System.err.println("null parent: " + other);
	71	+ }
	72	+
	73	+ /*
	74	+ double ident[][] = LA.newMatrix();
	75	+ if (bRep == null)
	76	+ other.bRep = null;
	77	+ else
	78	+ other.bRep = new BoundaryRep(bRep, ident);
	79	+ */
	80	+ // Really new...
	81	+ //other.editWindow = null;
	82	+ if (name == null)
	83	+ other.name = null;
	84	+ else
	85	+ other.name = new String(name);
	86	+
	87	+ if (material != null)
	88	+ {
	89	+ other.material = new cMaterial(material);
	90	+ } else
	91	+ {
	92	+ other.material = null;
	93	+ }
	94	+
	95	+ other.GetTextures().name = GetTextures().name;
	96	+
	97	+ CopyExtraMaterial(other);
	98	+
	99	+ other.touched = touched;
	100	+ other.softtouched = softtouched;
	101	+
	102	+ other.random = random;
	103	+ other.link2master = link2master;
	104	+ other.transformcount = transformcount;
	105	+ other.marked = marked;
	106	+ other.skip = skip;
	107	+ other.count = count;
	108	+ other.flipV = flipV;
	109	+ other.live = live;
	110	+ other.rewind = rewind;
	111	+ other.hide = hide;
	112	+ other.texres = texres;
	113	+ other.speedup = speedup;
	114	+ other.height = height;
	115	+ other.depth = depth;
	116	+ }
	117	+
43	118	int VersionCount()
44	119	{
45	120	int count = 0;
46	121
47		- for (int i = versionlist.length; --i >= 0;)
48		- {
49		- if (versionlist[i] != null)
50		- count++;
51		- }
	122	+ if (versionlist != null)
	123	+ for (int i = versionlist.length; --i >= 0;)
	124	+ {
	125	+ if (versionlist[i] != null)
	126	+ count++;
	127	+ }
52	128
53	129	return count;
54	130	}
..	..	@@ -64,6 +140,7 @@
64	140	projectedVertices[i] = new cVector2(); // Others
65	141	}
66	142	projectedVertices[0].x = 100; // bump
	143	+ projectedVertices[1].y = 1000; // punchthrough. only for png
67	144	}
68	145
69	146	void MinMax(cVector minima, cVector maxima)
..	..	@@ -190,8 +267,39 @@
190	267	}
191	268	}
192	269
	270	+ boolean HasBigData()
	271	+ {
	272	+ if (blockloop)
	273	+ return false;
	274	+
	275	+ if (bRep != null)
	276	+ {
	277	+ return true;
	278	+ }
	279	+
	280	+ blockloop = true;
	281	+
	282	+ for (int i = 0; i < Size(); i++)
	283	+ {
	284	+ Object3D child = (Object3D) get(i);
	285	+ if (child == null)
	286	+ continue;
	287	+ if (child.HasBigData())
	288	+ {
	289	+ blockloop = false;
	290	+ return true;
	291	+ }
	292	+ }
	293	+
	294	+ blockloop = false;
	295	+ return false;
	296	+ }
	297	+
193	298	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
194	299	{
	300	+ if (blockloop)
	301	+ return;
	302	+
195	303	Object3D o;
196	304
197	305	boolean isnew = false;
..	..	@@ -215,7 +323,7 @@
215	323	hashtable.put(GetUUID(), o);
216	324	}
217	325
218		- if (!blockloop)
	326	+ //if (!blockloop)
219	327	{
220	328	blockloop = true;
221	329
..	..	@@ -227,7 +335,7 @@
227	335	blockloop = false;
228	336	}
229	337
230		- if (isnew)
	338	+ //if (isnew)
231	339	ExtractBigData(o);
232	340	}
233	341
..	..	@@ -338,15 +446,15 @@
338	446
339	447	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
340	448	{
	449	+ if (blockloop)
	450	+ return;
	451	+
341	452	if (!hashtable.containsKey(GetUUID()))
342	453	return;
343	454
344	455	Object3D o = hashtable.get(GetUUID());
345	456
346	457	RestoreBigData(o);
347		-
348		- if (blockloop)
349		- return;
350	458
351	459	blockloop = true;
352	460
..	..	@@ -363,6 +471,7 @@
363	471	void RestoreBigData(Object3D o)
364	472	{
365	473	//System.err.println("RestoreBigData : " + this + " <-- " + o);
	474	+ Grafreed.Assert(this.bRep == null);
366	475
367	476	this.bRep = o.bRep;
368	477	if (this.support != null && o.transientrep != null)
..	..	@@ -524,7 +633,7 @@
524	633	transient boolean keepdontselect;
525	634	boolean dontselect = false;
526	635	boolean hide = false;
527		- boolean link2master = false; // performs reset support/master at each frame
	636	+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
528	637	boolean marked = false; // animation node
529	638	boolean skip = false; // centroid issue
530	639	boolean skipmocap = false; // mocap data
..	..	@@ -532,6 +641,9 @@
532	641	boolean random = false;
533	642	boolean speedup = false;
534	643	boolean rewind = false;
	644	+
	645	+ // Option to sort triangles, e.g. for transparency.
	646	+ boolean sort = false;
535	647
536	648	float NORMALPUSH = 0;
537	649
..	..	@@ -550,7 +662,7 @@
550	662	{
551	663	sorted = true;
552	664
553		- for (int i=0; i<size()-1; i++)
	665	+ for (int i=0; i<Size()-1; i++)
554	666	{
555	667	Object3D obji = get(i);
556	668	Object3D objj = get(i+1);
..	..	@@ -574,7 +686,7 @@
574	686	{
575	687	sorted = true;
576	688
577		- for (int i=0; i<size()-1; i++)
	689	+ for (int i=0; i<Size()-1; i++)
578	690	{
579	691	Object3D obji = get(i);
580	692	Object3D objj = get(i+1);
..	..	@@ -911,7 +1023,7 @@
911	1023
912	1024	void Step()
913	1025	{
914		- // marde pour serialization de Texture
	1026	+ // patch pour serialization de Texture
915	1027	resetmaxcount();
916	1028	resettransformcount();
917	1029	resetstep();
..	..	@@ -1104,24 +1216,28 @@
1104	1216	{
1105	1217	// return true;
1106	1218
1107		- if (material == null \|\| material.multiply)
1108		- return true;
	1219	+// if (material == null \|\| material.multiply)
	1220	+// return true;
	1221	+//
	1222	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1223	+// return false;
	1224	+//
	1225	+// // Transparent objects are dynamic because we have to sort the triangles.
	1226	+// return material.opacity > 0.99;
1109	1227
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;
	1228	+ return !sort;
1115	1229	}
1116	1230
1117	1231	boolean IsOpaque()
1118	1232	{
1119	1233	// return true;
1120	1234
1121		- if (material == null \|\| material.multiply)
1122		- return true;
	1235	+// if (material == null \|\| material.multiply)
	1236	+// return true;
	1237	+//
	1238	+// return material.opacity > 0.99;
1123	1239
1124		- return material.opacity > 0.99;
	1240	+ return !sort;
1125	1241	}
1126	1242
1127	1243	Object3D()
..	..	@@ -1199,8 +1315,10 @@
1199	1315
1200	1316	// will share the geometry
1201	1317	assert (!(this instanceof Composite));
1202		- return deepCopy(); // Never called for Composite
1203		-
	1318	+
	1319	+ Object3D obj = deepCopy(); // Never called for Composite
	1320	+ obj.count = 2;
	1321	+ return obj;
1204	1322	}
1205	1323
1206	1324	boolean HasLoops()
..	..	@@ -1208,6 +1326,30 @@
1208	1326	return false;
1209	1327	}
1210	1328
	1329	+ void ResetUUIDs()
	1330	+ {
	1331	+ if (blockloop)
	1332	+ {
	1333	+ return;
	1334	+ }
	1335	+
	1336	+ this.uuid = null;
	1337	+
	1338	+ blockloop = true;
	1339	+
	1340	+ for (int i = 0; i < Size(); i++)
	1341	+ {
	1342	+ Object3D obj = (Object3D) Children().get(i);
	1343	+
	1344	+ if (obj != null)
	1345	+ {
	1346	+ obj.ResetUUIDs();
	1347	+ }
	1348	+ }
	1349	+
	1350	+ blockloop = false;
	1351	+ }
	1352	+
1211	1353	boolean IsInfinite()
1212	1354	{
1213	1355	if (blockloop)
..	..	@@ -1278,78 +1420,16 @@
1278	1420	return;
1279	1421
1280	1422	blockloop = true;
	1423	+
	1424	+ other.parent = parent;
	1425	+
1281	1426	//System.out.println("COPY " + this + " to " + other);
1282	1427	//new Exception().printStackTrace();
	1428	+ deepCopyNode(other);
1283	1429
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	1430	other.bRep = bRep; // Share the geometry
1315	1431
1316	1432	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	1433
1354	1434	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1355	1435	// {
..	..	@@ -1405,17 +1485,24 @@
1405	1485	if ((mask & GEOMETRY) != 0)
1406	1486	{
1407	1487	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	1488	{
	1489	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1414	1490	CameraPane.RemoveList(bRep.displaylist);
1415	1491	bRep.displaylist = 0; // june 2013 -1;
1416	1492	}
1417	1493	else
1418		- bRep = bRep;
	1494	+ {
	1495	+ //assert(other.bRep == null);
	1496	+ bRep = other.bRep;
	1497	+ }
	1498	+
	1499	+// if (bRep != null)
	1500	+// {
	1501	+// CameraPane.RemoveList(bRep.displaylist);
	1502	+// bRep.displaylist = 0; // june 2013 -1;
	1503	+// }
	1504	+// else
	1505	+// bRep = bRep;
1419	1506	}
1420	1507
1421	1508	/* Use a MASK = GEO/MAT
..	..	@@ -3211,7 +3298,10 @@
3211	3298	{
3212	3299	if (bRep != null)
3213	3300	{
	3301	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3214	3302	bRep.GenerateNormals(crease);
	3303	+ if (!bRep.trimmed)
	3304	+ bRep.MergeNormals();
3215	3305	Touch();
3216	3306	}
3217	3307	}
..	..	@@ -3322,6 +3412,18 @@
3322	3412	obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3323	3413	}
3324	3414	}
	3415	+ }
	3416	+
	3417	+ public void Scale(int scale)
	3418	+ {
	3419	+ Object3D obj = this;
	3420	+
	3421	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3422	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3423	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3424	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3425	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3426	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3325	3427	}
3326	3428
3327	3429	public void TextureRatioTransform(int axis)
..	..	@@ -3615,6 +3717,7 @@
3615	3717	if (bRep != null)
3616	3718	{
3617	3719	//bRep.RemoveOneTriangle();
	3720	+ System.out.println();
3618	3721	System.out.println("Reducing " + this);
3619	3722	if (name != null && name.contains("lockpickstraps"))
3620	3723	name = name;
..	..	@@ -3945,6 +4048,7 @@
3945	4048
3946	4049	void RevertMeshes()
3947	4050	{
	4051	+ // BLOCKLOOP
3948	4052	if (this instanceof cMesh)
3949	4053	{
3950	4054	((cMesh)this).Revert();
..	..	@@ -3975,11 +4079,6 @@
3975	4079	Touch();
3976	4080	}
3977	4081
3978		- ResetRecur();
3979		- }
3980		-
3981		- void ResetRecur()
3982		- {
3983	4082	for (int i = 0; i < size(); i++)
3984	4083	{
3985	4084	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4002,11 +4101,6 @@
4002	4101	Step();
4003	4102	Touch();
4004	4103
4005		- StepRecur();
4006		- }
4007		-
4008		- void StepRecur()
4009		- {
4010	4104	for (int i = 0; i < size(); i++)
4011	4105	{
4012	4106	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4193,8 +4287,8 @@
4193	4287	Touch();
4194	4288	}
4195	4289
4196		- transient cVector min = new cVector();
4197		- transient cVector max = new cVector();
	4290	+ transient cVector min;
	4291	+ transient cVector max;
4198	4292
4199	4293	void getBounds(cVector minima, cVector maxima, boolean xform)
4200	4294	{
..	..	@@ -4210,15 +4304,15 @@
4210	4304	if (blockloop)
4211	4305	return;
4212	4306
4213		- if (min == null) // ???
	4307	+ if (min == null)
4214	4308	{
4215	4309	min = new cVector();
4216	4310	max = new cVector();
4217	4311	}
4218	4312
4219		- for (int i = 0; i<size(); i++)
	4313	+ for (int i = 0; i<Size(); i++)
4220	4314	{
4221		- Object3D child = (Object3D) reserve(i);
	4315	+ Object3D child = (Object3D) get(i); //reserve(i);
4222	4316	if (child == null)
4223	4317	continue;
4224	4318
..	..	@@ -4237,21 +4331,21 @@
4237	4331	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4238	4332	//if (child.hide)
4239	4333	{
4240		- release(i);
	4334	+ //release(i);
4241	4335	continue;
4242	4336	}
4243	4337
4244	4338	blockloop = true;
4245	4339	child.getBounds(min, max, true); // xform);
4246	4340	blockloop = false;
4247		- release(i);
	4341	+ //release(i);
4248	4342
4249	4343	MinMax(minima, maxima);
4250	4344	}
4251	4345
4252	4346	if (bRep != null)
4253	4347	{
4254		- bRep.getBounds(minima,maxima,this);
	4348	+ bRep.getBounds(minima, maxima, xform?this:null);
4255	4349	}
4256	4350
4257	4351	if (false) // xform)
..	..	@@ -6083,6 +6177,10 @@
6083	6177	return live && bRep != null;
6084	6178	}
6085	6179
	6180	+ static cVector minima = new cVector();
	6181	+ static cVector maxima = new cVector();
	6182	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6183	+
6086	6184	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6087	6185	{
6088	6186	Invariants(); // june 2013
..	..	@@ -6090,6 +6188,29 @@
6090	6188	if (support != null)
6091	6189	{
6092	6190	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6191	+ }
	6192	+
	6193	+ if (live && link2master && support == null && !this.marked) // project on ground
	6194	+ {
	6195	+ getBounds(minima, maxima, true);
	6196	+ center.x = (minima.x + maxima.x) / 2;
	6197	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6198	+ center.z = (minima.z + maxima.z) / 2;
	6199	+
	6200	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6201	+
	6202	+ IntersectResult res = new IntersectResult();
	6203	+ res.t = Double.POSITIVE_INFINITY;
	6204	+
	6205	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6206	+ {
	6207	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6208	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6209	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6210	+
	6211	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6212	+ LA.matInvert(toParent, fromParent);
	6213	+ }
6093	6214	}
6094	6215
6095	6216	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -6211,8 +6332,8 @@
6211	6332	Globals.lighttouched = true; // all panes...
6212	6333	}
6213	6334
6214		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
6215		- //touched = false;
	6335	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6336	+ touched = false;
6216	6337
6217	6338	if (this instanceof Texture \|\| this instanceof TextureNode)
6218	6339	{
..	..	@@ -6313,6 +6434,20 @@
6313	6434	{
6314	6435	drawSelf(display, root, selected, blocked);
6315	6436	}
	6437	+
	6438	+// if (!(this instanceof Composite))
	6439	+// {
	6440	+// for (int i = 0; i < size(); i++)
	6441	+// {
	6442	+// Object3D child = (Object3D) reserve(i);
	6443	+// if (child == null)
	6444	+// continue;
	6445	+//
	6446	+// child.draw(display, root, selected, blocked);
	6447	+//
	6448	+// release(i);
	6449	+// }
	6450	+// }
6316	6451	} else
6317	6452	{
6318	6453	/*
..	..	@@ -6345,13 +6480,14 @@
6345	6480	boolean failedPigment = false;
6346	6481	boolean failedBump = false;
6347	6482
	6483	+ CameraPane.lastObject = this;
6348	6484	try
6349	6485	{
6350	6486	display.BindPigmentTexture(tex, texres);
6351	6487	}
6352	6488	catch (Exception e)
6353	6489	{
6354		- System.err.println("FAILED: " + this);
	6490	+ // System.err.println("FAILED: " + this);
6355	6491	failedPigment = true;
6356	6492	}
6357	6493
..	..	@@ -6382,6 +6518,20 @@
6382	6518	display.CallList(bRep.displaylist);
6383	6519	// june 2013 drawSelf(display, root, selected);
6384	6520	}
	6521	+ }
	6522	+
	6523	+ assert (!(this instanceof Composite));
	6524	+ {
	6525	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6526	+// {
	6527	+// Object3D child = (Object3D) reserve(i);
	6528	+// if (child == null)
	6529	+// continue;
	6530	+//
	6531	+// child.draw(display, root, selected, blocked);
	6532	+//
	6533	+// release(i);
	6534	+// }
6385	6535	}
6386	6536	}
6387	6537
..	..	@@ -6435,16 +6585,17 @@
6435	6585
6436	6586	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6437	6587	{
6438		- if (GetBRep() == null)
6439		- {
6440		- drawSelf(display, root, selected, blocked);
6441		- } else
	6588	+ if (GetBRep() != null)
6442	6589	{
6443	6590	DrawNode(display, root, selected);
6444	6591	if (this instanceof BezierPatch)
6445	6592	{
6446	6593	//drawSelf(display, root, selected);
6447	6594	}
	6595	+ }
	6596	+ else
	6597	+ {
	6598	+ drawSelf(display, root, selected, blocked);
6448	6599	}
6449	6600	}
6450	6601
..	..	@@ -6856,7 +7007,7 @@
6856	7007	facescompare[k] = new FaceCompare(k);
6857	7008	}
6858	7009
6859		- center = new cVector();
	7010	+ centertriangle = new cVector();
6860	7011	}
6861	7012	else
6862	7013	{
..	..	@@ -6979,7 +7130,7 @@
6979	7130	*/
6980	7131	}
6981	7132
6982		- transient cVector center;
	7133	+ transient cVector centertriangle;
6983	7134
6984	7135	class FaceCompare implements Comparable
6985	7136	{
..	..	@@ -7008,14 +7159,14 @@
7008	7159	Vertex q = bRep.GetVertex(face.q);
7009	7160	Vertex r = bRep.GetVertex(face.r);
7010	7161
7011		- center.set(p);
7012		- center.add(q);
7013		- center.add(r);
7014		- center.mul(1.0/3);
	7162	+ centertriangle.set(p);
	7163	+ centertriangle.add(q);
	7164	+ centertriangle.add(r);
	7165	+ centertriangle.mul(1.0/3);
7015	7166
7016		- center.sub(Globals.theRenderer.EyeCamera().location);
	7167	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
7017	7168
7018		- distance = center.dot(center);
	7169	+ distance = centertriangle.dot(centertriangle);
7019	7170	}
7020	7171
7021	7172	return distance;
..	..	@@ -8190,10 +8341,10 @@
8190	8341	} // + super.toString();
8191	8342	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
8192	8343
8193		-// if (!Globals.ADVANCED)
8194		-// return objname;
	8344	+ if (!Globals.ADVANCED)
	8345	+ return objname;
8195	8346
8196		- return objname + " " + System.identityHashCode(this); // + GetUUID()
	8347	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
8197	8348	}
8198	8349
8199	8350	public int hashCode()
..	..	@@ -8438,8 +8589,8 @@
8438	8589	private static cVector2 qq2 = new cVector2();
8439	8590	private static cVector2 rr2 = new cVector2();
8440	8591	private static cVector2 ss2 = new cVector2();
8441		- private static cVector edge1 = new cVector();
8442		- private static cVector edge2 = new cVector();
	8592	+// private static cVector edge1 = new cVector();
	8593	+// private static cVector edge2 = new cVector();
8443	8594	//private static cVector norm = new cVector();
8444	8595	/transient private/ int hitSomething;
8445	8596	static final int hitCenter = 1;
..	..	@@ -8637,7 +8788,275 @@
8637	8788
8638	8789	Touch();
8639	8790	}
	8791	+
	8792	+ static Vertex s1 = new Vertex();
	8793	+ static Vertex s2 = new Vertex();
	8794	+ static Vertex s3 = new Vertex();
8640	8795
	8796	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8797	+ {
	8798	+ boolean success = false;
	8799	+
	8800	+ if (bRep.stripified)
	8801	+ {
	8802	+ int[] strips = bRep.getRawIndices();
	8803	+
	8804	+ // TRIANGLE STRIP ARRAY
	8805	+ if (bRep.trimmed)
	8806	+ {
	8807	+ float[] v = bRep.getRawVertices();
	8808	+
	8809	+ int count3 = 0;
	8810	+
	8811	+ if (v.length > 0)
	8812	+ {
	8813	+ for (int i = 0; i < strips.length; i++)
	8814	+ {
	8815	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8816	+ count3 += 3;
	8817	+
	8818	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8819	+ count3 += 3;
	8820	+
	8821	+ for (int j = 0; j < strips[i] - 2; j++)
	8822	+ {
	8823	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8824	+ count3 += 3;
	8825	+
	8826	+ if (j%2 == 0)
	8827	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8828	+ else
	8829	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8830	+
	8831	+ s1.set(s2);
	8832	+ s2.set(s3);
	8833	+ }
	8834	+ }
	8835	+ }
	8836	+
	8837	+ assert count3 == v.length;
	8838	+ }
	8839	+ else // !trimmed
	8840	+ {
	8841	+ int count = 0;
	8842	+ for (int i = 0; i < strips.length; i++)
	8843	+ {
	8844	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8845	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8846	+
	8847	+ for (int j = 0; j < strips[i] - 2; j++)
	8848	+ {
	8849	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8850	+
	8851	+ if (j%2 == 0)
	8852	+ success \|= intersectTriangle(ray, result, p, q, r);
	8853	+ else
	8854	+ success \|= intersectTriangle(ray, result, p, r, q);
	8855	+
	8856	+ p = q;
	8857	+ q = r;
	8858	+ }
	8859	+ }
	8860	+ }
	8861	+ } else // catch (Error e)
	8862	+ {
	8863	+ int facecount = bRep.FaceCount();
	8864	+ for (int i = 0; i < facecount; i++)
	8865	+ {
	8866	+ Face face = bRep.GetFace(i);
	8867	+
	8868	+ Vertex p = bRep.GetVertex(face.p);
	8869	+ Vertex q = bRep.GetVertex(face.q);
	8870	+ Vertex r = bRep.GetVertex(face.r);
	8871	+
	8872	+ success \|= intersectTriangle(ray, result, p, q, r);
	8873	+ }
	8874	+ }
	8875	+
	8876	+ return success;
	8877	+ }
	8878	+
	8879	+ static cVector eye = new cVector();
	8880	+ static cVector dir = new cVector();
	8881	+
	8882	+ transient BBox bbox = null;
	8883	+
	8884	+ boolean intersect(Ray ray, IntersectResult result)
	8885	+ {
	8886	+ double eyex = ray.eyePoint.x;
	8887	+ double eyey = ray.eyePoint.y;
	8888	+ double eyez = ray.eyePoint.z;
	8889	+
	8890	+ double dirx = ray.viewDirection.x;
	8891	+ double diry = ray.viewDirection.y;
	8892	+ double dirz = ray.viewDirection.z;
	8893	+
	8894	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8895	+ {
	8896	+ eye.x = eyex;
	8897	+ eye.y = eyey;
	8898	+ eye.z = eyez;
	8899	+ dir.x = dirx;
	8900	+ dir.y = diry;
	8901	+ dir.z = dirz;
	8902	+
	8903	+ LA.xformPos(eye, this.fromParent, eye);
	8904	+ LA.xformDir(dir, this.fromParent, dir);
	8905	+
	8906	+ ray.eyePoint.x = eye.x;
	8907	+ ray.eyePoint.y = eye.y;
	8908	+ ray.eyePoint.z = eye.z;
	8909	+
	8910	+ ray.viewDirection.x = dir.x;
	8911	+ ray.viewDirection.y = dir.y;
	8912	+ ray.viewDirection.z = dir.z;
	8913	+ }
	8914	+
	8915	+ boolean success = false;
	8916	+
	8917	+ boolean touch = false;
	8918	+
	8919	+ if (bRep != null && link2master)
	8920	+ {
	8921	+ if (bbox == null)
	8922	+ {
	8923	+ bbox = new BBox();
	8924	+
	8925	+ cVector min = new cVector();
	8926	+ cVector max = new cVector();
	8927	+
	8928	+ this.getBounds(min, max, true);
	8929	+
	8930	+ bbox.min.x = min.x;
	8931	+ bbox.min.y = min.y;
	8932	+ bbox.min.z = min.z;
	8933	+
	8934	+ bbox.max.x = max.x;
	8935	+ bbox.max.y = max.y;
	8936	+ bbox.max.z = max.z;
	8937	+ }
	8938	+
	8939	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8940	+ {
	8941	+ success \|= intersectMesh(ray, result);
	8942	+ }
	8943	+ else
	8944	+ {
	8945	+ //this.hide = true;
	8946	+ touch = true;
	8947	+ }
	8948	+ }
	8949	+
	8950	+ for (int i=0; i<size(); i++)
	8951	+ {
	8952	+ Object3D child = (Object3D) reserve(i);
	8953	+
	8954	+ if (child == null)
	8955	+ continue;
	8956	+
	8957	+ success \|= child.intersect(ray, result);
	8958	+ release(i);
	8959	+ }
	8960	+
	8961	+ ray.eyePoint.x = eyex;
	8962	+ ray.eyePoint.y = eyey;
	8963	+ ray.eyePoint.z = eyez;
	8964	+
	8965	+ ray.viewDirection.x = dirx;
	8966	+ ray.viewDirection.y = diry;
	8967	+ ray.viewDirection.z = dirz;
	8968	+
	8969	+// if (touch)
	8970	+// this.Touch(); // refresh display list
	8971	+
	8972	+ return success;
	8973	+ }
	8974	+
	8975	+ static Vector3d edge1 = new Vector3d();
	8976	+ static Vector3d edge2 = new Vector3d();
	8977	+ static Vector3d P = new Vector3d();
	8978	+ static Vector3d T = new Vector3d();
	8979	+ static Vector3d Q = new Vector3d();
	8980	+
	8981	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8982	+ {
	8983	+ if (false)
	8984	+ {
	8985	+ result.t = 0;
	8986	+ return true;
	8987	+ }
	8988	+
	8989	+ /*
	8990	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	8991	+
	8992	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	8993	+ */
	8994	+
	8995	+ // Calculate edges of the triangle
	8996	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	8997	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	8998	+
	8999	+ // Calculate the determinant (U parameter)
	9000	+ P.cross(ray.viewDirection, edge2);
	9001	+ double det = edge1.dot(P);
	9002	+
	9003	+ if (det > -1e-9 && det < 1e-9)
	9004	+ {
	9005	+ return false;
	9006	+ } // Ray lies in plane of triangle
	9007	+
	9008	+ double invDet = 1 / det;
	9009	+
	9010	+ // Calculate distance from vertex1 to ray origin
	9011	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9012	+
	9013	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9014	+
	9015	+ if (U < 0.f \|\| U > 1.f)
	9016	+ {
	9017	+ return false;
	9018	+ } // Intersection lies outside of the triangle
	9019	+
	9020	+ // Calculate V parameter
	9021	+ Q.cross(T, edge1);
	9022	+
	9023	+ double V = ray.viewDirection.dot(Q) * invDet;
	9024	+
	9025	+ if (V < 0.f \|\| (U + V) > 1.f)
	9026	+ {
	9027	+ return false;
	9028	+ } // Intersection lies outside of the triangle
	9029	+
	9030	+ double t = edge2.dot(Q) * invDet;
	9031	+
	9032	+ if (t > 1e-9) // Triangle and ray intersects
	9033	+ {
	9034	+ //result.isIntersected = true;
	9035	+ //result.id = id;
	9036	+
	9037	+ if (false) // isShadow)
	9038	+ {
	9039	+ result.t = t;
	9040	+ return true;
	9041	+ } else if (t < result.t)
	9042	+ {
	9043	+ result.object = this;
	9044	+
	9045	+ result.t = t;
	9046	+
	9047	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9048	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9049	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9050	+
	9051	+ result.n.cross(edge1, edge2);
	9052	+ result.n.normalize();
	9053	+ }
	9054	+
	9055	+ return true;
	9056	+ }
	9057	+
	9058	+ return false;
	9059	+ }
8641	9060
8642	9061	public int Size()
8643	9062	{