~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,18 +22,129 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo. No need to be transient.
	28	+ // TEMPORARY for versions. No need to be transient.
28	29	mocap.reader.BVHReader.BVHResult savebvh;
29	30	Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
30	34	//
31	35
32		- byte[] versions[];
	36	+ String skyboxname;
	37	+ String skyboxext;
	38	+
	39	+ Object3D[] versionlist;
33	40	int versionindex = -1;
34	41
	42	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	43	+
	44	+ transient int tabIndex; // Tabs can change between sessions.
	45	+
35	46	ScriptNode scriptnode;
36	47
	48	+ void GetOrigin(cVector o)
	49	+ {
	50	+ o.x = this.toParent[3][0];
	51	+ o.y = this.toParent[3][1];
	52	+ o.z = this.toParent[3][2];
	53	+ }
	54	+
	55	+ void SetOrigin(cVector o)
	56	+ {
	57	+ this.toParent[3][0] = o.x;
	58	+ this.toParent[3][1] = o.y;
	59	+ this.toParent[3][2] = o.z;
	60	+ }
	61	+
	62	+ void deepCopyNode(Object3D other)
	63	+ {
	64	+ other.skyboxname = skyboxname;
	65	+ other.skyboxext = skyboxext;
	66	+
	67	+ if (toParent != null)
	68	+ {
	69	+ other.toParent = LA.newMatrix();
	70	+ other.fromParent = LA.newMatrix();
	71	+ LA.matCopy(toParent, other.toParent);
	72	+ LA.matCopy(fromParent, other.fromParent);
	73	+ if (toParentMarked != null)
	74	+ {
	75	+ other.toParentMarked = LA.newMatrix();
	76	+ other.fromParentMarked = LA.newMatrix();
	77	+ LA.matCopy(toParentMarked, other.toParentMarked);
	78	+ LA.matCopy(fromParentMarked, other.fromParentMarked);
	79	+ }
	80	+ }
	81	+ else
	82	+ {
	83	+ if (other.toParent == null)
	84	+// assert(other.toParent == null);
	85	+// new Exception().printStackTrace();
	86	+ System.err.println("null parent: " + other);
	87	+ }
	88	+
	89	+ /*
	90	+ double ident[][] = LA.newMatrix();
	91	+ if (bRep == null)
	92	+ other.bRep = null;
	93	+ else
	94	+ other.bRep = new BoundaryRep(bRep, ident);
	95	+ */
	96	+ // Really new...
	97	+ //other.editWindow = null;
	98	+ if (name == null)
	99	+ other.name = null;
	100	+ else
	101	+ other.name = new String(name);
	102	+
	103	+ if (material != null)
	104	+ {
	105	+ other.material = new cMaterial(material);
	106	+ } else
	107	+ {
	108	+ other.material = null;
	109	+ }
	110	+
	111	+ other.GetTextures().name = GetTextures().name;
	112	+
	113	+ CopyExtraMaterial(other);
	114	+
	115	+ other.touched = touched;
	116	+ other.softtouched = softtouched;
	117	+
	118	+ other.random = random;
	119	+ other.link2master = Link2Support();
	120	+ other.transformcount = transformcount;
	121	+ other.marked = marked;
	122	+ other.skip = skip;
	123	+ other.count = count;
	124	+ other.flipV = flipV;
	125	+ other.live = live;
	126	+ other.rewind = rewind;
	127	+ other.hide = hide;
	128	+ other.texres = texres;
	129	+ other.speedup = speedup;
	130	+ other.height = height;
	131	+ other.depth = depth;
	132	+ }
	133	+
	134	+ int VersionCount()
	135	+ {
	136	+ int count = 0;
	137	+
	138	+ if (versionlist != null)
	139	+ for (int i = versionlist.length; --i >= 0;)
	140	+ {
	141	+ if (versionlist[i] != null)
	142	+ count++;
	143	+ }
	144	+
	145	+ return count;
	146	+ }
	147	+
37	148	void InitOthers()
38	149	{
39	150	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -45,6 +156,7 @@
45	156	projectedVertices[i] = new cVector2(); // Others
46	157	}
47	158	projectedVertices[0].x = 100; // bump
	159	+ projectedVertices[1].y = 1000; // punchthrough. only for png
48	160	}
49	161
50	162	void MinMax(cVector minima, cVector maxima)
..	..	@@ -124,7 +236,7 @@
124	236	return;
125	237
126	238	transientsupport = support;
127		- transientlink2master = link2master;
	239	+ transientlink2master = Link2Support();
128	240
129	241	support = null;
130	242	link2master = false;
..	..	@@ -171,9 +283,42 @@
171	283	}
172	284	}
173	285
	286	+ boolean HasBigData()
	287	+ {
	288	+ if (blockloop)
	289	+ return false;
	290	+
	291	+ if (bRep != null)
	292	+ {
	293	+ return true;
	294	+ }
	295	+
	296	+ blockloop = true;
	297	+
	298	+ for (int i = 0; i < Size(); i++)
	299	+ {
	300	+ Object3D child = (Object3D) get(i);
	301	+ if (child == null)
	302	+ continue;
	303	+ if (child.HasBigData())
	304	+ {
	305	+ blockloop = false;
	306	+ return true;
	307	+ }
	308	+ }
	309	+
	310	+ blockloop = false;
	311	+ return false;
	312	+ }
	313	+
174	314	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
175	315	{
	316	+ if (blockloop)
	317	+ return;
	318	+
176	319	Object3D o;
	320	+
	321	+ boolean isnew = false;
177	322
178	323	if (hashtable.containsKey(GetUUID()))
179	324	{
..	..	@@ -187,12 +332,14 @@
187	332	}
188	333	else
189	334	{
	335	+ isnew = true;
	336	+
190	337	o = new Object3D("copy of " + this.name);
191	338
192	339	hashtable.put(GetUUID(), o);
193	340	}
194	341
195		- if (!blockloop)
	342	+ //if (!blockloop)
196	343	{
197	344	blockloop = true;
198	345
..	..	@@ -203,12 +350,15 @@
203	350
204	351	blockloop = false;
205	352	}
206		-
207		- ExtractBigData(o);
	353	+
	354	+ //if (isnew)
	355	+ ExtractBigData(o);
208	356	}
209	357
210	358	void ExtractBigData(Object3D o)
211	359	{
	360	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	361	+
212	362	if (o.bRep != null)
213	363	Grafreed.Assert(o.bRep == this.bRep);
214	364
..	..	@@ -219,8 +369,8 @@
219	369	// o.bRep.support = null;
220	370	// }
221	371	o.selection = this.selection;
222		- o.versions = this.versions;
223		- o.versionindex = this.versionindex;
	372	+ //o.versionlist = this.versionlist;
	373	+ //o.versionindex = this.versionindex;
224	374
225	375	if (this.support != null)
226	376	{
..	..	@@ -243,17 +393,84 @@
243	393	// this.fileparent = null;
244	394	}
245	395
	396	+// Object3D GetObject(java.util.UUID uuid)
	397	+// {
	398	+// if (this.uuid.equals(uuid))
	399	+// return this;
	400	+//
	401	+// if (blockloop)
	402	+// return null;
	403	+//
	404	+// blockloop = true;
	405	+//
	406	+// for (int i=0; i<Size(); i++)
	407	+// {
	408	+// Object3D o = get(i).GetObject(uuid);
	409	+//
	410	+// if (o != null)
	411	+// return o;
	412	+// }
	413	+//
	414	+// blockloop = false;
	415	+//
	416	+// return null;
	417	+// }
	418	+
	419	+ transient boolean tag;
	420	+
	421	+ void TagObjects(Object3D o, boolean tag)
	422	+ {
	423	+ if (blockloop)
	424	+ return;
	425	+
	426	+ o.tag = tag;
	427	+
	428	+ if (o == this)
	429	+ return;
	430	+
	431	+ blockloop = true;
	432	+
	433	+ for (int i=0; i<Size(); i++)
	434	+ {
	435	+ get(i).TagObjects(o, tag);
	436	+ }
	437	+
	438	+ blockloop = false;
	439	+ }
	440	+
	441	+ boolean HasTags()
	442	+ {
	443	+ if (blockloop)
	444	+ return false;
	445	+
	446	+ blockloop = true;
	447	+
	448	+ boolean hasTags = false;
	449	+
	450	+ for (int i=0; i<Size(); i++)
	451	+ {
	452	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	453	+
	454	+ if (hasTags)
	455	+ break;
	456	+ }
	457	+
	458	+ blockloop = false;
	459	+
	460	+ return hasTags;
	461	+ }
	462	+
246	463	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
247	464	{
	465	+ if (blockloop)
	466	+ return;
	467	+
248	468	if (!hashtable.containsKey(GetUUID()))
249	469	return;
250	470
251	471	Object3D o = hashtable.get(GetUUID());
252	472
253	473	RestoreBigData(o);
254		-
255		- if (blockloop)
256		- return;
257	474
258	475	blockloop = true;
259	476
..	..	@@ -269,6 +486,9 @@
269	486
270	487	void RestoreBigData(Object3D o)
271	488	{
	489	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	490	+ Grafreed.Assert(this.bRep == null);
	491	+
272	492	this.bRep = o.bRep;
273	493	if (this.support != null && o.transientrep != null)
274	494	{
..	..	@@ -277,8 +497,8 @@
277	497
278	498	this.selection = o.selection;
279	499
280		- this.versions = o.versions;
281		- this.versionindex = o.versionindex;
	500	+ //this.versionlist = o.versionlist;
	501	+ //this.versionindex = o.versionindex;
282	502	// July 2019 if (this.bRep != null)
283	503	// this.bRep.support = o.transientrep;
284	504	// this.support = o.support;
..	..	@@ -429,7 +649,10 @@
429	649	transient boolean keepdontselect;
430	650	boolean dontselect = false;
431	651	boolean hide = false;
432		- boolean link2master = false; // performs reset support/master at each frame
	652	+
	653	+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
	654	+ boolean link2support = false; // (cannot rename due to serialization)
	655	+
433	656	boolean marked = false; // animation node
434	657	boolean skip = false; // centroid issue
435	658	boolean skipmocap = false; // mocap data
..	..	@@ -437,6 +660,9 @@
437	660	boolean random = false;
438	661	boolean speedup = false;
439	662	boolean rewind = false;
	663	+
	664	+ // Option to sort triangles, e.g. for transparency.
	665	+ boolean sort = false;
440	666
441	667	float NORMALPUSH = 0;
442	668
..	..	@@ -447,27 +673,74 @@
447	673	return this;
448	674	}
449	675
	676	+ class SizeCompare implements Comparable
	677	+ {
	678	+ int size;
	679	+ Object3D child;
	680	+
	681	+ SizeCompare(Object3D c)
	682	+ {
	683	+ child = c;
	684	+ size = c.MemorySize();
	685	+ }
	686	+
	687	+ public int compareTo(Object o)
	688	+ {
	689	+ SizeCompare comp = (SizeCompare) o;
	690	+
	691	+ return comp.size < size ? 1 : -1;
	692	+ }
	693	+ }
	694	+
	695	+ transient SizeCompare[] sizecompare = null;
	696	+
450	697	void SortBySize()
451	698	{
452		- boolean sorted = false;
	699	+// boolean sorted = false;
	700	+//
	701	+// while (!sorted)
	702	+// {
	703	+// sorted = true;
	704	+//
	705	+// for (int i=0; i<Size()-1; i++)
	706	+// {
	707	+// Object3D obji = get(i);
	708	+// Object3D objj = get(i+1);
	709	+//
	710	+// if (obji.MemorySize() < objj.MemorySize())
	711	+// {
	712	+// set(i, objj);
	713	+// set(i+1, obji);
	714	+//
	715	+// sorted = false;
	716	+// }
	717	+// }
	718	+// }
	719	+
	720	+ int count = Size();
453	721
454		- while (!sorted)
	722	+ if (sizecompare == null \|\| sizecompare.length != count)
455	723	{
456		- sorted = true;
457		-
458		- for (int i=0; i<size()-1; i++)
	724	+ sizecompare = new SizeCompare[count];
	725	+
	726	+ for (int k=0; k<count; k++)
459	727	{
460		- Object3D obji = get(i);
461		- Object3D objj = get(i+1);
462		-
463		- if (obji.MemorySize() < objj.MemorySize())
464		- {
465		- set(i, objj);
466		- set(i+1, obji);
467		-
468		- sorted = false;
469		- }
	728	+ sizecompare[k] = new SizeCompare(get(k));
470	729	}
	730	+ }
	731	+ else
	732	+ {
	733	+ for (int k=0; k<count; k++)
	734	+ {
	735	+ sizecompare[k].size = get(k).MemorySize();
	736	+ }
	737	+ }
	738	+
	739	+ java.util.Arrays.sort(sizecompare);
	740	+
	741	+ for (int i=0; i<count; i++)
	742	+ {
	743	+ set(i, sizecompare[i].child);
471	744	}
472	745	}
473	746
..	..	@@ -479,7 +752,7 @@
479	752	{
480	753	sorted = true;
481	754
482		- for (int i=0; i<size()-1; i++)
	755	+ for (int i=0; i<Size()-1; i++)
483	756	{
484	757	Object3D obji = get(i);
485	758	Object3D objj = get(i+1);
..	..	@@ -495,38 +768,63 @@
495	768	}
496	769	}
497	770
498		- int memorysize;
	771	+ transient int memorysize; // needs to be transient, dunno why
499	772
500	773	int MemorySize()
501	774	{
502		- if (true) // memorysize == 0)
	775	+// if (memorysize == 0)
	776	+// {
	777	+// try
	778	+// {
	779	+// Object3D obj = this;
	780	+//
	781	+// Object3D parent = obj.parent;
	782	+// obj.parent = null;
	783	+// Object3D support = obj.support;
	784	+// obj.support = null;
	785	+//
	786	+// java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
	787	+// java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(baos);
	788	+//
	789	+// out.writeObject(obj);
	790	+//
	791	+// obj.parent = parent;
	792	+// obj.support = support;
	793	+//
	794	+// memorysize = baos.toByteArray().length;
	795	+// }
	796	+// catch (Exception e)
	797	+// {
	798	+// e.printStackTrace();
	799	+// }
	800	+// }
	801	+//
	802	+// return memorysize;
	803	+
	804	+ if (blockloop)
503	805	{
504		- try
505		- {
506		- Object3D obj = this;
	806	+ return 0;
	807	+ }
507	808
508		- Object3D parent = obj.parent;
509		- obj.parent = null;
510		- Object3D support = obj.support;
511		- obj.support = null;
512		-
513		- java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
514		- java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(baos);
515		-
516		- out.writeObject(obj);
517		-
518		- obj.parent = parent;
519		- obj.support = support;
520		-
521		- memorysize = baos.toByteArray().length;
522		- }
523		- catch (Exception e)
524		- {
525		- e.printStackTrace();
526		- }
	809	+ int memory = 0;
	810	+
	811	+ if (bRep != null)
	812	+ {
	813	+ memory = bRep.VertexCount();
527	814	}
528	815
529		- return memorysize;
	816	+ blockloop = true;
	817	+
	818	+ for (int i = 0; i < Size(); i++)
	819	+ {
	820	+ Object3D obj = (Object3D) Children().get(i);
	821	+
	822	+ memory += obj.MemorySize();
	823	+ }
	824	+
	825	+ blockloop = false;
	826	+
	827	+ return memory;
530	828	}
531	829
532	830	void Slower()
..	..	@@ -614,7 +912,7 @@
614	912	{
615	913	if (maxcount != 1)
616	914	{
617		- new Exception().printStackTrace();
	915	+ //new Exception().printStackTrace();
618	916	}
619	917
620	918	toParentMarked = LA.newMatrix();
..	..	@@ -816,7 +1114,7 @@
816	1114
817	1115	void Step()
818	1116	{
819		- // marde pour serialization de Texture
	1117	+ // patch pour serialization de Texture
820	1118	resetmaxcount();
821	1119	resettransformcount();
822	1120	resetstep();
..	..	@@ -851,7 +1149,7 @@
851	1149	transformcount++;
852	1150	}
853	1151
854		- int maxcount;
	1152	+ int maxcount = 128;
855	1153	int transformcount;
856	1154	int step;
857	1155
..	..	@@ -904,7 +1202,10 @@
904	1202	if (step == 0)
905	1203	step = 1;
906	1204	if (maxcount == 0)
907		- maxcount = 128; // 2048; // 4;
	1205	+ {
	1206	+ System.out.println("maxcount == 0");
	1207	+ System.exit(0); // maxcount = 128; // 2048; // 4;
	1208	+ }
908	1209	// if (acceleration == 0)
909	1210	// acceleration = 10;
910	1211	if (delay == 0) // serial
..	..	@@ -930,6 +1231,8 @@
930	1231	(Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
931	1232	currentframe != Globals.framecount)
932	1233	{
	1234	+ Globals.lighttouched = true;
	1235	+
933	1236	currentframe = Globals.framecount;
934	1237
935	1238	// System.err.println("transformcount = " + transformcount);
..	..	@@ -1009,21 +1312,28 @@
1009	1312	{
1010	1313	// return true;
1011	1314
1012		- if (material == null \|\| material.multiply)
1013		- return true;
	1315	+// if (material == null \|\| material.multiply)
	1316	+// return true;
	1317	+//
	1318	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1319	+// return false;
	1320	+//
	1321	+// // Transparent objects are dynamic because we have to sort the triangles.
	1322	+// return material.opacity > 0.99;
1014	1323
1015		- // Transparent objects are dynamic because we have to sort the triangles.
1016		- return material.opacity > 0.99;
	1324	+ return !sort;
1017	1325	}
1018	1326
1019	1327	boolean IsOpaque()
1020	1328	{
1021	1329	// return true;
1022	1330
1023		- if (material == null \|\| material.multiply)
1024		- return true;
	1331	+// if (material == null \|\| material.multiply)
	1332	+// return true;
	1333	+//
	1334	+// return material.opacity > 0.99;
1025	1335
1026		- return material.opacity > 0.99;
	1336	+ return !sort;
1027	1337	}
1028	1338
1029	1339	Object3D()
..	..	@@ -1101,8 +1411,10 @@
1101	1411
1102	1412	// will share the geometry
1103	1413	assert (!(this instanceof Composite));
1104		- return deepCopy(); // Never called for Composite
1105		-
	1414	+
	1415	+ Object3D obj = deepCopy(); // Never called for Composite
	1416	+ obj.count = 2;
	1417	+ return obj;
1106	1418	}
1107	1419
1108	1420	boolean HasLoops()
..	..	@@ -1110,6 +1422,30 @@
1110	1422	return false;
1111	1423	}
1112	1424
	1425	+ void ResetUUIDs()
	1426	+ {
	1427	+ if (blockloop)
	1428	+ {
	1429	+ return;
	1430	+ }
	1431	+
	1432	+ this.uuid = null;
	1433	+
	1434	+ blockloop = true;
	1435	+
	1436	+ for (int i = 0; i < Size(); i++)
	1437	+ {
	1438	+ Object3D obj = (Object3D) Children().get(i);
	1439	+
	1440	+ if (obj != null)
	1441	+ {
	1442	+ obj.ResetUUIDs();
	1443	+ }
	1444	+ }
	1445	+
	1446	+ blockloop = false;
	1447	+ }
	1448	+
1113	1449	boolean IsInfinite()
1114	1450	{
1115	1451	if (blockloop)
..	..	@@ -1180,78 +1516,16 @@
1180	1516	return;
1181	1517
1182	1518	blockloop = true;
	1519	+
	1520	+ // other.parent = parent;
	1521	+
1183	1522	//System.out.println("COPY " + this + " to " + other);
1184	1523	//new Exception().printStackTrace();
	1524	+ deepCopyNode(other);
1185	1525
1186		- other.parent = parent;
1187		- if (toParent != null)
1188		- {
1189		- other.toParent = LA.newMatrix();
1190		- other.fromParent = LA.newMatrix();
1191		- LA.matCopy(toParent, other.toParent);
1192		- LA.matCopy(fromParent, other.fromParent);
1193		- if (toParentMarked != null)
1194		- {
1195		- other.toParentMarked = LA.newMatrix();
1196		- other.fromParentMarked = LA.newMatrix();
1197		- LA.matCopy(toParentMarked, other.toParentMarked);
1198		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1199		- }
1200		- }
1201		- else
1202		- {
1203		- if (other.toParent == null)
1204		-// assert(other.toParent == null);
1205		-// new Exception().printStackTrace();
1206		- System.err.println("null parent: " + other);
1207		- }
1208		- /*
1209		- double ident[][] = LA.newMatrix();
1210		- if (bRep == null)
1211		- other.bRep = null;
1212		- else
1213		- other.bRep = new BoundaryRep(bRep, ident);
1214		- */
1215		- // Really new...
1216	1526	other.bRep = bRep; // Share the geometry
1217	1527
1218	1528	other.support = support; // Share the support
1219		-
1220		- //other.editWindow = null;
1221		- if (name == null)
1222		- other.name = null;
1223		- else
1224		- other.name = new String(name);
1225		-
1226		- if (material != null)
1227		- {
1228		- other.material = new cMaterial(material);
1229		- } else
1230		- {
1231		- other.material = null;
1232		- }
1233		-
1234		- other.GetTextures().name = GetTextures().name;
1235		-
1236		- CopyExtraMaterial(other);
1237		-
1238		- other.touched = touched;
1239		- other.softtouched = softtouched;
1240		-
1241		- other.random = random;
1242		- other.link2master = link2master;
1243		- other.transformcount = transformcount;
1244		- other.marked = marked;
1245		- other.skip = skip;
1246		- other.count = count;
1247		- other.flipV = flipV;
1248		- other.live = live;
1249		- other.rewind = rewind;
1250		- other.hide = hide;
1251		- other.texres = texres;
1252		- other.speedup = speedup;
1253		- other.height = height;
1254		- other.depth = depth;
1255	1529
1256	1530	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1257	1531	// {
..	..	@@ -1279,7 +1553,7 @@
1279	1553	Object3D obj = (Object3D)Children().get(i);
1280	1554	if (IsContainedIn(obj))
1281	1555	{
1282		-// assert(false); // ?!?!?!?!?!
	1556	+ assert(false); // ?!?!?!?!?!
1283	1557	c.Children().setElementAt(c, i);
1284	1558	}
1285	1559	else
..	..	@@ -1307,17 +1581,24 @@
1307	1581	if ((mask & GEOMETRY) != 0)
1308	1582	{
1309	1583	if (bRep != null)
1310		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1311		- else
1312		- assert(other.bRep == null);
1313		-
1314		- if (bRep != null)
1315	1584	{
	1585	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1316	1586	CameraPane.RemoveList(bRep.displaylist);
1317	1587	bRep.displaylist = 0; // june 2013 -1;
1318	1588	}
1319	1589	else
1320		- bRep = bRep;
	1590	+ {
	1591	+ //assert(other.bRep == null);
	1592	+ bRep = other.bRep;
	1593	+ }
	1594	+
	1595	+// if (bRep != null)
	1596	+// {
	1597	+// CameraPane.RemoveList(bRep.displaylist);
	1598	+// bRep.displaylist = 0; // june 2013 -1;
	1599	+// }
	1600	+// else
	1601	+// bRep = bRep;
1321	1602	}
1322	1603
1323	1604	/* Use a MASK = GEO/MAT
..	..	@@ -2293,11 +2574,6 @@
2293	2574
2294	2575	InitOthers();
2295	2576
2296		- if (this instanceof Camera)
2297		- {
2298		- material.shift = 90;
2299		- }
2300		-
2301	2577	material.multiply = multiply;
2302	2578
2303	2579	if (multiply)
..	..	@@ -2375,7 +2651,7 @@
2375	2651	return b;
2376	2652	}
2377	2653
2378		- void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate)
	2654	+ void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate, boolean colorparallax)
2379	2655	{
2380	2656	if (blockloop)
2381	2657	{
..	..	@@ -2385,7 +2661,7 @@
2385	2661	// super.UpdateMaterial(anchor, current, false);
2386	2662	if (material != null)
2387	2663	{
2388		- material.UpdateMaterial(anchor, current);
	2664	+ material.UpdateMaterial(anchor, current, colorparallax);
2389	2665	}
2390	2666
2391	2667	if (!propagate)
..	..	@@ -2399,7 +2675,7 @@
2399	2675	if (child == null)
2400	2676	continue;
2401	2677	blockloop = true;
2402		- child.UpdateMaterial(anchor, current, propagate);
	2678	+ child.UpdateMaterial(anchor, current, propagate, false);
2403	2679	blockloop = false;
2404	2680	Children().release(i);
2405	2681	}
..	..	@@ -2413,7 +2689,7 @@
2413	2689	if (child == null)
2414	2690	continue;
2415	2691	blockloop = true;
2416		- child.UpdateMaterial(anchor, current, propagate);
	2692	+ child.UpdateMaterial(anchor, current, propagate, false);
2417	2693	blockloop = false;
2418	2694	Children().release(i);
2419	2695	}
..	..	@@ -2438,6 +2714,11 @@
2438	2714	else
2439	2715	{
2440	2716	//((ObjEditor)editWindow).SetupUI2(null);
	2717	+ if (objectUI != null)
	2718	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2719	+ else
	2720	+ //new Exception().printStackTrace();
	2721	+ System.err.println("objectUI is null");
2441	2722	}
2442	2723	}
2443	2724
..	..	@@ -2567,7 +2848,8 @@
2567	2848	private static final int editSelf = 1;
2568	2849	private static final int editChild = 2;
2569	2850
2570		- void drawEditHandles(ClickInfo info, int level)
	2851	+ void drawEditHandles(//ClickInfo info,
	2852	+ int level)
2571	2853	{
2572	2854	if (level == 0)
2573	2855	{
..	..	@@ -2575,7 +2857,8 @@
2575	2857	return;
2576	2858
2577	2859	Object3D selectee;
2578		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2860	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2861	+ level + 1))
2579	2862	{
2580	2863	selectee = (Object3D) e.nextElement();
2581	2864	}
..	..	@@ -2583,19 +2866,22 @@
2583	2866	} else
2584	2867	{
2585	2868	//super.
2586		- drawEditHandles0(info, level + 1);
	2869	+ drawEditHandles0(//info,
	2870	+ level + 1);
2587	2871	}
2588	2872	}
2589	2873
2590		- boolean doEditClick(ClickInfo info, int level)
	2874	+ boolean doEditClick(//ClickInfo info,
	2875	+ int level)
2591	2876	{
2592	2877	doSomething = 0;
2593	2878	if (level == 0)
2594	2879	{
2595		- return doParentClick(info);
	2880	+ return doParentClick(); //info);
2596	2881	}
2597	2882	if (//super.
2598		- doEditClick0(info, level))
	2883	+ doEditClick0(//info,
	2884	+ level))
2599	2885	{
2600	2886	doSomething = 1;
2601	2887	return true;
..	..	@@ -2605,7 +2891,7 @@
2605	2891	}
2606	2892	}
2607	2893
2608		- boolean doParentClick(ClickInfo info)
	2894	+ boolean doParentClick() //ClickInfo info)
2609	2895	{
2610	2896	if (selection == null)
2611	2897	{
..	..	@@ -2618,7 +2904,8 @@
2618	2904	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2619	2905	{
2620	2906	Object3D selectee = (Object3D) e.nextElement();
2621		- if (selectee.doEditClick(info, 1))
	2907	+ if (selectee.doEditClick(//info,
	2908	+ 1))
2622	2909	{
2623	2910	childToDrag = selectee;
2624	2911	doSomething = 2;
..	..	@@ -2630,13 +2917,15 @@
2630	2917	return retval;
2631	2918	}
2632	2919
2633		- void doEditDrag(ClickInfo info, boolean opposite)
	2920	+ void doEditDrag(//ClickInfo clickInfo,
	2921	+ boolean opposite)
2634	2922	{
2635	2923	switch (doSomething)
2636	2924	{
2637	2925	case 1: // '\001'
2638	2926	//super.
2639		- doEditDrag0(info, opposite);
	2927	+ doEditDrag0(//clickInfo,
	2928	+ opposite);
2640	2929	break;
2641	2930
2642	2931	case 2: // '\002'
..	..	@@ -2649,11 +2938,13 @@
2649	2938	{
2650	2939	//sel.hitSomething = childToDrag.hitSomething;
2651	2940	//childToDrag.doEditDrag(info);
2652		- sel.doEditDrag(info, opposite);
	2941	+ sel.doEditDrag(//clickInfo,
	2942	+ opposite);
2653	2943	} else
2654	2944	{
2655	2945	//super.
2656		- doEditDrag0(info, opposite);
	2946	+ doEditDrag0(//clickInfo,
	2947	+ opposite);
2657	2948	}
2658	2949	}
2659	2950	break;
..	..	@@ -2671,6 +2962,9 @@
2671	2962	{
2672	2963	deselectAll();
2673	2964	}
	2965	+
	2966	+ new Exception().printStackTrace();
	2967	+
2674	2968	ClickInfo newInfo = new ClickInfo();
2675	2969	newInfo.flags = info.flags;
2676	2970	newInfo.bounds = info.bounds;
..	..	@@ -3100,7 +3394,10 @@
3100	3394	{
3101	3395	if (bRep != null)
3102	3396	{
	3397	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
3103	3398	bRep.GenerateNormals(crease);
	3399	+ if (!bRep.trimmed)
	3400	+ bRep.MergeNormals();
3104	3401	Touch();
3105	3402	}
3106	3403	}
..	..	@@ -3175,6 +3472,105 @@
3175	3472	blockloop = false;
3176	3473	}
3177	3474
	3475	+ public void ResetTransform(int mask)
	3476	+ {
	3477	+ Object3D obj = this;
	3478	+
	3479	+ if (mask == -1)
	3480	+ {
	3481	+ if (obj instanceof Camera) // jan 2014
	3482	+ {
	3483	+ LA.matIdentity(obj.toParent);
	3484	+ LA.matIdentity(obj.fromParent);
	3485	+ }
	3486	+ else
	3487	+ {
	3488	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3489	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3490	+ }
	3491	+ return;
	3492	+ }
	3493	+
	3494	+ if ((mask&2) != 0) // Scale/rotation
	3495	+ {
	3496	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3497	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3498	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3499	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3500	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3501	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3502	+ }
	3503	+ if ((mask&1) != 0) // Translation
	3504	+ {
	3505	+ if (obj.toParent != null)
	3506	+ {
	3507	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3508	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3509	+ }
	3510	+ }
	3511	+ }
	3512	+
	3513	+ public void Scale(float scale)
	3514	+ {
	3515	+ Object3D obj = this;
	3516	+
	3517	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3518	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3519	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3520	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3521	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3522	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3523	+ }
	3524	+
	3525	+ public void TextureRatioTransform(int axis)
	3526	+ {
	3527	+ cTexture tex = GetTextures();
	3528	+
	3529	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3530	+
	3531	+ try
	3532	+ {
	3533	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3534	+ }
	3535	+ catch (Exception e)
	3536	+ {
	3537	+ System.err.println("FAIL TextureRatio: " + this);
	3538	+ }
	3539	+
	3540	+ LA.matIdentity(Object3D.mat);
	3541	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3542	+
	3543	+ if (toParent == null)
	3544	+ {
	3545	+ toParent = LA.newMatrix();
	3546	+ fromParent = LA.newMatrix();
	3547	+ }
	3548	+
	3549	+ ResetTransform(2);
	3550	+
	3551	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3552	+ LA.matInvert(fromParent, toParent);
	3553	+ }
	3554	+
	3555	+ void TextureRatio(int axis)
	3556	+ {
	3557	+ if (blockloop)
	3558	+ return;
	3559	+
	3560	+ blockloop = true;
	3561	+
	3562	+ TextureRatioTransform(axis);
	3563	+
	3564	+ for (int i=Size(); --i>=0;)
	3565	+ {
	3566	+ Object3D v = get(i);
	3567	+
	3568	+ v.TextureRatio(axis);
	3569	+ }
	3570	+
	3571	+ blockloop = false;
	3572	+ }
	3573	+
3178	3574	void TransformChildren()
3179	3575	{
3180	3576	if (toParent != null)
..	..	@@ -3417,6 +3813,7 @@
3417	3813	if (bRep != null)
3418	3814	{
3419	3815	//bRep.RemoveOneTriangle();
	3816	+ System.out.println();
3420	3817	System.out.println("Reducing " + this);
3421	3818	if (name != null && name.contains("lockpickstraps"))
3422	3819	name = name;
..	..	@@ -3528,15 +3925,47 @@
3528	3925
3529	3926	void ClearMaterials()
3530	3927	{
	3928	+ if (blockloop)
	3929	+ return;
	3930	+
	3931	+ blockloop = true;
	3932	+
3531	3933	ClearMaterial();
3532		- for (int i = 0; i < size(); i++)
	3934	+ for (int i = 0; i < Size(); i++)
3533	3935	{
3534		- Object3D child = (Object3D) reserve(i);
	3936	+ Object3D child = (Object3D) get(i);
3535	3937	if (child == null)
3536	3938	continue;
3537	3939	child.ClearMaterials();
3538		- release(i);
3539	3940	}
	3941	+
	3942	+ blockloop = false;
	3943	+ }
	3944	+
	3945	+ void ClearVersionList()
	3946	+ {
	3947	+ this.versionlist = null;
	3948	+ this.versionindex = -1;
	3949	+ this.versiontable = null;
	3950	+ }
	3951	+
	3952	+ void ClearVersions()
	3953	+ {
	3954	+ if (blockloop)
	3955	+ return;
	3956	+
	3957	+ blockloop = true;
	3958	+
	3959	+ ClearVersionList();
	3960	+ for (int i = 0; i < Size(); i++)
	3961	+ {
	3962	+ Object3D child = (Object3D) get(i);
	3963	+ if (child == null)
	3964	+ continue;
	3965	+ child.ClearVersions();
	3966	+ }
	3967	+
	3968	+ blockloop = false;
3540	3969	}
3541	3970
3542	3971	void FlipV(boolean flip)
..	..	@@ -3715,6 +4144,7 @@
3715	4144
3716	4145	void RevertMeshes()
3717	4146	{
	4147	+ // BLOCKLOOP
3718	4148	if (this instanceof cMesh)
3719	4149	{
3720	4150	((cMesh)this).Revert();
..	..	@@ -3745,11 +4175,6 @@
3745	4175	Touch();
3746	4176	}
3747	4177
3748		- ResetRecur();
3749		- }
3750		-
3751		- void ResetRecur()
3752		- {
3753	4178	for (int i = 0; i < size(); i++)
3754	4179	{
3755	4180	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3772,11 +4197,6 @@
3772	4197	Step();
3773	4198	Touch();
3774	4199
3775		- StepRecur();
3776		- }
3777		-
3778		- void StepRecur()
3779		- {
3780	4200	for (int i = 0; i < size(); i++)
3781	4201	{
3782	4202	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3963,8 +4383,8 @@
3963	4383	Touch();
3964	4384	}
3965	4385
3966		- transient cVector min = new cVector();
3967		- transient cVector max = new cVector();
	4386	+ transient cVector min;
	4387	+ transient cVector max;
3968	4388
3969	4389	void getBounds(cVector minima, cVector maxima, boolean xform)
3970	4390	{
..	..	@@ -3980,15 +4400,15 @@
3980	4400	if (blockloop)
3981	4401	return;
3982	4402
3983		- if (min == null) // ???
	4403	+ if (min == null)
3984	4404	{
3985	4405	min = new cVector();
3986	4406	max = new cVector();
3987	4407	}
3988	4408
3989		- for (int i = 0; i<size(); i++)
	4409	+ for (int i = 0; i<Size(); i++)
3990	4410	{
3991		- Object3D child = (Object3D) reserve(i);
	4411	+ Object3D child = (Object3D) get(i); //reserve(i);
3992	4412	if (child == null)
3993	4413	continue;
3994	4414
..	..	@@ -4007,21 +4427,21 @@
4007	4427	if (child.hide && !(child instanceof Merge) \|\| child.skip)
4008	4428	//if (child.hide)
4009	4429	{
4010		- release(i);
	4430	+ //release(i);
4011	4431	continue;
4012	4432	}
4013	4433
4014	4434	blockloop = true;
4015	4435	child.getBounds(min, max, true); // xform);
4016	4436	blockloop = false;
4017		- release(i);
	4437	+ //release(i);
4018	4438
4019	4439	MinMax(minima, maxima);
4020	4440	}
4021	4441
4022	4442	if (bRep != null)
4023	4443	{
4024		- bRep.getBounds(minima,maxima,this);
	4444	+ bRep.getBounds(minima, maxima, xform?this:null);
4025	4445	}
4026	4446
4027	4447	if (false) // xform)
..	..	@@ -5294,8 +5714,9 @@
5294	5714	{
5295	5715	}
5296	5716	// transient int displaylist = 0; // -1;
5297		- transient boolean touched = true;
5298		- transient boolean softtouched = true;
	5717	+ transient boolean reset = false; // Recalculate
	5718	+ transient boolean touched = true; // call list only
	5719	+ transient boolean softtouched = true; // aucune idee
5299	5720
5300	5721	void Touch()
5301	5722	{
..	..	@@ -5348,6 +5769,7 @@
5348	5769	{
5349	5770	//System.out.println("HardTouch " + this); // new Exception().printStackTrace();
5350	5771	//new Exception().printStackTrace();
	5772	+ reset = true;
5351	5773	touched = true;
5352	5774	CameraPane.touched = true;
5353	5775	//if (parent != null)
..	..	@@ -5526,6 +5948,11 @@
5526	5948	if (fullname == null)
5527	5949	return "";
5528	5950
	5951	+ if (fullname.pigment != null)
	5952	+ {
	5953	+ return fullname.pigment;
	5954	+ }
	5955	+
5529	5956	// System.out.println("Fullname = " + fullname);
5530	5957
5531	5958	// Does not work on Windows due to C:
..	..	@@ -5538,7 +5965,7 @@
5538	5965
5539	5966	if (split.length == 0)
5540	5967	{
5541		- return "";
	5968	+ return fullname.pigment = "";
5542	5969	}
5543	5970
5544	5971	if (split.length <= 2)
..	..	@@ -5546,22 +5973,27 @@
5546	5973	if (fullname.name.endsWith(":"))
5547	5974	{
5548	5975	// Windows
5549		- return fullname.name.substring(0, fullname.name.length()-1);
	5976	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5550	5977	}
5551	5978
5552		- return split[0];
	5979	+ return fullname.pigment = split[0];
5553	5980	}
5554	5981
5555	5982	// Windows
5556	5983	assert(split.length == 4);
5557	5984
5558		- return split[0] + ":" + split[1];
	5985	+ return fullname.pigment = split[0] + ":" + split[1];
5559	5986	}
5560	5987
5561	5988	static String GetBump(cTexture fullname)
5562	5989	{
5563	5990	if (fullname == null)
5564	5991	return "";
	5992	+
	5993	+ if (fullname.bump != null)
	5994	+ {
	5995	+ return fullname.bump;
	5996	+ }
5565	5997
5566	5998	// System.out.println("Fullname = " + fullname);
5567	5999	// Does not work on Windows due to C:
..	..	@@ -5573,12 +6005,12 @@
5573	6005
5574	6006	if (split.length == 0)
5575	6007	{
5576		- return "";
	6008	+ return fullname.bump = "";
5577	6009	}
5578	6010
5579	6011	if (split.length == 1)
5580	6012	{
5581		- return "";
	6013	+ return fullname.bump = "";
5582	6014	}
5583	6015
5584	6016	if (split.length == 2)
..	..	@@ -5586,16 +6018,16 @@
5586	6018	if (fullname.name.endsWith(":"))
5587	6019	{
5588	6020	// Windows
5589		- return "";
	6021	+ return fullname.bump = "";
5590	6022	}
5591	6023
5592		- return split[1];
	6024	+ return fullname.bump = split[1];
5593	6025	}
5594	6026
5595	6027	// Windows
5596	6028	assert(split.length == 4);
5597	6029
5598		- return split[2] + ":" + split[3];
	6030	+ return fullname.bump = split[2] + ":" + split[3];
5599	6031	}
5600	6032
5601	6033	String GetPigmentTexture()
..	..	@@ -5678,6 +6110,9 @@
5678	6110	texname = "";
5679	6111
5680	6112	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6113	+
	6114	+ GetTextures().pigment = null;
	6115	+
5681	6116	Touch();
5682	6117	}
5683	6118
..	..	@@ -5751,6 +6186,8 @@
5751	6186
5752	6187	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5753	6188
	6189	+ GetTextures().bump = null;
	6190	+
5754	6191	Touch();
5755	6192	}
5756	6193
..	..	@@ -5815,7 +6252,7 @@
5815	6252	boolean NeedSupport()
5816	6253	{
5817	6254	return
5818		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
	6255	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5819	6256	// PROBLEM with CROWD!!
5820	6257	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5821	6258	}
..	..	@@ -5833,6 +6270,22 @@
5833	6270	return parent.IsLive();
5834	6271	}
5835	6272
	6273	+ boolean IsDynamic()
	6274	+ {
	6275	+ return live && bRep != null;
	6276	+ }
	6277	+
	6278	+ boolean Link2Support()
	6279	+ {
	6280	+ return link2master \|\| link2support;
	6281	+ }
	6282	+
	6283	+ static cVector minima = new cVector();
	6284	+ static cVector maxima = new cVector();
	6285	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6286	+
	6287	+ boolean compiling;
	6288	+
5836	6289	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5837	6290	{
5838	6291	Invariants(); // june 2013
..	..	@@ -5840,6 +6293,29 @@
5840	6293	if (support != null)
5841	6294	{
5842	6295	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6296	+ }
	6297	+
	6298	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6299	+ {
	6300	+ getBounds(minima, maxima, true);
	6301	+ center.x = (minima.x + maxima.x) / 2;
	6302	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6303	+ center.z = (minima.z + maxima.z) / 2;
	6304	+
	6305	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6306	+
	6307	+ IntersectResult res = new IntersectResult();
	6308	+ res.t = Double.POSITIVE_INFINITY;
	6309	+
	6310	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6311	+ {
	6312	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6313	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6314	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6315	+
	6316	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6317	+ LA.matInvert(toParent, fromParent);
	6318	+ }
5843	6319	}
5844	6320
5845	6321	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5893,8 +6369,12 @@
5893	6369	if (support != null)
5894	6370	support = support;
5895	6371
5896		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5897		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6372	+ boolean usecalllists = !IsDynamic() &&
	6373	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6374	+
	6375	+ //usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6376	+
	6377	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5898	6378
5899	6379	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5900	6380	{
..	..	@@ -5902,10 +6382,12 @@
5902	6382	bRep.displaylist = 0;
5903	6383	}
5904	6384	// usecalllists &= !(parent instanceof RandomNode);
5905		- // usecalllists = false;
	6385	+ if (CameraPane.BOXMODE) // Too dynamic
	6386	+ usecalllists = false;
5906	6387
5907		- if (GetBRep() != null)
5908		- usecalllists = usecalllists;
	6388	+ if (display.DrawMode() == display.SHADOW)
	6389	+ //GetBRep() != null)
	6390	+ usecalllists = !!usecalllists;
5909	6391	//System.out.println("draw " + this);
5910	6392	//new Exception().printStackTrace();
5911	6393
..	..	@@ -5915,7 +6397,7 @@
5915	6397
5916	6398	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5917	6399	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5918		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
	6400	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5919	6401	{
5920	6402	Globals.lighttouched = true;
5921	6403	} // all panes...
..	..	@@ -5927,7 +6409,7 @@
5927	6409	if (!(this instanceof Composite))
5928	6410	touched = false;
5929	6411	//if (displaylist == -1 && usecalllists)
5930		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6412	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5931	6413	{
5932	6414	bRep.displaylist = display.GenList();
5933	6415	assert(bRep.displaylist != 0);
..	..	@@ -5938,16 +6420,18 @@
5938	6420
5939	6421	//System.out.println("\tnew list " + list);
5940	6422	//gl.glDrawBuffer(gl.GL_NONE);
5941		- if (usecalllists)
	6423	+ if (usecalllists && bRep.displaylist > 0)
5942	6424	{
5943	6425	// System.err.println("new list " + bRep.displaylist + " for " + this);
5944	6426	display.NewList(bRep.displaylist);
5945	6427	}
5946	6428
	6429	+ compiling = true;
5947	6430	CallList(display, root, selected, blocked);
	6431	+ compiling = false;
5948	6432
5949	6433	// compiled = true;
5950		- if (usecalllists)
	6434	+ if (usecalllists && bRep.displaylist > 0)
5951	6435	{
5952	6436	// System.err.println("end list " + bRep.displaylist + " for " + this);
5953	6437	display.EndList();
..	..	@@ -5957,8 +6441,8 @@
5957	6441	Globals.lighttouched = true; // all panes...
5958	6442	}
5959	6443
5960		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5961		- //touched = false;
	6444	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6445	+ touched = false;
5962	6446
5963	6447	if (this instanceof Texture \|\| this instanceof TextureNode)
5964	6448	{
..	..	@@ -5997,7 +6481,7 @@
5997	6481	{
5998	6482	if (display.DrawMode() == iCameraPane.SHADOW)
5999	6483	{
6000		- if (!link2master // tricky to cull in shadow mode.
	6484	+ if (!Link2Support() // tricky to cull in shadow mode.
6001	6485	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6002	6486	{
6003	6487	//System.out.print("CULLED");
..	..	@@ -6059,6 +6543,20 @@
6059	6543	{
6060	6544	drawSelf(display, root, selected, blocked);
6061	6545	}
	6546	+
	6547	+// if (!(this instanceof Composite))
	6548	+// {
	6549	+// for (int i = 0; i < size(); i++)
	6550	+// {
	6551	+// Object3D child = (Object3D) reserve(i);
	6552	+// if (child == null)
	6553	+// continue;
	6554	+//
	6555	+// child.draw(display, root, selected, blocked);
	6556	+//
	6557	+// release(i);
	6558	+// }
	6559	+// }
6062	6560	} else
6063	6561	{
6064	6562	/*
..	..	@@ -6091,13 +6589,14 @@
6091	6589	boolean failedPigment = false;
6092	6590	boolean failedBump = false;
6093	6591
	6592	+ CameraPane.lastObject = this;
6094	6593	try
6095	6594	{
6096	6595	display.BindPigmentTexture(tex, texres);
6097	6596	}
6098	6597	catch (Exception e)
6099	6598	{
6100		- System.err.println("FAILED: " + this);
	6599	+ // System.err.println("FAILED: " + this);
6101	6600	failedPigment = true;
6102	6601	}
6103	6602
..	..	@@ -6128,6 +6627,20 @@
6128	6627	display.CallList(bRep.displaylist);
6129	6628	// june 2013 drawSelf(display, root, selected);
6130	6629	}
	6630	+ }
	6631	+
	6632	+ // Bezier surface: assert (!(this instanceof Composite));
	6633	+ {
	6634	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6635	+// {
	6636	+// Object3D child = (Object3D) reserve(i);
	6637	+// if (child == null)
	6638	+// continue;
	6639	+//
	6640	+// child.draw(display, root, selected, blocked);
	6641	+//
	6642	+// release(i);
	6643	+// }
6131	6644	}
6132	6645	}
6133	6646
..	..	@@ -6181,16 +6694,17 @@
6181	6694
6182	6695	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6183	6696	{
6184		- if (GetBRep() == null)
6185		- {
6186		- drawSelf(display, root, selected, blocked);
6187		- } else
	6697	+ if (GetBRep() != null)
6188	6698	{
6189	6699	DrawNode(display, root, selected);
6190	6700	if (this instanceof BezierPatch)
6191	6701	{
6192	6702	//drawSelf(display, root, selected);
6193	6703	}
	6704	+ }
	6705	+ else
	6706	+ {
	6707	+ drawSelf(display, root, selected, blocked);
6194	6708	}
6195	6709	}
6196	6710
..	..	@@ -6389,15 +6903,18 @@
6389	6903
6390	6904	void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
6391	6905	{
6392		- if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
6393		- return; // no shadow for transparent objects
6394		-
6395		- if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6396		- return;
	6906	+ if (!compiling)
	6907	+ {
	6908	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6909	+ return; // no shadow for transparent objects
	6910	+
	6911	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6912	+ return;
	6913	+ }
6397	6914
6398	6915	if (hide)
6399	6916	return;
6400		-
	6917	+
6401	6918	if (scriptnode != null)
6402	6919	{
6403	6920	scriptnode.DrawNode(display, root, selected);
..	..	@@ -6440,7 +6957,8 @@
6440	6957
6441	6958	//javax.media.opengl.GL gl = display.GetGL();
6442	6959
6443		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6960	+ if (CameraPane.BOXMODE && !Link2Support()) //
	6961	+ //!selected) // \|\| CameraPane.movingcamera)
6444	6962	{
6445	6963	int fc = bRep.FaceCount();
6446	6964	int vc = bRep.VertexCount();
..	..	@@ -6602,7 +7120,7 @@
6602	7120	facescompare[k] = new FaceCompare(k);
6603	7121	}
6604	7122
6605		- center = new cVector();
	7123	+ centertriangle = new cVector();
6606	7124	}
6607	7125	else
6608	7126	{
..	..	@@ -6725,7 +7243,7 @@
6725	7243	*/
6726	7244	}
6727	7245
6728		- transient cVector center;
	7246	+ transient cVector centertriangle;
6729	7247
6730	7248	class FaceCompare implements Comparable
6731	7249	{
..	..	@@ -6754,14 +7272,14 @@
6754	7272	Vertex q = bRep.GetVertex(face.q);
6755	7273	Vertex r = bRep.GetVertex(face.r);
6756	7274
6757		- center.set(p);
6758		- center.add(q);
6759		- center.add(r);
6760		- center.mul(1.0/3);
	7275	+ centertriangle.set(p);
	7276	+ centertriangle.add(q);
	7277	+ centertriangle.add(r);
	7278	+ centertriangle.mul(1.0/3);
6761	7279
6762		- center.sub(Globals.theRenderer.EyeCamera().location);
	7280	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6763	7281
6764		- distance = center.dot(center);
	7282	+ distance = centertriangle.dot(centertriangle);
6765	7283	}
6766	7284
6767	7285	return distance;
..	..	@@ -7298,20 +7816,23 @@
7298	7816	}
7299	7817	}
7300	7818
7301		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7819	+ static ClickInfo clickInfo = new ClickInfo();
	7820	+
	7821	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7822	+ Point outPt, Rectangle outRec)
7302	7823	{
7303		- int hc = info.bounds.x + info.bounds.width / 2;
7304		- int vc = info.bounds.y + info.bounds.height / 2;
7305		- double[][] toscreen = info.toScreen;
	7824	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7825	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7826	+ double[][] toscreen = clickInfo.toScreen;
7306	7827	if (toscreen == null)
7307	7828	{
7308		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7829	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7309	7830	}
7310	7831	cVector vec = in;
7311	7832	LA.xformPos(in, toscreen, in);
7312	7833	//System.out.println("Distance = " + info.camera.Distance());
7313		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7314		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7834	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7835	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7315	7836	outPt.x = hc + (int) vec.x;
7316	7837	outPt.y = vc - (int) vec.y;
7317	7838	outRec.x = outPt.x - 3;
..	..	@@ -7319,15 +7840,18 @@
7319	7840	outRec.width = outRec.height = 6;
7320	7841	}
7321	7842
7322		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7843	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7844	+ )
7323	7845	{
7324	7846	Point pt = new Point(0, 0);
7325	7847	Rectangle rec = new Rectangle();
7326		- calcHotSpot(in, info, pt, rec);
	7848	+ calcHotSpot(in, //clickInfo,
	7849	+ pt, rec);
7327	7850	return rec;
7328	7851	}
7329	7852
7330		- void drawEditHandles0(ClickInfo info, int level)
	7853	+ void drawEditHandles0(//ClickInfo clickInfo,
	7854	+ int level)
7331	7855	{
7332	7856	if (level == 0)
7333	7857	{
..	..	@@ -7336,16 +7860,19 @@
7336	7860	{
7337	7861	cVector origin = new cVector();
7338	7862	//LA.xformPos(origin, toParent, origin);
7339		- Rectangle spot = calcHotSpot(origin, info);
	7863	+ if (this.clickInfo == null)
	7864	+ this.clickInfo = new ClickInfo();
	7865	+
	7866	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7340	7867	Rectangle boundary = new Rectangle();
7341	7868	boundary.x = spot.x - 30;
7342	7869	boundary.y = spot.y - 30;
7343	7870	boundary.width = spot.width + 60;
7344	7871	boundary.height = spot.height + 60;
7345		- info.g.setColor(Color.red);
	7872	+ clickInfo.g.setColor(Color.white);
7346	7873	int spotw = spot.x + spot.width;
7347	7874	int spoth = spot.y + spot.height;
7348		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7875	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7349	7876	// if (CameraPane.Xmin > spot.x)
7350	7877	// {
7351	7878	// CameraPane.Xmin = spot.x;
..	..	@@ -7362,11 +7889,6 @@
7362	7889	// {
7363	7890	// CameraPane.Ymax = spoth;
7364	7891	// }
7365		- spot.translate(32, 32);
7366		- spotw = spot.x + spot.width;
7367		- spoth = spot.y + spot.height;
7368		- info.g.setColor(Color.cyan);
7369		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7370	7892	// if (CameraPane.Xmin > spot.x)
7371	7893	// {
7372	7894	// CameraPane.Xmin = spot.x;
..	..	@@ -7385,10 +7907,15 @@
7385	7907	// }
7386	7908	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7387	7909	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7388		- spot.translate(0, -32);
7389		- info.g.setColor(Color.yellow);
7390		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7391		- info.g.setColor(Color.green);
	7910	+ spot.translate(32, 0);
	7911	+ clickInfo.g.setColor(Color.yellow);
	7912	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7913	+
	7914	+ spot.translate(32, 64);
	7915	+ spotw = spot.x + spot.width;
	7916	+ spoth = spot.y + spot.height;
	7917	+ clickInfo.g.setColor(Color.cyan);
	7918	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7392	7919	// if (CameraPane.Xmin > spot.x)
7393	7920	// {
7394	7921	// CameraPane.Xmin = spot.x;
..	..	@@ -7405,8 +7932,9 @@
7405	7932	// {
7406	7933	// CameraPane.Ymax = spoth;
7407	7934	// }
7408		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7409		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7935	+ clickInfo.g.setColor(Color.green);
	7936	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7937	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7410	7938	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7411	7939	// if (CameraPane.Xmin > boundary.x)
7412	7940	// {
..	..	@@ -7428,7 +7956,8 @@
7428	7956	}
7429	7957	}
7430	7958
7431		- boolean doEditClick0(ClickInfo info, int level)
	7959	+ boolean doEditClick0(//ClickInfo clickInfo,
	7960	+ int level)
7432	7961	{
7433	7962	if (level == 0)
7434	7963	{
..	..	@@ -7437,8 +7966,8 @@
7437	7966
7438	7967	boolean retval = false;
7439	7968
7440		- startX = info.x;
7441		- startY = info.y;
	7969	+ startX = clickInfo.x;
	7970	+ startY = clickInfo.y;
7442	7971
7443	7972	hitSomething = -1;
7444	7973	cVector origin = new cVector();
..	..	@@ -7448,22 +7977,53 @@
7448	7977	{
7449	7978	centerPt = new Point(0, 0);
7450	7979	}
7451		- calcHotSpot(origin, info, centerPt, spot);
7452		- if (spot.contains(info.x, info.y))
	7980	+ calcHotSpot(origin, //info,
	7981	+ centerPt, spot);
	7982	+ if (spot.contains(clickInfo.x, clickInfo.y))
7453	7983	{
7454	7984	hitSomething = hitCenter;
7455	7985	retval = true;
7456	7986	}
7457	7987	spot.translate(32, 0);
7458		- if (spot.contains(info.x, info.y))
	7988	+ if (spot.contains(clickInfo.x, clickInfo.y))
7459	7989	{
7460	7990	hitSomething = hitRotate;
7461	7991	retval = true;
7462	7992	}
7463	7993	spot.translate(0, 32);
7464		- if (spot.contains(info.x, info.y))
	7994	+ spot.translate(32, 0);
	7995	+ spot.translate(0, 32);
	7996	+ if (spot.contains(clickInfo.x, clickInfo.y))
7465	7997	{
7466	7998	hitSomething = hitScale;
	7999	+
	8000	+ double scale = 0.005f * clickInfo.camera.Distance();
	8001	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	8002	+ double sign = 1;
	8003	+ if (hScale < 0)
	8004	+ {
	8005	+ sign = -1;
	8006	+ }
	8007	+ hScale = signMath.pow(signhScale, scale * 50);
	8008	+ if (hScale < 0.01)
	8009	+ {
	8010	+ //hScale = 0.01;
	8011	+ }
	8012	+
	8013	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	8014	+ sign = 1;
	8015	+ if (vScale < 0)
	8016	+ {
	8017	+ sign = -1;
	8018	+ }
	8019	+ vScale = signMath.pow(signvScale, scale * 50);
	8020	+ if (vScale < 0.01)
	8021	+ {
	8022	+ //vScale = 0.01;
	8023	+ }
	8024	+
	8025	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	8026	+
7467	8027	retval = true;
7468	8028	}
7469	8029
..	..	@@ -7473,7 +8033,7 @@
7473	8033	}
7474	8034
7475	8035	//System.out.println("info.modifiers = " + info.modifiers);
7476		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	8036	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7477	8037	//System.out.println("modified = " + modified);
7478	8038	//new Exception().printStackTrace();
7479	8039	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7501,7 +8061,8 @@
7501	8061	return true;
7502	8062	}
7503	8063
7504		- void doEditDrag0(ClickInfo info, boolean opposite)
	8064	+ void doEditDrag0(//ClickInfo info,
	8065	+ boolean opposite)
7505	8066	{
7506	8067	if (hitSomething == 0)
7507	8068	{
..	..	@@ -7515,7 +8076,7 @@
7515	8076
7516	8077	//System.out.println("hitSomething = " + hitSomething);
7517	8078
7518		- double scale = 0.005f * info.camera.Distance();
	8079	+ double scale = 0.005f * clickInfo.camera.Distance();
7519	8080
7520	8081	cVector xlate = new cVector();
7521	8082	//cVector xlate2 = new cVector();
..	..	@@ -7529,7 +8090,9 @@
7529	8090
7530	8091	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7531	8092
7532		- if (modified \|\| opposite)
	8093	+ // Modified could snap
	8094	+ if (//modified \|\|
	8095	+ opposite)
7533	8096	{
7534	8097	//assert(false);
7535	8098	/*
..	..	@@ -7549,8 +8112,8 @@
7549	8112	toParent[3][i] = xlate.get(i);
7550	8113	LA.matInvert(toParent, fromParent);
7551	8114	*/
7552		- cVector delta = LA.newVector(0, 0, startY - info.y);
7553		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8115	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8116	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7554	8117
7555	8118	LA.matCopy(startMat, toParent);
7556	8119	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7559,7 +8122,7 @@
7559	8122	} else
7560	8123	{
7561	8124	//LA.xformDir(delta, info.camera.fromScreen, delta);
7562		- cVector up = new cVector(info.camera.up);
	8125	+ cVector up = new cVector(clickInfo.camera.up);
7563	8126	cVector away = new cVector();
7564	8127	//cVector right2 = new cVector();
7565	8128	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7576,19 +8139,19 @@
7576	8139	LA.xformDir(up, ClickInfo.matbuffer, up);
7577	8140	// if (!CameraPane.LOCALTRANSFORM)
7578	8141	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7579		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8142	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7580	8143	// if (!CameraPane.LOCALTRANSFORM)
7581	8144	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7582	8145	//LA.vecCross(up, cVector.Z, right2);
7583	8146
7584		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8147	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7585	8148
7586	8149	//System.out.println("DELTA0 = " + delta);
7587	8150	//System.out.println("AWAY = " + info.camera.away);
7588	8151	//System.out.println("UP = " + info.camera.up);
7589	8152	if (away.z > 0)
7590	8153	{
7591		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8154	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7592	8155	{
7593	8156	delta.x = -delta.x;
7594	8157	} else
..	..	@@ -7603,7 +8166,7 @@
7603	8166	//System.out.println("DELTA1 = " + delta);
7604	8167	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7605	8168	//System.out.println("DELTA2 = " + delta);
7606		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8169	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7607	8170	LA.matCopy(startMat, toParent);
7608	8171	//System.out.println("DELTA3 = " + delta);
7609	8172	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7613,8 +8176,8 @@
7613	8176	break;
7614	8177
7615	8178	case hitRotate: // rotate
7616		- int dx = info.x - centerPt.x;
7617		- int dy = -(info.y - centerPt.y);
	8179	+ int dx = clickInfo.x - centerPt.x;
	8180	+ int dy = -(clickInfo.y - centerPt.y);
7618	8181	double angle = (double) Math.atan2(dx, dy);
7619	8182	angle = -(1.570796 - angle);
7620	8183
..	..	@@ -7623,7 +8186,7 @@
7623	8186
7624	8187	if (modified)
7625	8188	{
7626		- // Rotate 90 degrees
	8189	+ // Rotate 45 degrees
7627	8190	angle /= (Math.PI / 4);
7628	8191	angle = Math.floor(angle + 0.5);
7629	8192	angle *= (Math.PI / 4);
..	..	@@ -7637,7 +8200,7 @@
7637	8200	}
7638	8201	/**/
7639	8202
7640		- switch (info.pane.RenderCamera().viewCode)
	8203	+ switch (clickInfo.pane.RenderCamera().viewCode)
7641	8204	{
7642	8205	case 1: // '\001'
7643	8206	LA.matZRotate(toParent, angle);
..	..	@@ -7664,7 +8227,7 @@
7664	8227	break;
7665	8228
7666	8229	case hitScale: // scale
7667		- double hScale = (double) (info.x - centerPt.x) / 32;
	8230	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7668	8231	double sign = 1;
7669	8232	if (hScale < 0)
7670	8233	{
..	..	@@ -7676,7 +8239,7 @@
7676	8239	//hScale = 0.01;
7677	8240	}
7678	8241
7679		- double vScale = (double) (info.y - centerPt.y) / 32;
	8242	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7680	8243	sign = 1;
7681	8244	if (vScale < 0)
7682	8245	{
..	..	@@ -7687,6 +8250,7 @@
7687	8250	{
7688	8251	//vScale = 0.01;
7689	8252	}
	8253	+
7690	8254	LA.matCopy(startMat, toParent);
7691	8255	/**/
7692	8256	for (int i = 0; i < 3; i++)
..	..	@@ -7696,33 +8260,39 @@
7696	8260	}
7697	8261	/**/
7698	8262
7699		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	8263	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7700	8264
7701	8265	if (totalScale < 0.01)
7702	8266	{
7703	8267	totalScale = 0.01;
7704	8268	}
7705	8269
7706		- switch (info.pane.RenderCamera().viewCode)
	8270	+ switch (clickInfo.pane.RenderCamera().viewCode)
7707	8271	{
7708	8272	case 3: // '\001'
7709	8273	if (modified \|\| opposite)
7710	8274	{
	8275	+ if (modified) // && opposite)
	8276	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8277	+ else
7711	8278	//LA.matScale(toParent, 1, hScale, vScale);
7712		- LA.matScale(toParent, totalScale, 1, 1);
	8279	+ LA.matScale(toParent, totalScale, 1, 1);
7713	8280	} // vScale, 1);
7714	8281	else
7715	8282	{
7716	8283	// EXCEPTION!
7717		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8284	+ LA.matScale(toParent, 1, totalScale, totalScale);
7718	8285	} // vScale, 1);
7719	8286	break;
7720	8287
7721	8288	case 2: // '\002'
7722	8289	if (modified \|\| opposite)
7723	8290	{
7724		- //LA.matScale(toParent, hScale, 1, vScale);
7725		- LA.matScale(toParent, 1, totalScale, 1);
	8291	+ if (modified) // && opposite)
	8292	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8293	+ else
	8294	+ //LA.matScale(toParent, hScale, 1, vScale);
	8295	+ LA.matScale(toParent, 1, totalScale, 1);
7726	8296	} else
7727	8297	{
7728	8298	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7732,8 +8302,11 @@
7732	8302	case 1: // '\003'
7733	8303	if (modified \|\| opposite)
7734	8304	{
7735		- //LA.matScale(toParent, hScale, vScale, 1);
7736		- LA.matScale(toParent, 1, 1, totalScale);
	8305	+ if (modified) // && opposite)
	8306	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8307	+ else
	8308	+ //LA.matScale(toParent, hScale, vScale, 1);
	8309	+ LA.matScale(toParent, 1, 1, totalScale);
7737	8310	} else
7738	8311	{
7739	8312	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7770,7 +8343,7 @@
7770	8343	} // NEW ...
7771	8344
7772	8345
7773		- info.pane.repaint();
	8346	+ clickInfo.pane.repaint();
7774	8347	}
7775	8348
7776	8349	boolean overflow = false;
..	..	@@ -7877,19 +8450,19 @@
7877	8450	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7878	8451	} else
7879	8452	{
7880		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	8453	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + ((bRep==null)?(count - 1):bRep.VertexCount()) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7881	8454	} // + super.toString();
7882	8455	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7883	8456
7884	8457	if (!Globals.ADVANCED)
7885	8458	return objname;
7886	8459
7887		- return objname + " " + System.identityHashCode(this);
	8460	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7888	8461	}
7889	8462
7890	8463	public int hashCode()
7891	8464	{
7892		- // Fuck Vector...
	8465	+ // Do not use Vector...
7893	8466	return System.identityHashCode(this);
7894	8467	}
7895	8468
..	..	@@ -8129,8 +8702,8 @@
8129	8702	private static cVector2 qq2 = new cVector2();
8130	8703	private static cVector2 rr2 = new cVector2();
8131	8704	private static cVector2 ss2 = new cVector2();
8132		- private static cVector edge1 = new cVector();
8133		- private static cVector edge2 = new cVector();
	8705	+// private static cVector edge1 = new cVector();
	8706	+// private static cVector edge2 = new cVector();
8134	8707	//private static cVector norm = new cVector();
8135	8708	/transient private/ int hitSomething;
8136	8709	static final int hitCenter = 1;
..	..	@@ -8328,7 +8901,275 @@
8328	8901
8329	8902	Touch();
8330	8903	}
	8904	+
	8905	+ static Vertex s1 = new Vertex();
	8906	+ static Vertex s2 = new Vertex();
	8907	+ static Vertex s3 = new Vertex();
8331	8908
	8909	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8910	+ {
	8911	+ boolean success = false;
	8912	+
	8913	+ if (bRep.stripified)
	8914	+ {
	8915	+ int[] strips = bRep.getRawIndices();
	8916	+
	8917	+ // TRIANGLE STRIP ARRAY
	8918	+ if (bRep.trimmed)
	8919	+ {
	8920	+ float[] v = bRep.getRawVertices();
	8921	+
	8922	+ int count3 = 0;
	8923	+
	8924	+ if (v.length > 0)
	8925	+ {
	8926	+ for (int i = 0; i < strips.length; i++)
	8927	+ {
	8928	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8929	+ count3 += 3;
	8930	+
	8931	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8932	+ count3 += 3;
	8933	+
	8934	+ for (int j = 0; j < strips[i] - 2; j++)
	8935	+ {
	8936	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8937	+ count3 += 3;
	8938	+
	8939	+ if (j%2 == 0)
	8940	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8941	+ else
	8942	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8943	+
	8944	+ s1.set(s2);
	8945	+ s2.set(s3);
	8946	+ }
	8947	+ }
	8948	+ }
	8949	+
	8950	+ assert count3 == v.length;
	8951	+ }
	8952	+ else // !trimmed
	8953	+ {
	8954	+ int count = 0;
	8955	+ for (int i = 0; i < strips.length; i++)
	8956	+ {
	8957	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8958	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8959	+
	8960	+ for (int j = 0; j < strips[i] - 2; j++)
	8961	+ {
	8962	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8963	+
	8964	+ if (j%2 == 0)
	8965	+ success \|= intersectTriangle(ray, result, p, q, r);
	8966	+ else
	8967	+ success \|= intersectTriangle(ray, result, p, r, q);
	8968	+
	8969	+ p = q;
	8970	+ q = r;
	8971	+ }
	8972	+ }
	8973	+ }
	8974	+ } else // catch (Error e)
	8975	+ {
	8976	+ int facecount = bRep.FaceCount();
	8977	+ for (int i = 0; i < facecount; i++)
	8978	+ {
	8979	+ Face face = bRep.GetFace(i);
	8980	+
	8981	+ Vertex p = bRep.GetVertex(face.p);
	8982	+ Vertex q = bRep.GetVertex(face.q);
	8983	+ Vertex r = bRep.GetVertex(face.r);
	8984	+
	8985	+ success \|= intersectTriangle(ray, result, p, q, r);
	8986	+ }
	8987	+ }
	8988	+
	8989	+ return success;
	8990	+ }
	8991	+
	8992	+ static cVector eye = new cVector();
	8993	+ static cVector dir = new cVector();
	8994	+
	8995	+ transient BBox bbox = null;
	8996	+
	8997	+ boolean intersect(Ray ray, IntersectResult result)
	8998	+ {
	8999	+ double eyex = ray.eyePoint.x;
	9000	+ double eyey = ray.eyePoint.y;
	9001	+ double eyez = ray.eyePoint.z;
	9002	+
	9003	+ double dirx = ray.viewDirection.x;
	9004	+ double diry = ray.viewDirection.y;
	9005	+ double dirz = ray.viewDirection.z;
	9006	+
	9007	+ if (this.fromParent != null && !(this instanceof TextureNode))
	9008	+ {
	9009	+ eye.x = eyex;
	9010	+ eye.y = eyey;
	9011	+ eye.z = eyez;
	9012	+ dir.x = dirx;
	9013	+ dir.y = diry;
	9014	+ dir.z = dirz;
	9015	+
	9016	+ LA.xformPos(eye, this.fromParent, eye);
	9017	+ LA.xformDir(dir, this.fromParent, dir);
	9018	+
	9019	+ ray.eyePoint.x = eye.x;
	9020	+ ray.eyePoint.y = eye.y;
	9021	+ ray.eyePoint.z = eye.z;
	9022	+
	9023	+ ray.viewDirection.x = dir.x;
	9024	+ ray.viewDirection.y = dir.y;
	9025	+ ray.viewDirection.z = dir.z;
	9026	+ }
	9027	+
	9028	+ boolean success = false;
	9029	+
	9030	+ boolean touch = false;
	9031	+
	9032	+ if (bRep != null && Link2Support())
	9033	+ {
	9034	+ if (bbox == null)
	9035	+ {
	9036	+ bbox = new BBox();
	9037	+
	9038	+ cVector min = new cVector();
	9039	+ cVector max = new cVector();
	9040	+
	9041	+ this.getBounds(min, max, true);
	9042	+
	9043	+ bbox.min.x = min.x;
	9044	+ bbox.min.y = min.y;
	9045	+ bbox.min.z = min.z;
	9046	+
	9047	+ bbox.max.x = max.x;
	9048	+ bbox.max.y = max.y;
	9049	+ bbox.max.z = max.z;
	9050	+ }
	9051	+
	9052	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	9053	+ {
	9054	+ success \|= intersectMesh(ray, result);
	9055	+ }
	9056	+ else
	9057	+ {
	9058	+ //this.hide = true;
	9059	+ touch = true;
	9060	+ }
	9061	+ }
	9062	+
	9063	+ for (int i=0; i<size(); i++)
	9064	+ {
	9065	+ Object3D child = (Object3D) reserve(i);
	9066	+
	9067	+ if (child == null)
	9068	+ continue;
	9069	+
	9070	+ success \|= child.intersect(ray, result);
	9071	+ release(i);
	9072	+ }
	9073	+
	9074	+ ray.eyePoint.x = eyex;
	9075	+ ray.eyePoint.y = eyey;
	9076	+ ray.eyePoint.z = eyez;
	9077	+
	9078	+ ray.viewDirection.x = dirx;
	9079	+ ray.viewDirection.y = diry;
	9080	+ ray.viewDirection.z = dirz;
	9081	+
	9082	+// if (touch)
	9083	+// this.Touch(); // refresh display list
	9084	+
	9085	+ return success;
	9086	+ }
	9087	+
	9088	+ static Vector3d edge1 = new Vector3d();
	9089	+ static Vector3d edge2 = new Vector3d();
	9090	+ static Vector3d P = new Vector3d();
	9091	+ static Vector3d T = new Vector3d();
	9092	+ static Vector3d Q = new Vector3d();
	9093	+
	9094	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	9095	+ {
	9096	+ if (false)
	9097	+ {
	9098	+ result.t = 0;
	9099	+ return true;
	9100	+ }
	9101	+
	9102	+ /*
	9103	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9104	+
	9105	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9106	+ */
	9107	+
	9108	+ // Calculate edges of the triangle
	9109	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9110	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9111	+
	9112	+ // Calculate the determinant (U parameter)
	9113	+ P.cross(ray.viewDirection, edge2);
	9114	+ double det = edge1.dot(P);
	9115	+
	9116	+ if (det > -1e-9 && det < 1e-9)
	9117	+ {
	9118	+ return false;
	9119	+ } // Ray lies in plane of triangle
	9120	+
	9121	+ double invDet = 1 / det;
	9122	+
	9123	+ // Calculate distance from vertex1 to ray origin
	9124	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9125	+
	9126	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9127	+
	9128	+ if (U < 0.f \|\| U > 1.f)
	9129	+ {
	9130	+ return false;
	9131	+ } // Intersection lies outside of the triangle
	9132	+
	9133	+ // Calculate V parameter
	9134	+ Q.cross(T, edge1);
	9135	+
	9136	+ double V = ray.viewDirection.dot(Q) * invDet;
	9137	+
	9138	+ if (V < 0.f \|\| (U + V) > 1.f)
	9139	+ {
	9140	+ return false;
	9141	+ } // Intersection lies outside of the triangle
	9142	+
	9143	+ double t = edge2.dot(Q) * invDet;
	9144	+
	9145	+ if (t > 1e-9) // Triangle and ray intersects
	9146	+ {
	9147	+ //result.isIntersected = true;
	9148	+ //result.id = id;
	9149	+
	9150	+ if (false) // isShadow)
	9151	+ {
	9152	+ result.t = t;
	9153	+ return true;
	9154	+ } else if (t < result.t)
	9155	+ {
	9156	+ result.object = this;
	9157	+
	9158	+ result.t = t;
	9159	+
	9160	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9161	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9162	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9163	+
	9164	+ result.n.cross(edge1, edge2);
	9165	+ result.n.normalize();
	9166	+ }
	9167	+
	9168	+ return true;
	9169	+ }
	9170	+
	9171	+ return false;
	9172	+ }
8332	9173
8333	9174	public int Size()
8334	9175	{
..	..	@@ -8425,5 +9266,17 @@
8425	9266	return -1;
8426	9267	}
8427	9268	*/
	9269	+
	9270	+ void Translate(double x, double y, double z)
	9271	+ {
	9272	+ if (toParent == null)
	9273	+ {
	9274	+ toParent = LA.newMatrix();
	9275	+ fromParent = LA.newMatrix();
	9276	+ }
	9277	+
	9278	+ LA.matTranslate(toParent, x, y, z);
	9279	+ LA.matTranslateInv(fromParent, -x, -y, -z);
	9280	+ }
8428	9281	}
8429	9282