~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,15 +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
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for versions. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
30	34	//
	35	+
	36	+ String skyboxname;
	37	+ String skyboxext;
	38	+
	39	+ Object3D[] versionlist;
	40	+ int versionindex = -1;
	41	+
	42	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	43	+
	44	+ int tabIndex;
31	45
32	46	ScriptNode scriptnode;
33	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	+
34	134	void InitOthers()
35	135	{
36	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -42,6 +142,7 @@
42	142	projectedVertices[i] = new cVector2(); // Others
43	143	}
44	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
45	146	}
46	147
47	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -121,7 +222,7 @@
121	222	return;
122	223
123	224	transientsupport = support;
124		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
125	226
126	227	support = null;
127	228	link2master = false;
..	..	@@ -168,38 +269,102 @@
168	269	}
169	270	}
170	271
171		- void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	272	+ boolean HasBigData()
172	273	{
173		- if (hashtable.containsKey(GetUUID()))
	274	+ if (blockloop)
	275	+ return false;
	276	+
	277	+ if (bRep != null)
174	278	{
175		- Object3D o = hashtable.get(GetUUID());
176		-
177		- assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
180		-
181		- return;
182		- }
183		-
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
189		- {
190		- get(i).ExtractBigData(hashtable);
	279	+ return true;
191	280	}
192	281
193		- ExtractBigData(o);
	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	+
	300	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	301	+ {
	302	+ if (blockloop)
	303	+ return;
	304	+
	305	+ Object3D o;
	306	+
	307	+ boolean isnew = false;
	308	+
	309	+ if (hashtable.containsKey(GetUUID()))
	310	+ {
	311	+ o = hashtable.get(GetUUID());
	312	+
	313	+ Grafreed.Assert(this.bRep == o.bRep);
	314	+ //if (this.bRep != null)
	315	+ // assert(this.bRep.support == o.transientrep);
	316	+ if (this.support != null)
	317	+ assert(this.support.bRep == o.transientrep);
	318	+ }
	319	+ else
	320	+ {
	321	+ isnew = true;
	322	+
	323	+ o = new Object3D("copy of " + this.name);
	324	+
	325	+ hashtable.put(GetUUID(), o);
	326	+ }
	327	+
	328	+ //if (!blockloop)
	329	+ {
	330	+ blockloop = true;
	331	+
	332	+ for (int i=0; i<Size(); i++)
	333	+ {
	334	+ get(i).ExtractBigData(hashtable);
	335	+ }
	336	+
	337	+ blockloop = false;
	338	+ }
	339	+
	340	+ //if (isnew)
	341	+ ExtractBigData(o);
194	342	}
195	343
196	344	void ExtractBigData(Object3D o)
197	345	{
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
	348	+ if (o.bRep != null)
	349	+ Grafreed.Assert(o.bRep == this.bRep);
	350	+
198	351	o.bRep = this.bRep;
199		- if (this.bRep != null)
	352	+// July 2019 if (this.bRep != null)
	353	+// {
	354	+// o.transientrep = this.bRep.support;
	355	+// o.bRep.support = null;
	356	+// }
	357	+ o.selection = this.selection;
	358	+ //o.versionlist = this.versionlist;
	359	+ //o.versionindex = this.versionindex;
	360	+
	361	+ if (this.support != null)
200	362	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	363	+ if (o.transientrep != null)
	364	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	365	+
	366	+ o.transientrep = this.support.bRep;
	367	+ this.support.bRep = null;
203	368	}
204	369
205	370	// o.support = this.support;
..	..	@@ -214,8 +379,78 @@
214	379	// this.fileparent = null;
215	380	}
216	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	+
217	449	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	450	{
	451	+ if (blockloop)
	452	+ return;
	453	+
219	454	if (!hashtable.containsKey(GetUUID()))
220	455	return;
221	456
..	..	@@ -223,19 +458,35 @@
223	458
224	459	RestoreBigData(o);
225	460
226		- hashtable.remove(GetUUID());
	461	+ blockloop = true;
	462	+
	463	+ //hashtable.remove(GetUUID());
227	464
228	465	for (int i=0; i<Size(); i++)
229	466	{
230	467	get(i).RestoreBigData(hashtable);
231	468	}
	469	+
	470	+ blockloop = false;
232	471	}
233	472
234	473	void RestoreBigData(Object3D o)
235	474	{
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
236	478	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	479	+ if (this.support != null && o.transientrep != null)
	480	+ {
	481	+ this.support.bRep = o.transientrep;
	482	+ }
	483	+
	484	+ this.selection = o.selection;
	485	+
	486	+ //this.versionlist = o.versionlist;
	487	+ //this.versionindex = o.versionindex;
	488	+// July 2019 if (this.bRep != null)
	489	+// this.bRep.support = o.transientrep;
239	490	// this.support = o.support;
240	491	// this.fileparent = o.fileparent;
241	492	}
..	..	@@ -381,9 +632,13 @@
381	632	}
382	633
383	634	boolean live = false;
	635	+ transient boolean keepdontselect;
384	636	boolean dontselect = false;
385	637	boolean hide = false;
386		- 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	+
387	642	boolean marked = false; // animation node
388	643	boolean skip = false; // centroid issue
389	644	boolean skipmocap = false; // mocap data
..	..	@@ -391,6 +646,9 @@
391	646	boolean random = false;
392	647	boolean speedup = false;
393	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
394	652
395	653	float NORMALPUSH = 0;
396	654
..	..	@@ -409,7 +667,7 @@
409	667	{
410	668	sorted = true;
411	669
412		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
413	671	{
414	672	Object3D obji = get(i);
415	673	Object3D objj = get(i+1);
..	..	@@ -433,7 +691,7 @@
433	691	{
434	692	sorted = true;
435	693
436		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
437	695	{
438	696	Object3D obji = get(i);
439	697	Object3D objj = get(i+1);
..	..	@@ -449,11 +707,11 @@
449	707	}
450	708	}
451	709
452		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
453	711
454	712	int MemorySize()
455	713	{
456		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
457	715	{
458	716	try
459	717	{
..	..	@@ -563,12 +821,14 @@
563	821	toParent = LA.newMatrix();
564	822	fromParent = LA.newMatrix();
565	823	}
	824	+
566	825	if (toParentMarked == null)
567	826	{
568	827	if (maxcount != 1)
569	828	{
570		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
571	830	}
	831	+
572	832	toParentMarked = LA.newMatrix();
573	833	fromParentMarked = LA.newMatrix();
574	834	}
..	..	@@ -768,7 +1028,7 @@
768	1028
769	1029	void Step()
770	1030	{
771		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
772	1032	resetmaxcount();
773	1033	resettransformcount();
774	1034	resetstep();
..	..	@@ -879,7 +1139,7 @@
879	1139
880	1140	if (marked && Globals.isLIVE() && live &&
881	1141	//TEMP21aug2018
882		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1142	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
883	1143	currentframe != Globals.framecount)
884	1144	{
885	1145	currentframe = Globals.framecount;
..	..	@@ -891,7 +1151,8 @@
891	1151
892	1152	boolean changedir = random && Math.random() < 0.01; // && !link2master;
893	1153
894		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1154	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1155	+ (step == 1 && changedir))
895	1156	{
896	1157	countdown = 1;
897	1158	delay = speedup?8:1;
..	..	@@ -960,20 +1221,28 @@
960	1221	{
961	1222	// return true;
962	1223
963		- if (material == null \|\| material.multiply)
964		- return true;
	1224	+// if (material == null \|\| material.multiply)
	1225	+// return true;
	1226	+//
	1227	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1228	+// return false;
	1229	+//
	1230	+// // Transparent objects are dynamic because we have to sort the triangles.
	1231	+// return material.opacity > 0.99;
965	1232
966		- return material.opacity > 0.99;
	1233	+ return !sort;
967	1234	}
968	1235
969	1236	boolean IsOpaque()
970	1237	{
971	1238	// return true;
972	1239
973		- if (material == null \|\| material.multiply)
974		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
975	1244
976		- return material.opacity > 0.99;
	1245	+ return !sort;
977	1246	}
978	1247
979	1248	Object3D()
..	..	@@ -1051,8 +1320,10 @@
1051	1320
1052	1321	// will share the geometry
1053	1322	assert (!(this instanceof Composite));
1054		- return deepCopy(); // Never called for Composite
1055		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
1056	1327	}
1057	1328
1058	1329	boolean HasLoops()
..	..	@@ -1060,6 +1331,30 @@
1060	1331	return false;
1061	1332	}
1062	1333
	1334	+ void ResetUUIDs()
	1335	+ {
	1336	+ if (blockloop)
	1337	+ {
	1338	+ return;
	1339	+ }
	1340	+
	1341	+ this.uuid = null;
	1342	+
	1343	+ blockloop = true;
	1344	+
	1345	+ for (int i = 0; i < Size(); i++)
	1346	+ {
	1347	+ Object3D obj = (Object3D) Children().get(i);
	1348	+
	1349	+ if (obj != null)
	1350	+ {
	1351	+ obj.ResetUUIDs();
	1352	+ }
	1353	+ }
	1354	+
	1355	+ blockloop = false;
	1356	+ }
	1357	+
1063	1358	boolean IsInfinite()
1064	1359	{
1065	1360	if (blockloop)
..	..	@@ -1130,78 +1425,16 @@
1130	1425	return;
1131	1426
1132	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1133	1431	//System.out.println("COPY " + this + " to " + other);
1134	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1135	1434
1136		- other.parent = parent;
1137		- if (toParent != null)
1138		- {
1139		- other.toParent = LA.newMatrix();
1140		- other.fromParent = LA.newMatrix();
1141		- LA.matCopy(toParent, other.toParent);
1142		- LA.matCopy(fromParent, other.fromParent);
1143		- if (toParentMarked != null)
1144		- {
1145		- other.toParentMarked = LA.newMatrix();
1146		- other.fromParentMarked = LA.newMatrix();
1147		- LA.matCopy(toParentMarked, other.toParentMarked);
1148		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1149		- }
1150		- }
1151		- else
1152		- {
1153		- if (other.toParent == null)
1154		-// assert(other.toParent == null);
1155		-// new Exception().printStackTrace();
1156		- System.err.println("null parent: " + other);
1157		- }
1158		- /*
1159		- double ident[][] = LA.newMatrix();
1160		- if (bRep == null)
1161		- other.bRep = null;
1162		- else
1163		- other.bRep = new BoundaryRep(bRep, ident);
1164		- */
1165		- // Really new...
1166	1435	other.bRep = bRep; // Share the geometry
1167	1436
1168	1437	other.support = support; // Share the support
1169		-
1170		- //other.editWindow = null;
1171		- if (name == null)
1172		- other.name = null;
1173		- else
1174		- other.name = new String(name);
1175		-
1176		- if (material != null)
1177		- {
1178		- other.material = new cMaterial(material);
1179		- } else
1180		- {
1181		- other.material = null;
1182		- }
1183		-
1184		- other.GetTextures().name = GetTextures().name;
1185		-
1186		- CopyExtraMaterial(other);
1187		-
1188		- other.touched = touched;
1189		- other.softtouched = softtouched;
1190		-
1191		- other.random = random;
1192		- other.link2master = link2master;
1193		- other.transformcount = transformcount;
1194		- other.marked = marked;
1195		- other.skip = skip;
1196		- other.count = count;
1197		- other.flipV = flipV;
1198		- other.live = live;
1199		- other.rewind = rewind;
1200		- other.hide = hide;
1201		- other.texres = texres;
1202		- other.speedup = speedup;
1203		- other.height = height;
1204		- other.depth = depth;
1205	1438
1206	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1207	1440	// {
..	..	@@ -1257,17 +1490,24 @@
1257	1490	if ((mask & GEOMETRY) != 0)
1258	1491	{
1259	1492	if (bRep != null)
1260		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1261		- else
1262		- assert(other.bRep == null);
1263		-
1264		- if (bRep != null)
1265	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1266	1495	CameraPane.RemoveList(bRep.displaylist);
1267	1496	bRep.displaylist = 0; // june 2013 -1;
1268	1497	}
1269	1498	else
1270		- bRep = bRep;
	1499	+ {
	1500	+ //assert(other.bRep == null);
	1501	+ bRep = other.bRep;
	1502	+ }
	1503	+
	1504	+// if (bRep != null)
	1505	+// {
	1506	+// CameraPane.RemoveList(bRep.displaylist);
	1507	+// bRep.displaylist = 0; // june 2013 -1;
	1508	+// }
	1509	+// else
	1510	+// bRep = bRep;
1271	1511	}
1272	1512
1273	1513	/* Use a MASK = GEO/MAT
..	..	@@ -1363,6 +1603,7 @@
1363	1603	toParent = LA.newMatrix();
1364	1604	fromParent = LA.newMatrix();
1365	1605	}
	1606	+
1366	1607	LA.matCopy(other.toParent, toParent);
1367	1608	LA.matCopy(other.fromParent, fromParent);
1368	1609
..	..	@@ -2242,11 +2483,6 @@
2242	2483
2243	2484	InitOthers();
2244	2485
2245		- if (this instanceof Camera)
2246		- {
2247		- material.shift = 90;
2248		- }
2249		-
2250	2486	material.multiply = multiply;
2251	2487
2252	2488	if (multiply)
..	..	@@ -2384,6 +2620,15 @@
2384	2620	}
2385	2621	*/
2386	2622	}
	2623	+ else
	2624	+ {
	2625	+ //((ObjEditor)editWindow).SetupUI2(null);
	2626	+ if (objectUI != null)
	2627	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2628	+ else
	2629	+ //new Exception().printStackTrace();
	2630	+ System.err.println("objectUI is null");
	2631	+ }
2387	2632	}
2388	2633
2389	2634	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2425,6 +2670,14 @@
2425	2670	{
2426	2671	editWindow.refreshContents();
2427	2672	}
	2673	+ else
	2674	+ {
	2675	+ if (manipWindow != null)
	2676	+ {
	2677	+ manipWindow.refreshContents();
	2678	+ }
	2679	+ }
	2680	+
2428	2681	//if (parent != null)
2429	2682	//parent.refreshEditWindow();
2430	2683	}
..	..	@@ -2504,7 +2757,8 @@
2504	2757	private static final int editSelf = 1;
2505	2758	private static final int editChild = 2;
2506	2759
2507		- void drawEditHandles(ClickInfo info, int level)
	2760	+ void drawEditHandles(//ClickInfo info,
	2761	+ int level)
2508	2762	{
2509	2763	if (level == 0)
2510	2764	{
..	..	@@ -2512,7 +2766,8 @@
2512	2766	return;
2513	2767
2514	2768	Object3D selectee;
2515		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2769	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2770	+ level + 1))
2516	2771	{
2517	2772	selectee = (Object3D) e.nextElement();
2518	2773	}
..	..	@@ -2520,19 +2775,22 @@
2520	2775	} else
2521	2776	{
2522	2777	//super.
2523		- drawEditHandles0(info, level + 1);
	2778	+ drawEditHandles0(//info,
	2779	+ level + 1);
2524	2780	}
2525	2781	}
2526	2782
2527		- boolean doEditClick(ClickInfo info, int level)
	2783	+ boolean doEditClick(//ClickInfo info,
	2784	+ int level)
2528	2785	{
2529	2786	doSomething = 0;
2530	2787	if (level == 0)
2531	2788	{
2532		- return doParentClick(info);
	2789	+ return doParentClick(); //info);
2533	2790	}
2534	2791	if (//super.
2535		- doEditClick0(info, level))
	2792	+ doEditClick0(//info,
	2793	+ level))
2536	2794	{
2537	2795	doSomething = 1;
2538	2796	return true;
..	..	@@ -2542,7 +2800,7 @@
2542	2800	}
2543	2801	}
2544	2802
2545		- boolean doParentClick(ClickInfo info)
	2803	+ boolean doParentClick() //ClickInfo info)
2546	2804	{
2547	2805	if (selection == null)
2548	2806	{
..	..	@@ -2555,7 +2813,8 @@
2555	2813	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2556	2814	{
2557	2815	Object3D selectee = (Object3D) e.nextElement();
2558		- if (selectee.doEditClick(info, 1))
	2816	+ if (selectee.doEditClick(//info,
	2817	+ 1))
2559	2818	{
2560	2819	childToDrag = selectee;
2561	2820	doSomething = 2;
..	..	@@ -2567,13 +2826,15 @@
2567	2826	return retval;
2568	2827	}
2569	2828
2570		- void doEditDrag(ClickInfo info, boolean opposite)
	2829	+ void doEditDrag(//ClickInfo clickInfo,
	2830	+ boolean opposite)
2571	2831	{
2572	2832	switch (doSomething)
2573	2833	{
2574	2834	case 1: // '\001'
2575	2835	//super.
2576		- doEditDrag0(info, opposite);
	2836	+ doEditDrag0(//clickInfo,
	2837	+ opposite);
2577	2838	break;
2578	2839
2579	2840	case 2: // '\002'
..	..	@@ -2586,11 +2847,13 @@
2586	2847	{
2587	2848	//sel.hitSomething = childToDrag.hitSomething;
2588	2849	//childToDrag.doEditDrag(info);
2589		- sel.doEditDrag(info, opposite);
	2850	+ sel.doEditDrag(//clickInfo,
	2851	+ opposite);
2590	2852	} else
2591	2853	{
2592	2854	//super.
2593		- doEditDrag0(info, opposite);
	2855	+ doEditDrag0(//clickInfo,
	2856	+ opposite);
2594	2857	}
2595	2858	}
2596	2859	break;
..	..	@@ -2608,6 +2871,9 @@
2608	2871	{
2609	2872	deselectAll();
2610	2873	}
	2874	+
	2875	+ new Exception().printStackTrace();
	2876	+
2611	2877	ClickInfo newInfo = new ClickInfo();
2612	2878	newInfo.flags = info.flags;
2613	2879	newInfo.bounds = info.bounds;
..	..	@@ -3037,7 +3303,10 @@
3037	3303	{
3038	3304	if (bRep != null)
3039	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3040	3307	bRep.GenerateNormals(crease);
	3308	+ if (!bRep.trimmed)
	3309	+ bRep.MergeNormals();
3041	3310	Touch();
3042	3311	}
3043	3312	}
..	..	@@ -3055,7 +3324,7 @@
3055	3324	{
3056	3325	if (bRep != null)
3057	3326	{
3058		- bRep.GenerateNormalsMINE();
	3327	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3059	3328	Touch();
3060	3329	}
3061	3330	}
..	..	@@ -3112,6 +3381,105 @@
3112	3381	blockloop = false;
3113	3382	}
3114	3383
	3384	+ public void ResetTransform(int mask)
	3385	+ {
	3386	+ Object3D obj = this;
	3387	+
	3388	+ if (mask == -1)
	3389	+ {
	3390	+ if (obj instanceof Camera) // jan 2014
	3391	+ {
	3392	+ LA.matIdentity(obj.toParent);
	3393	+ LA.matIdentity(obj.fromParent);
	3394	+ }
	3395	+ else
	3396	+ {
	3397	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3398	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3399	+ }
	3400	+ return;
	3401	+ }
	3402	+
	3403	+ if ((mask&2) != 0) // Scale/rotation
	3404	+ {
	3405	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3406	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3407	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3408	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3409	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3410	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3411	+ }
	3412	+ if ((mask&1) != 0) // Translation
	3413	+ {
	3414	+ if (obj.toParent != null)
	3415	+ {
	3416	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3417	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3418	+ }
	3419	+ }
	3420	+ }
	3421	+
	3422	+ public void Scale(int scale)
	3423	+ {
	3424	+ Object3D obj = this;
	3425	+
	3426	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3427	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3428	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3429	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3430	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3431	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3432	+ }
	3433	+
	3434	+ public void TextureRatioTransform(int axis)
	3435	+ {
	3436	+ cTexture tex = GetTextures();
	3437	+
	3438	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3439	+
	3440	+ try
	3441	+ {
	3442	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3443	+ }
	3444	+ catch (Exception e)
	3445	+ {
	3446	+ System.err.println("FAIL TextureRatio: " + this);
	3447	+ }
	3448	+
	3449	+ LA.matIdentity(Object3D.mat);
	3450	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3451	+
	3452	+ if (toParent == null)
	3453	+ {
	3454	+ toParent = LA.newMatrix();
	3455	+ fromParent = LA.newMatrix();
	3456	+ }
	3457	+
	3458	+ ResetTransform(2);
	3459	+
	3460	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3461	+ LA.matInvert(fromParent, toParent);
	3462	+ }
	3463	+
	3464	+ void TextureRatio(int axis)
	3465	+ {
	3466	+ if (blockloop)
	3467	+ return;
	3468	+
	3469	+ blockloop = true;
	3470	+
	3471	+ TextureRatioTransform(axis);
	3472	+
	3473	+ for (int i=Size(); --i>=0;)
	3474	+ {
	3475	+ Object3D v = get(i);
	3476	+
	3477	+ v.TextureRatio(axis);
	3478	+ }
	3479	+
	3480	+ blockloop = false;
	3481	+ }
	3482	+
3115	3483	void TransformChildren()
3116	3484	{
3117	3485	if (toParent != null)
..	..	@@ -3354,6 +3722,7 @@
3354	3722	if (bRep != null)
3355	3723	{
3356	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3357	3726	System.out.println("Reducing " + this);
3358	3727	if (name != null && name.contains("lockpickstraps"))
3359	3728	name = name;
..	..	@@ -3465,15 +3834,47 @@
3465	3834
3466	3835	void ClearMaterials()
3467	3836	{
	3837	+ if (blockloop)
	3838	+ return;
	3839	+
	3840	+ blockloop = true;
	3841	+
3468	3842	ClearMaterial();
3469		- for (int i = 0; i < size(); i++)
	3843	+ for (int i = 0; i < Size(); i++)
3470	3844	{
3471		- Object3D child = (Object3D) reserve(i);
	3845	+ Object3D child = (Object3D) get(i);
3472	3846	if (child == null)
3473	3847	continue;
3474	3848	child.ClearMaterials();
3475		- release(i);
3476	3849	}
	3850	+
	3851	+ blockloop = false;
	3852	+ }
	3853	+
	3854	+ void ClearVersionList()
	3855	+ {
	3856	+ this.versionlist = null;
	3857	+ this.versionindex = -1;
	3858	+ this.versiontable = null;
	3859	+ }
	3860	+
	3861	+ void ClearVersions()
	3862	+ {
	3863	+ if (blockloop)
	3864	+ return;
	3865	+
	3866	+ blockloop = true;
	3867	+
	3868	+ ClearVersionList();
	3869	+ for (int i = 0; i < Size(); i++)
	3870	+ {
	3871	+ Object3D child = (Object3D) get(i);
	3872	+ if (child == null)
	3873	+ continue;
	3874	+ child.ClearVersions();
	3875	+ }
	3876	+
	3877	+ blockloop = false;
3477	3878	}
3478	3879
3479	3880	void FlipV(boolean flip)
..	..	@@ -3501,7 +3902,8 @@
3501	3902	if (blockloop)
3502	3903	return;
3503	3904
3504		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3905	+ if (//marked \|\| // does not make sense
	3906	+ (bRep != null \|\| material != null)) // borderline...
3505	3907	live = h;
3506	3908
3507	3909	for (int i = 0; i < Size(); i++)
..	..	@@ -3522,7 +3924,8 @@
3522	3924	return;
3523	3925
3524	3926	//if (bRep != null)
3525		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3927	+ if (//marked \|\| // does not make sense
	3928	+ (bRep != null \|\| material != null)) // borderline...
3526	3929	link2master = h;
3527	3930
3528	3931	for (int i = 0; i < Size(); i++)
..	..	@@ -3542,7 +3945,8 @@
3542	3945	if (blockloop)
3543	3946	return;
3544	3947
3545		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3948	+ if (//marked \|\| // does not make sense
	3949	+ (bRep != null \|\| material != null)) // borderline...
3546	3950	hide = h;
3547	3951
3548	3952	for (int i = 0; i < Size(); i++)
..	..	@@ -3562,7 +3966,7 @@
3562	3966	if (blockloop)
3563	3967	return;
3564	3968
3565		- if (bRep != null && material != null) // borderline...
	3969	+ if (bRep != null \|\| material != null) // borderline...
3566	3970	marked = h;
3567	3971
3568	3972	for (int i = 0; i < Size(); i++)
..	..	@@ -3572,6 +3976,46 @@
3572	3976	continue;
3573	3977	blockloop = true;
3574	3978	child.MarkLeaves(h);
	3979	+ blockloop = false;
	3980	+ // release(i);
	3981	+ }
	3982	+ }
	3983	+
	3984	+ void RewindLeaves(boolean h)
	3985	+ {
	3986	+ if (blockloop)
	3987	+ return;
	3988	+
	3989	+ if (bRep != null \|\| material != null) // borderline...
	3990	+ rewind = h;
	3991	+
	3992	+ for (int i = 0; i < Size(); i++)
	3993	+ {
	3994	+ Object3D child = (Object3D) get(i); // reserve(i);
	3995	+ if (child == null)
	3996	+ continue;
	3997	+ blockloop = true;
	3998	+ child.RewindLeaves(h);
	3999	+ blockloop = false;
	4000	+ // release(i);
	4001	+ }
	4002	+ }
	4003	+
	4004	+ void RandomLeaves(boolean h)
	4005	+ {
	4006	+ if (blockloop)
	4007	+ return;
	4008	+
	4009	+ if (bRep != null \|\| material != null) // borderline...
	4010	+ random = h;
	4011	+
	4012	+ for (int i = 0; i < Size(); i++)
	4013	+ {
	4014	+ Object3D child = (Object3D) get(i); // reserve(i);
	4015	+ if (child == null)
	4016	+ continue;
	4017	+ blockloop = true;
	4018	+ child.RandomLeaves(h);
3575	4019	blockloop = false;
3576	4020	// release(i);
3577	4021	}
..	..	@@ -3609,6 +4053,7 @@
3609	4053
3610	4054	void RevertMeshes()
3611	4055	{
	4056	+ // BLOCKLOOP
3612	4057	if (this instanceof cMesh)
3613	4058	{
3614	4059	((cMesh)this).Revert();
..	..	@@ -3639,11 +4084,6 @@
3639	4084	Touch();
3640	4085	}
3641	4086
3642		- ResetRecur();
3643		- }
3644		-
3645		- void ResetRecur()
3646		- {
3647	4087	for (int i = 0; i < size(); i++)
3648	4088	{
3649	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3666,11 +4106,6 @@
3666	4106	Step();
3667	4107	Touch();
3668	4108
3669		- StepRecur();
3670		- }
3671		-
3672		- void StepRecur()
3673		- {
3674	4109	for (int i = 0; i < size(); i++)
3675	4110	{
3676	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3857,8 +4292,8 @@
3857	4292	Touch();
3858	4293	}
3859	4294
3860		- transient cVector min = new cVector();
3861		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
3862	4297
3863	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
3864	4299	{
..	..	@@ -3874,15 +4309,15 @@
3874	4309	if (blockloop)
3875	4310	return;
3876	4311
3877		- if (min == null) // ???
	4312	+ if (min == null)
3878	4313	{
3879	4314	min = new cVector();
3880	4315	max = new cVector();
3881	4316	}
3882	4317
3883		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
3884	4319	{
3885		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
3886	4321	if (child == null)
3887	4322	continue;
3888	4323
..	..	@@ -3901,21 +4336,21 @@
3901	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3902	4337	//if (child.hide)
3903	4338	{
3904		- release(i);
	4339	+ //release(i);
3905	4340	continue;
3906	4341	}
3907	4342
3908	4343	blockloop = true;
3909	4344	child.getBounds(min, max, true); // xform);
3910	4345	blockloop = false;
3911		- release(i);
	4346	+ //release(i);
3912	4347
3913	4348	MinMax(minima, maxima);
3914	4349	}
3915	4350
3916	4351	if (bRep != null)
3917	4352	{
3918		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
3919	4354	}
3920	4355
3921	4356	if (false) // xform)
..	..	@@ -4345,6 +4780,55 @@
4345	4780	{
4346	4781	blockloop = true;
4347	4782	get(i).RepairShadow();
	4783	+ blockloop = false;
	4784	+ }
	4785	+ }
	4786	+
	4787	+ void RepairSOV()
	4788	+ {
	4789	+ if (blockloop)
	4790	+ return;
	4791	+
	4792	+ String texname = this.GetPigmentTexture();
	4793	+
	4794	+ if (texname.startsWith("sov"))
	4795	+ {
	4796	+ String[] s = texname.split("/");
	4797	+
	4798	+ String[] sname = s[1].split("Color.pn");
	4799	+
	4800	+ texname = sname[0];
	4801	+
	4802	+ if (sname.length > 1)
	4803	+ {
	4804	+ texname += "Color.jpg";
	4805	+ }
	4806	+
	4807	+ this.SetPigmentTexture("sov/" + texname);
	4808	+ }
	4809	+
	4810	+ texname = this.GetBumpTexture();
	4811	+
	4812	+ if (texname.startsWith("sov"))
	4813	+ {
	4814	+ String[] s = texname.split("/");
	4815	+
	4816	+ String[] sname = s[1].split("Bump.pn");
	4817	+
	4818	+ texname = sname[0];
	4819	+
	4820	+ if (sname.length > 1)
	4821	+ {
	4822	+ texname += "Bump.jpg";
	4823	+ }
	4824	+
	4825	+ this.SetBumpTexture("sov/" + texname);
	4826	+ }
	4827	+
	4828	+ for (int i=0; i<Size(); i++)
	4829	+ {
	4830	+ blockloop = true;
	4831	+ get(i).RepairSOV();
4348	4832	blockloop = false;
4349	4833	}
4350	4834	}
..	..	@@ -4863,6 +5347,14 @@
4863	5347	}
4864	5348	}
4865	5349
	5350	+ ObjEditor GetWindow()
	5351	+ {
	5352	+ if (editWindow != null)
	5353	+ return editWindow;
	5354	+
	5355	+ return manipWindow;
	5356	+ }
	5357	+
4866	5358	cTreePath Select(int indexcount, boolean deselect)
4867	5359	{
4868	5360	if (hide \|\| dontselect)
..	..	@@ -4899,10 +5391,11 @@
4899	5391	if (leaf != null)
4900	5392	{
4901	5393	cTreePath tp = new cTreePath(this, leaf);
4902		- if (editWindow != null)
	5394	+ ObjEditor window = GetWindow();
	5395	+ if (window != null)
4903	5396	{
4904	5397	//System.out.println("editWindow = " + editWindow + " vs " + this);
4905		- editWindow.Select(tp, deselect, true);
	5398	+ window.Select(tp, deselect, true);
4906	5399	}
4907	5400
4908	5401	return tp;
..	..	@@ -4919,6 +5412,7 @@
4919	5412
4920	5413	if (child == null)
4921	5414	continue;
	5415	+
4922	5416	if (child.HasTransparency() && child.size() != 0)
4923	5417	{
4924	5418	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4928,9 +5422,10 @@
4928	5422	if (leaf != null)
4929	5423	{
4930	5424	cTreePath tp = new cTreePath(this, leaf);
4931		- if (editWindow != null)
	5425	+ ObjEditor window = GetWindow();
	5426	+ if (window != null)
4932	5427	{
4933		- editWindow.Select(tp, deselect, true);
	5428	+ window.Select(tp, deselect, true);
4934	5429	}
4935	5430
4936	5431	return tp;
..	..	@@ -5255,6 +5750,51 @@
5255	5750	blockloop = false;
5256	5751	}
5257	5752
	5753	+ void ResetSelectable()
	5754	+ {
	5755	+ if (blockloop)
	5756	+ return;
	5757	+
	5758	+ blockloop = true;
	5759	+
	5760	+ keepdontselect = dontselect;
	5761	+ dontselect = true;
	5762	+
	5763	+ Object3D child;
	5764	+ int nb = Size();
	5765	+ for (int i = 0; i < nb; i++)
	5766	+ {
	5767	+ child = (Object3D) get(i);
	5768	+ if (child == null)
	5769	+ continue;
	5770	+ child.ResetSelectable();
	5771	+ }
	5772	+
	5773	+ blockloop = false;
	5774	+ }
	5775	+
	5776	+ void RestoreSelectable()
	5777	+ {
	5778	+ if (blockloop)
	5779	+ return;
	5780	+
	5781	+ blockloop = true;
	5782	+
	5783	+ dontselect = keepdontselect;
	5784	+
	5785	+ Object3D child;
	5786	+ int nb = Size();
	5787	+ for (int i = 0; i < nb; i++)
	5788	+ {
	5789	+ child = (Object3D) get(i);
	5790	+ if (child == null)
	5791	+ continue;
	5792	+ child.RestoreSelectable();
	5793	+ }
	5794	+
	5795	+ blockloop = false;
	5796	+ }
	5797	+
5258	5798	boolean IsSelected()
5259	5799	{
5260	5800	if (parent == null)
..	..	@@ -5315,6 +5855,11 @@
5315	5855	if (fullname == null)
5316	5856	return "";
5317	5857
	5858	+ if (fullname.pigment != null)
	5859	+ {
	5860	+ return fullname.pigment;
	5861	+ }
	5862	+
5318	5863	// System.out.println("Fullname = " + fullname);
5319	5864
5320	5865	// Does not work on Windows due to C:
..	..	@@ -5327,7 +5872,7 @@
5327	5872
5328	5873	if (split.length == 0)
5329	5874	{
5330		- return "";
	5875	+ return fullname.pigment = "";
5331	5876	}
5332	5877
5333	5878	if (split.length <= 2)
..	..	@@ -5335,22 +5880,27 @@
5335	5880	if (fullname.name.endsWith(":"))
5336	5881	{
5337	5882	// Windows
5338		- return fullname.name.substring(0, fullname.name.length()-1);
	5883	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5339	5884	}
5340	5885
5341		- return split[0];
	5886	+ return fullname.pigment = split[0];
5342	5887	}
5343	5888
5344	5889	// Windows
5345	5890	assert(split.length == 4);
5346	5891
5347		- return split[0] + ":" + split[1];
	5892	+ return fullname.pigment = split[0] + ":" + split[1];
5348	5893	}
5349	5894
5350	5895	static String GetBump(cTexture fullname)
5351	5896	{
5352	5897	if (fullname == null)
5353	5898	return "";
	5899	+
	5900	+ if (fullname.bump != null)
	5901	+ {
	5902	+ return fullname.bump;
	5903	+ }
5354	5904
5355	5905	// System.out.println("Fullname = " + fullname);
5356	5906	// Does not work on Windows due to C:
..	..	@@ -5362,12 +5912,12 @@
5362	5912
5363	5913	if (split.length == 0)
5364	5914	{
5365		- return "";
	5915	+ return fullname.bump = "";
5366	5916	}
5367	5917
5368	5918	if (split.length == 1)
5369	5919	{
5370		- return "";
	5920	+ return fullname.bump = "";
5371	5921	}
5372	5922
5373	5923	if (split.length == 2)
..	..	@@ -5375,16 +5925,16 @@
5375	5925	if (fullname.name.endsWith(":"))
5376	5926	{
5377	5927	// Windows
5378		- return "";
	5928	+ return fullname.bump = "";
5379	5929	}
5380	5930
5381		- return split[1];
	5931	+ return fullname.bump = split[1];
5382	5932	}
5383	5933
5384	5934	// Windows
5385	5935	assert(split.length == 4);
5386	5936
5387		- return split[2] + ":" + split[3];
	5937	+ return fullname.bump = split[2] + ":" + split[3];
5388	5938	}
5389	5939
5390	5940	String GetPigmentTexture()
..	..	@@ -5467,6 +6017,9 @@
5467	6017	texname = "";
5468	6018
5469	6019	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6020	+
	6021	+ GetTextures().pigment = null;
	6022	+
5470	6023	Touch();
5471	6024	}
5472	6025
..	..	@@ -5540,6 +6093,8 @@
5540	6093
5541	6094	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5542	6095
	6096	+ GetTextures().bump = null;
	6097	+
5543	6098	Touch();
5544	6099	}
5545	6100
..	..	@@ -5564,6 +6119,38 @@
5564	6119	}
5565	6120	}
5566	6121
	6122	+ void EmbedTextures(boolean embed)
	6123	+ {
	6124	+ if (blockloop)
	6125	+ return;
	6126	+
	6127	+ //if (GetTextures() != null)
	6128	+ if (embed)
	6129	+ CameraPane.EmbedTextures(GetTextures());
	6130	+ else
	6131	+ {
	6132	+ GetTextures().pigmentdata = null;
	6133	+ GetTextures().bumpdata = null;
	6134	+ GetTextures().pw = 0;
	6135	+ GetTextures().ph = 0;
	6136	+ GetTextures().bw = 0;
	6137	+ GetTextures().bh = 0;
	6138	+ }
	6139	+
	6140	+ int nb = Size();
	6141	+ for (int i = 0; i < nb; i++)
	6142	+ {
	6143	+ Object3D child = (Object3D) get(i);
	6144	+
	6145	+ if (child == null)
	6146	+ continue;
	6147	+
	6148	+ blockloop = true;
	6149	+ child.EmbedTextures(embed);
	6150	+ blockloop = false;
	6151	+ }
	6152	+ }
	6153	+
5567	6154	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5568	6155	{
5569	6156	Draw(display, root, selected, blocked);
..	..	@@ -5572,12 +6159,37 @@
5572	6159	boolean NeedSupport()
5573	6160	{
5574	6161	return
5575		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	6162	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5576	6163	// PROBLEM with CROWD!!
5577	6164	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5578	6165	}
5579	6166
5580	6167	static boolean DEBUG_SELECTION = false;
	6168	+
	6169	+ boolean IsLive()
	6170	+ {
	6171	+ if (live)
	6172	+ return true;
	6173	+
	6174	+ if (parent == null)
	6175	+ return false;
	6176	+
	6177	+ return parent.IsLive();
	6178	+ }
	6179	+
	6180	+ boolean IsDynamic()
	6181	+ {
	6182	+ return live && bRep != null;
	6183	+ }
	6184	+
	6185	+ boolean Link2Support()
	6186	+ {
	6187	+ return link2master \|\| link2support;
	6188	+ }
	6189	+
	6190	+ static cVector minima = new cVector();
	6191	+ static cVector maxima = new cVector();
	6192	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
5581	6193
5582	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5583	6195	{
..	..	@@ -5586,6 +6198,29 @@
5586	6198	if (support != null)
5587	6199	{
5588	6200	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6201	+ }
	6202	+
	6203	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6204	+ {
	6205	+ getBounds(minima, maxima, true);
	6206	+ center.x = (minima.x + maxima.x) / 2;
	6207	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6208	+ center.z = (minima.z + maxima.z) / 2;
	6209	+
	6210	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6211	+
	6212	+ IntersectResult res = new IntersectResult();
	6213	+ res.t = Double.POSITIVE_INFINITY;
	6214	+
	6215	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6216	+ {
	6217	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6218	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6219	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6220	+
	6221	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6222	+ LA.matInvert(toParent, fromParent);
	6223	+ }
5589	6224	}
5590	6225
5591	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5639,8 +6274,11 @@
5639	6274	if (support != null)
5640	6275	support = support;
5641	6276
5642		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6277	+ boolean usecalllists = !IsDynamic() &&
	6278	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6280	+
	6281	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5644	6282
5645	6283	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646	6284	{
..	..	@@ -5648,10 +6286,12 @@
5648	6286	bRep.displaylist = 0;
5649	6287	}
5650	6288	// usecalllists &= !(parent instanceof RandomNode);
5651		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
5652	6291
5653		- if (GetBRep() != null)
5654		- usecalllists = usecalllists;
	6292	+ if (display.DrawMode() == display.SHADOW)
	6293	+ //GetBRep() != null)
	6294	+ usecalllists = !!usecalllists;
5655	6295	//System.out.println("draw " + this);
5656	6296	//new Exception().printStackTrace();
5657	6297
..	..	@@ -5660,10 +6300,12 @@
5660	6300	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5661	6301
5662	6302	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6303	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6304	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5664	6305	{
5665	6306	Globals.lighttouched = true;
5666	6307	} // all panes...
	6308	+
5667	6309	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5668	6310	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5669	6311	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5671,7 +6313,7 @@
5671	6313	if (!(this instanceof Composite))
5672	6314	touched = false;
5673	6315	//if (displaylist == -1 && usecalllists)
5674		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6316	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5675	6317	{
5676	6318	bRep.displaylist = display.GenList();
5677	6319	assert(bRep.displaylist != 0);
..	..	@@ -5682,7 +6324,7 @@
5682	6324
5683	6325	//System.out.println("\tnew list " + list);
5684	6326	//gl.glDrawBuffer(gl.GL_NONE);
5685		- if (usecalllists)
	6327	+ if (usecalllists && bRep.displaylist > 0)
5686	6328	{
5687	6329	// System.err.println("new list " + bRep.displaylist + " for " + this);
5688	6330	display.NewList(bRep.displaylist);
..	..	@@ -5691,7 +6333,7 @@
5691	6333	CallList(display, root, selected, blocked);
5692	6334
5693	6335	// compiled = true;
5694		- if (usecalllists)
	6336	+ if (usecalllists && bRep.displaylist > 0)
5695	6337	{
5696	6338	// System.err.println("end list " + bRep.displaylist + " for " + this);
5697	6339	display.EndList();
..	..	@@ -5701,8 +6343,8 @@
5701	6343	Globals.lighttouched = true; // all panes...
5702	6344	}
5703	6345
5704		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5705		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
5706	6348
5707	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
5708	6350	{
..	..	@@ -5741,7 +6383,7 @@
5741	6383	{
5742	6384	if (display.DrawMode() == iCameraPane.SHADOW)
5743	6385	{
5744		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
5745	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5746	6388	{
5747	6389	//System.out.print("CULLED");
..	..	@@ -5791,6 +6433,7 @@
5791	6433	if (GetBRep() != null)
5792	6434	{
5793	6435	display.NextIndex();
	6436	+
5794	6437	// vertex color conflict : gl.glCallList(list);
5795	6438	DrawNode(display, root, selected);
5796	6439	if (this instanceof BezierPatch)
..	..	@@ -5802,6 +6445,20 @@
5802	6445	{
5803	6446	drawSelf(display, root, selected, blocked);
5804	6447	}
	6448	+
	6449	+// if (!(this instanceof Composite))
	6450	+// {
	6451	+// for (int i = 0; i < size(); i++)
	6452	+// {
	6453	+// Object3D child = (Object3D) reserve(i);
	6454	+// if (child == null)
	6455	+// continue;
	6456	+//
	6457	+// child.draw(display, root, selected, blocked);
	6458	+//
	6459	+// release(i);
	6460	+// }
	6461	+// }
5805	6462	} else
5806	6463	{
5807	6464	/*
..	..	@@ -5831,16 +6488,28 @@
5831	6488	tex = GetTextures();
5832	6489	}
5833	6490
5834		- boolean failed = false;
	6491	+ boolean failedPigment = false;
	6492	+ boolean failedBump = false;
5835	6493
	6494	+ CameraPane.lastObject = this;
5836	6495	try
5837	6496	{
5838		- display.BindTextures(tex, texres);
	6497	+ display.BindPigmentTexture(tex, texres);
5839	6498	}
5840	6499	catch (Exception e)
5841	6500	{
5842		- System.err.println("FAILED: " + this);
5843		- failed = true;
	6501	+ // System.err.println("FAILED: " + this);
	6502	+ failedPigment = true;
	6503	+ }
	6504	+
	6505	+ try
	6506	+ {
	6507	+ display.BindBumpTexture(tex, texres);
	6508	+ }
	6509	+ catch (Exception e)
	6510	+ {
	6511	+ //System.err.println("FAILED: " + this);
	6512	+ failedBump = true;
5844	6513	}
5845	6514
5846	6515	if (!compiled)
..	..	@@ -5861,10 +6530,27 @@
5861	6530	// june 2013 drawSelf(display, root, selected);
5862	6531	}
5863	6532	}
	6533	+
	6534	+ assert (!(this instanceof Composite));
	6535	+ {
	6536	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6537	+// {
	6538	+// Object3D child = (Object3D) reserve(i);
	6539	+// if (child == null)
	6540	+// continue;
	6541	+//
	6542	+// child.draw(display, root, selected, blocked);
	6543	+//
	6544	+// release(i);
	6545	+// }
	6546	+ }
5864	6547	}
5865	6548
5866		- if (!failed)
5867		- display.ReleaseTextures(tex);
	6549	+ if (!failedBump)
	6550	+ display.ReleaseBumpTexture(tex);
	6551	+
	6552	+ if (!failedPigment)
	6553	+ display.ReleasePigmentTexture(tex);
5868	6554
5869	6555	display.PopMaterial(this, selected);
5870	6556	}
..	..	@@ -5910,16 +6596,17 @@
5910	6596
5911	6597	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5912	6598	{
5913		- if (GetBRep() == null)
5914		- {
5915		- drawSelf(display, root, selected, blocked);
5916		- } else
	6599	+ if (GetBRep() != null)
5917	6600	{
5918	6601	DrawNode(display, root, selected);
5919	6602	if (this instanceof BezierPatch)
5920	6603	{
5921	6604	//drawSelf(display, root, selected);
5922	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
5923	6610	}
5924	6611	}
5925	6612
..	..	@@ -6169,7 +6856,7 @@
6169	6856
6170	6857	//javax.media.opengl.GL gl = display.GetGL();
6171	6858
6172		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
6173	6860	{
6174	6861	int fc = bRep.FaceCount();
6175	6862	int vc = bRep.VertexCount();
..	..	@@ -6237,6 +6924,11 @@
6237	6924	// dec 2012
6238	6925	new Exception().printStackTrace();
6239	6926	return;
	6927	+ }
	6928	+
	6929	+ if (dontselect)
	6930	+ {
	6931	+ //bRep.GenerateNormalsMINE();
6240	6932	}
6241	6933
6242	6934	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6326,7 +7018,7 @@
6326	7018	facescompare[k] = new FaceCompare(k);
6327	7019	}
6328	7020
6329		- center = new cVector();
	7021	+ centertriangle = new cVector();
6330	7022	}
6331	7023	else
6332	7024	{
..	..	@@ -6449,7 +7141,7 @@
6449	7141	*/
6450	7142	}
6451	7143
6452		- transient cVector center;
	7144	+ transient cVector centertriangle;
6453	7145
6454	7146	class FaceCompare implements Comparable
6455	7147	{
..	..	@@ -6478,14 +7170,14 @@
6478	7170	Vertex q = bRep.GetVertex(face.q);
6479	7171	Vertex r = bRep.GetVertex(face.r);
6480	7172
6481		- center.set(p);
6482		- center.add(q);
6483		- center.add(r);
6484		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
6485	7177
6486		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6487	7179
6488		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
6489	7181	}
6490	7182
6491	7183	return distance;
..	..	@@ -7022,20 +7714,23 @@
7022	7714	}
7023	7715	}
7024	7716
7025		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7717	+ static ClickInfo clickInfo = new ClickInfo();
	7718	+
	7719	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7720	+ Point outPt, Rectangle outRec)
7026	7721	{
7027		- int hc = info.bounds.x + info.bounds.width / 2;
7028		- int vc = info.bounds.y + info.bounds.height / 2;
7029		- double[][] toscreen = info.toScreen;
	7722	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7723	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7724	+ double[][] toscreen = clickInfo.toScreen;
7030	7725	if (toscreen == null)
7031	7726	{
7032		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7727	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7033	7728	}
7034	7729	cVector vec = in;
7035	7730	LA.xformPos(in, toscreen, in);
7036	7731	//System.out.println("Distance = " + info.camera.Distance());
7037		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7038		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7732	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7733	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7039	7734	outPt.x = hc + (int) vec.x;
7040	7735	outPt.y = vc - (int) vec.y;
7041	7736	outRec.x = outPt.x - 3;
..	..	@@ -7043,15 +7738,18 @@
7043	7738	outRec.width = outRec.height = 6;
7044	7739	}
7045	7740
7046		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7741	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7742	+ )
7047	7743	{
7048	7744	Point pt = new Point(0, 0);
7049	7745	Rectangle rec = new Rectangle();
7050		- calcHotSpot(in, info, pt, rec);
	7746	+ calcHotSpot(in, //clickInfo,
	7747	+ pt, rec);
7051	7748	return rec;
7052	7749	}
7053	7750
7054		- void drawEditHandles0(ClickInfo info, int level)
	7751	+ void drawEditHandles0(//ClickInfo clickInfo,
	7752	+ int level)
7055	7753	{
7056	7754	if (level == 0)
7057	7755	{
..	..	@@ -7060,16 +7758,19 @@
7060	7758	{
7061	7759	cVector origin = new cVector();
7062	7760	//LA.xformPos(origin, toParent, origin);
7063		- Rectangle spot = calcHotSpot(origin, info);
	7761	+ if (this.clickInfo == null)
	7762	+ this.clickInfo = new ClickInfo();
	7763	+
	7764	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7064	7765	Rectangle boundary = new Rectangle();
7065	7766	boundary.x = spot.x - 30;
7066	7767	boundary.y = spot.y - 30;
7067	7768	boundary.width = spot.width + 60;
7068	7769	boundary.height = spot.height + 60;
7069		- info.g.setColor(Color.red);
	7770	+ clickInfo.g.setColor(Color.white);
7070	7771	int spotw = spot.x + spot.width;
7071	7772	int spoth = spot.y + spot.height;
7072		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7773	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7073	7774	// if (CameraPane.Xmin > spot.x)
7074	7775	// {
7075	7776	// CameraPane.Xmin = spot.x;
..	..	@@ -7086,11 +7787,33 @@
7086	7787	// {
7087	7788	// CameraPane.Ymax = spoth;
7088	7789	// }
7089		- spot.translate(32, 32);
	7790	+// if (CameraPane.Xmin > spot.x)
	7791	+// {
	7792	+// CameraPane.Xmin = spot.x;
	7793	+// }
	7794	+// if (CameraPane.Xmax < spotw)
	7795	+// {
	7796	+// CameraPane.Xmax = spotw;
	7797	+// }
	7798	+// if (CameraPane.Ymin > spot.y)
	7799	+// {
	7800	+// CameraPane.Ymin = spot.y;
	7801	+// }
	7802	+// if (CameraPane.Ymax < spoth)
	7803	+// {
	7804	+// CameraPane.Ymax = spoth;
	7805	+// }
	7806	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7807	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7808	+ spot.translate(32, 0);
	7809	+ clickInfo.g.setColor(Color.yellow);
	7810	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7811	+
	7812	+ spot.translate(32, 64);
7090	7813	spotw = spot.x + spot.width;
7091	7814	spoth = spot.y + spot.height;
7092		- info.g.setColor(Color.blue);
7093		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7815	+ clickInfo.g.setColor(Color.cyan);
	7816	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7094	7817	// if (CameraPane.Xmin > spot.x)
7095	7818	// {
7096	7819	// CameraPane.Xmin = spot.x;
..	..	@@ -7107,29 +7830,9 @@
7107	7830	// {
7108	7831	// CameraPane.Ymax = spoth;
7109	7832	// }
7110		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7112		- spot.translate(0, -32);
7113		- info.g.setColor(Color.green);
7114		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7115		-// if (CameraPane.Xmin > spot.x)
7116		-// {
7117		-// CameraPane.Xmin = spot.x;
7118		-// }
7119		-// if (CameraPane.Xmax < spotw)
7120		-// {
7121		-// CameraPane.Xmax = spotw;
7122		-// }
7123		-// if (CameraPane.Ymin > spot.y)
7124		-// {
7125		-// CameraPane.Ymin = spot.y;
7126		-// }
7127		-// if (CameraPane.Ymax < spoth)
7128		-// {
7129		-// CameraPane.Ymax = spoth;
7130		-// }
7131		- info.g.drawArc(boundary.x, boundary.y,
7132		- boundary.width, boundary.height, 0, 360);
	7833	+ clickInfo.g.setColor(Color.green);
	7834	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7835	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7133	7836	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7134	7837	// if (CameraPane.Xmin > boundary.x)
7135	7838	// {
..	..	@@ -7151,7 +7854,8 @@
7151	7854	}
7152	7855	}
7153	7856
7154		- boolean doEditClick0(ClickInfo info, int level)
	7857	+ boolean doEditClick0(//ClickInfo clickInfo,
	7858	+ int level)
7155	7859	{
7156	7860	if (level == 0)
7157	7861	{
..	..	@@ -7160,8 +7864,8 @@
7160	7864
7161	7865	boolean retval = false;
7162	7866
7163		- startX = info.x;
7164		- startY = info.y;
	7867	+ startX = clickInfo.x;
	7868	+ startY = clickInfo.y;
7165	7869
7166	7870	hitSomething = -1;
7167	7871	cVector origin = new cVector();
..	..	@@ -7171,22 +7875,53 @@
7171	7875	{
7172	7876	centerPt = new Point(0, 0);
7173	7877	}
7174		- calcHotSpot(origin, info, centerPt, spot);
7175		- if (spot.contains(info.x, info.y))
	7878	+ calcHotSpot(origin, //info,
	7879	+ centerPt, spot);
	7880	+ if (spot.contains(clickInfo.x, clickInfo.y))
7176	7881	{
7177	7882	hitSomething = hitCenter;
7178	7883	retval = true;
7179	7884	}
7180	7885	spot.translate(32, 0);
7181		- if (spot.contains(info.x, info.y))
	7886	+ if (spot.contains(clickInfo.x, clickInfo.y))
7182	7887	{
7183	7888	hitSomething = hitRotate;
7184	7889	retval = true;
7185	7890	}
7186	7891	spot.translate(0, 32);
7187		- if (spot.contains(info.x, info.y))
	7892	+ spot.translate(32, 0);
	7893	+ spot.translate(0, 32);
	7894	+ if (spot.contains(clickInfo.x, clickInfo.y))
7188	7895	{
7189	7896	hitSomething = hitScale;
	7897	+
	7898	+ double scale = 0.005f * clickInfo.camera.Distance();
	7899	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7900	+ double sign = 1;
	7901	+ if (hScale < 0)
	7902	+ {
	7903	+ sign = -1;
	7904	+ }
	7905	+ hScale = signMath.pow(signhScale, scale * 50);
	7906	+ if (hScale < 0.01)
	7907	+ {
	7908	+ //hScale = 0.01;
	7909	+ }
	7910	+
	7911	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7912	+ sign = 1;
	7913	+ if (vScale < 0)
	7914	+ {
	7915	+ sign = -1;
	7916	+ }
	7917	+ vScale = signMath.pow(signvScale, scale * 50);
	7918	+ if (vScale < 0.01)
	7919	+ {
	7920	+ //vScale = 0.01;
	7921	+ }
	7922	+
	7923	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7924	+
7190	7925	retval = true;
7191	7926	}
7192	7927
..	..	@@ -7196,7 +7931,7 @@
7196	7931	}
7197	7932
7198	7933	//System.out.println("info.modifiers = " + info.modifiers);
7199		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7934	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7200	7935	//System.out.println("modified = " + modified);
7201	7936	//new Exception().printStackTrace();
7202	7937	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7224,7 +7959,8 @@
7224	7959	return true;
7225	7960	}
7226	7961
7227		- void doEditDrag0(ClickInfo info, boolean opposite)
	7962	+ void doEditDrag0(//ClickInfo info,
	7963	+ boolean opposite)
7228	7964	{
7229	7965	if (hitSomething == 0)
7230	7966	{
..	..	@@ -7238,7 +7974,7 @@
7238	7974
7239	7975	//System.out.println("hitSomething = " + hitSomething);
7240	7976
7241		- double scale = 0.005f * info.camera.Distance();
	7977	+ double scale = 0.005f * clickInfo.camera.Distance();
7242	7978
7243	7979	cVector xlate = new cVector();
7244	7980	//cVector xlate2 = new cVector();
..	..	@@ -7252,7 +7988,9 @@
7252	7988
7253	7989	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7254	7990
7255		- if (modified \|\| opposite)
	7991	+ // Modified could snap
	7992	+ if (//modified \|\|
	7993	+ opposite)
7256	7994	{
7257	7995	//assert(false);
7258	7996	/*
..	..	@@ -7272,8 +8010,8 @@
7272	8010	toParent[3][i] = xlate.get(i);
7273	8011	LA.matInvert(toParent, fromParent);
7274	8012	*/
7275		- cVector delta = LA.newVector(0, 0, startY - info.y);
7276		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8013	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8014	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7277	8015
7278	8016	LA.matCopy(startMat, toParent);
7279	8017	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7282,7 +8020,7 @@
7282	8020	} else
7283	8021	{
7284	8022	//LA.xformDir(delta, info.camera.fromScreen, delta);
7285		- cVector up = new cVector(info.camera.up);
	8023	+ cVector up = new cVector(clickInfo.camera.up);
7286	8024	cVector away = new cVector();
7287	8025	//cVector right2 = new cVector();
7288	8026	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7299,19 +8037,19 @@
7299	8037	LA.xformDir(up, ClickInfo.matbuffer, up);
7300	8038	// if (!CameraPane.LOCALTRANSFORM)
7301	8039	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7302		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8040	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7303	8041	// if (!CameraPane.LOCALTRANSFORM)
7304	8042	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7305	8043	//LA.vecCross(up, cVector.Z, right2);
7306	8044
7307		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8045	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7308	8046
7309	8047	//System.out.println("DELTA0 = " + delta);
7310	8048	//System.out.println("AWAY = " + info.camera.away);
7311	8049	//System.out.println("UP = " + info.camera.up);
7312	8050	if (away.z > 0)
7313	8051	{
7314		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8052	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7315	8053	{
7316	8054	delta.x = -delta.x;
7317	8055	} else
..	..	@@ -7326,7 +8064,7 @@
7326	8064	//System.out.println("DELTA1 = " + delta);
7327	8065	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7328	8066	//System.out.println("DELTA2 = " + delta);
7329		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8067	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7330	8068	LA.matCopy(startMat, toParent);
7331	8069	//System.out.println("DELTA3 = " + delta);
7332	8070	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7336,8 +8074,8 @@
7336	8074	break;
7337	8075
7338	8076	case hitRotate: // rotate
7339		- int dx = info.x - centerPt.x;
7340		- int dy = -(info.y - centerPt.y);
	8077	+ int dx = clickInfo.x - centerPt.x;
	8078	+ int dy = -(clickInfo.y - centerPt.y);
7341	8079	double angle = (double) Math.atan2(dx, dy);
7342	8080	angle = -(1.570796 - angle);
7343	8081
..	..	@@ -7346,7 +8084,7 @@
7346	8084
7347	8085	if (modified)
7348	8086	{
7349		- // Rotate 90 degrees
	8087	+ // Rotate 45 degrees
7350	8088	angle /= (Math.PI / 4);
7351	8089	angle = Math.floor(angle + 0.5);
7352	8090	angle *= (Math.PI / 4);
..	..	@@ -7360,7 +8098,7 @@
7360	8098	}
7361	8099	/**/
7362	8100
7363		- switch (info.pane.RenderCamera().viewCode)
	8101	+ switch (clickInfo.pane.RenderCamera().viewCode)
7364	8102	{
7365	8103	case 1: // '\001'
7366	8104	LA.matZRotate(toParent, angle);
..	..	@@ -7387,7 +8125,7 @@
7387	8125	break;
7388	8126
7389	8127	case hitScale: // scale
7390		- double hScale = (double) (info.x - centerPt.x) / 32;
	8128	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7391	8129	double sign = 1;
7392	8130	if (hScale < 0)
7393	8131	{
..	..	@@ -7399,7 +8137,7 @@
7399	8137	//hScale = 0.01;
7400	8138	}
7401	8139
7402		- double vScale = (double) (info.y - centerPt.y) / 32;
	8140	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7403	8141	sign = 1;
7404	8142	if (vScale < 0)
7405	8143	{
..	..	@@ -7410,6 +8148,7 @@
7410	8148	{
7411	8149	//vScale = 0.01;
7412	8150	}
	8151	+
7413	8152	LA.matCopy(startMat, toParent);
7414	8153	/**/
7415	8154	for (int i = 0; i < 3; i++)
..	..	@@ -7419,32 +8158,39 @@
7419	8158	}
7420	8159	/**/
7421	8160
7422		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	8161	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7423	8162
7424	8163	if (totalScale < 0.01)
7425	8164	{
7426	8165	totalScale = 0.01;
7427	8166	}
7428	8167
7429		- switch (info.pane.RenderCamera().viewCode)
	8168	+ switch (clickInfo.pane.RenderCamera().viewCode)
7430	8169	{
7431	8170	case 3: // '\001'
7432		- if (modified)
	8171	+ if (modified \|\| opposite)
7433	8172	{
	8173	+ if (modified) // && opposite)
	8174	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8175	+ else
7434	8176	//LA.matScale(toParent, 1, hScale, vScale);
7435		- LA.matScale(toParent, totalScale, 1, 1);
	8177	+ LA.matScale(toParent, totalScale, 1, 1);
7436	8178	} // vScale, 1);
7437	8179	else
7438	8180	{
7439		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8181	+ // EXCEPTION!
	8182	+ LA.matScale(toParent, 1, totalScale, totalScale);
7440	8183	} // vScale, 1);
7441	8184	break;
7442	8185
7443	8186	case 2: // '\002'
7444		- if (modified)
	8187	+ if (modified \|\| opposite)
7445	8188	{
7446		- //LA.matScale(toParent, hScale, 1, vScale);
7447		- LA.matScale(toParent, 1, totalScale, 1);
	8189	+ if (modified) // && opposite)
	8190	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8191	+ else
	8192	+ //LA.matScale(toParent, hScale, 1, vScale);
	8193	+ LA.matScale(toParent, 1, totalScale, 1);
7448	8194	} else
7449	8195	{
7450	8196	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7452,10 +8198,13 @@
7452	8198	break;
7453	8199
7454	8200	case 1: // '\003'
7455		- if (modified)
	8201	+ if (modified \|\| opposite)
7456	8202	{
7457		- //LA.matScale(toParent, hScale, vScale, 1);
7458		- LA.matScale(toParent, 1, 1, totalScale);
	8203	+ if (modified) // && opposite)
	8204	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8205	+ else
	8206	+ //LA.matScale(toParent, hScale, vScale, 1);
	8207	+ LA.matScale(toParent, 1, 1, totalScale);
7459	8208	} else
7460	8209	{
7461	8210	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7492,7 +8241,7 @@
7492	8241	} // NEW ...
7493	8242
7494	8243
7495		- info.pane.repaint();
	8244	+ clickInfo.pane.repaint();
7496	8245	}
7497	8246
7498	8247	boolean overflow = false;
..	..	@@ -7606,12 +8355,12 @@
7606	8355	if (!Globals.ADVANCED)
7607	8356	return objname;
7608	8357
7609		- return objname + " " + System.identityHashCode(this);
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7610	8359	}
7611	8360
7612	8361	public int hashCode()
7613	8362	{
7614		- // Fuck Vector...
	8363	+ // Do not use Vector...
7615	8364	return System.identityHashCode(this);
7616	8365	}
7617	8366
..	..	@@ -7671,6 +8420,10 @@
7671	8420	{
7672	8421	editWindow = null;
7673	8422	} // ?
	8423	+ }
	8424	+ else
	8425	+ {
	8426	+ //editWindow.closeUI();
7674	8427	}
7675	8428	}
7676	8429
..	..	@@ -7829,6 +8582,10 @@
7829	8582	}
7830	8583
7831	8584	transient ObjEditor editWindow;
	8585	+ transient ObjEditor manipWindow;
	8586	+
	8587	+ transient boolean pinned;
	8588	+
7832	8589	transient ObjectUI objectUI;
7833	8590	public static int povDepth = 0;
7834	8591	private static cVector tbMin = new cVector();
..	..	@@ -7843,8 +8600,8 @@
7843	8600	private static cVector2 qq2 = new cVector2();
7844	8601	private static cVector2 rr2 = new cVector2();
7845	8602	private static cVector2 ss2 = new cVector2();
7846		- private static cVector edge1 = new cVector();
7847		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
7848	8605	//private static cVector norm = new cVector();
7849	8606	/transient private/ int hitSomething;
7850	8607	static final int hitCenter = 1;
..	..	@@ -8042,7 +8799,275 @@
8042	8799
8043	8800	Touch();
8044	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
8045	8806
	8807	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8808	+ {
	8809	+ boolean success = false;
	8810	+
	8811	+ if (bRep.stripified)
	8812	+ {
	8813	+ int[] strips = bRep.getRawIndices();
	8814	+
	8815	+ // TRIANGLE STRIP ARRAY
	8816	+ if (bRep.trimmed)
	8817	+ {
	8818	+ float[] v = bRep.getRawVertices();
	8819	+
	8820	+ int count3 = 0;
	8821	+
	8822	+ if (v.length > 0)
	8823	+ {
	8824	+ for (int i = 0; i < strips.length; i++)
	8825	+ {
	8826	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8827	+ count3 += 3;
	8828	+
	8829	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ for (int j = 0; j < strips[i] - 2; j++)
	8833	+ {
	8834	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8835	+ count3 += 3;
	8836	+
	8837	+ if (j%2 == 0)
	8838	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8839	+ else
	8840	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8841	+
	8842	+ s1.set(s2);
	8843	+ s2.set(s3);
	8844	+ }
	8845	+ }
	8846	+ }
	8847	+
	8848	+ assert count3 == v.length;
	8849	+ }
	8850	+ else // !trimmed
	8851	+ {
	8852	+ int count = 0;
	8853	+ for (int i = 0; i < strips.length; i++)
	8854	+ {
	8855	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8856	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8857	+
	8858	+ for (int j = 0; j < strips[i] - 2; j++)
	8859	+ {
	8860	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8861	+
	8862	+ if (j%2 == 0)
	8863	+ success \|= intersectTriangle(ray, result, p, q, r);
	8864	+ else
	8865	+ success \|= intersectTriangle(ray, result, p, r, q);
	8866	+
	8867	+ p = q;
	8868	+ q = r;
	8869	+ }
	8870	+ }
	8871	+ }
	8872	+ } else // catch (Error e)
	8873	+ {
	8874	+ int facecount = bRep.FaceCount();
	8875	+ for (int i = 0; i < facecount; i++)
	8876	+ {
	8877	+ Face face = bRep.GetFace(i);
	8878	+
	8879	+ Vertex p = bRep.GetVertex(face.p);
	8880	+ Vertex q = bRep.GetVertex(face.q);
	8881	+ Vertex r = bRep.GetVertex(face.r);
	8882	+
	8883	+ success \|= intersectTriangle(ray, result, p, q, r);
	8884	+ }
	8885	+ }
	8886	+
	8887	+ return success;
	8888	+ }
	8889	+
	8890	+ static cVector eye = new cVector();
	8891	+ static cVector dir = new cVector();
	8892	+
	8893	+ transient BBox bbox = null;
	8894	+
	8895	+ boolean intersect(Ray ray, IntersectResult result)
	8896	+ {
	8897	+ double eyex = ray.eyePoint.x;
	8898	+ double eyey = ray.eyePoint.y;
	8899	+ double eyez = ray.eyePoint.z;
	8900	+
	8901	+ double dirx = ray.viewDirection.x;
	8902	+ double diry = ray.viewDirection.y;
	8903	+ double dirz = ray.viewDirection.z;
	8904	+
	8905	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8906	+ {
	8907	+ eye.x = eyex;
	8908	+ eye.y = eyey;
	8909	+ eye.z = eyez;
	8910	+ dir.x = dirx;
	8911	+ dir.y = diry;
	8912	+ dir.z = dirz;
	8913	+
	8914	+ LA.xformPos(eye, this.fromParent, eye);
	8915	+ LA.xformDir(dir, this.fromParent, dir);
	8916	+
	8917	+ ray.eyePoint.x = eye.x;
	8918	+ ray.eyePoint.y = eye.y;
	8919	+ ray.eyePoint.z = eye.z;
	8920	+
	8921	+ ray.viewDirection.x = dir.x;
	8922	+ ray.viewDirection.y = dir.y;
	8923	+ ray.viewDirection.z = dir.z;
	8924	+ }
	8925	+
	8926	+ boolean success = false;
	8927	+
	8928	+ boolean touch = false;
	8929	+
	8930	+ if (bRep != null && Link2Support())
	8931	+ {
	8932	+ if (bbox == null)
	8933	+ {
	8934	+ bbox = new BBox();
	8935	+
	8936	+ cVector min = new cVector();
	8937	+ cVector max = new cVector();
	8938	+
	8939	+ this.getBounds(min, max, true);
	8940	+
	8941	+ bbox.min.x = min.x;
	8942	+ bbox.min.y = min.y;
	8943	+ bbox.min.z = min.z;
	8944	+
	8945	+ bbox.max.x = max.x;
	8946	+ bbox.max.y = max.y;
	8947	+ bbox.max.z = max.z;
	8948	+ }
	8949	+
	8950	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8951	+ {
	8952	+ success \|= intersectMesh(ray, result);
	8953	+ }
	8954	+ else
	8955	+ {
	8956	+ //this.hide = true;
	8957	+ touch = true;
	8958	+ }
	8959	+ }
	8960	+
	8961	+ for (int i=0; i<size(); i++)
	8962	+ {
	8963	+ Object3D child = (Object3D) reserve(i);
	8964	+
	8965	+ if (child == null)
	8966	+ continue;
	8967	+
	8968	+ success \|= child.intersect(ray, result);
	8969	+ release(i);
	8970	+ }
	8971	+
	8972	+ ray.eyePoint.x = eyex;
	8973	+ ray.eyePoint.y = eyey;
	8974	+ ray.eyePoint.z = eyez;
	8975	+
	8976	+ ray.viewDirection.x = dirx;
	8977	+ ray.viewDirection.y = diry;
	8978	+ ray.viewDirection.z = dirz;
	8979	+
	8980	+// if (touch)
	8981	+// this.Touch(); // refresh display list
	8982	+
	8983	+ return success;
	8984	+ }
	8985	+
	8986	+ static Vector3d edge1 = new Vector3d();
	8987	+ static Vector3d edge2 = new Vector3d();
	8988	+ static Vector3d P = new Vector3d();
	8989	+ static Vector3d T = new Vector3d();
	8990	+ static Vector3d Q = new Vector3d();
	8991	+
	8992	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8993	+ {
	8994	+ if (false)
	8995	+ {
	8996	+ result.t = 0;
	8997	+ return true;
	8998	+ }
	8999	+
	9000	+ /*
	9001	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9002	+
	9003	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9004	+ */
	9005	+
	9006	+ // Calculate edges of the triangle
	9007	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9008	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9009	+
	9010	+ // Calculate the determinant (U parameter)
	9011	+ P.cross(ray.viewDirection, edge2);
	9012	+ double det = edge1.dot(P);
	9013	+
	9014	+ if (det > -1e-9 && det < 1e-9)
	9015	+ {
	9016	+ return false;
	9017	+ } // Ray lies in plane of triangle
	9018	+
	9019	+ double invDet = 1 / det;
	9020	+
	9021	+ // Calculate distance from vertex1 to ray origin
	9022	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9023	+
	9024	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9025	+
	9026	+ if (U < 0.f \|\| U > 1.f)
	9027	+ {
	9028	+ return false;
	9029	+ } // Intersection lies outside of the triangle
	9030	+
	9031	+ // Calculate V parameter
	9032	+ Q.cross(T, edge1);
	9033	+
	9034	+ double V = ray.viewDirection.dot(Q) * invDet;
	9035	+
	9036	+ if (V < 0.f \|\| (U + V) > 1.f)
	9037	+ {
	9038	+ return false;
	9039	+ } // Intersection lies outside of the triangle
	9040	+
	9041	+ double t = edge2.dot(Q) * invDet;
	9042	+
	9043	+ if (t > 1e-9) // Triangle and ray intersects
	9044	+ {
	9045	+ //result.isIntersected = true;
	9046	+ //result.id = id;
	9047	+
	9048	+ if (false) // isShadow)
	9049	+ {
	9050	+ result.t = t;
	9051	+ return true;
	9052	+ } else if (t < result.t)
	9053	+ {
	9054	+ result.object = this;
	9055	+
	9056	+ result.t = t;
	9057	+
	9058	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9059	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9060	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9061	+
	9062	+ result.n.cross(edge1, edge2);
	9063	+ result.n.normalize();
	9064	+ }
	9065	+
	9066	+ return true;
	9067	+ }
	9068	+
	9069	+ return false;
	9070	+ }
8046	9071
8047	9072	public int Size()
8048	9073	{