~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,18 +22,115 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo. No need to be transient.
	28	+ // TEMPORARY for versions. No need to be transient.
28	29	mocap.reader.BVHReader.BVHResult savebvh;
29	30	Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
30	34	//
31	35
32		- byte[] versions[] = new byte[100][];
	36	+ String skyboxname;
	37	+ String skyboxext;
	38	+
	39	+ Object3D[] versionlist;
33	40	int versionindex = -1;
34	41
	42	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	43	+
	44	+ transient int tabIndex; // Tabs can change between sessions.
	45	+
35	46	ScriptNode scriptnode;
36	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	+
37	134	void InitOthers()
38	135	{
39	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -45,6 +142,7 @@
45	142	projectedVertices[i] = new cVector2(); // Others
46	143	}
47	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
48	146	}
49	147
50	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -124,7 +222,7 @@
124	222	return;
125	223
126	224	transientsupport = support;
127		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
128	226
129	227	support = null;
130	228	link2master = false;
..	..	@@ -171,9 +269,42 @@
171	269	}
172	270	}
173	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	+
174	300	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
175	301	{
	302	+ if (blockloop)
	303	+ return;
	304	+
176	305	Object3D o;
	306	+
	307	+ boolean isnew = false;
177	308
178	309	if (hashtable.containsKey(GetUUID()))
179	310	{
..	..	@@ -187,12 +318,14 @@
187	318	}
188	319	else
189	320	{
	321	+ isnew = true;
	322	+
190	323	o = new Object3D("copy of " + this.name);
191	324
192	325	hashtable.put(GetUUID(), o);
193	326	}
194	327
195		- if (!blockloop)
	328	+ //if (!blockloop)
196	329	{
197	330	blockloop = true;
198	331
..	..	@@ -203,12 +336,15 @@
203	336
204	337	blockloop = false;
205	338	}
206		-
207		- ExtractBigData(o);
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
208	342	}
209	343
210	344	void ExtractBigData(Object3D o)
211	345	{
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
212	348	if (o.bRep != null)
213	349	Grafreed.Assert(o.bRep == this.bRep);
214	350
..	..	@@ -219,6 +355,8 @@
219	355	// o.bRep.support = null;
220	356	// }
221	357	o.selection = this.selection;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
222	360
223	361	if (this.support != null)
224	362	{
..	..	@@ -241,17 +379,84 @@
241	379	// this.fileparent = null;
242	380	}
243	381
	382	+// Object3D GetObject(java.util.UUID uuid)
	383	+// {
	384	+// if (this.uuid.equals(uuid))
	385	+// return this;
	386	+//
	387	+// if (blockloop)
	388	+// return null;
	389	+//
	390	+// blockloop = true;
	391	+//
	392	+// for (int i=0; i<Size(); i++)
	393	+// {
	394	+// Object3D o = get(i).GetObject(uuid);
	395	+//
	396	+// if (o != null)
	397	+// return o;
	398	+// }
	399	+//
	400	+// blockloop = false;
	401	+//
	402	+// return null;
	403	+// }
	404	+
	405	+ transient boolean tag;
	406	+
	407	+ void TagObjects(Object3D o, boolean tag)
	408	+ {
	409	+ if (blockloop)
	410	+ return;
	411	+
	412	+ o.tag = tag;
	413	+
	414	+ if (o == this)
	415	+ return;
	416	+
	417	+ blockloop = true;
	418	+
	419	+ for (int i=0; i<Size(); i++)
	420	+ {
	421	+ get(i).TagObjects(o, tag);
	422	+ }
	423	+
	424	+ blockloop = false;
	425	+ }
	426	+
	427	+ boolean HasTags()
	428	+ {
	429	+ if (blockloop)
	430	+ return false;
	431	+
	432	+ blockloop = true;
	433	+
	434	+ boolean hasTags = false;
	435	+
	436	+ for (int i=0; i<Size(); i++)
	437	+ {
	438	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	439	+
	440	+ if (hasTags)
	441	+ break;
	442	+ }
	443	+
	444	+ blockloop = false;
	445	+
	446	+ return hasTags;
	447	+ }
	448	+
244	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
245	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
246	454	if (!hashtable.containsKey(GetUUID()))
247	455	return;
248	456
249	457	Object3D o = hashtable.get(GetUUID());
250	458
251	459	RestoreBigData(o);
252		-
253		- if (blockloop)
254		- return;
255	460
256	461	blockloop = true;
257	462
..	..	@@ -267,6 +472,9 @@
267	472
268	473	void RestoreBigData(Object3D o)
269	474	{
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
270	478	this.bRep = o.bRep;
271	479	if (this.support != null && o.transientrep != null)
272	480	{
..	..	@@ -274,6 +482,9 @@
274	482	}
275	483
276	484	this.selection = o.selection;
	485	+
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
277	488	// July 2019 if (this.bRep != null)
278	489	// this.bRep.support = o.transientrep;
279	490	// this.support = o.support;
..	..	@@ -421,9 +632,13 @@
421	632	}
422	633
423	634	boolean live = false;
	635	+ transient boolean keepdontselect;
424	636	boolean dontselect = false;
425	637	boolean hide = false;
426		- 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	+
427	642	boolean marked = false; // animation node
428	643	boolean skip = false; // centroid issue
429	644	boolean skipmocap = false; // mocap data
..	..	@@ -431,6 +646,9 @@
431	646	boolean random = false;
432	647	boolean speedup = false;
433	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
434	652
435	653	float NORMALPUSH = 0;
436	654
..	..	@@ -449,7 +667,7 @@
449	667	{
450	668	sorted = true;
451	669
452		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
453	671	{
454	672	Object3D obji = get(i);
455	673	Object3D objj = get(i+1);
..	..	@@ -473,7 +691,7 @@
473	691	{
474	692	sorted = true;
475	693
476		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
477	695	{
478	696	Object3D obji = get(i);
479	697	Object3D objj = get(i+1);
..	..	@@ -489,11 +707,11 @@
489	707	}
490	708	}
491	709
492		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
493	711
494	712	int MemorySize()
495	713	{
496		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
497	715	{
498	716	try
499	717	{
..	..	@@ -608,7 +826,7 @@
608	826	{
609	827	if (maxcount != 1)
610	828	{
611		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
612	830	}
613	831
614	832	toParentMarked = LA.newMatrix();
..	..	@@ -810,7 +1028,7 @@
810	1028
811	1029	void Step()
812	1030	{
813		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
814	1032	resetmaxcount();
815	1033	resettransformcount();
816	1034	resetstep();
..	..	@@ -924,6 +1142,8 @@
924	1142	(Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
925	1143	currentframe != Globals.framecount)
926	1144	{
	1145	+ Globals.lighttouched = true;
	1146	+
927	1147	currentframe = Globals.framecount;
928	1148
929	1149	// System.err.println("transformcount = " + transformcount);
..	..	@@ -1003,21 +1223,28 @@
1003	1223	{
1004	1224	// return true;
1005	1225
1006		- if (material == null \|\| material.multiply)
1007		- return true;
	1226	+// if (material == null \|\| material.multiply)
	1227	+// return true;
	1228	+//
	1229	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1230	+// return false;
	1231	+//
	1232	+// // Transparent objects are dynamic because we have to sort the triangles.
	1233	+// return material.opacity > 0.99;
1008	1234
1009		- // Transparent objects are dynamic because we have to sort the triangles.
1010		- return material.opacity > 0.99;
	1235	+ return !sort;
1011	1236	}
1012	1237
1013	1238	boolean IsOpaque()
1014	1239	{
1015	1240	// return true;
1016	1241
1017		- if (material == null \|\| material.multiply)
1018		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
1019	1246
1020		- return material.opacity > 0.99;
	1247	+ return !sort;
1021	1248	}
1022	1249
1023	1250	Object3D()
..	..	@@ -1095,8 +1322,10 @@
1095	1322
1096	1323	// will share the geometry
1097	1324	assert (!(this instanceof Composite));
1098		- return deepCopy(); // Never called for Composite
1099		-
	1325	+
	1326	+ Object3D obj = deepCopy(); // Never called for Composite
	1327	+ obj.count = 2;
	1328	+ return obj;
1100	1329	}
1101	1330
1102	1331	boolean HasLoops()
..	..	@@ -1104,6 +1333,30 @@
1104	1333	return false;
1105	1334	}
1106	1335
	1336	+ void ResetUUIDs()
	1337	+ {
	1338	+ if (blockloop)
	1339	+ {
	1340	+ return;
	1341	+ }
	1342	+
	1343	+ this.uuid = null;
	1344	+
	1345	+ blockloop = true;
	1346	+
	1347	+ for (int i = 0; i < Size(); i++)
	1348	+ {
	1349	+ Object3D obj = (Object3D) Children().get(i);
	1350	+
	1351	+ if (obj != null)
	1352	+ {
	1353	+ obj.ResetUUIDs();
	1354	+ }
	1355	+ }
	1356	+
	1357	+ blockloop = false;
	1358	+ }
	1359	+
1107	1360	boolean IsInfinite()
1108	1361	{
1109	1362	if (blockloop)
..	..	@@ -1174,78 +1427,16 @@
1174	1427	return;
1175	1428
1176	1429	blockloop = true;
	1430	+
	1431	+ other.parent = parent;
	1432	+
1177	1433	//System.out.println("COPY " + this + " to " + other);
1178	1434	//new Exception().printStackTrace();
	1435	+ deepCopyNode(other);
1179	1436
1180		- other.parent = parent;
1181		- if (toParent != null)
1182		- {
1183		- other.toParent = LA.newMatrix();
1184		- other.fromParent = LA.newMatrix();
1185		- LA.matCopy(toParent, other.toParent);
1186		- LA.matCopy(fromParent, other.fromParent);
1187		- if (toParentMarked != null)
1188		- {
1189		- other.toParentMarked = LA.newMatrix();
1190		- other.fromParentMarked = LA.newMatrix();
1191		- LA.matCopy(toParentMarked, other.toParentMarked);
1192		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1193		- }
1194		- }
1195		- else
1196		- {
1197		- if (other.toParent == null)
1198		-// assert(other.toParent == null);
1199		-// new Exception().printStackTrace();
1200		- System.err.println("null parent: " + other);
1201		- }
1202		- /*
1203		- double ident[][] = LA.newMatrix();
1204		- if (bRep == null)
1205		- other.bRep = null;
1206		- else
1207		- other.bRep = new BoundaryRep(bRep, ident);
1208		- */
1209		- // Really new...
1210	1437	other.bRep = bRep; // Share the geometry
1211	1438
1212	1439	other.support = support; // Share the support
1213		-
1214		- //other.editWindow = null;
1215		- if (name == null)
1216		- other.name = null;
1217		- else
1218		- other.name = new String(name);
1219		-
1220		- if (material != null)
1221		- {
1222		- other.material = new cMaterial(material);
1223		- } else
1224		- {
1225		- other.material = null;
1226		- }
1227		-
1228		- other.GetTextures().name = GetTextures().name;
1229		-
1230		- CopyExtraMaterial(other);
1231		-
1232		- other.touched = touched;
1233		- other.softtouched = softtouched;
1234		-
1235		- other.random = random;
1236		- other.link2master = link2master;
1237		- other.transformcount = transformcount;
1238		- other.marked = marked;
1239		- other.skip = skip;
1240		- other.count = count;
1241		- other.flipV = flipV;
1242		- other.live = live;
1243		- other.rewind = rewind;
1244		- other.hide = hide;
1245		- other.texres = texres;
1246		- other.speedup = speedup;
1247		- other.height = height;
1248		- other.depth = depth;
1249	1440
1250	1441	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1251	1442	// {
..	..	@@ -1301,17 +1492,24 @@
1301	1492	if ((mask & GEOMETRY) != 0)
1302	1493	{
1303	1494	if (bRep != null)
1304		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1305		- else
1306		- assert(other.bRep == null);
1307		-
1308		- if (bRep != null)
1309	1495	{
	1496	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1310	1497	CameraPane.RemoveList(bRep.displaylist);
1311	1498	bRep.displaylist = 0; // june 2013 -1;
1312	1499	}
1313	1500	else
1314		- bRep = bRep;
	1501	+ {
	1502	+ //assert(other.bRep == null);
	1503	+ bRep = other.bRep;
	1504	+ }
	1505	+
	1506	+// if (bRep != null)
	1507	+// {
	1508	+// CameraPane.RemoveList(bRep.displaylist);
	1509	+// bRep.displaylist = 0; // june 2013 -1;
	1510	+// }
	1511	+// else
	1512	+// bRep = bRep;
1315	1513	}
1316	1514
1317	1515	/* Use a MASK = GEO/MAT
..	..	@@ -2287,11 +2485,6 @@
2287	2485
2288	2486	InitOthers();
2289	2487
2290		- if (this instanceof Camera)
2291		- {
2292		- material.shift = 90;
2293		- }
2294		-
2295	2488	material.multiply = multiply;
2296	2489
2297	2490	if (multiply)
..	..	@@ -2432,6 +2625,11 @@
2432	2625	else
2433	2626	{
2434	2627	//((ObjEditor)editWindow).SetupUI2(null);
	2628	+ if (objectUI != null)
	2629	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2630	+ else
	2631	+ //new Exception().printStackTrace();
	2632	+ System.err.println("objectUI is null");
2435	2633	}
2436	2634	}
2437	2635
..	..	@@ -2561,7 +2759,8 @@
2561	2759	private static final int editSelf = 1;
2562	2760	private static final int editChild = 2;
2563	2761
2564		- void drawEditHandles(ClickInfo info, int level)
	2762	+ void drawEditHandles(//ClickInfo info,
	2763	+ int level)
2565	2764	{
2566	2765	if (level == 0)
2567	2766	{
..	..	@@ -2569,7 +2768,8 @@
2569	2768	return;
2570	2769
2571	2770	Object3D selectee;
2572		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2771	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2772	+ level + 1))
2573	2773	{
2574	2774	selectee = (Object3D) e.nextElement();
2575	2775	}
..	..	@@ -2577,19 +2777,22 @@
2577	2777	} else
2578	2778	{
2579	2779	//super.
2580		- drawEditHandles0(info, level + 1);
	2780	+ drawEditHandles0(//info,
	2781	+ level + 1);
2581	2782	}
2582	2783	}
2583	2784
2584		- boolean doEditClick(ClickInfo info, int level)
	2785	+ boolean doEditClick(//ClickInfo info,
	2786	+ int level)
2585	2787	{
2586	2788	doSomething = 0;
2587	2789	if (level == 0)
2588	2790	{
2589		- return doParentClick(info);
	2791	+ return doParentClick(); //info);
2590	2792	}
2591	2793	if (//super.
2592		- doEditClick0(info, level))
	2794	+ doEditClick0(//info,
	2795	+ level))
2593	2796	{
2594	2797	doSomething = 1;
2595	2798	return true;
..	..	@@ -2599,7 +2802,7 @@
2599	2802	}
2600	2803	}
2601	2804
2602		- boolean doParentClick(ClickInfo info)
	2805	+ boolean doParentClick() //ClickInfo info)
2603	2806	{
2604	2807	if (selection == null)
2605	2808	{
..	..	@@ -2612,7 +2815,8 @@
2612	2815	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2613	2816	{
2614	2817	Object3D selectee = (Object3D) e.nextElement();
2615		- if (selectee.doEditClick(info, 1))
	2818	+ if (selectee.doEditClick(//info,
	2819	+ 1))
2616	2820	{
2617	2821	childToDrag = selectee;
2618	2822	doSomething = 2;
..	..	@@ -2624,13 +2828,15 @@
2624	2828	return retval;
2625	2829	}
2626	2830
2627		- void doEditDrag(ClickInfo info, boolean opposite)
	2831	+ void doEditDrag(//ClickInfo clickInfo,
	2832	+ boolean opposite)
2628	2833	{
2629	2834	switch (doSomething)
2630	2835	{
2631	2836	case 1: // '\001'
2632	2837	//super.
2633		- doEditDrag0(info, opposite);
	2838	+ doEditDrag0(//clickInfo,
	2839	+ opposite);
2634	2840	break;
2635	2841
2636	2842	case 2: // '\002'
..	..	@@ -2643,11 +2849,13 @@
2643	2849	{
2644	2850	//sel.hitSomething = childToDrag.hitSomething;
2645	2851	//childToDrag.doEditDrag(info);
2646		- sel.doEditDrag(info, opposite);
	2852	+ sel.doEditDrag(//clickInfo,
	2853	+ opposite);
2647	2854	} else
2648	2855	{
2649	2856	//super.
2650		- doEditDrag0(info, opposite);
	2857	+ doEditDrag0(//clickInfo,
	2858	+ opposite);
2651	2859	}
2652	2860	}
2653	2861	break;
..	..	@@ -2665,6 +2873,9 @@
2665	2873	{
2666	2874	deselectAll();
2667	2875	}
	2876	+
	2877	+ new Exception().printStackTrace();
	2878	+
2668	2879	ClickInfo newInfo = new ClickInfo();
2669	2880	newInfo.flags = info.flags;
2670	2881	newInfo.bounds = info.bounds;
..	..	@@ -3094,7 +3305,10 @@
3094	3305	{
3095	3306	if (bRep != null)
3096	3307	{
	3308	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3097	3309	bRep.GenerateNormals(crease);
	3310	+ if (!bRep.trimmed)
	3311	+ bRep.MergeNormals();
3098	3312	Touch();
3099	3313	}
3100	3314	}
..	..	@@ -3112,7 +3326,7 @@
3112	3326	{
3113	3327	if (bRep != null)
3114	3328	{
3115		- bRep.GenerateNormalsMINE();
	3329	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3116	3330	Touch();
3117	3331	}
3118	3332	}
..	..	@@ -3169,6 +3383,105 @@
3169	3383	blockloop = false;
3170	3384	}
3171	3385
	3386	+ public void ResetTransform(int mask)
	3387	+ {
	3388	+ Object3D obj = this;
	3389	+
	3390	+ if (mask == -1)
	3391	+ {
	3392	+ if (obj instanceof Camera) // jan 2014
	3393	+ {
	3394	+ LA.matIdentity(obj.toParent);
	3395	+ LA.matIdentity(obj.fromParent);
	3396	+ }
	3397	+ else
	3398	+ {
	3399	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3400	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3401	+ }
	3402	+ return;
	3403	+ }
	3404	+
	3405	+ if ((mask&2) != 0) // Scale/rotation
	3406	+ {
	3407	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3408	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3409	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3410	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3411	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3412	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3413	+ }
	3414	+ if ((mask&1) != 0) // Translation
	3415	+ {
	3416	+ if (obj.toParent != null)
	3417	+ {
	3418	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3419	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3420	+ }
	3421	+ }
	3422	+ }
	3423	+
	3424	+ public void Scale(float scale)
	3425	+ {
	3426	+ Object3D obj = this;
	3427	+
	3428	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3429	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3430	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3431	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3432	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3433	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3434	+ }
	3435	+
	3436	+ public void TextureRatioTransform(int axis)
	3437	+ {
	3438	+ cTexture tex = GetTextures();
	3439	+
	3440	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3441	+
	3442	+ try
	3443	+ {
	3444	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3445	+ }
	3446	+ catch (Exception e)
	3447	+ {
	3448	+ System.err.println("FAIL TextureRatio: " + this);
	3449	+ }
	3450	+
	3451	+ LA.matIdentity(Object3D.mat);
	3452	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3453	+
	3454	+ if (toParent == null)
	3455	+ {
	3456	+ toParent = LA.newMatrix();
	3457	+ fromParent = LA.newMatrix();
	3458	+ }
	3459	+
	3460	+ ResetTransform(2);
	3461	+
	3462	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3463	+ LA.matInvert(fromParent, toParent);
	3464	+ }
	3465	+
	3466	+ void TextureRatio(int axis)
	3467	+ {
	3468	+ if (blockloop)
	3469	+ return;
	3470	+
	3471	+ blockloop = true;
	3472	+
	3473	+ TextureRatioTransform(axis);
	3474	+
	3475	+ for (int i=Size(); --i>=0;)
	3476	+ {
	3477	+ Object3D v = get(i);
	3478	+
	3479	+ v.TextureRatio(axis);
	3480	+ }
	3481	+
	3482	+ blockloop = false;
	3483	+ }
	3484	+
3172	3485	void TransformChildren()
3173	3486	{
3174	3487	if (toParent != null)
..	..	@@ -3411,6 +3724,7 @@
3411	3724	if (bRep != null)
3412	3725	{
3413	3726	//bRep.RemoveOneTriangle();
	3727	+ System.out.println();
3414	3728	System.out.println("Reducing " + this);
3415	3729	if (name != null && name.contains("lockpickstraps"))
3416	3730	name = name;
..	..	@@ -3522,15 +3836,47 @@
3522	3836
3523	3837	void ClearMaterials()
3524	3838	{
	3839	+ if (blockloop)
	3840	+ return;
	3841	+
	3842	+ blockloop = true;
	3843	+
3525	3844	ClearMaterial();
3526		- for (int i = 0; i < size(); i++)
	3845	+ for (int i = 0; i < Size(); i++)
3527	3846	{
3528		- Object3D child = (Object3D) reserve(i);
	3847	+ Object3D child = (Object3D) get(i);
3529	3848	if (child == null)
3530	3849	continue;
3531	3850	child.ClearMaterials();
3532		- release(i);
3533	3851	}
	3852	+
	3853	+ blockloop = false;
	3854	+ }
	3855	+
	3856	+ void ClearVersionList()
	3857	+ {
	3858	+ this.versionlist = null;
	3859	+ this.versionindex = -1;
	3860	+ this.versiontable = null;
	3861	+ }
	3862	+
	3863	+ void ClearVersions()
	3864	+ {
	3865	+ if (blockloop)
	3866	+ return;
	3867	+
	3868	+ blockloop = true;
	3869	+
	3870	+ ClearVersionList();
	3871	+ for (int i = 0; i < Size(); i++)
	3872	+ {
	3873	+ Object3D child = (Object3D) get(i);
	3874	+ if (child == null)
	3875	+ continue;
	3876	+ child.ClearVersions();
	3877	+ }
	3878	+
	3879	+ blockloop = false;
3534	3880	}
3535	3881
3536	3882	void FlipV(boolean flip)
..	..	@@ -3709,6 +4055,7 @@
3709	4055
3710	4056	void RevertMeshes()
3711	4057	{
	4058	+ // BLOCKLOOP
3712	4059	if (this instanceof cMesh)
3713	4060	{
3714	4061	((cMesh)this).Revert();
..	..	@@ -3739,11 +4086,6 @@
3739	4086	Touch();
3740	4087	}
3741	4088
3742		- ResetRecur();
3743		- }
3744		-
3745		- void ResetRecur()
3746		- {
3747	4089	for (int i = 0; i < size(); i++)
3748	4090	{
3749	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3766,11 +4108,6 @@
3766	4108	Step();
3767	4109	Touch();
3768	4110
3769		- StepRecur();
3770		- }
3771		-
3772		- void StepRecur()
3773		- {
3774	4111	for (int i = 0; i < size(); i++)
3775	4112	{
3776	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3957,8 +4294,8 @@
3957	4294	Touch();
3958	4295	}
3959	4296
3960		- transient cVector min = new cVector();
3961		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
3962	4299
3963	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
3964	4301	{
..	..	@@ -3974,15 +4311,15 @@
3974	4311	if (blockloop)
3975	4312	return;
3976	4313
3977		- if (min == null) // ???
	4314	+ if (min == null)
3978	4315	{
3979	4316	min = new cVector();
3980	4317	max = new cVector();
3981	4318	}
3982	4319
3983		- for (int i = 0; i<size(); i++)
	4320	+ for (int i = 0; i<Size(); i++)
3984	4321	{
3985		- Object3D child = (Object3D) reserve(i);
	4322	+ Object3D child = (Object3D) get(i); //reserve(i);
3986	4323	if (child == null)
3987	4324	continue;
3988	4325
..	..	@@ -4001,21 +4338,21 @@
4001	4338	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4002	4339	//if (child.hide)
4003	4340	{
4004		- release(i);
	4341	+ //release(i);
4005	4342	continue;
4006	4343	}
4007	4344
4008	4345	blockloop = true;
4009	4346	child.getBounds(min, max, true); // xform);
4010	4347	blockloop = false;
4011		- release(i);
	4348	+ //release(i);
4012	4349
4013	4350	MinMax(minima, maxima);
4014	4351	}
4015	4352
4016	4353	if (bRep != null)
4017	4354	{
4018		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
4019	4356	}
4020	4357
4021	4358	if (false) // xform)
..	..	@@ -5415,6 +5752,51 @@
5415	5752	blockloop = false;
5416	5753	}
5417	5754
	5755	+ void ResetSelectable()
	5756	+ {
	5757	+ if (blockloop)
	5758	+ return;
	5759	+
	5760	+ blockloop = true;
	5761	+
	5762	+ keepdontselect = dontselect;
	5763	+ dontselect = true;
	5764	+
	5765	+ Object3D child;
	5766	+ int nb = Size();
	5767	+ for (int i = 0; i < nb; i++)
	5768	+ {
	5769	+ child = (Object3D) get(i);
	5770	+ if (child == null)
	5771	+ continue;
	5772	+ child.ResetSelectable();
	5773	+ }
	5774	+
	5775	+ blockloop = false;
	5776	+ }
	5777	+
	5778	+ void RestoreSelectable()
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ blockloop = true;
	5784	+
	5785	+ dontselect = keepdontselect;
	5786	+
	5787	+ Object3D child;
	5788	+ int nb = Size();
	5789	+ for (int i = 0; i < nb; i++)
	5790	+ {
	5791	+ child = (Object3D) get(i);
	5792	+ if (child == null)
	5793	+ continue;
	5794	+ child.RestoreSelectable();
	5795	+ }
	5796	+
	5797	+ blockloop = false;
	5798	+ }
	5799	+
5418	5800	boolean IsSelected()
5419	5801	{
5420	5802	if (parent == null)
..	..	@@ -5475,6 +5857,11 @@
5475	5857	if (fullname == null)
5476	5858	return "";
5477	5859
	5860	+ if (fullname.pigment != null)
	5861	+ {
	5862	+ return fullname.pigment;
	5863	+ }
	5864	+
5478	5865	// System.out.println("Fullname = " + fullname);
5479	5866
5480	5867	// Does not work on Windows due to C:
..	..	@@ -5487,7 +5874,7 @@
5487	5874
5488	5875	if (split.length == 0)
5489	5876	{
5490		- return "";
	5877	+ return fullname.pigment = "";
5491	5878	}
5492	5879
5493	5880	if (split.length <= 2)
..	..	@@ -5495,22 +5882,27 @@
5495	5882	if (fullname.name.endsWith(":"))
5496	5883	{
5497	5884	// Windows
5498		- return fullname.name.substring(0, fullname.name.length()-1);
	5885	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5499	5886	}
5500	5887
5501		- return split[0];
	5888	+ return fullname.pigment = split[0];
5502	5889	}
5503	5890
5504	5891	// Windows
5505	5892	assert(split.length == 4);
5506	5893
5507		- return split[0] + ":" + split[1];
	5894	+ return fullname.pigment = split[0] + ":" + split[1];
5508	5895	}
5509	5896
5510	5897	static String GetBump(cTexture fullname)
5511	5898	{
5512	5899	if (fullname == null)
5513	5900	return "";
	5901	+
	5902	+ if (fullname.bump != null)
	5903	+ {
	5904	+ return fullname.bump;
	5905	+ }
5514	5906
5515	5907	// System.out.println("Fullname = " + fullname);
5516	5908	// Does not work on Windows due to C:
..	..	@@ -5522,12 +5914,12 @@
5522	5914
5523	5915	if (split.length == 0)
5524	5916	{
5525		- return "";
	5917	+ return fullname.bump = "";
5526	5918	}
5527	5919
5528	5920	if (split.length == 1)
5529	5921	{
5530		- return "";
	5922	+ return fullname.bump = "";
5531	5923	}
5532	5924
5533	5925	if (split.length == 2)
..	..	@@ -5535,16 +5927,16 @@
5535	5927	if (fullname.name.endsWith(":"))
5536	5928	{
5537	5929	// Windows
5538		- return "";
	5930	+ return fullname.bump = "";
5539	5931	}
5540	5932
5541		- return split[1];
	5933	+ return fullname.bump = split[1];
5542	5934	}
5543	5935
5544	5936	// Windows
5545	5937	assert(split.length == 4);
5546	5938
5547		- return split[2] + ":" + split[3];
	5939	+ return fullname.bump = split[2] + ":" + split[3];
5548	5940	}
5549	5941
5550	5942	String GetPigmentTexture()
..	..	@@ -5627,6 +6019,9 @@
5627	6019	texname = "";
5628	6020
5629	6021	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6022	+
	6023	+ GetTextures().pigment = null;
	6024	+
5630	6025	Touch();
5631	6026	}
5632	6027
..	..	@@ -5700,6 +6095,8 @@
5700	6095
5701	6096	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5702	6097
	6098	+ GetTextures().bump = null;
	6099	+
5703	6100	Touch();
5704	6101	}
5705	6102
..	..	@@ -5724,6 +6121,38 @@
5724	6121	}
5725	6122	}
5726	6123
	6124	+ void EmbedTextures(boolean embed)
	6125	+ {
	6126	+ if (blockloop)
	6127	+ return;
	6128	+
	6129	+ //if (GetTextures() != null)
	6130	+ if (embed)
	6131	+ CameraPane.EmbedTextures(GetTextures());
	6132	+ else
	6133	+ {
	6134	+ GetTextures().pigmentdata = null;
	6135	+ GetTextures().bumpdata = null;
	6136	+ GetTextures().pw = 0;
	6137	+ GetTextures().ph = 0;
	6138	+ GetTextures().bw = 0;
	6139	+ GetTextures().bh = 0;
	6140	+ }
	6141	+
	6142	+ int nb = Size();
	6143	+ for (int i = 0; i < nb; i++)
	6144	+ {
	6145	+ Object3D child = (Object3D) get(i);
	6146	+
	6147	+ if (child == null)
	6148	+ continue;
	6149	+
	6150	+ blockloop = true;
	6151	+ child.EmbedTextures(embed);
	6152	+ blockloop = false;
	6153	+ }
	6154	+ }
	6155	+
5727	6156	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5728	6157	{
5729	6158	Draw(display, root, selected, blocked);
..	..	@@ -5732,7 +6161,7 @@
5732	6161	boolean NeedSupport()
5733	6162	{
5734	6163	return
5735		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
	6164	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5736	6165	// PROBLEM with CROWD!!
5737	6166	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5738	6167	}
..	..	@@ -5750,6 +6179,20 @@
5750	6179	return parent.IsLive();
5751	6180	}
5752	6181
	6182	+ boolean IsDynamic()
	6183	+ {
	6184	+ return live && bRep != null;
	6185	+ }
	6186	+
	6187	+ boolean Link2Support()
	6188	+ {
	6189	+ return link2master \|\| link2support;
	6190	+ }
	6191	+
	6192	+ static cVector minima = new cVector();
	6193	+ static cVector maxima = new cVector();
	6194	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6195	+
5753	6196	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5754	6197	{
5755	6198	Invariants(); // june 2013
..	..	@@ -5757,6 +6200,29 @@
5757	6200	if (support != null)
5758	6201	{
5759	6202	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6203	+ }
	6204	+
	6205	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6206	+ {
	6207	+ getBounds(minima, maxima, true);
	6208	+ center.x = (minima.x + maxima.x) / 2;
	6209	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6210	+ center.z = (minima.z + maxima.z) / 2;
	6211	+
	6212	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6213	+
	6214	+ IntersectResult res = new IntersectResult();
	6215	+ res.t = Double.POSITIVE_INFINITY;
	6216	+
	6217	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6218	+ {
	6219	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6220	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6221	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6222	+
	6223	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6224	+ LA.matInvert(toParent, fromParent);
	6225	+ }
5760	6226	}
5761	6227
5762	6228	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5810,8 +6276,11 @@
5810	6276	if (support != null)
5811	6277	support = support;
5812	6278
5813		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5814		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ boolean usecalllists = !IsDynamic() &&
	6280	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6281	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6282	+
	6283	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5815	6284
5816	6285	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5817	6286	{
..	..	@@ -5819,10 +6288,12 @@
5819	6288	bRep.displaylist = 0;
5820	6289	}
5821	6290	// usecalllists &= !(parent instanceof RandomNode);
5822		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
5823	6293
5824		- if (GetBRep() != null)
5825		- usecalllists = usecalllists;
	6294	+ if (display.DrawMode() == display.SHADOW)
	6295	+ //GetBRep() != null)
	6296	+ usecalllists = !!usecalllists;
5826	6297	//System.out.println("draw " + this);
5827	6298	//new Exception().printStackTrace();
5828	6299
..	..	@@ -5832,7 +6303,7 @@
5832	6303
5833	6304	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5834	6305	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5835		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5836	6307	{
5837	6308	Globals.lighttouched = true;
5838	6309	} // all panes...
..	..	@@ -5844,7 +6315,7 @@
5844	6315	if (!(this instanceof Composite))
5845	6316	touched = false;
5846	6317	//if (displaylist == -1 && usecalllists)
5847		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6318	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5848	6319	{
5849	6320	bRep.displaylist = display.GenList();
5850	6321	assert(bRep.displaylist != 0);
..	..	@@ -5855,7 +6326,7 @@
5855	6326
5856	6327	//System.out.println("\tnew list " + list);
5857	6328	//gl.glDrawBuffer(gl.GL_NONE);
5858		- if (usecalllists)
	6329	+ if (usecalllists && bRep.displaylist > 0)
5859	6330	{
5860	6331	// System.err.println("new list " + bRep.displaylist + " for " + this);
5861	6332	display.NewList(bRep.displaylist);
..	..	@@ -5864,7 +6335,7 @@
5864	6335	CallList(display, root, selected, blocked);
5865	6336
5866	6337	// compiled = true;
5867		- if (usecalllists)
	6338	+ if (usecalllists && bRep.displaylist > 0)
5868	6339	{
5869	6340	// System.err.println("end list " + bRep.displaylist + " for " + this);
5870	6341	display.EndList();
..	..	@@ -5874,8 +6345,8 @@
5874	6345	Globals.lighttouched = true; // all panes...
5875	6346	}
5876	6347
5877		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5878		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
5879	6350
5880	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
5881	6352	{
..	..	@@ -5914,7 +6385,7 @@
5914	6385	{
5915	6386	if (display.DrawMode() == iCameraPane.SHADOW)
5916	6387	{
5917		- if (!link2master // tricky to cull in shadow mode.
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
5918	6389	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5919	6390	{
5920	6391	//System.out.print("CULLED");
..	..	@@ -5976,6 +6447,20 @@
5976	6447	{
5977	6448	drawSelf(display, root, selected, blocked);
5978	6449	}
	6450	+
	6451	+// if (!(this instanceof Composite))
	6452	+// {
	6453	+// for (int i = 0; i < size(); i++)
	6454	+// {
	6455	+// Object3D child = (Object3D) reserve(i);
	6456	+// if (child == null)
	6457	+// continue;
	6458	+//
	6459	+// child.draw(display, root, selected, blocked);
	6460	+//
	6461	+// release(i);
	6462	+// }
	6463	+// }
5979	6464	} else
5980	6465	{
5981	6466	/*
..	..	@@ -6008,13 +6493,14 @@
6008	6493	boolean failedPigment = false;
6009	6494	boolean failedBump = false;
6010	6495
	6496	+ CameraPane.lastObject = this;
6011	6497	try
6012	6498	{
6013	6499	display.BindPigmentTexture(tex, texres);
6014	6500	}
6015	6501	catch (Exception e)
6016	6502	{
6017		- System.err.println("FAILED: " + this);
	6503	+ // System.err.println("FAILED: " + this);
6018	6504	failedPigment = true;
6019	6505	}
6020	6506
..	..	@@ -6045,6 +6531,20 @@
6045	6531	display.CallList(bRep.displaylist);
6046	6532	// june 2013 drawSelf(display, root, selected);
6047	6533	}
	6534	+ }
	6535	+
	6536	+ assert (!(this instanceof Composite));
	6537	+ {
	6538	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6539	+// {
	6540	+// Object3D child = (Object3D) reserve(i);
	6541	+// if (child == null)
	6542	+// continue;
	6543	+//
	6544	+// child.draw(display, root, selected, blocked);
	6545	+//
	6546	+// release(i);
	6547	+// }
6048	6548	}
6049	6549	}
6050	6550
..	..	@@ -6098,16 +6598,17 @@
6098	6598
6099	6599	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6100	6600	{
6101		- if (GetBRep() == null)
6102		- {
6103		- drawSelf(display, root, selected, blocked);
6104		- } else
	6601	+ if (GetBRep() != null)
6105	6602	{
6106	6603	DrawNode(display, root, selected);
6107	6604	if (this instanceof BezierPatch)
6108	6605	{
6109	6606	//drawSelf(display, root, selected);
6110	6607	}
	6608	+ }
	6609	+ else
	6610	+ {
	6611	+ drawSelf(display, root, selected, blocked);
6111	6612	}
6112	6613	}
6113	6614
..	..	@@ -6357,7 +6858,8 @@
6357	6858
6358	6859	//javax.media.opengl.GL gl = display.GetGL();
6359	6860
6360		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
6361	6863	{
6362	6864	int fc = bRep.FaceCount();
6363	6865	int vc = bRep.VertexCount();
..	..	@@ -6519,7 +7021,7 @@
6519	7021	facescompare[k] = new FaceCompare(k);
6520	7022	}
6521	7023
6522		- center = new cVector();
	7024	+ centertriangle = new cVector();
6523	7025	}
6524	7026	else
6525	7027	{
..	..	@@ -6642,7 +7144,7 @@
6642	7144	*/
6643	7145	}
6644	7146
6645		- transient cVector center;
	7147	+ transient cVector centertriangle;
6646	7148
6647	7149	class FaceCompare implements Comparable
6648	7150	{
..	..	@@ -6671,14 +7173,14 @@
6671	7173	Vertex q = bRep.GetVertex(face.q);
6672	7174	Vertex r = bRep.GetVertex(face.r);
6673	7175
6674		- center.set(p);
6675		- center.add(q);
6676		- center.add(r);
6677		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
6678	7180
6679		- center.sub(Globals.theRenderer.EyeCamera().location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6680	7182
6681		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
6682	7184	}
6683	7185
6684	7186	return distance;
..	..	@@ -7215,20 +7717,23 @@
7215	7717	}
7216	7718	}
7217	7719
7218		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7720	+ static ClickInfo clickInfo = new ClickInfo();
	7721	+
	7722	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7723	+ Point outPt, Rectangle outRec)
7219	7724	{
7220		- int hc = info.bounds.x + info.bounds.width / 2;
7221		- int vc = info.bounds.y + info.bounds.height / 2;
7222		- double[][] toscreen = info.toScreen;
	7725	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7726	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7727	+ double[][] toscreen = clickInfo.toScreen;
7223	7728	if (toscreen == null)
7224	7729	{
7225		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7730	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7226	7731	}
7227	7732	cVector vec = in;
7228	7733	LA.xformPos(in, toscreen, in);
7229	7734	//System.out.println("Distance = " + info.camera.Distance());
7230		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7231		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7735	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7736	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7232	7737	outPt.x = hc + (int) vec.x;
7233	7738	outPt.y = vc - (int) vec.y;
7234	7739	outRec.x = outPt.x - 3;
..	..	@@ -7236,15 +7741,18 @@
7236	7741	outRec.width = outRec.height = 6;
7237	7742	}
7238	7743
7239		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7744	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7745	+ )
7240	7746	{
7241	7747	Point pt = new Point(0, 0);
7242	7748	Rectangle rec = new Rectangle();
7243		- calcHotSpot(in, info, pt, rec);
	7749	+ calcHotSpot(in, //clickInfo,
	7750	+ pt, rec);
7244	7751	return rec;
7245	7752	}
7246	7753
7247		- void drawEditHandles0(ClickInfo info, int level)
	7754	+ void drawEditHandles0(//ClickInfo clickInfo,
	7755	+ int level)
7248	7756	{
7249	7757	if (level == 0)
7250	7758	{
..	..	@@ -7253,16 +7761,19 @@
7253	7761	{
7254	7762	cVector origin = new cVector();
7255	7763	//LA.xformPos(origin, toParent, origin);
7256		- Rectangle spot = calcHotSpot(origin, info);
	7764	+ if (this.clickInfo == null)
	7765	+ this.clickInfo = new ClickInfo();
	7766	+
	7767	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7257	7768	Rectangle boundary = new Rectangle();
7258	7769	boundary.x = spot.x - 30;
7259	7770	boundary.y = spot.y - 30;
7260	7771	boundary.width = spot.width + 60;
7261	7772	boundary.height = spot.height + 60;
7262		- info.g.setColor(Color.red);
	7773	+ clickInfo.g.setColor(Color.white);
7263	7774	int spotw = spot.x + spot.width;
7264	7775	int spoth = spot.y + spot.height;
7265		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7776	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7266	7777	// if (CameraPane.Xmin > spot.x)
7267	7778	// {
7268	7779	// CameraPane.Xmin = spot.x;
..	..	@@ -7279,11 +7790,6 @@
7279	7790	// {
7280	7791	// CameraPane.Ymax = spoth;
7281	7792	// }
7282		- spot.translate(32, 32);
7283		- spotw = spot.x + spot.width;
7284		- spoth = spot.y + spot.height;
7285		- info.g.setColor(Color.cyan);
7286		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7287	7793	// if (CameraPane.Xmin > spot.x)
7288	7794	// {
7289	7795	// CameraPane.Xmin = spot.x;
..	..	@@ -7302,10 +7808,15 @@
7302	7808	// }
7303	7809	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7304	7810	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7305		- spot.translate(0, -32);
7306		- info.g.setColor(Color.yellow);
7307		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7308		- info.g.setColor(Color.green);
	7811	+ spot.translate(32, 0);
	7812	+ clickInfo.g.setColor(Color.yellow);
	7813	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7814	+
	7815	+ spot.translate(32, 64);
	7816	+ spotw = spot.x + spot.width;
	7817	+ spoth = spot.y + spot.height;
	7818	+ clickInfo.g.setColor(Color.cyan);
	7819	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7309	7820	// if (CameraPane.Xmin > spot.x)
7310	7821	// {
7311	7822	// CameraPane.Xmin = spot.x;
..	..	@@ -7322,8 +7833,9 @@
7322	7833	// {
7323	7834	// CameraPane.Ymax = spoth;
7324	7835	// }
7325		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7326		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7836	+ clickInfo.g.setColor(Color.green);
	7837	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7838	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7327	7839	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7328	7840	// if (CameraPane.Xmin > boundary.x)
7329	7841	// {
..	..	@@ -7345,7 +7857,8 @@
7345	7857	}
7346	7858	}
7347	7859
7348		- boolean doEditClick0(ClickInfo info, int level)
	7860	+ boolean doEditClick0(//ClickInfo clickInfo,
	7861	+ int level)
7349	7862	{
7350	7863	if (level == 0)
7351	7864	{
..	..	@@ -7354,8 +7867,8 @@
7354	7867
7355	7868	boolean retval = false;
7356	7869
7357		- startX = info.x;
7358		- startY = info.y;
	7870	+ startX = clickInfo.x;
	7871	+ startY = clickInfo.y;
7359	7872
7360	7873	hitSomething = -1;
7361	7874	cVector origin = new cVector();
..	..	@@ -7365,22 +7878,53 @@
7365	7878	{
7366	7879	centerPt = new Point(0, 0);
7367	7880	}
7368		- calcHotSpot(origin, info, centerPt, spot);
7369		- if (spot.contains(info.x, info.y))
	7881	+ calcHotSpot(origin, //info,
	7882	+ centerPt, spot);
	7883	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7884	{
7371	7885	hitSomething = hitCenter;
7372	7886	retval = true;
7373	7887	}
7374	7888	spot.translate(32, 0);
7375		- if (spot.contains(info.x, info.y))
	7889	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7890	{
7377	7891	hitSomething = hitRotate;
7378	7892	retval = true;
7379	7893	}
7380	7894	spot.translate(0, 32);
7381		- if (spot.contains(info.x, info.y))
	7895	+ spot.translate(32, 0);
	7896	+ spot.translate(0, 32);
	7897	+ if (spot.contains(clickInfo.x, clickInfo.y))
7382	7898	{
7383	7899	hitSomething = hitScale;
	7900	+
	7901	+ double scale = 0.005f * clickInfo.camera.Distance();
	7902	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7903	+ double sign = 1;
	7904	+ if (hScale < 0)
	7905	+ {
	7906	+ sign = -1;
	7907	+ }
	7908	+ hScale = signMath.pow(signhScale, scale * 50);
	7909	+ if (hScale < 0.01)
	7910	+ {
	7911	+ //hScale = 0.01;
	7912	+ }
	7913	+
	7914	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7915	+ sign = 1;
	7916	+ if (vScale < 0)
	7917	+ {
	7918	+ sign = -1;
	7919	+ }
	7920	+ vScale = signMath.pow(signvScale, scale * 50);
	7921	+ if (vScale < 0.01)
	7922	+ {
	7923	+ //vScale = 0.01;
	7924	+ }
	7925	+
	7926	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7927	+
7384	7928	retval = true;
7385	7929	}
7386	7930
..	..	@@ -7390,7 +7934,7 @@
7390	7934	}
7391	7935
7392	7936	//System.out.println("info.modifiers = " + info.modifiers);
7393		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7937	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7394	7938	//System.out.println("modified = " + modified);
7395	7939	//new Exception().printStackTrace();
7396	7940	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7418,7 +7962,8 @@
7418	7962	return true;
7419	7963	}
7420	7964
7421		- void doEditDrag0(ClickInfo info, boolean opposite)
	7965	+ void doEditDrag0(//ClickInfo info,
	7966	+ boolean opposite)
7422	7967	{
7423	7968	if (hitSomething == 0)
7424	7969	{
..	..	@@ -7432,7 +7977,7 @@
7432	7977
7433	7978	//System.out.println("hitSomething = " + hitSomething);
7434	7979
7435		- double scale = 0.005f * info.camera.Distance();
	7980	+ double scale = 0.005f * clickInfo.camera.Distance();
7436	7981
7437	7982	cVector xlate = new cVector();
7438	7983	//cVector xlate2 = new cVector();
..	..	@@ -7446,7 +7991,9 @@
7446	7991
7447	7992	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7448	7993
7449		- if (modified \|\| opposite)
	7994	+ // Modified could snap
	7995	+ if (//modified \|\|
	7996	+ opposite)
7450	7997	{
7451	7998	//assert(false);
7452	7999	/*
..	..	@@ -7466,8 +8013,8 @@
7466	8013	toParent[3][i] = xlate.get(i);
7467	8014	LA.matInvert(toParent, fromParent);
7468	8015	*/
7469		- cVector delta = LA.newVector(0, 0, startY - info.y);
7470		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8016	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8017	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7471	8018
7472	8019	LA.matCopy(startMat, toParent);
7473	8020	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7476,7 +8023,7 @@
7476	8023	} else
7477	8024	{
7478	8025	//LA.xformDir(delta, info.camera.fromScreen, delta);
7479		- cVector up = new cVector(info.camera.up);
	8026	+ cVector up = new cVector(clickInfo.camera.up);
7480	8027	cVector away = new cVector();
7481	8028	//cVector right2 = new cVector();
7482	8029	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7493,19 +8040,19 @@
7493	8040	LA.xformDir(up, ClickInfo.matbuffer, up);
7494	8041	// if (!CameraPane.LOCALTRANSFORM)
7495	8042	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7496		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8043	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7497	8044	// if (!CameraPane.LOCALTRANSFORM)
7498	8045	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7499	8046	//LA.vecCross(up, cVector.Z, right2);
7500	8047
7501		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8048	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7502	8049
7503	8050	//System.out.println("DELTA0 = " + delta);
7504	8051	//System.out.println("AWAY = " + info.camera.away);
7505	8052	//System.out.println("UP = " + info.camera.up);
7506	8053	if (away.z > 0)
7507	8054	{
7508		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8055	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7509	8056	{
7510	8057	delta.x = -delta.x;
7511	8058	} else
..	..	@@ -7520,7 +8067,7 @@
7520	8067	//System.out.println("DELTA1 = " + delta);
7521	8068	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7522	8069	//System.out.println("DELTA2 = " + delta);
7523		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8070	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7524	8071	LA.matCopy(startMat, toParent);
7525	8072	//System.out.println("DELTA3 = " + delta);
7526	8073	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7530,8 +8077,8 @@
7530	8077	break;
7531	8078
7532	8079	case hitRotate: // rotate
7533		- int dx = info.x - centerPt.x;
7534		- int dy = -(info.y - centerPt.y);
	8080	+ int dx = clickInfo.x - centerPt.x;
	8081	+ int dy = -(clickInfo.y - centerPt.y);
7535	8082	double angle = (double) Math.atan2(dx, dy);
7536	8083	angle = -(1.570796 - angle);
7537	8084
..	..	@@ -7540,7 +8087,7 @@
7540	8087
7541	8088	if (modified)
7542	8089	{
7543		- // Rotate 90 degrees
	8090	+ // Rotate 45 degrees
7544	8091	angle /= (Math.PI / 4);
7545	8092	angle = Math.floor(angle + 0.5);
7546	8093	angle *= (Math.PI / 4);
..	..	@@ -7554,7 +8101,7 @@
7554	8101	}
7555	8102	/**/
7556	8103
7557		- switch (info.pane.RenderCamera().viewCode)
	8104	+ switch (clickInfo.pane.RenderCamera().viewCode)
7558	8105	{
7559	8106	case 1: // '\001'
7560	8107	LA.matZRotate(toParent, angle);
..	..	@@ -7581,7 +8128,7 @@
7581	8128	break;
7582	8129
7583	8130	case hitScale: // scale
7584		- double hScale = (double) (info.x - centerPt.x) / 32;
	8131	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7585	8132	double sign = 1;
7586	8133	if (hScale < 0)
7587	8134	{
..	..	@@ -7593,7 +8140,7 @@
7593	8140	//hScale = 0.01;
7594	8141	}
7595	8142
7596		- double vScale = (double) (info.y - centerPt.y) / 32;
	8143	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7597	8144	sign = 1;
7598	8145	if (vScale < 0)
7599	8146	{
..	..	@@ -7604,6 +8151,7 @@
7604	8151	{
7605	8152	//vScale = 0.01;
7606	8153	}
	8154	+
7607	8155	LA.matCopy(startMat, toParent);
7608	8156	/**/
7609	8157	for (int i = 0; i < 3; i++)
..	..	@@ -7613,33 +8161,39 @@
7613	8161	}
7614	8162	/**/
7615	8163
7616		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	8164	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7617	8165
7618	8166	if (totalScale < 0.01)
7619	8167	{
7620	8168	totalScale = 0.01;
7621	8169	}
7622	8170
7623		- switch (info.pane.RenderCamera().viewCode)
	8171	+ switch (clickInfo.pane.RenderCamera().viewCode)
7624	8172	{
7625	8173	case 3: // '\001'
7626	8174	if (modified \|\| opposite)
7627	8175	{
	8176	+ if (modified) // && opposite)
	8177	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8178	+ else
7628	8179	//LA.matScale(toParent, 1, hScale, vScale);
7629		- LA.matScale(toParent, totalScale, 1, 1);
	8180	+ LA.matScale(toParent, totalScale, 1, 1);
7630	8181	} // vScale, 1);
7631	8182	else
7632	8183	{
7633	8184	// EXCEPTION!
7634		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8185	+ LA.matScale(toParent, 1, totalScale, totalScale);
7635	8186	} // vScale, 1);
7636	8187	break;
7637	8188
7638	8189	case 2: // '\002'
7639	8190	if (modified \|\| opposite)
7640	8191	{
7641		- //LA.matScale(toParent, hScale, 1, vScale);
7642		- LA.matScale(toParent, 1, totalScale, 1);
	8192	+ if (modified) // && opposite)
	8193	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8194	+ else
	8195	+ //LA.matScale(toParent, hScale, 1, vScale);
	8196	+ LA.matScale(toParent, 1, totalScale, 1);
7643	8197	} else
7644	8198	{
7645	8199	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7649,8 +8203,11 @@
7649	8203	case 1: // '\003'
7650	8204	if (modified \|\| opposite)
7651	8205	{
7652		- //LA.matScale(toParent, hScale, vScale, 1);
7653		- LA.matScale(toParent, 1, 1, totalScale);
	8206	+ if (modified) // && opposite)
	8207	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8208	+ else
	8209	+ //LA.matScale(toParent, hScale, vScale, 1);
	8210	+ LA.matScale(toParent, 1, 1, totalScale);
7654	8211	} else
7655	8212	{
7656	8213	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7687,7 +8244,7 @@
7687	8244	} // NEW ...
7688	8245
7689	8246
7690		- info.pane.repaint();
	8247	+ clickInfo.pane.repaint();
7691	8248	}
7692	8249
7693	8250	boolean overflow = false;
..	..	@@ -7801,12 +8358,12 @@
7801	8358	if (!Globals.ADVANCED)
7802	8359	return objname;
7803	8360
7804		- return objname + " " + System.identityHashCode(this);
	8361	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7805	8362	}
7806	8363
7807	8364	public int hashCode()
7808	8365	{
7809		- // Fuck Vector...
	8366	+ // Do not use Vector...
7810	8367	return System.identityHashCode(this);
7811	8368	}
7812	8369
..	..	@@ -8046,8 +8603,8 @@
8046	8603	private static cVector2 qq2 = new cVector2();
8047	8604	private static cVector2 rr2 = new cVector2();
8048	8605	private static cVector2 ss2 = new cVector2();
8049		- private static cVector edge1 = new cVector();
8050		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
8051	8608	//private static cVector norm = new cVector();
8052	8609	/transient private/ int hitSomething;
8053	8610	static final int hitCenter = 1;
..	..	@@ -8245,7 +8802,275 @@
8245	8802
8246	8803	Touch();
8247	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
8248	8809
	8810	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8811	+ {
	8812	+ boolean success = false;
	8813	+
	8814	+ if (bRep.stripified)
	8815	+ {
	8816	+ int[] strips = bRep.getRawIndices();
	8817	+
	8818	+ // TRIANGLE STRIP ARRAY
	8819	+ if (bRep.trimmed)
	8820	+ {
	8821	+ float[] v = bRep.getRawVertices();
	8822	+
	8823	+ int count3 = 0;
	8824	+
	8825	+ if (v.length > 0)
	8826	+ {
	8827	+ for (int i = 0; i < strips.length; i++)
	8828	+ {
	8829	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8833	+ count3 += 3;
	8834	+
	8835	+ for (int j = 0; j < strips[i] - 2; j++)
	8836	+ {
	8837	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8838	+ count3 += 3;
	8839	+
	8840	+ if (j%2 == 0)
	8841	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8842	+ else
	8843	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8844	+
	8845	+ s1.set(s2);
	8846	+ s2.set(s3);
	8847	+ }
	8848	+ }
	8849	+ }
	8850	+
	8851	+ assert count3 == v.length;
	8852	+ }
	8853	+ else // !trimmed
	8854	+ {
	8855	+ int count = 0;
	8856	+ for (int i = 0; i < strips.length; i++)
	8857	+ {
	8858	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8859	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8860	+
	8861	+ for (int j = 0; j < strips[i] - 2; j++)
	8862	+ {
	8863	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8864	+
	8865	+ if (j%2 == 0)
	8866	+ success \|= intersectTriangle(ray, result, p, q, r);
	8867	+ else
	8868	+ success \|= intersectTriangle(ray, result, p, r, q);
	8869	+
	8870	+ p = q;
	8871	+ q = r;
	8872	+ }
	8873	+ }
	8874	+ }
	8875	+ } else // catch (Error e)
	8876	+ {
	8877	+ int facecount = bRep.FaceCount();
	8878	+ for (int i = 0; i < facecount; i++)
	8879	+ {
	8880	+ Face face = bRep.GetFace(i);
	8881	+
	8882	+ Vertex p = bRep.GetVertex(face.p);
	8883	+ Vertex q = bRep.GetVertex(face.q);
	8884	+ Vertex r = bRep.GetVertex(face.r);
	8885	+
	8886	+ success \|= intersectTriangle(ray, result, p, q, r);
	8887	+ }
	8888	+ }
	8889	+
	8890	+ return success;
	8891	+ }
	8892	+
	8893	+ static cVector eye = new cVector();
	8894	+ static cVector dir = new cVector();
	8895	+
	8896	+ transient BBox bbox = null;
	8897	+
	8898	+ boolean intersect(Ray ray, IntersectResult result)
	8899	+ {
	8900	+ double eyex = ray.eyePoint.x;
	8901	+ double eyey = ray.eyePoint.y;
	8902	+ double eyez = ray.eyePoint.z;
	8903	+
	8904	+ double dirx = ray.viewDirection.x;
	8905	+ double diry = ray.viewDirection.y;
	8906	+ double dirz = ray.viewDirection.z;
	8907	+
	8908	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8909	+ {
	8910	+ eye.x = eyex;
	8911	+ eye.y = eyey;
	8912	+ eye.z = eyez;
	8913	+ dir.x = dirx;
	8914	+ dir.y = diry;
	8915	+ dir.z = dirz;
	8916	+
	8917	+ LA.xformPos(eye, this.fromParent, eye);
	8918	+ LA.xformDir(dir, this.fromParent, dir);
	8919	+
	8920	+ ray.eyePoint.x = eye.x;
	8921	+ ray.eyePoint.y = eye.y;
	8922	+ ray.eyePoint.z = eye.z;
	8923	+
	8924	+ ray.viewDirection.x = dir.x;
	8925	+ ray.viewDirection.y = dir.y;
	8926	+ ray.viewDirection.z = dir.z;
	8927	+ }
	8928	+
	8929	+ boolean success = false;
	8930	+
	8931	+ boolean touch = false;
	8932	+
	8933	+ if (bRep != null && Link2Support())
	8934	+ {
	8935	+ if (bbox == null)
	8936	+ {
	8937	+ bbox = new BBox();
	8938	+
	8939	+ cVector min = new cVector();
	8940	+ cVector max = new cVector();
	8941	+
	8942	+ this.getBounds(min, max, true);
	8943	+
	8944	+ bbox.min.x = min.x;
	8945	+ bbox.min.y = min.y;
	8946	+ bbox.min.z = min.z;
	8947	+
	8948	+ bbox.max.x = max.x;
	8949	+ bbox.max.y = max.y;
	8950	+ bbox.max.z = max.z;
	8951	+ }
	8952	+
	8953	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8954	+ {
	8955	+ success \|= intersectMesh(ray, result);
	8956	+ }
	8957	+ else
	8958	+ {
	8959	+ //this.hide = true;
	8960	+ touch = true;
	8961	+ }
	8962	+ }
	8963	+
	8964	+ for (int i=0; i<size(); i++)
	8965	+ {
	8966	+ Object3D child = (Object3D) reserve(i);
	8967	+
	8968	+ if (child == null)
	8969	+ continue;
	8970	+
	8971	+ success \|= child.intersect(ray, result);
	8972	+ release(i);
	8973	+ }
	8974	+
	8975	+ ray.eyePoint.x = eyex;
	8976	+ ray.eyePoint.y = eyey;
	8977	+ ray.eyePoint.z = eyez;
	8978	+
	8979	+ ray.viewDirection.x = dirx;
	8980	+ ray.viewDirection.y = diry;
	8981	+ ray.viewDirection.z = dirz;
	8982	+
	8983	+// if (touch)
	8984	+// this.Touch(); // refresh display list
	8985	+
	8986	+ return success;
	8987	+ }
	8988	+
	8989	+ static Vector3d edge1 = new Vector3d();
	8990	+ static Vector3d edge2 = new Vector3d();
	8991	+ static Vector3d P = new Vector3d();
	8992	+ static Vector3d T = new Vector3d();
	8993	+ static Vector3d Q = new Vector3d();
	8994	+
	8995	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8996	+ {
	8997	+ if (false)
	8998	+ {
	8999	+ result.t = 0;
	9000	+ return true;
	9001	+ }
	9002	+
	9003	+ /*
	9004	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9005	+
	9006	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9007	+ */
	9008	+
	9009	+ // Calculate edges of the triangle
	9010	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9011	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9012	+
	9013	+ // Calculate the determinant (U parameter)
	9014	+ P.cross(ray.viewDirection, edge2);
	9015	+ double det = edge1.dot(P);
	9016	+
	9017	+ if (det > -1e-9 && det < 1e-9)
	9018	+ {
	9019	+ return false;
	9020	+ } // Ray lies in plane of triangle
	9021	+
	9022	+ double invDet = 1 / det;
	9023	+
	9024	+ // Calculate distance from vertex1 to ray origin
	9025	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9026	+
	9027	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9028	+
	9029	+ if (U < 0.f \|\| U > 1.f)
	9030	+ {
	9031	+ return false;
	9032	+ } // Intersection lies outside of the triangle
	9033	+
	9034	+ // Calculate V parameter
	9035	+ Q.cross(T, edge1);
	9036	+
	9037	+ double V = ray.viewDirection.dot(Q) * invDet;
	9038	+
	9039	+ if (V < 0.f \|\| (U + V) > 1.f)
	9040	+ {
	9041	+ return false;
	9042	+ } // Intersection lies outside of the triangle
	9043	+
	9044	+ double t = edge2.dot(Q) * invDet;
	9045	+
	9046	+ if (t > 1e-9) // Triangle and ray intersects
	9047	+ {
	9048	+ //result.isIntersected = true;
	9049	+ //result.id = id;
	9050	+
	9051	+ if (false) // isShadow)
	9052	+ {
	9053	+ result.t = t;
	9054	+ return true;
	9055	+ } else if (t < result.t)
	9056	+ {
	9057	+ result.object = this;
	9058	+
	9059	+ result.t = t;
	9060	+
	9061	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9062	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9063	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9064	+
	9065	+ result.n.cross(edge1, edge2);
	9066	+ result.n.normalize();
	9067	+ }
	9068	+
	9069	+ return true;
	9070	+ }
	9071	+
	9072	+ return false;
	9073	+ }
8249	9074
8250	9075	public int Size()
8251	9076	{