~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,21 +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	36	String skyboxname;
33	37	String skyboxext;
34	38
35		- Object3D versions[];
	39	+ Object3D[] versionlist;
36	40	int versionindex = -1;
37	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	+
38	46	ScriptNode scriptnode;
39	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	+
40	134	void InitOthers()
41	135	{
42	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -48,6 +142,7 @@
48	142	projectedVertices[i] = new cVector2(); // Others
49	143	}
50	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
51	146	}
52	147
53	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -127,7 +222,7 @@
127	222	return;
128	223
129	224	transientsupport = support;
130		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
131	226
132	227	support = null;
133	228	link2master = false;
..	..	@@ -174,9 +269,42 @@
174	269	}
175	270	}
176	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	+
177	300	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
178	301	{
	302	+ if (blockloop)
	303	+ return;
	304	+
179	305	Object3D o;
	306	+
	307	+ boolean isnew = false;
180	308
181	309	if (hashtable.containsKey(GetUUID()))
182	310	{
..	..	@@ -190,12 +318,14 @@
190	318	}
191	319	else
192	320	{
	321	+ isnew = true;
	322	+
193	323	o = new Object3D("copy of " + this.name);
194	324
195	325	hashtable.put(GetUUID(), o);
196	326	}
197	327
198		- if (!blockloop)
	328	+ //if (!blockloop)
199	329	{
200	330	blockloop = true;
201	331
..	..	@@ -206,12 +336,15 @@
206	336
207	337	blockloop = false;
208	338	}
209		-
210		- ExtractBigData(o);
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
211	342	}
212	343
213	344	void ExtractBigData(Object3D o)
214	345	{
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
215	348	if (o.bRep != null)
216	349	Grafreed.Assert(o.bRep == this.bRep);
217	350
..	..	@@ -222,8 +355,8 @@
222	355	// o.bRep.support = null;
223	356	// }
224	357	o.selection = this.selection;
225		- o.versions = this.versions;
226		- o.versionindex = this.versionindex;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
227	360
228	361	if (this.support != null)
229	362	{
..	..	@@ -246,17 +379,84 @@
246	379	// this.fileparent = null;
247	380	}
248	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	+
249	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
250	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
251	454	if (!hashtable.containsKey(GetUUID()))
252	455	return;
253	456
254	457	Object3D o = hashtable.get(GetUUID());
255	458
256	459	RestoreBigData(o);
257		-
258		- if (blockloop)
259		- return;
260	460
261	461	blockloop = true;
262	462
..	..	@@ -272,6 +472,9 @@
272	472
273	473	void RestoreBigData(Object3D o)
274	474	{
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
275	478	this.bRep = o.bRep;
276	479	if (this.support != null && o.transientrep != null)
277	480	{
..	..	@@ -280,8 +483,8 @@
280	483
281	484	this.selection = o.selection;
282	485
283		- this.versions = o.versions;
284		- this.versionindex = o.versionindex;
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
285	488	// July 2019 if (this.bRep != null)
286	489	// this.bRep.support = o.transientrep;
287	490	// this.support = o.support;
..	..	@@ -432,7 +635,10 @@
432	635	transient boolean keepdontselect;
433	636	boolean dontselect = false;
434	637	boolean hide = false;
435		- 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	+
436	642	boolean marked = false; // animation node
437	643	boolean skip = false; // centroid issue
438	644	boolean skipmocap = false; // mocap data
..	..	@@ -440,6 +646,9 @@
440	646	boolean random = false;
441	647	boolean speedup = false;
442	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
443	652
444	653	float NORMALPUSH = 0;
445	654
..	..	@@ -458,7 +667,7 @@
458	667	{
459	668	sorted = true;
460	669
461		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
462	671	{
463	672	Object3D obji = get(i);
464	673	Object3D objj = get(i+1);
..	..	@@ -482,7 +691,7 @@
482	691	{
483	692	sorted = true;
484	693
485		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
486	695	{
487	696	Object3D obji = get(i);
488	697	Object3D objj = get(i+1);
..	..	@@ -498,11 +707,11 @@
498	707	}
499	708	}
500	709
501		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
502	711
503	712	int MemorySize()
504	713	{
505		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
506	715	{
507	716	try
508	717	{
..	..	@@ -617,7 +826,7 @@
617	826	{
618	827	if (maxcount != 1)
619	828	{
620		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
621	830	}
622	831
623	832	toParentMarked = LA.newMatrix();
..	..	@@ -819,7 +1028,7 @@
819	1028
820	1029	void Step()
821	1030	{
822		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
823	1032	resetmaxcount();
824	1033	resettransformcount();
825	1034	resetstep();
..	..	@@ -933,6 +1142,8 @@
933	1142	(Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
934	1143	currentframe != Globals.framecount)
935	1144	{
	1145	+ Globals.lighttouched = true;
	1146	+
936	1147	currentframe = Globals.framecount;
937	1148
938	1149	// System.err.println("transformcount = " + transformcount);
..	..	@@ -1012,24 +1223,28 @@
1012	1223	{
1013	1224	// return true;
1014	1225
1015		- if (material == null \|\| material.multiply)
1016		- 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;
1017	1234
1018		- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1019		- return false;
1020		-
1021		- // Transparent objects are dynamic because we have to sort the triangles.
1022		- return material.opacity > 0.99;
	1235	+ return !sort;
1023	1236	}
1024	1237
1025	1238	boolean IsOpaque()
1026	1239	{
1027	1240	// return true;
1028	1241
1029		- if (material == null \|\| material.multiply)
1030		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
1031	1246
1032		- return material.opacity > 0.99;
	1247	+ return !sort;
1033	1248	}
1034	1249
1035	1250	Object3D()
..	..	@@ -1107,8 +1322,10 @@
1107	1322
1108	1323	// will share the geometry
1109	1324	assert (!(this instanceof Composite));
1110		- return deepCopy(); // Never called for Composite
1111		-
	1325	+
	1326	+ Object3D obj = deepCopy(); // Never called for Composite
	1327	+ obj.count = 2;
	1328	+ return obj;
1112	1329	}
1113	1330
1114	1331	boolean HasLoops()
..	..	@@ -1116,6 +1333,30 @@
1116	1333	return false;
1117	1334	}
1118	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	+
1119	1360	boolean IsInfinite()
1120	1361	{
1121	1362	if (blockloop)
..	..	@@ -1186,78 +1427,16 @@
1186	1427	return;
1187	1428
1188	1429	blockloop = true;
	1430	+
	1431	+ other.parent = parent;
	1432	+
1189	1433	//System.out.println("COPY " + this + " to " + other);
1190	1434	//new Exception().printStackTrace();
	1435	+ deepCopyNode(other);
1191	1436
1192		- other.parent = parent;
1193		- if (toParent != null)
1194		- {
1195		- other.toParent = LA.newMatrix();
1196		- other.fromParent = LA.newMatrix();
1197		- LA.matCopy(toParent, other.toParent);
1198		- LA.matCopy(fromParent, other.fromParent);
1199		- if (toParentMarked != null)
1200		- {
1201		- other.toParentMarked = LA.newMatrix();
1202		- other.fromParentMarked = LA.newMatrix();
1203		- LA.matCopy(toParentMarked, other.toParentMarked);
1204		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1205		- }
1206		- }
1207		- else
1208		- {
1209		- if (other.toParent == null)
1210		-// assert(other.toParent == null);
1211		-// new Exception().printStackTrace();
1212		- System.err.println("null parent: " + other);
1213		- }
1214		- /*
1215		- double ident[][] = LA.newMatrix();
1216		- if (bRep == null)
1217		- other.bRep = null;
1218		- else
1219		- other.bRep = new BoundaryRep(bRep, ident);
1220		- */
1221		- // Really new...
1222	1437	other.bRep = bRep; // Share the geometry
1223	1438
1224	1439	other.support = support; // Share the support
1225		-
1226		- //other.editWindow = null;
1227		- if (name == null)
1228		- other.name = null;
1229		- else
1230		- other.name = new String(name);
1231		-
1232		- if (material != null)
1233		- {
1234		- other.material = new cMaterial(material);
1235		- } else
1236		- {
1237		- other.material = null;
1238		- }
1239		-
1240		- other.GetTextures().name = GetTextures().name;
1241		-
1242		- CopyExtraMaterial(other);
1243		-
1244		- other.touched = touched;
1245		- other.softtouched = softtouched;
1246		-
1247		- other.random = random;
1248		- other.link2master = link2master;
1249		- other.transformcount = transformcount;
1250		- other.marked = marked;
1251		- other.skip = skip;
1252		- other.count = count;
1253		- other.flipV = flipV;
1254		- other.live = live;
1255		- other.rewind = rewind;
1256		- other.hide = hide;
1257		- other.texres = texres;
1258		- other.speedup = speedup;
1259		- other.height = height;
1260		- other.depth = depth;
1261	1440
1262	1441	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1263	1442	// {
..	..	@@ -1313,17 +1492,24 @@
1313	1492	if ((mask & GEOMETRY) != 0)
1314	1493	{
1315	1494	if (bRep != null)
1316		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1317		- else
1318		- assert(other.bRep == null);
1319		-
1320		- if (bRep != null)
1321	1495	{
	1496	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1322	1497	CameraPane.RemoveList(bRep.displaylist);
1323	1498	bRep.displaylist = 0; // june 2013 -1;
1324	1499	}
1325	1500	else
1326		- 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;
1327	1513	}
1328	1514
1329	1515	/* Use a MASK = GEO/MAT
..	..	@@ -2299,11 +2485,6 @@
2299	2485
2300	2486	InitOthers();
2301	2487
2302		- if (this instanceof Camera)
2303		- {
2304		- material.shift = 90;
2305		- }
2306		-
2307	2488	material.multiply = multiply;
2308	2489
2309	2490	if (multiply)
..	..	@@ -2444,6 +2625,11 @@
2444	2625	else
2445	2626	{
2446	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");
2447	2633	}
2448	2634	}
2449	2635
..	..	@@ -3119,7 +3305,10 @@
3119	3305	{
3120	3306	if (bRep != null)
3121	3307	{
	3308	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3122	3309	bRep.GenerateNormals(crease);
	3310	+ if (!bRep.trimmed)
	3311	+ bRep.MergeNormals();
3123	3312	Touch();
3124	3313	}
3125	3314	}
..	..	@@ -3194,6 +3383,105 @@
3194	3383	blockloop = false;
3195	3384	}
3196	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	+
3197	3485	void TransformChildren()
3198	3486	{
3199	3487	if (toParent != null)
..	..	@@ -3436,6 +3724,7 @@
3436	3724	if (bRep != null)
3437	3725	{
3438	3726	//bRep.RemoveOneTriangle();
	3727	+ System.out.println();
3439	3728	System.out.println("Reducing " + this);
3440	3729	if (name != null && name.contains("lockpickstraps"))
3441	3730	name = name;
..	..	@@ -3547,15 +3836,47 @@
3547	3836
3548	3837	void ClearMaterials()
3549	3838	{
	3839	+ if (blockloop)
	3840	+ return;
	3841	+
	3842	+ blockloop = true;
	3843	+
3550	3844	ClearMaterial();
3551		- for (int i = 0; i < size(); i++)
	3845	+ for (int i = 0; i < Size(); i++)
3552	3846	{
3553		- Object3D child = (Object3D) reserve(i);
	3847	+ Object3D child = (Object3D) get(i);
3554	3848	if (child == null)
3555	3849	continue;
3556	3850	child.ClearMaterials();
3557		- release(i);
3558	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;
3559	3880	}
3560	3881
3561	3882	void FlipV(boolean flip)
..	..	@@ -3734,6 +4055,7 @@
3734	4055
3735	4056	void RevertMeshes()
3736	4057	{
	4058	+ // BLOCKLOOP
3737	4059	if (this instanceof cMesh)
3738	4060	{
3739	4061	((cMesh)this).Revert();
..	..	@@ -3764,11 +4086,6 @@
3764	4086	Touch();
3765	4087	}
3766	4088
3767		- ResetRecur();
3768		- }
3769		-
3770		- void ResetRecur()
3771		- {
3772	4089	for (int i = 0; i < size(); i++)
3773	4090	{
3774	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3791,11 +4108,6 @@
3791	4108	Step();
3792	4109	Touch();
3793	4110
3794		- StepRecur();
3795		- }
3796		-
3797		- void StepRecur()
3798		- {
3799	4111	for (int i = 0; i < size(); i++)
3800	4112	{
3801	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3982,8 +4294,8 @@
3982	4294	Touch();
3983	4295	}
3984	4296
3985		- transient cVector min = new cVector();
3986		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
3987	4299
3988	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
3989	4301	{
..	..	@@ -3999,15 +4311,15 @@
3999	4311	if (blockloop)
4000	4312	return;
4001	4313
4002		- if (min == null) // ???
	4314	+ if (min == null)
4003	4315	{
4004	4316	min = new cVector();
4005	4317	max = new cVector();
4006	4318	}
4007	4319
4008		- for (int i = 0; i<size(); i++)
	4320	+ for (int i = 0; i<Size(); i++)
4009	4321	{
4010		- Object3D child = (Object3D) reserve(i);
	4322	+ Object3D child = (Object3D) get(i); //reserve(i);
4011	4323	if (child == null)
4012	4324	continue;
4013	4325
..	..	@@ -4026,21 +4338,21 @@
4026	4338	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4027	4339	//if (child.hide)
4028	4340	{
4029		- release(i);
	4341	+ //release(i);
4030	4342	continue;
4031	4343	}
4032	4344
4033	4345	blockloop = true;
4034	4346	child.getBounds(min, max, true); // xform);
4035	4347	blockloop = false;
4036		- release(i);
	4348	+ //release(i);
4037	4349
4038	4350	MinMax(minima, maxima);
4039	4351	}
4040	4352
4041	4353	if (bRep != null)
4042	4354	{
4043		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
4044	4356	}
4045	4357
4046	4358	if (false) // xform)
..	..	@@ -5545,6 +5857,11 @@
5545	5857	if (fullname == null)
5546	5858	return "";
5547	5859
	5860	+ if (fullname.pigment != null)
	5861	+ {
	5862	+ return fullname.pigment;
	5863	+ }
	5864	+
5548	5865	// System.out.println("Fullname = " + fullname);
5549	5866
5550	5867	// Does not work on Windows due to C:
..	..	@@ -5557,7 +5874,7 @@
5557	5874
5558	5875	if (split.length == 0)
5559	5876	{
5560		- return "";
	5877	+ return fullname.pigment = "";
5561	5878	}
5562	5879
5563	5880	if (split.length <= 2)
..	..	@@ -5565,22 +5882,27 @@
5565	5882	if (fullname.name.endsWith(":"))
5566	5883	{
5567	5884	// Windows
5568		- return fullname.name.substring(0, fullname.name.length()-1);
	5885	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5569	5886	}
5570	5887
5571		- return split[0];
	5888	+ return fullname.pigment = split[0];
5572	5889	}
5573	5890
5574	5891	// Windows
5575	5892	assert(split.length == 4);
5576	5893
5577		- return split[0] + ":" + split[1];
	5894	+ return fullname.pigment = split[0] + ":" + split[1];
5578	5895	}
5579	5896
5580	5897	static String GetBump(cTexture fullname)
5581	5898	{
5582	5899	if (fullname == null)
5583	5900	return "";
	5901	+
	5902	+ if (fullname.bump != null)
	5903	+ {
	5904	+ return fullname.bump;
	5905	+ }
5584	5906
5585	5907	// System.out.println("Fullname = " + fullname);
5586	5908	// Does not work on Windows due to C:
..	..	@@ -5592,12 +5914,12 @@
5592	5914
5593	5915	if (split.length == 0)
5594	5916	{
5595		- return "";
	5917	+ return fullname.bump = "";
5596	5918	}
5597	5919
5598	5920	if (split.length == 1)
5599	5921	{
5600		- return "";
	5922	+ return fullname.bump = "";
5601	5923	}
5602	5924
5603	5925	if (split.length == 2)
..	..	@@ -5605,16 +5927,16 @@
5605	5927	if (fullname.name.endsWith(":"))
5606	5928	{
5607	5929	// Windows
5608		- return "";
	5930	+ return fullname.bump = "";
5609	5931	}
5610	5932
5611		- return split[1];
	5933	+ return fullname.bump = split[1];
5612	5934	}
5613	5935
5614	5936	// Windows
5615	5937	assert(split.length == 4);
5616	5938
5617		- return split[2] + ":" + split[3];
	5939	+ return fullname.bump = split[2] + ":" + split[3];
5618	5940	}
5619	5941
5620	5942	String GetPigmentTexture()
..	..	@@ -5697,6 +6019,9 @@
5697	6019	texname = "";
5698	6020
5699	6021	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6022	+
	6023	+ GetTextures().pigment = null;
	6024	+
5700	6025	Touch();
5701	6026	}
5702	6027
..	..	@@ -5770,6 +6095,8 @@
5770	6095
5771	6096	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5772	6097
	6098	+ GetTextures().bump = null;
	6099	+
5773	6100	Touch();
5774	6101	}
5775	6102
..	..	@@ -5834,7 +6161,7 @@
5834	6161	boolean NeedSupport()
5835	6162	{
5836	6163	return
5837		- 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
5838	6165	// PROBLEM with CROWD!!
5839	6166	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5840	6167	}
..	..	@@ -5852,6 +6179,20 @@
5852	6179	return parent.IsLive();
5853	6180	}
5854	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	+
5855	6196	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5856	6197	{
5857	6198	Invariants(); // june 2013
..	..	@@ -5859,6 +6200,29 @@
5859	6200	if (support != null)
5860	6201	{
5861	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	+ }
5862	6226	}
5863	6227
5864	6228	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5912,7 +6276,8 @@
5912	6276	if (support != null)
5913	6277	support = support;
5914	6278
5915		- 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);
5916	6281	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5917	6282
5918	6283	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -5923,7 +6288,8 @@
5923	6288	bRep.displaylist = 0;
5924	6289	}
5925	6290	// usecalllists &= !(parent instanceof RandomNode);
5926		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
5927	6293
5928	6294	if (display.DrawMode() == display.SHADOW)
5929	6295	//GetBRep() != null)
..	..	@@ -5937,7 +6303,7 @@
5937	6303
5938	6304	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5939	6305	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5940		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5941	6307	{
5942	6308	Globals.lighttouched = true;
5943	6309	} // all panes...
..	..	@@ -5979,8 +6345,8 @@
5979	6345	Globals.lighttouched = true; // all panes...
5980	6346	}
5981	6347
5982		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5983		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
5984	6350
5985	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
5986	6352	{
..	..	@@ -6019,7 +6385,7 @@
6019	6385	{
6020	6386	if (display.DrawMode() == iCameraPane.SHADOW)
6021	6387	{
6022		- if (!link2master // tricky to cull in shadow mode.
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
6023	6389	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6024	6390	{
6025	6391	//System.out.print("CULLED");
..	..	@@ -6081,6 +6447,20 @@
6081	6447	{
6082	6448	drawSelf(display, root, selected, blocked);
6083	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	+// }
6084	6464	} else
6085	6465	{
6086	6466	/*
..	..	@@ -6113,13 +6493,14 @@
6113	6493	boolean failedPigment = false;
6114	6494	boolean failedBump = false;
6115	6495
	6496	+ CameraPane.lastObject = this;
6116	6497	try
6117	6498	{
6118	6499	display.BindPigmentTexture(tex, texres);
6119	6500	}
6120	6501	catch (Exception e)
6121	6502	{
6122		- System.err.println("FAILED: " + this);
	6503	+ // System.err.println("FAILED: " + this);
6123	6504	failedPigment = true;
6124	6505	}
6125	6506
..	..	@@ -6150,6 +6531,20 @@
6150	6531	display.CallList(bRep.displaylist);
6151	6532	// june 2013 drawSelf(display, root, selected);
6152	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	+// }
6153	6548	}
6154	6549	}
6155	6550
..	..	@@ -6203,16 +6598,17 @@
6203	6598
6204	6599	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6205	6600	{
6206		- if (GetBRep() == null)
6207		- {
6208		- drawSelf(display, root, selected, blocked);
6209		- } else
	6601	+ if (GetBRep() != null)
6210	6602	{
6211	6603	DrawNode(display, root, selected);
6212	6604	if (this instanceof BezierPatch)
6213	6605	{
6214	6606	//drawSelf(display, root, selected);
6215	6607	}
	6608	+ }
	6609	+ else
	6610	+ {
	6611	+ drawSelf(display, root, selected, blocked);
6216	6612	}
6217	6613	}
6218	6614
..	..	@@ -6462,7 +6858,8 @@
6462	6858
6463	6859	//javax.media.opengl.GL gl = display.GetGL();
6464	6860
6465		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
6466	6863	{
6467	6864	int fc = bRep.FaceCount();
6468	6865	int vc = bRep.VertexCount();
..	..	@@ -6624,7 +7021,7 @@
6624	7021	facescompare[k] = new FaceCompare(k);
6625	7022	}
6626	7023
6627		- center = new cVector();
	7024	+ centertriangle = new cVector();
6628	7025	}
6629	7026	else
6630	7027	{
..	..	@@ -6747,7 +7144,7 @@
6747	7144	*/
6748	7145	}
6749	7146
6750		- transient cVector center;
	7147	+ transient cVector centertriangle;
6751	7148
6752	7149	class FaceCompare implements Comparable
6753	7150	{
..	..	@@ -6776,14 +7173,14 @@
6776	7173	Vertex q = bRep.GetVertex(face.q);
6777	7174	Vertex r = bRep.GetVertex(face.r);
6778	7175
6779		- center.set(p);
6780		- center.add(q);
6781		- center.add(r);
6782		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
6783	7180
6784		- center.sub(Globals.theRenderer.EyeCamera().location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6785	7182
6786		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
6787	7184	}
6788	7185
6789	7186	return distance;
..	..	@@ -7373,7 +7770,7 @@
7373	7770	boundary.y = spot.y - 30;
7374	7771	boundary.width = spot.width + 60;
7375	7772	boundary.height = spot.height + 60;
7376		- clickInfo.g.setColor(Color.red);
	7773	+ clickInfo.g.setColor(Color.white);
7377	7774	int spotw = spot.x + spot.width;
7378	7775	int spoth = spot.y + spot.height;
7379	7776	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7393,7 +7790,29 @@
7393	7790	// {
7394	7791	// CameraPane.Ymax = spoth;
7395	7792	// }
7396		- spot.translate(32, 32);
	7793	+// if (CameraPane.Xmin > spot.x)
	7794	+// {
	7795	+// CameraPane.Xmin = spot.x;
	7796	+// }
	7797	+// if (CameraPane.Xmax < spotw)
	7798	+// {
	7799	+// CameraPane.Xmax = spotw;
	7800	+// }
	7801	+// if (CameraPane.Ymin > spot.y)
	7802	+// {
	7803	+// CameraPane.Ymin = spot.y;
	7804	+// }
	7805	+// if (CameraPane.Ymax < spoth)
	7806	+// {
	7807	+// CameraPane.Ymax = spoth;
	7808	+// }
	7809	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7810	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	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);
7397	7816	spotw = spot.x + spot.width;
7398	7817	spoth = spot.y + spot.height;
7399	7818	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7414,28 +7833,7 @@
7414	7833	// {
7415	7834	// CameraPane.Ymax = spoth;
7416	7835	// }
7417		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7418		- //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7419		- spot.translate(0, -32);
7420		- clickInfo.g.setColor(Color.yellow);
7421		- clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7422	7836	clickInfo.g.setColor(Color.green);
7423		-// if (CameraPane.Xmin > spot.x)
7424		-// {
7425		-// CameraPane.Xmin = spot.x;
7426		-// }
7427		-// if (CameraPane.Xmax < spotw)
7428		-// {
7429		-// CameraPane.Xmax = spotw;
7430		-// }
7431		-// if (CameraPane.Ymin > spot.y)
7432		-// {
7433		-// CameraPane.Ymin = spot.y;
7434		-// }
7435		-// if (CameraPane.Ymax < spoth)
7436		-// {
7437		-// CameraPane.Ymax = spoth;
7438		-// }
7439	7837	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7440	7838	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7441	7839	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7494,12 +7892,14 @@
7494	7892	retval = true;
7495	7893	}
7496	7894	spot.translate(0, 32);
	7895	+ spot.translate(32, 0);
	7896	+ spot.translate(0, 32);
7497	7897	if (spot.contains(clickInfo.x, clickInfo.y))
7498	7898	{
7499	7899	hitSomething = hitScale;
7500	7900
7501	7901	double scale = 0.005f * clickInfo.camera.Distance();
7502		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7902	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7503	7903	double sign = 1;
7504	7904	if (hScale < 0)
7505	7905	{
..	..	@@ -7511,7 +7911,7 @@
7511	7911	//hScale = 0.01;
7512	7912	}
7513	7913
7514		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7914	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7515	7915	sign = 1;
7516	7916	if (vScale < 0)
7517	7917	{
..	..	@@ -7591,7 +7991,9 @@
7591	7991
7592	7992	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7593	7993
7594		- if (modified \|\| opposite)
	7994	+ // Modified could snap
	7995	+ if (//modified \|\|
	7996	+ opposite)
7595	7997	{
7596	7998	//assert(false);
7597	7999	/*
..	..	@@ -7685,7 +8087,7 @@
7685	8087
7686	8088	if (modified)
7687	8089	{
7688		- // Rotate 90 degrees
	8090	+ // Rotate 45 degrees
7689	8091	angle /= (Math.PI / 4);
7690	8092	angle = Math.floor(angle + 0.5);
7691	8093	angle *= (Math.PI / 4);
..	..	@@ -7726,7 +8128,7 @@
7726	8128	break;
7727	8129
7728	8130	case hitScale: // scale
7729		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	8131	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7730	8132	double sign = 1;
7731	8133	if (hScale < 0)
7732	8134	{
..	..	@@ -7738,7 +8140,7 @@
7738	8140	//hScale = 0.01;
7739	8141	}
7740	8142
7741		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	8143	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7742	8144	sign = 1;
7743	8145	if (vScale < 0)
7744	8146	{
..	..	@@ -7771,21 +8173,27 @@
7771	8173	case 3: // '\001'
7772	8174	if (modified \|\| opposite)
7773	8175	{
	8176	+ if (modified) // && opposite)
	8177	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8178	+ else
7774	8179	//LA.matScale(toParent, 1, hScale, vScale);
7775		- LA.matScale(toParent, totalScale, 1, 1);
	8180	+ LA.matScale(toParent, totalScale, 1, 1);
7776	8181	} // vScale, 1);
7777	8182	else
7778	8183	{
7779	8184	// EXCEPTION!
7780		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8185	+ LA.matScale(toParent, 1, totalScale, totalScale);
7781	8186	} // vScale, 1);
7782	8187	break;
7783	8188
7784	8189	case 2: // '\002'
7785	8190	if (modified \|\| opposite)
7786	8191	{
7787		- //LA.matScale(toParent, hScale, 1, vScale);
7788		- 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);
7789	8197	} else
7790	8198	{
7791	8199	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7795,8 +8203,11 @@
7795	8203	case 1: // '\003'
7796	8204	if (modified \|\| opposite)
7797	8205	{
7798		- //LA.matScale(toParent, hScale, vScale, 1);
7799		- 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);
7800	8211	} else
7801	8212	{
7802	8213	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7947,12 +8358,12 @@
7947	8358	if (!Globals.ADVANCED)
7948	8359	return objname;
7949	8360
7950		- return objname + " " + System.identityHashCode(this);
	8361	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7951	8362	}
7952	8363
7953	8364	public int hashCode()
7954	8365	{
7955		- // Fuck Vector...
	8366	+ // Do not use Vector...
7956	8367	return System.identityHashCode(this);
7957	8368	}
7958	8369
..	..	@@ -8192,8 +8603,8 @@
8192	8603	private static cVector2 qq2 = new cVector2();
8193	8604	private static cVector2 rr2 = new cVector2();
8194	8605	private static cVector2 ss2 = new cVector2();
8195		- private static cVector edge1 = new cVector();
8196		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
8197	8608	//private static cVector norm = new cVector();
8198	8609	/transient private/ int hitSomething;
8199	8610	static final int hitCenter = 1;
..	..	@@ -8391,7 +8802,275 @@
8391	8802
8392	8803	Touch();
8393	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
8394	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	+ }
8395	9074
8396	9075	public int Size()
8397	9076	{