~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	+ transient int tabIndex; // Tabs can change between sessions.
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		- Grafreed.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	{
..	..	@@ -568,7 +826,7 @@
568	826	{
569	827	if (maxcount != 1)
570	828	{
571		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
572	830	}
573	831
574	832	toParentMarked = LA.newMatrix();
..	..	@@ -770,7 +1028,7 @@
770	1028
771	1029	void Step()
772	1030	{
773		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
774	1032	resetmaxcount();
775	1033	resettransformcount();
776	1034	resetstep();
..	..	@@ -884,6 +1142,8 @@
884	1142	(Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	1143	currentframe != Globals.framecount)
886	1144	{
	1145	+ Globals.lighttouched = true;
	1146	+
887	1147	currentframe = Globals.framecount;
888	1148
889	1149	// System.err.println("transformcount = " + transformcount);
..	..	@@ -963,21 +1223,28 @@
963	1223	{
964	1224	// return true;
965	1225
966		- if (material == null \|\| material.multiply)
967		- 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;
968	1234
969		- // Transparent objects are dynamic because we have to sort the triangles.
970		- return material.opacity > 0.99;
	1235	+ return !sort;
971	1236	}
972	1237
973	1238	boolean IsOpaque()
974	1239	{
975	1240	// return true;
976	1241
977		- if (material == null \|\| material.multiply)
978		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
979	1246
980		- return material.opacity > 0.99;
	1247	+ return !sort;
981	1248	}
982	1249
983	1250	Object3D()
..	..	@@ -1055,8 +1322,10 @@
1055	1322
1056	1323	// will share the geometry
1057	1324	assert (!(this instanceof Composite));
1058		- return deepCopy(); // Never called for Composite
1059		-
	1325	+
	1326	+ Object3D obj = deepCopy(); // Never called for Composite
	1327	+ obj.count = 2;
	1328	+ return obj;
1060	1329	}
1061	1330
1062	1331	boolean HasLoops()
..	..	@@ -1064,6 +1333,30 @@
1064	1333	return false;
1065	1334	}
1066	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	+
1067	1360	boolean IsInfinite()
1068	1361	{
1069	1362	if (blockloop)
..	..	@@ -1134,78 +1427,16 @@
1134	1427	return;
1135	1428
1136	1429	blockloop = true;
	1430	+
	1431	+ other.parent = parent;
	1432	+
1137	1433	//System.out.println("COPY " + this + " to " + other);
1138	1434	//new Exception().printStackTrace();
	1435	+ deepCopyNode(other);
1139	1436
1140		- other.parent = parent;
1141		- if (toParent != null)
1142		- {
1143		- other.toParent = LA.newMatrix();
1144		- other.fromParent = LA.newMatrix();
1145		- LA.matCopy(toParent, other.toParent);
1146		- LA.matCopy(fromParent, other.fromParent);
1147		- if (toParentMarked != null)
1148		- {
1149		- other.toParentMarked = LA.newMatrix();
1150		- other.fromParentMarked = LA.newMatrix();
1151		- LA.matCopy(toParentMarked, other.toParentMarked);
1152		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1153		- }
1154		- }
1155		- else
1156		- {
1157		- if (other.toParent == null)
1158		-// assert(other.toParent == null);
1159		-// new Exception().printStackTrace();
1160		- System.err.println("null parent: " + other);
1161		- }
1162		- /*
1163		- double ident[][] = LA.newMatrix();
1164		- if (bRep == null)
1165		- other.bRep = null;
1166		- else
1167		- other.bRep = new BoundaryRep(bRep, ident);
1168		- */
1169		- // Really new...
1170	1437	other.bRep = bRep; // Share the geometry
1171	1438
1172	1439	other.support = support; // Share the support
1173		-
1174		- //other.editWindow = null;
1175		- if (name == null)
1176		- other.name = null;
1177		- else
1178		- other.name = new String(name);
1179		-
1180		- if (material != null)
1181		- {
1182		- other.material = new cMaterial(material);
1183		- } else
1184		- {
1185		- other.material = null;
1186		- }
1187		-
1188		- other.GetTextures().name = GetTextures().name;
1189		-
1190		- CopyExtraMaterial(other);
1191		-
1192		- other.touched = touched;
1193		- other.softtouched = softtouched;
1194		-
1195		- other.random = random;
1196		- other.link2master = link2master;
1197		- other.transformcount = transformcount;
1198		- other.marked = marked;
1199		- other.skip = skip;
1200		- other.count = count;
1201		- other.flipV = flipV;
1202		- other.live = live;
1203		- other.rewind = rewind;
1204		- other.hide = hide;
1205		- other.texres = texres;
1206		- other.speedup = speedup;
1207		- other.height = height;
1208		- other.depth = depth;
1209	1440
1210	1441	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1211	1442	// {
..	..	@@ -1261,17 +1492,24 @@
1261	1492	if ((mask & GEOMETRY) != 0)
1262	1493	{
1263	1494	if (bRep != null)
1264		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1265		- else
1266		- assert(other.bRep == null);
1267		-
1268		- if (bRep != null)
1269	1495	{
	1496	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1270	1497	CameraPane.RemoveList(bRep.displaylist);
1271	1498	bRep.displaylist = 0; // june 2013 -1;
1272	1499	}
1273	1500	else
1274		- 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;
1275	1513	}
1276	1514
1277	1515	/* Use a MASK = GEO/MAT
..	..	@@ -1367,6 +1605,7 @@
1367	1605	toParent = LA.newMatrix();
1368	1606	fromParent = LA.newMatrix();
1369	1607	}
	1608	+
1370	1609	LA.matCopy(other.toParent, toParent);
1371	1610	LA.matCopy(other.fromParent, fromParent);
1372	1611
..	..	@@ -2246,11 +2485,6 @@
2246	2485
2247	2486	InitOthers();
2248	2487
2249		- if (this instanceof Camera)
2250		- {
2251		- material.shift = 90;
2252		- }
2253		-
2254	2488	material.multiply = multiply;
2255	2489
2256	2490	if (multiply)
..	..	@@ -2391,6 +2625,11 @@
2391	2625	else
2392	2626	{
2393	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");
2394	2633	}
2395	2634	}
2396	2635
..	..	@@ -2433,6 +2672,14 @@
2433	2672	{
2434	2673	editWindow.refreshContents();
2435	2674	}
	2675	+ else
	2676	+ {
	2677	+ if (manipWindow != null)
	2678	+ {
	2679	+ manipWindow.refreshContents();
	2680	+ }
	2681	+ }
	2682	+
2436	2683	//if (parent != null)
2437	2684	//parent.refreshEditWindow();
2438	2685	}
..	..	@@ -2512,7 +2759,8 @@
2512	2759	private static final int editSelf = 1;
2513	2760	private static final int editChild = 2;
2514	2761
2515		- void drawEditHandles(ClickInfo info, int level)
	2762	+ void drawEditHandles(//ClickInfo info,
	2763	+ int level)
2516	2764	{
2517	2765	if (level == 0)
2518	2766	{
..	..	@@ -2520,7 +2768,8 @@
2520	2768	return;
2521	2769
2522	2770	Object3D selectee;
2523		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2771	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2772	+ level + 1))
2524	2773	{
2525	2774	selectee = (Object3D) e.nextElement();
2526	2775	}
..	..	@@ -2528,19 +2777,22 @@
2528	2777	} else
2529	2778	{
2530	2779	//super.
2531		- drawEditHandles0(info, level + 1);
	2780	+ drawEditHandles0(//info,
	2781	+ level + 1);
2532	2782	}
2533	2783	}
2534	2784
2535		- boolean doEditClick(ClickInfo info, int level)
	2785	+ boolean doEditClick(//ClickInfo info,
	2786	+ int level)
2536	2787	{
2537	2788	doSomething = 0;
2538	2789	if (level == 0)
2539	2790	{
2540		- return doParentClick(info);
	2791	+ return doParentClick(); //info);
2541	2792	}
2542	2793	if (//super.
2543		- doEditClick0(info, level))
	2794	+ doEditClick0(//info,
	2795	+ level))
2544	2796	{
2545	2797	doSomething = 1;
2546	2798	return true;
..	..	@@ -2550,7 +2802,7 @@
2550	2802	}
2551	2803	}
2552	2804
2553		- boolean doParentClick(ClickInfo info)
	2805	+ boolean doParentClick() //ClickInfo info)
2554	2806	{
2555	2807	if (selection == null)
2556	2808	{
..	..	@@ -2563,7 +2815,8 @@
2563	2815	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2564	2816	{
2565	2817	Object3D selectee = (Object3D) e.nextElement();
2566		- if (selectee.doEditClick(info, 1))
	2818	+ if (selectee.doEditClick(//info,
	2819	+ 1))
2567	2820	{
2568	2821	childToDrag = selectee;
2569	2822	doSomething = 2;
..	..	@@ -2575,13 +2828,15 @@
2575	2828	return retval;
2576	2829	}
2577	2830
2578		- void doEditDrag(ClickInfo info, boolean opposite)
	2831	+ void doEditDrag(//ClickInfo clickInfo,
	2832	+ boolean opposite)
2579	2833	{
2580	2834	switch (doSomething)
2581	2835	{
2582	2836	case 1: // '\001'
2583	2837	//super.
2584		- doEditDrag0(info, opposite);
	2838	+ doEditDrag0(//clickInfo,
	2839	+ opposite);
2585	2840	break;
2586	2841
2587	2842	case 2: // '\002'
..	..	@@ -2594,11 +2849,13 @@
2594	2849	{
2595	2850	//sel.hitSomething = childToDrag.hitSomething;
2596	2851	//childToDrag.doEditDrag(info);
2597		- sel.doEditDrag(info, opposite);
	2852	+ sel.doEditDrag(//clickInfo,
	2853	+ opposite);
2598	2854	} else
2599	2855	{
2600	2856	//super.
2601		- doEditDrag0(info, opposite);
	2857	+ doEditDrag0(//clickInfo,
	2858	+ opposite);
2602	2859	}
2603	2860	}
2604	2861	break;
..	..	@@ -2616,6 +2873,9 @@
2616	2873	{
2617	2874	deselectAll();
2618	2875	}
	2876	+
	2877	+ new Exception().printStackTrace();
	2878	+
2619	2879	ClickInfo newInfo = new ClickInfo();
2620	2880	newInfo.flags = info.flags;
2621	2881	newInfo.bounds = info.bounds;
..	..	@@ -3045,7 +3305,10 @@
3045	3305	{
3046	3306	if (bRep != null)
3047	3307	{
	3308	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3048	3309	bRep.GenerateNormals(crease);
	3310	+ if (!bRep.trimmed)
	3311	+ bRep.MergeNormals();
3049	3312	Touch();
3050	3313	}
3051	3314	}
..	..	@@ -3063,7 +3326,7 @@
3063	3326	{
3064	3327	if (bRep != null)
3065	3328	{
3066		- bRep.GenerateNormalsMINE();
	3329	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3067	3330	Touch();
3068	3331	}
3069	3332	}
..	..	@@ -3120,6 +3383,105 @@
3120	3383	blockloop = false;
3121	3384	}
3122	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	+
3123	3485	void TransformChildren()
3124	3486	{
3125	3487	if (toParent != null)
..	..	@@ -3362,6 +3724,7 @@
3362	3724	if (bRep != null)
3363	3725	{
3364	3726	//bRep.RemoveOneTriangle();
	3727	+ System.out.println();
3365	3728	System.out.println("Reducing " + this);
3366	3729	if (name != null && name.contains("lockpickstraps"))
3367	3730	name = name;
..	..	@@ -3473,15 +3836,47 @@
3473	3836
3474	3837	void ClearMaterials()
3475	3838	{
	3839	+ if (blockloop)
	3840	+ return;
	3841	+
	3842	+ blockloop = true;
	3843	+
3476	3844	ClearMaterial();
3477		- for (int i = 0; i < size(); i++)
	3845	+ for (int i = 0; i < Size(); i++)
3478	3846	{
3479		- Object3D child = (Object3D) reserve(i);
	3847	+ Object3D child = (Object3D) get(i);
3480	3848	if (child == null)
3481	3849	continue;
3482	3850	child.ClearMaterials();
3483		- release(i);
3484	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;
3485	3880	}
3486	3881
3487	3882	void FlipV(boolean flip)
..	..	@@ -3660,6 +4055,7 @@
3660	4055
3661	4056	void RevertMeshes()
3662	4057	{
	4058	+ // BLOCKLOOP
3663	4059	if (this instanceof cMesh)
3664	4060	{
3665	4061	((cMesh)this).Revert();
..	..	@@ -3690,11 +4086,6 @@
3690	4086	Touch();
3691	4087	}
3692	4088
3693		- ResetRecur();
3694		- }
3695		-
3696		- void ResetRecur()
3697		- {
3698	4089	for (int i = 0; i < size(); i++)
3699	4090	{
3700	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3717,11 +4108,6 @@
3717	4108	Step();
3718	4109	Touch();
3719	4110
3720		- StepRecur();
3721		- }
3722		-
3723		- void StepRecur()
3724		- {
3725	4111	for (int i = 0; i < size(); i++)
3726	4112	{
3727	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3908,8 +4294,8 @@
3908	4294	Touch();
3909	4295	}
3910	4296
3911		- transient cVector min = new cVector();
3912		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
3913	4299
3914	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
3915	4301	{
..	..	@@ -3925,15 +4311,15 @@
3925	4311	if (blockloop)
3926	4312	return;
3927	4313
3928		- if (min == null) // ???
	4314	+ if (min == null)
3929	4315	{
3930	4316	min = new cVector();
3931	4317	max = new cVector();
3932	4318	}
3933	4319
3934		- for (int i = 0; i<size(); i++)
	4320	+ for (int i = 0; i<Size(); i++)
3935	4321	{
3936		- Object3D child = (Object3D) reserve(i);
	4322	+ Object3D child = (Object3D) get(i); //reserve(i);
3937	4323	if (child == null)
3938	4324	continue;
3939	4325
..	..	@@ -3952,21 +4338,21 @@
3952	4338	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3953	4339	//if (child.hide)
3954	4340	{
3955		- release(i);
	4341	+ //release(i);
3956	4342	continue;
3957	4343	}
3958	4344
3959	4345	blockloop = true;
3960	4346	child.getBounds(min, max, true); // xform);
3961	4347	blockloop = false;
3962		- release(i);
	4348	+ //release(i);
3963	4349
3964	4350	MinMax(minima, maxima);
3965	4351	}
3966	4352
3967	4353	if (bRep != null)
3968	4354	{
3969		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
3970	4356	}
3971	4357
3972	4358	if (false) // xform)
..	..	@@ -4963,6 +5349,14 @@
4963	5349	}
4964	5350	}
4965	5351
	5352	+ ObjEditor GetWindow()
	5353	+ {
	5354	+ if (editWindow != null)
	5355	+ return editWindow;
	5356	+
	5357	+ return manipWindow;
	5358	+ }
	5359	+
4966	5360	cTreePath Select(int indexcount, boolean deselect)
4967	5361	{
4968	5362	if (hide \|\| dontselect)
..	..	@@ -4999,10 +5393,11 @@
4999	5393	if (leaf != null)
5000	5394	{
5001	5395	cTreePath tp = new cTreePath(this, leaf);
5002		- if (editWindow != null)
	5396	+ ObjEditor window = GetWindow();
	5397	+ if (window != null)
5003	5398	{
5004	5399	//System.out.println("editWindow = " + editWindow + " vs " + this);
5005		- editWindow.Select(tp, deselect, true);
	5400	+ window.Select(tp, deselect, true);
5006	5401	}
5007	5402
5008	5403	return tp;
..	..	@@ -5019,6 +5414,7 @@
5019	5414
5020	5415	if (child == null)
5021	5416	continue;
	5417	+
5022	5418	if (child.HasTransparency() && child.size() != 0)
5023	5419	{
5024	5420	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5028,9 +5424,10 @@
5028	5424	if (leaf != null)
5029	5425	{
5030	5426	cTreePath tp = new cTreePath(this, leaf);
5031		- if (editWindow != null)
	5427	+ ObjEditor window = GetWindow();
	5428	+ if (window != null)
5032	5429	{
5033		- editWindow.Select(tp, deselect, true);
	5430	+ window.Select(tp, deselect, true);
5034	5431	}
5035	5432
5036	5433	return tp;
..	..	@@ -5355,6 +5752,51 @@
5355	5752	blockloop = false;
5356	5753	}
5357	5754
	5755	+ void ResetSelectable()
	5756	+ {
	5757	+ if (blockloop)
	5758	+ return;
	5759	+
	5760	+ blockloop = true;
	5761	+
	5762	+ keepdontselect = dontselect;
	5763	+ dontselect = true;
	5764	+
	5765	+ Object3D child;
	5766	+ int nb = Size();
	5767	+ for (int i = 0; i < nb; i++)
	5768	+ {
	5769	+ child = (Object3D) get(i);
	5770	+ if (child == null)
	5771	+ continue;
	5772	+ child.ResetSelectable();
	5773	+ }
	5774	+
	5775	+ blockloop = false;
	5776	+ }
	5777	+
	5778	+ void RestoreSelectable()
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ blockloop = true;
	5784	+
	5785	+ dontselect = keepdontselect;
	5786	+
	5787	+ Object3D child;
	5788	+ int nb = Size();
	5789	+ for (int i = 0; i < nb; i++)
	5790	+ {
	5791	+ child = (Object3D) get(i);
	5792	+ if (child == null)
	5793	+ continue;
	5794	+ child.RestoreSelectable();
	5795	+ }
	5796	+
	5797	+ blockloop = false;
	5798	+ }
	5799	+
5358	5800	boolean IsSelected()
5359	5801	{
5360	5802	if (parent == null)
..	..	@@ -5415,6 +5857,11 @@
5415	5857	if (fullname == null)
5416	5858	return "";
5417	5859
	5860	+ if (fullname.pigment != null)
	5861	+ {
	5862	+ return fullname.pigment;
	5863	+ }
	5864	+
5418	5865	// System.out.println("Fullname = " + fullname);
5419	5866
5420	5867	// Does not work on Windows due to C:
..	..	@@ -5427,7 +5874,7 @@
5427	5874
5428	5875	if (split.length == 0)
5429	5876	{
5430		- return "";
	5877	+ return fullname.pigment = "";
5431	5878	}
5432	5879
5433	5880	if (split.length <= 2)
..	..	@@ -5435,22 +5882,27 @@
5435	5882	if (fullname.name.endsWith(":"))
5436	5883	{
5437	5884	// Windows
5438		- return fullname.name.substring(0, fullname.name.length()-1);
	5885	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5439	5886	}
5440	5887
5441		- return split[0];
	5888	+ return fullname.pigment = split[0];
5442	5889	}
5443	5890
5444	5891	// Windows
5445	5892	assert(split.length == 4);
5446	5893
5447		- return split[0] + ":" + split[1];
	5894	+ return fullname.pigment = split[0] + ":" + split[1];
5448	5895	}
5449	5896
5450	5897	static String GetBump(cTexture fullname)
5451	5898	{
5452	5899	if (fullname == null)
5453	5900	return "";
	5901	+
	5902	+ if (fullname.bump != null)
	5903	+ {
	5904	+ return fullname.bump;
	5905	+ }
5454	5906
5455	5907	// System.out.println("Fullname = " + fullname);
5456	5908	// Does not work on Windows due to C:
..	..	@@ -5462,12 +5914,12 @@
5462	5914
5463	5915	if (split.length == 0)
5464	5916	{
5465		- return "";
	5917	+ return fullname.bump = "";
5466	5918	}
5467	5919
5468	5920	if (split.length == 1)
5469	5921	{
5470		- return "";
	5922	+ return fullname.bump = "";
5471	5923	}
5472	5924
5473	5925	if (split.length == 2)
..	..	@@ -5475,16 +5927,16 @@
5475	5927	if (fullname.name.endsWith(":"))
5476	5928	{
5477	5929	// Windows
5478		- return "";
	5930	+ return fullname.bump = "";
5479	5931	}
5480	5932
5481		- return split[1];
	5933	+ return fullname.bump = split[1];
5482	5934	}
5483	5935
5484	5936	// Windows
5485	5937	assert(split.length == 4);
5486	5938
5487		- return split[2] + ":" + split[3];
	5939	+ return fullname.bump = split[2] + ":" + split[3];
5488	5940	}
5489	5941
5490	5942	String GetPigmentTexture()
..	..	@@ -5567,6 +6019,9 @@
5567	6019	texname = "";
5568	6020
5569	6021	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6022	+
	6023	+ GetTextures().pigment = null;
	6024	+
5570	6025	Touch();
5571	6026	}
5572	6027
..	..	@@ -5640,6 +6095,8 @@
5640	6095
5641	6096	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5642	6097
	6098	+ GetTextures().bump = null;
	6099	+
5643	6100	Touch();
5644	6101	}
5645	6102
..	..	@@ -5664,6 +6121,38 @@
5664	6121	}
5665	6122	}
5666	6123
	6124	+ void EmbedTextures(boolean embed)
	6125	+ {
	6126	+ if (blockloop)
	6127	+ return;
	6128	+
	6129	+ //if (GetTextures() != null)
	6130	+ if (embed)
	6131	+ CameraPane.EmbedTextures(GetTextures());
	6132	+ else
	6133	+ {
	6134	+ GetTextures().pigmentdata = null;
	6135	+ GetTextures().bumpdata = null;
	6136	+ GetTextures().pw = 0;
	6137	+ GetTextures().ph = 0;
	6138	+ GetTextures().bw = 0;
	6139	+ GetTextures().bh = 0;
	6140	+ }
	6141	+
	6142	+ int nb = Size();
	6143	+ for (int i = 0; i < nb; i++)
	6144	+ {
	6145	+ Object3D child = (Object3D) get(i);
	6146	+
	6147	+ if (child == null)
	6148	+ continue;
	6149	+
	6150	+ blockloop = true;
	6151	+ child.EmbedTextures(embed);
	6152	+ blockloop = false;
	6153	+ }
	6154	+ }
	6155	+
5667	6156	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5668	6157	{
5669	6158	Draw(display, root, selected, blocked);
..	..	@@ -5672,7 +6161,7 @@
5672	6161	boolean NeedSupport()
5673	6162	{
5674	6163	return
5675		- 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
5676	6165	// PROBLEM with CROWD!!
5677	6166	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5678	6167	}
..	..	@@ -5690,6 +6179,20 @@
5690	6179	return parent.IsLive();
5691	6180	}
5692	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	+
5693	6196	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5694	6197	{
5695	6198	Invariants(); // june 2013
..	..	@@ -5697,6 +6200,29 @@
5697	6200	if (support != null)
5698	6201	{
5699	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	+ }
5700	6226	}
5701	6227
5702	6228	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5750,8 +6276,11 @@
5750	6276	if (support != null)
5751	6277	support = support;
5752	6278
5753		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ boolean usecalllists = !IsDynamic() &&
	6280	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6281	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6282	+
	6283	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5755	6284
5756	6285	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5757	6286	{
..	..	@@ -5759,10 +6288,12 @@
5759	6288	bRep.displaylist = 0;
5760	6289	}
5761	6290	// usecalllists &= !(parent instanceof RandomNode);
5762		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
5763	6293
5764		- if (GetBRep() != null)
5765		- usecalllists = usecalllists;
	6294	+ if (display.DrawMode() == display.SHADOW)
	6295	+ //GetBRep() != null)
	6296	+ usecalllists = !!usecalllists;
5766	6297	//System.out.println("draw " + this);
5767	6298	//new Exception().printStackTrace();
5768	6299
..	..	@@ -5772,7 +6303,7 @@
5772	6303
5773	6304	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774	6305	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5775		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5776	6307	{
5777	6308	Globals.lighttouched = true;
5778	6309	} // all panes...
..	..	@@ -5784,7 +6315,7 @@
5784	6315	if (!(this instanceof Composite))
5785	6316	touched = false;
5786	6317	//if (displaylist == -1 && usecalllists)
5787		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6318	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5788	6319	{
5789	6320	bRep.displaylist = display.GenList();
5790	6321	assert(bRep.displaylist != 0);
..	..	@@ -5795,7 +6326,7 @@
5795	6326
5796	6327	//System.out.println("\tnew list " + list);
5797	6328	//gl.glDrawBuffer(gl.GL_NONE);
5798		- if (usecalllists)
	6329	+ if (usecalllists && bRep.displaylist > 0)
5799	6330	{
5800	6331	// System.err.println("new list " + bRep.displaylist + " for " + this);
5801	6332	display.NewList(bRep.displaylist);
..	..	@@ -5804,7 +6335,7 @@
5804	6335	CallList(display, root, selected, blocked);
5805	6336
5806	6337	// compiled = true;
5807		- if (usecalllists)
	6338	+ if (usecalllists && bRep.displaylist > 0)
5808	6339	{
5809	6340	// System.err.println("end list " + bRep.displaylist + " for " + this);
5810	6341	display.EndList();
..	..	@@ -5814,8 +6345,8 @@
5814	6345	Globals.lighttouched = true; // all panes...
5815	6346	}
5816	6347
5817		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5818		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
5819	6350
5820	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
5821	6352	{
..	..	@@ -5854,7 +6385,7 @@
5854	6385	{
5855	6386	if (display.DrawMode() == iCameraPane.SHADOW)
5856	6387	{
5857		- if (!link2master // tricky to cull in shadow mode.
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
5858	6389	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5859	6390	{
5860	6391	//System.out.print("CULLED");
..	..	@@ -5904,6 +6435,7 @@
5904	6435	if (GetBRep() != null)
5905	6436	{
5906	6437	display.NextIndex();
	6438	+
5907	6439	// vertex color conflict : gl.glCallList(list);
5908	6440	DrawNode(display, root, selected);
5909	6441	if (this instanceof BezierPatch)
..	..	@@ -5915,6 +6447,20 @@
5915	6447	{
5916	6448	drawSelf(display, root, selected, blocked);
5917	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	+// }
5918	6464	} else
5919	6465	{
5920	6466	/*
..	..	@@ -5947,13 +6493,14 @@
5947	6493	boolean failedPigment = false;
5948	6494	boolean failedBump = false;
5949	6495
	6496	+ CameraPane.lastObject = this;
5950	6497	try
5951	6498	{
5952	6499	display.BindPigmentTexture(tex, texres);
5953	6500	}
5954	6501	catch (Exception e)
5955	6502	{
5956		- System.err.println("FAILED: " + this);
	6503	+ // System.err.println("FAILED: " + this);
5957	6504	failedPigment = true;
5958	6505	}
5959	6506
..	..	@@ -5984,6 +6531,20 @@
5984	6531	display.CallList(bRep.displaylist);
5985	6532	// june 2013 drawSelf(display, root, selected);
5986	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	+// }
5987	6548	}
5988	6549	}
5989	6550
..	..	@@ -6037,16 +6598,17 @@
6037	6598
6038	6599	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6039	6600	{
6040		- if (GetBRep() == null)
6041		- {
6042		- drawSelf(display, root, selected, blocked);
6043		- } else
	6601	+ if (GetBRep() != null)
6044	6602	{
6045	6603	DrawNode(display, root, selected);
6046	6604	if (this instanceof BezierPatch)
6047	6605	{
6048	6606	//drawSelf(display, root, selected);
6049	6607	}
	6608	+ }
	6609	+ else
	6610	+ {
	6611	+ drawSelf(display, root, selected, blocked);
6050	6612	}
6051	6613	}
6052	6614
..	..	@@ -6296,7 +6858,8 @@
6296	6858
6297	6859	//javax.media.opengl.GL gl = display.GetGL();
6298	6860
6299		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
6300	6863	{
6301	6864	int fc = bRep.FaceCount();
6302	6865	int vc = bRep.VertexCount();
..	..	@@ -6458,7 +7021,7 @@
6458	7021	facescompare[k] = new FaceCompare(k);
6459	7022	}
6460	7023
6461		- center = new cVector();
	7024	+ centertriangle = new cVector();
6462	7025	}
6463	7026	else
6464	7027	{
..	..	@@ -6581,7 +7144,7 @@
6581	7144	*/
6582	7145	}
6583	7146
6584		- transient cVector center;
	7147	+ transient cVector centertriangle;
6585	7148
6586	7149	class FaceCompare implements Comparable
6587	7150	{
..	..	@@ -6610,14 +7173,14 @@
6610	7173	Vertex q = bRep.GetVertex(face.q);
6611	7174	Vertex r = bRep.GetVertex(face.r);
6612	7175
6613		- center.set(p);
6614		- center.add(q);
6615		- center.add(r);
6616		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
6617	7180
6618		- center.sub(Globals.theRenderer.EyeCamera().location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6619	7182
6620		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
6621	7184	}
6622	7185
6623	7186	return distance;
..	..	@@ -7154,20 +7717,23 @@
7154	7717	}
7155	7718	}
7156	7719
7157		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7720	+ static ClickInfo clickInfo = new ClickInfo();
	7721	+
	7722	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7723	+ Point outPt, Rectangle outRec)
7158	7724	{
7159		- int hc = info.bounds.x + info.bounds.width / 2;
7160		- int vc = info.bounds.y + info.bounds.height / 2;
7161		- double[][] toscreen = info.toScreen;
	7725	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7726	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7727	+ double[][] toscreen = clickInfo.toScreen;
7162	7728	if (toscreen == null)
7163	7729	{
7164		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7730	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7165	7731	}
7166	7732	cVector vec = in;
7167	7733	LA.xformPos(in, toscreen, in);
7168	7734	//System.out.println("Distance = " + info.camera.Distance());
7169		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7170		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7735	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7736	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7171	7737	outPt.x = hc + (int) vec.x;
7172	7738	outPt.y = vc - (int) vec.y;
7173	7739	outRec.x = outPt.x - 3;
..	..	@@ -7175,15 +7741,18 @@
7175	7741	outRec.width = outRec.height = 6;
7176	7742	}
7177	7743
7178		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7744	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7745	+ )
7179	7746	{
7180	7747	Point pt = new Point(0, 0);
7181	7748	Rectangle rec = new Rectangle();
7182		- calcHotSpot(in, info, pt, rec);
	7749	+ calcHotSpot(in, //clickInfo,
	7750	+ pt, rec);
7183	7751	return rec;
7184	7752	}
7185	7753
7186		- void drawEditHandles0(ClickInfo info, int level)
	7754	+ void drawEditHandles0(//ClickInfo clickInfo,
	7755	+ int level)
7187	7756	{
7188	7757	if (level == 0)
7189	7758	{
..	..	@@ -7192,16 +7761,19 @@
7192	7761	{
7193	7762	cVector origin = new cVector();
7194	7763	//LA.xformPos(origin, toParent, origin);
7195		- Rectangle spot = calcHotSpot(origin, info);
	7764	+ if (this.clickInfo == null)
	7765	+ this.clickInfo = new ClickInfo();
	7766	+
	7767	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7196	7768	Rectangle boundary = new Rectangle();
7197	7769	boundary.x = spot.x - 30;
7198	7770	boundary.y = spot.y - 30;
7199	7771	boundary.width = spot.width + 60;
7200	7772	boundary.height = spot.height + 60;
7201		- info.g.setColor(Color.red);
	7773	+ clickInfo.g.setColor(Color.white);
7202	7774	int spotw = spot.x + spot.width;
7203	7775	int spoth = spot.y + spot.height;
7204		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7776	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7205	7777	// if (CameraPane.Xmin > spot.x)
7206	7778	// {
7207	7779	// CameraPane.Xmin = spot.x;
..	..	@@ -7218,11 +7790,6 @@
7218	7790	// {
7219	7791	// CameraPane.Ymax = spoth;
7220	7792	// }
7221		- spot.translate(32, 32);
7222		- spotw = spot.x + spot.width;
7223		- spoth = spot.y + spot.height;
7224		- info.g.setColor(Color.cyan);
7225		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7226	7793	// if (CameraPane.Xmin > spot.x)
7227	7794	// {
7228	7795	// CameraPane.Xmin = spot.x;
..	..	@@ -7241,10 +7808,15 @@
7241	7808	// }
7242	7809	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243	7810	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7244		- spot.translate(0, -32);
7245		- info.g.setColor(Color.yellow);
7246		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7247		- info.g.setColor(Color.green);
	7811	+ spot.translate(32, 0);
	7812	+ clickInfo.g.setColor(Color.yellow);
	7813	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7814	+
	7815	+ spot.translate(32, 64);
	7816	+ spotw = spot.x + spot.width;
	7817	+ spoth = spot.y + spot.height;
	7818	+ clickInfo.g.setColor(Color.cyan);
	7819	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7248	7820	// if (CameraPane.Xmin > spot.x)
7249	7821	// {
7250	7822	// CameraPane.Xmin = spot.x;
..	..	@@ -7261,8 +7833,9 @@
7261	7833	// {
7262	7834	// CameraPane.Ymax = spoth;
7263	7835	// }
7264		- info.g.drawArc(boundary.x, boundary.y,
7265		- boundary.width, boundary.height, 0, 360);
	7836	+ clickInfo.g.setColor(Color.green);
	7837	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7838	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7266	7839	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267	7840	// if (CameraPane.Xmin > boundary.x)
7268	7841	// {
..	..	@@ -7284,7 +7857,8 @@
7284	7857	}
7285	7858	}
7286	7859
7287		- boolean doEditClick0(ClickInfo info, int level)
	7860	+ boolean doEditClick0(//ClickInfo clickInfo,
	7861	+ int level)
7288	7862	{
7289	7863	if (level == 0)
7290	7864	{
..	..	@@ -7293,8 +7867,8 @@
7293	7867
7294	7868	boolean retval = false;
7295	7869
7296		- startX = info.x;
7297		- startY = info.y;
	7870	+ startX = clickInfo.x;
	7871	+ startY = clickInfo.y;
7298	7872
7299	7873	hitSomething = -1;
7300	7874	cVector origin = new cVector();
..	..	@@ -7304,22 +7878,53 @@
7304	7878	{
7305	7879	centerPt = new Point(0, 0);
7306	7880	}
7307		- calcHotSpot(origin, info, centerPt, spot);
7308		- if (spot.contains(info.x, info.y))
	7881	+ calcHotSpot(origin, //info,
	7882	+ centerPt, spot);
	7883	+ if (spot.contains(clickInfo.x, clickInfo.y))
7309	7884	{
7310	7885	hitSomething = hitCenter;
7311	7886	retval = true;
7312	7887	}
7313	7888	spot.translate(32, 0);
7314		- if (spot.contains(info.x, info.y))
	7889	+ if (spot.contains(clickInfo.x, clickInfo.y))
7315	7890	{
7316	7891	hitSomething = hitRotate;
7317	7892	retval = true;
7318	7893	}
7319	7894	spot.translate(0, 32);
7320		- if (spot.contains(info.x, info.y))
	7895	+ spot.translate(32, 0);
	7896	+ spot.translate(0, 32);
	7897	+ if (spot.contains(clickInfo.x, clickInfo.y))
7321	7898	{
7322	7899	hitSomething = hitScale;
	7900	+
	7901	+ double scale = 0.005f * clickInfo.camera.Distance();
	7902	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7903	+ double sign = 1;
	7904	+ if (hScale < 0)
	7905	+ {
	7906	+ sign = -1;
	7907	+ }
	7908	+ hScale = signMath.pow(signhScale, scale * 50);
	7909	+ if (hScale < 0.01)
	7910	+ {
	7911	+ //hScale = 0.01;
	7912	+ }
	7913	+
	7914	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7915	+ sign = 1;
	7916	+ if (vScale < 0)
	7917	+ {
	7918	+ sign = -1;
	7919	+ }
	7920	+ vScale = signMath.pow(signvScale, scale * 50);
	7921	+ if (vScale < 0.01)
	7922	+ {
	7923	+ //vScale = 0.01;
	7924	+ }
	7925	+
	7926	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7927	+
7323	7928	retval = true;
7324	7929	}
7325	7930
..	..	@@ -7329,7 +7934,7 @@
7329	7934	}
7330	7935
7331	7936	//System.out.println("info.modifiers = " + info.modifiers);
7332		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7937	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7333	7938	//System.out.println("modified = " + modified);
7334	7939	//new Exception().printStackTrace();
7335	7940	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7357,7 +7962,8 @@
7357	7962	return true;
7358	7963	}
7359	7964
7360		- void doEditDrag0(ClickInfo info, boolean opposite)
	7965	+ void doEditDrag0(//ClickInfo info,
	7966	+ boolean opposite)
7361	7967	{
7362	7968	if (hitSomething == 0)
7363	7969	{
..	..	@@ -7371,7 +7977,7 @@
7371	7977
7372	7978	//System.out.println("hitSomething = " + hitSomething);
7373	7979
7374		- double scale = 0.005f * info.camera.Distance();
	7980	+ double scale = 0.005f * clickInfo.camera.Distance();
7375	7981
7376	7982	cVector xlate = new cVector();
7377	7983	//cVector xlate2 = new cVector();
..	..	@@ -7385,7 +7991,9 @@
7385	7991
7386	7992	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7387	7993
7388		- if (modified \|\| opposite)
	7994	+ // Modified could snap
	7995	+ if (//modified \|\|
	7996	+ opposite)
7389	7997	{
7390	7998	//assert(false);
7391	7999	/*
..	..	@@ -7405,8 +8013,8 @@
7405	8013	toParent[3][i] = xlate.get(i);
7406	8014	LA.matInvert(toParent, fromParent);
7407	8015	*/
7408		- cVector delta = LA.newVector(0, 0, startY - info.y);
7409		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8016	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8017	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7410	8018
7411	8019	LA.matCopy(startMat, toParent);
7412	8020	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7415,7 +8023,7 @@
7415	8023	} else
7416	8024	{
7417	8025	//LA.xformDir(delta, info.camera.fromScreen, delta);
7418		- cVector up = new cVector(info.camera.up);
	8026	+ cVector up = new cVector(clickInfo.camera.up);
7419	8027	cVector away = new cVector();
7420	8028	//cVector right2 = new cVector();
7421	8029	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7432,19 +8040,19 @@
7432	8040	LA.xformDir(up, ClickInfo.matbuffer, up);
7433	8041	// if (!CameraPane.LOCALTRANSFORM)
7434	8042	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7435		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8043	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7436	8044	// if (!CameraPane.LOCALTRANSFORM)
7437	8045	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7438	8046	//LA.vecCross(up, cVector.Z, right2);
7439	8047
7440		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8048	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7441	8049
7442	8050	//System.out.println("DELTA0 = " + delta);
7443	8051	//System.out.println("AWAY = " + info.camera.away);
7444	8052	//System.out.println("UP = " + info.camera.up);
7445	8053	if (away.z > 0)
7446	8054	{
7447		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8055	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7448	8056	{
7449	8057	delta.x = -delta.x;
7450	8058	} else
..	..	@@ -7459,7 +8067,7 @@
7459	8067	//System.out.println("DELTA1 = " + delta);
7460	8068	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7461	8069	//System.out.println("DELTA2 = " + delta);
7462		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8070	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7463	8071	LA.matCopy(startMat, toParent);
7464	8072	//System.out.println("DELTA3 = " + delta);
7465	8073	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7469,8 +8077,8 @@
7469	8077	break;
7470	8078
7471	8079	case hitRotate: // rotate
7472		- int dx = info.x - centerPt.x;
7473		- int dy = -(info.y - centerPt.y);
	8080	+ int dx = clickInfo.x - centerPt.x;
	8081	+ int dy = -(clickInfo.y - centerPt.y);
7474	8082	double angle = (double) Math.atan2(dx, dy);
7475	8083	angle = -(1.570796 - angle);
7476	8084
..	..	@@ -7479,7 +8087,7 @@
7479	8087
7480	8088	if (modified)
7481	8089	{
7482		- // Rotate 90 degrees
	8090	+ // Rotate 45 degrees
7483	8091	angle /= (Math.PI / 4);
7484	8092	angle = Math.floor(angle + 0.5);
7485	8093	angle *= (Math.PI / 4);
..	..	@@ -7493,7 +8101,7 @@
7493	8101	}
7494	8102	/**/
7495	8103
7496		- switch (info.pane.RenderCamera().viewCode)
	8104	+ switch (clickInfo.pane.RenderCamera().viewCode)
7497	8105	{
7498	8106	case 1: // '\001'
7499	8107	LA.matZRotate(toParent, angle);
..	..	@@ -7520,7 +8128,7 @@
7520	8128	break;
7521	8129
7522	8130	case hitScale: // scale
7523		- double hScale = (double) (info.x - centerPt.x) / 32;
	8131	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7524	8132	double sign = 1;
7525	8133	if (hScale < 0)
7526	8134	{
..	..	@@ -7532,7 +8140,7 @@
7532	8140	//hScale = 0.01;
7533	8141	}
7534	8142
7535		- double vScale = (double) (info.y - centerPt.y) / 32;
	8143	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7536	8144	sign = 1;
7537	8145	if (vScale < 0)
7538	8146	{
..	..	@@ -7543,6 +8151,7 @@
7543	8151	{
7544	8152	//vScale = 0.01;
7545	8153	}
	8154	+
7546	8155	LA.matCopy(startMat, toParent);
7547	8156	/**/
7548	8157	for (int i = 0; i < 3; i++)
..	..	@@ -7552,33 +8161,39 @@
7552	8161	}
7553	8162	/**/
7554	8163
7555		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	8164	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7556	8165
7557	8166	if (totalScale < 0.01)
7558	8167	{
7559	8168	totalScale = 0.01;
7560	8169	}
7561	8170
7562		- switch (info.pane.RenderCamera().viewCode)
	8171	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	8172	{
7564	8173	case 3: // '\001'
7565	8174	if (modified \|\| opposite)
7566	8175	{
	8176	+ if (modified) // && opposite)
	8177	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8178	+ else
7567	8179	//LA.matScale(toParent, 1, hScale, vScale);
7568		- LA.matScale(toParent, totalScale, 1, 1);
	8180	+ LA.matScale(toParent, totalScale, 1, 1);
7569	8181	} // vScale, 1);
7570	8182	else
7571	8183	{
7572	8184	// EXCEPTION!
7573		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8185	+ LA.matScale(toParent, 1, totalScale, totalScale);
7574	8186	} // vScale, 1);
7575	8187	break;
7576	8188
7577	8189	case 2: // '\002'
7578	8190	if (modified \|\| opposite)
7579	8191	{
7580		- //LA.matScale(toParent, hScale, 1, vScale);
7581		- 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);
7582	8197	} else
7583	8198	{
7584	8199	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7588,8 +8203,11 @@
7588	8203	case 1: // '\003'
7589	8204	if (modified \|\| opposite)
7590	8205	{
7591		- //LA.matScale(toParent, hScale, vScale, 1);
7592		- 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);
7593	8211	} else
7594	8212	{
7595	8213	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7626,7 +8244,7 @@
7626	8244	} // NEW ...
7627	8245
7628	8246
7629		- info.pane.repaint();
	8247	+ clickInfo.pane.repaint();
7630	8248	}
7631	8249
7632	8250	boolean overflow = false;
..	..	@@ -7740,12 +8358,12 @@
7740	8358	if (!Globals.ADVANCED)
7741	8359	return objname;
7742	8360
7743		- return objname + " " + System.identityHashCode(this);
	8361	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7744	8362	}
7745	8363
7746	8364	public int hashCode()
7747	8365	{
7748		- // Fuck Vector...
	8366	+ // Do not use Vector...
7749	8367	return System.identityHashCode(this);
7750	8368	}
7751	8369
..	..	@@ -7967,6 +8585,10 @@
7967	8585	}
7968	8586
7969	8587	transient ObjEditor editWindow;
	8588	+ transient ObjEditor manipWindow;
	8589	+
	8590	+ transient boolean pinned;
	8591	+
7970	8592	transient ObjectUI objectUI;
7971	8593	public static int povDepth = 0;
7972	8594	private static cVector tbMin = new cVector();
..	..	@@ -7981,8 +8603,8 @@
7981	8603	private static cVector2 qq2 = new cVector2();
7982	8604	private static cVector2 rr2 = new cVector2();
7983	8605	private static cVector2 ss2 = new cVector2();
7984		- private static cVector edge1 = new cVector();
7985		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
7986	8608	//private static cVector norm = new cVector();
7987	8609	/transient private/ int hitSomething;
7988	8610	static final int hitCenter = 1;
..	..	@@ -8180,7 +8802,275 @@
8180	8802
8181	8803	Touch();
8182	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
8183	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	+ }
8184	9074
8185	9075	public int Size()
8186	9076	{