~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,136 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ // Use GetUUID for backward compatibility with null.
	26	+ private UUID uuid = UUID.randomUUID();
	27	+
	28	+ // TEMPORARY for versions. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+
	32	+ // FileObject
	33	+ Object3D savefilecontent;
	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.
	45	+
22	46	ScriptNode scriptnode;
	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	+
	134	+ void InitOthers()
	135	+ {
	136	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	137	+ {
	138	+ projectedVertices = new Object3D.cVector2[3];
	139	+ }
	140	+ for (int i = 0; i < 3; i++)
	141	+ {
	142	+ projectedVertices[i] = new cVector2(); // Others
	143	+ }
	144	+ projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
	146	+ }
23	147
24	148	void MinMax(cVector minima, cVector maxima)
25	149	{
..	..	@@ -86,64 +210,286 @@
86	210
87	211	// transient boolean reduced; // for morph reduction
88	212
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	213	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	214	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	215
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	216	+ transient Object3D transientsupport; // for cloning
	217	+ transient boolean transientlink2master;
94	218
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	219	+ void SaveSupports()
107	220	{
108		- bRep.SaveSupports();
	221	+ if (blockloop)
	222	+ return;
	223	+
	224	+ transientsupport = support;
	225	+ transientlink2master = Link2Support();
	226	+
	227	+ support = null;
	228	+ link2master = false;
	229	+
	230	+ if (bRep != null)
	231	+ {
	232	+ bRep.SaveSupports();
	233	+ }
	234	+
	235	+ for (int i = 0; i < Size(); i++)
	236	+ {
	237	+ Object3D child = (Object3D) get(i);
	238	+ if (child == null)
	239	+ continue;
	240	+ blockloop = true;
	241	+ child.SaveSupports();
	242	+ blockloop = false;
	243	+ }
109	244	}
110		-
111		- for (int i = 0; i < Size(); i++)
	245	+
	246	+ void RestoreSupports()
112	247	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	248	+ if (blockloop)
	249	+ return;
	250	+
	251	+ support = transientsupport;
	252	+ link2master = transientlink2master;
	253	+ transientsupport = null;
	254	+ transientlink2master = false;
	255	+
	256	+ if (bRep != null)
	257	+ {
	258	+ bRep.RestoreSupports();
	259	+ }
	260	+
	261	+ for (int i = 0; i < Size(); i++)
	262	+ {
	263	+ Object3D child = (Object3D) get(i);
	264	+ if (child == null)
	265	+ continue;
	266	+ blockloop = true;
	267	+ child.RestoreSupports();
	268	+ blockloop = false;
	269	+ }
	270	+ }
	271	+
	272	+ boolean HasBigData()
	273	+ {
	274	+ if (blockloop)
	275	+ return false;
	276	+
	277	+ if (bRep != null)
	278	+ {
	279	+ return true;
	280	+ }
	281	+
116	282	blockloop = true;
117		- child.SaveSupports();
	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);
	342	+ }
	343	+
	344	+ void ExtractBigData(Object3D o)
	345	+ {
	346	+ //System.err.println("ExtractBigData : " + this + " --> " + o);
	347	+
	348	+ if (o.bRep != null)
	349	+ Grafreed.Assert(o.bRep == this.bRep);
	350	+
	351	+ o.bRep = this.bRep;
	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)
	362	+ {
	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;
	368	+ }
	369	+
	370	+ // o.support = this.support;
	371	+ // o.fileparent = this.fileparent;
	372	+ // if (this.bRep != null)
	373	+ // o.bRep = this.bRep.support;
	374	+
	375	+ this.bRep = null;
	376	+ // if (this.bRep != null)
	377	+ // this.bRep.support = null;
	378	+ // this.support = null;
	379	+ // this.fileparent = null;
	380	+ }
	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	+
118	424	blockloop = false;
119	425	}
120		-}
121	426
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
	427	+ boolean HasTags()
	428	+ {
	429	+ if (blockloop)
	430	+ return false;
126	431
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
133		- {
134		- bRep.RestoreSupports();
135		- }
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142	432	blockloop = true;
143		- child.RestoreSupports();
	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	+
	449	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	450	+ {
	451	+ if (blockloop)
	452	+ return;
	453	+
	454	+ if (!hashtable.containsKey(GetUUID()))
	455	+ return;
	456	+
	457	+ Object3D o = hashtable.get(GetUUID());
	458	+
	459	+ RestoreBigData(o);
	460	+
	461	+ blockloop = true;
	462	+
	463	+ //hashtable.remove(GetUUID());
	464	+
	465	+ for (int i=0; i<Size(); i++)
	466	+ {
	467	+ get(i).RestoreBigData(hashtable);
	468	+ }
	469	+
144	470	blockloop = false;
145	471	}
146		-}
	472	+
	473	+ void RestoreBigData(Object3D o)
	474	+ {
	475	+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
	476	+ Grafreed.Assert(this.bRep == null);
	477	+
	478	+ this.bRep = o.bRep;
	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;
	490	+ // this.support = o.support;
	491	+ // this.fileparent = o.fileparent;
	492	+ }
147	493
148	494	// MOCAP SUPPORT
149	495	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,8 +632,13 @@
286	632	}
287	633
288	634	boolean live = false;
	635	+ transient boolean keepdontselect;
	636	+ boolean dontselect = false;
289	637	boolean hide = false;
290		- 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	+
291	642	boolean marked = false; // animation node
292	643	boolean skip = false; // centroid issue
293	644	boolean skipmocap = false; // mocap data
..	..	@@ -295,6 +646,11 @@
295	646	boolean random = false;
296	647	boolean speedup = false;
297	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
	652	+
	653	+ float NORMALPUSH = 0;
298	654
299	655	Object3D support;
300	656
..	..	@@ -311,7 +667,7 @@
311	667	{
312	668	sorted = true;
313	669
314		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
315	671	{
316	672	Object3D obji = get(i);
317	673	Object3D objj = get(i+1);
..	..	@@ -335,7 +691,7 @@
335	691	{
336	692	sorted = true;
337	693
338		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
339	695	{
340	696	Object3D obji = get(i);
341	697	Object3D objj = get(i+1);
..	..	@@ -351,7 +707,7 @@
351	707	}
352	708	}
353	709
354		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
355	711
356	712	int MemorySize()
357	713	{
..	..	@@ -415,16 +771,16 @@
415	771	{
416	772	Object3D copy = this;
417	773
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	774	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	775
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	776	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	777	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	778	+ parentcam = Globals.theRenderer.Cameras()[1];
423	779	}
424	780
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	781	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	782	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	783	+ parentcam = Globals.theRenderer.Cameras()[0];
428	784	}
429	785
430	786	if (this == parentcam)
..	..	@@ -432,7 +788,7 @@
432	788	//assert(this instanceof Camera);
433	789
434	790	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	791	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	792	}
437	793
438	794	copy.marked ^= true;
..	..	@@ -452,7 +808,7 @@
452	808	//assert(this instanceof Camera);
453	809
454	810	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	811	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	812	}
457	813
458	814	copy.Touch(); // display list issue
..	..	@@ -465,12 +821,14 @@
465	821	toParent = LA.newMatrix();
466	822	fromParent = LA.newMatrix();
467	823	}
	824	+
468	825	if (toParentMarked == null)
469	826	{
470	827	if (maxcount != 1)
471	828	{
472		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
473	830	}
	831	+
474	832	toParentMarked = LA.newMatrix();
475	833	fromParentMarked = LA.newMatrix();
476	834	}
..	..	@@ -587,7 +945,7 @@
587	945	return;
588	946	}
589	947
590		- if (CameraPane.fromscript)
	948	+ if (Globals.fromscript)
591	949	{
592	950	transformcount = 0;
593	951	return;
..	..	@@ -670,7 +1028,7 @@
670	1028
671	1029	void Step()
672	1030	{
673		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
674	1032	resetmaxcount();
675	1033	resettransformcount();
676	1034	resetstep();
..	..	@@ -745,7 +1103,7 @@
745	1103
746	1104	int GetTransformCount()
747	1105	{
748		- // marde pour serialization de Texture
	1106	+ // patch pour serialization de Texture
749	1107	resetmaxcount();
750	1108	resettransformcount();
751	1109	resetstep();
..	..	@@ -758,7 +1116,7 @@
758	1116	if (step == 0)
759	1117	step = 1;
760	1118	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	1119	+ maxcount = 128; // 2048; // 4;
762	1120	// if (acceleration == 0)
763	1121	// acceleration = 10;
764	1122	if (delay == 0) // serial
..	..	@@ -779,9 +1137,14 @@
779	1137	// factor = CameraPane.STEP;
780	1138	// }
781	1139
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	1140	+ if (marked && Globals.isLIVE() && live &&
	1141	+ //TEMP21aug2018
	1142	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	1143	+ currentframe != Globals.framecount)
783	1144	{
784		- currentframe = CameraPane.framecount;
	1145	+ Globals.lighttouched = true;
	1146	+
	1147	+ currentframe = Globals.framecount;
785	1148
786	1149	// System.err.println("transformcount = " + transformcount);
787	1150	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +1153,8 @@
790	1153
791	1154	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	1155
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1156	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1157	+ (step == 1 && changedir))
794	1158	{
795	1159	countdown = 1;
796	1160	delay = speedup?8:1;
..	..	@@ -859,20 +1223,28 @@
859	1223	{
860	1224	// return true;
861	1225
862		- if (material == null \|\| material.multiply)
863		- 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;
864	1234
865		- return material.opacity > 0.99;
	1235	+ return !sort;
866	1236	}
867	1237
868	1238	boolean IsOpaque()
869	1239	{
870	1240	// return true;
871	1241
872		- if (material == null \|\| material.multiply)
873		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
874	1246
875		- return material.opacity > 0.99;
	1247	+ return !sort;
876	1248	}
877	1249
878	1250	Object3D()
..	..	@@ -893,6 +1265,11 @@
893	1265	fromParent = null; // LA.newMatrix();
894	1266	bRep = null; // new BoundaryRep();
895	1267
	1268	+ if (oname != null && oname.equals("LeftHand"))
	1269	+ {
	1270	+ name = oname;
	1271	+ }
	1272	+
896	1273	/*
897	1274	float hue = (float)Math.random();
898	1275	Color col;
..	..	@@ -935,7 +1312,7 @@
935	1312
936	1313	public Object clone()
937	1314	{
938		- return GrafreeD.clone(this);
	1315	+ return Grafreed.clone(this);
939	1316	}
940	1317
941	1318	Object3D copyExpand()
..	..	@@ -945,8 +1322,10 @@
945	1322
946	1323	// will share the geometry
947	1324	assert (!(this instanceof Composite));
948		- return deepCopy(); // Never called for Composite
949		-
	1325	+
	1326	+ Object3D obj = deepCopy(); // Never called for Composite
	1327	+ obj.count = 2;
	1328	+ return obj;
950	1329	}
951	1330
952	1331	boolean HasLoops()
..	..	@@ -954,6 +1333,30 @@
954	1333	return false;
955	1334	}
956	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	+
957	1360	boolean IsInfinite()
958	1361	{
959	1362	if (blockloop)
..	..	@@ -1024,78 +1427,16 @@
1024	1427	return;
1025	1428
1026	1429	blockloop = true;
	1430	+
	1431	+ other.parent = parent;
	1432	+
1027	1433	//System.out.println("COPY " + this + " to " + other);
1028	1434	//new Exception().printStackTrace();
	1435	+ deepCopyNode(other);
1029	1436
1030		- other.parent = parent;
1031		- if (toParent != null)
1032		- {
1033		- other.toParent = LA.newMatrix();
1034		- other.fromParent = LA.newMatrix();
1035		- LA.matCopy(toParent, other.toParent);
1036		- LA.matCopy(fromParent, other.fromParent);
1037		- if (toParentMarked != null)
1038		- {
1039		- other.toParentMarked = LA.newMatrix();
1040		- other.fromParentMarked = LA.newMatrix();
1041		- LA.matCopy(toParentMarked, other.toParentMarked);
1042		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1043		- }
1044		- }
1045		- else
1046		- {
1047		- if (other.toParent == null)
1048		-// assert(other.toParent == null);
1049		-// new Exception().printStackTrace();
1050		- System.err.println("null parent: " + other);
1051		- }
1052		- /*
1053		- double ident[][] = LA.newMatrix();
1054		- if (bRep == null)
1055		- other.bRep = null;
1056		- else
1057		- other.bRep = new BoundaryRep(bRep, ident);
1058		- */
1059		- // Really new...
1060	1437	other.bRep = bRep; // Share the geometry
1061	1438
1062	1439	other.support = support; // Share the support
1063		-
1064		- //other.editWindow = null;
1065		- if (name == null)
1066		- other.name = null;
1067		- else
1068		- other.name = new String(name);
1069		-
1070		- if (material != null)
1071		- {
1072		- other.material = new cMaterial(material);
1073		- } else
1074		- {
1075		- other.material = null;
1076		- }
1077		-
1078		- other.GetTextures().name = GetTextures().name;
1079		-
1080		- CopyExtraMaterial(other);
1081		-
1082		- other.touched = touched;
1083		- other.softtouched = softtouched;
1084		-
1085		- other.random = random;
1086		- other.link2master = link2master;
1087		- other.transformcount = transformcount;
1088		- other.marked = marked;
1089		- other.skip = skip;
1090		- other.count = count;
1091		- other.flipV = flipV;
1092		- other.live = live;
1093		- other.rewind = rewind;
1094		- other.hide = hide;
1095		- other.texres = texres;
1096		- other.speedup = speedup;
1097		- other.height = height;
1098		- other.depth = depth;
1099	1440
1100	1441	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1101	1442	// {
..	..	@@ -1151,17 +1492,24 @@
1151	1492	if ((mask & GEOMETRY) != 0)
1152	1493	{
1153	1494	if (bRep != null)
1154		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1155		- else
1156		- assert(other.bRep == null);
1157		-
1158		- if (bRep != null)
1159	1495	{
	1496	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1160	1497	CameraPane.RemoveList(bRep.displaylist);
1161	1498	bRep.displaylist = 0; // june 2013 -1;
1162	1499	}
1163	1500	else
1164		- 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;
1165	1513	}
1166	1514
1167	1515	/* Use a MASK = GEO/MAT
..	..	@@ -1257,6 +1605,7 @@
1257	1605	toParent = LA.newMatrix();
1258	1606	fromParent = LA.newMatrix();
1259	1607	}
	1608	+
1260	1609	LA.matCopy(other.toParent, toParent);
1261	1610	LA.matCopy(other.fromParent, fromParent);
1262	1611
..	..	@@ -1446,7 +1795,16 @@
1446	1795	// if (other == null)
1447	1796	// return;
1448	1797
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1798	+ if (other != null)
	1799	+ {
	1800	+ BoundaryRep.SEUIL = other.material.cameralight;
	1801	+
	1802	+ // Set default to 0.1
	1803	+ BoundaryRep.SEUIL /= 4; // 2;
	1804	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1805	+ }
	1806	+
	1807	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1808
1451	1809	//if (bRep != null)
1452	1810	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +2059,7 @@
1701	2059	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	2060	o.bRep = transientrep;
1703	2061	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	2062	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	2063	o.CreateMaterial();
1706	2064	o.SetAttributes(this, -1);
1707	2065	//parent
..	..	@@ -1714,7 +2072,7 @@
1714	2072	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	2073	o.bRep = bRep;
1716	2074	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	2075	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	2076	o.CreateMaterial();
1719	2077	//o.overwriteThis(this, -1);
1720	2078	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +2159,15 @@
1801	2159	if (obj.name == null)
1802	2160	continue; // can't be a null one
1803	2161
	2162	+ // Try perfect match first.
1804	2163	if (n.equals(obj.name))
1805	2164	{
1806	2165	theobj = obj;
1807	2166	count++;
1808	2167	}
1809	2168	}
	2169	+
	2170	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	2171
1811	2172	if (count != 1)
1812	2173	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +2177,9 @@
1816	2177	if (obj.name == null)
1817	2178	continue; // can't be a null one
1818	2179
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	2180	+ String name = obj.name.split(":")[0]; // Poser generates a count
	2181	+ //if (n.startsWith(obj.name))
	2182	+ if (n.contains(name))
1821	2183	{
1822	2184	theobj = obj;
1823	2185	count++;
..	..	@@ -2120,21 +2482,9 @@
2120	2482	if (/parent != null &&/ material == null)
2121	2483	{
2122	2484	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
2132	2485
2133		- if (this instanceof Camera)
2134		- {
2135		- material.shift = 90;
2136		- }
2137		-
	2486	+ InitOthers();
	2487	+
2138	2488	material.multiply = multiply;
2139	2489
2140	2490	if (multiply)
..	..	@@ -2272,12 +2622,22 @@
2272	2622	}
2273	2623	*/
2274	2624	}
	2625	+ else
	2626	+ {
	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");
	2633	+ }
2275	2634	}
2276	2635
2277	2636	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2637	{
2279	2638	if (newWindow)
2280	2639	{
	2640	+ new Exception().printStackTrace();
2281	2641	System.exit(0);
2282	2642	if (parent != null)
2283	2643	{
..	..	@@ -2312,6 +2672,14 @@
2312	2672	{
2313	2673	editWindow.refreshContents();
2314	2674	}
	2675	+ else
	2676	+ {
	2677	+ if (manipWindow != null)
	2678	+ {
	2679	+ manipWindow.refreshContents();
	2680	+ }
	2681	+ }
	2682	+
2315	2683	//if (parent != null)
2316	2684	//parent.refreshEditWindow();
2317	2685	}
..	..	@@ -2391,7 +2759,8 @@
2391	2759	private static final int editSelf = 1;
2392	2760	private static final int editChild = 2;
2393	2761
2394		- void drawEditHandles(ClickInfo info, int level)
	2762	+ void drawEditHandles(//ClickInfo info,
	2763	+ int level)
2395	2764	{
2396	2765	if (level == 0)
2397	2766	{
..	..	@@ -2399,7 +2768,8 @@
2399	2768	return;
2400	2769
2401	2770	Object3D selectee;
2402		- 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))
2403	2773	{
2404	2774	selectee = (Object3D) e.nextElement();
2405	2775	}
..	..	@@ -2407,19 +2777,22 @@
2407	2777	} else
2408	2778	{
2409	2779	//super.
2410		- drawEditHandles0(info, level + 1);
	2780	+ drawEditHandles0(//info,
	2781	+ level + 1);
2411	2782	}
2412	2783	}
2413	2784
2414		- boolean doEditClick(ClickInfo info, int level)
	2785	+ boolean doEditClick(//ClickInfo info,
	2786	+ int level)
2415	2787	{
2416	2788	doSomething = 0;
2417	2789	if (level == 0)
2418	2790	{
2419		- return doParentClick(info);
	2791	+ return doParentClick(); //info);
2420	2792	}
2421	2793	if (//super.
2422		- doEditClick0(info, level))
	2794	+ doEditClick0(//info,
	2795	+ level))
2423	2796	{
2424	2797	doSomething = 1;
2425	2798	return true;
..	..	@@ -2429,7 +2802,7 @@
2429	2802	}
2430	2803	}
2431	2804
2432		- boolean doParentClick(ClickInfo info)
	2805	+ boolean doParentClick() //ClickInfo info)
2433	2806	{
2434	2807	if (selection == null)
2435	2808	{
..	..	@@ -2442,7 +2815,8 @@
2442	2815	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2443	2816	{
2444	2817	Object3D selectee = (Object3D) e.nextElement();
2445		- if (selectee.doEditClick(info, 1))
	2818	+ if (selectee.doEditClick(//info,
	2819	+ 1))
2446	2820	{
2447	2821	childToDrag = selectee;
2448	2822	doSomething = 2;
..	..	@@ -2454,13 +2828,15 @@
2454	2828	return retval;
2455	2829	}
2456	2830
2457		- void doEditDrag(ClickInfo info)
	2831	+ void doEditDrag(//ClickInfo clickInfo,
	2832	+ boolean opposite)
2458	2833	{
2459	2834	switch (doSomething)
2460	2835	{
2461	2836	case 1: // '\001'
2462	2837	//super.
2463		- doEditDrag0(info);
	2838	+ doEditDrag0(//clickInfo,
	2839	+ opposite);
2464	2840	break;
2465	2841
2466	2842	case 2: // '\002'
..	..	@@ -2473,11 +2849,13 @@
2473	2849	{
2474	2850	//sel.hitSomething = childToDrag.hitSomething;
2475	2851	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2852	+ sel.doEditDrag(//clickInfo,
	2853	+ opposite);
2477	2854	} else
2478	2855	{
2479	2856	//super.
2480		- doEditDrag0(info);
	2857	+ doEditDrag0(//clickInfo,
	2858	+ opposite);
2481	2859	}
2482	2860	}
2483	2861	break;
..	..	@@ -2495,6 +2873,9 @@
2495	2873	{
2496	2874	deselectAll();
2497	2875	}
	2876	+
	2877	+ new Exception().printStackTrace();
	2878	+
2498	2879	ClickInfo newInfo = new ClickInfo();
2499	2880	newInfo.flags = info.flags;
2500	2881	newInfo.bounds = info.bounds;
..	..	@@ -2587,6 +2968,18 @@
2587	2968	void GenNormalsS(boolean crease)
2588	2969	{
2589	2970	selection.GenNormals(crease);
	2971	+// for (int i=0; i<selection.size(); i++)
	2972	+// {
	2973	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2974	+// selectee.GenNormals(crease);
	2975	+// }
	2976	+
	2977	+ //Touch();
	2978	+ }
	2979	+
	2980	+ void GenNormalsMeshS()
	2981	+ {
	2982	+ selection.GenNormalsMesh();
2590	2983	// for (int i=0; i<selection.size(); i++)
2591	2984	// {
2592	2985	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +3125,42 @@
2732	3125	blockloop = false;
2733	3126	}
2734	3127
	3128	+ void GenNormalsMesh()
	3129	+ {
	3130	+ if (blockloop)
	3131	+ return;
	3132	+
	3133	+ blockloop = true;
	3134	+ GenNormalsMesh0();
	3135	+ for (int i = 0; i < Children().Size(); i++)
	3136	+ {
	3137	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3138	+ if (child == null)
	3139	+ continue;
	3140	+ child.GenNormalsMesh();
	3141	+// Children().release(i);
	3142	+ }
	3143	+ blockloop = false;
	3144	+ }
	3145	+
	3146	+ void GenNormalsMINE()
	3147	+ {
	3148	+ if (blockloop)
	3149	+ return;
	3150	+
	3151	+ blockloop = true;
	3152	+ GenNormalsMINE0();
	3153	+ for (int i = 0; i < Children().Size(); i++)
	3154	+ {
	3155	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3156	+ if (child == null)
	3157	+ continue;
	3158	+ child.GenNormalsMINE();
	3159	+// Children().release(i);
	3160	+ }
	3161	+ blockloop = false;
	3162	+ }
	3163	+
2735	3164	void ClearColors()
2736	3165	{
2737	3166	if (blockloop)
..	..	@@ -2866,7 +3295,8 @@
2866	3295	{
2867	3296	if (bRep != null)
2868	3297	{
2869		- bRep.GenUV();
	3298	+ bRep.GenUV(); //1);
	3299	+ //bRep.UnfoldUV();
2870	3300	Touch();
2871	3301	}
2872	3302	}
..	..	@@ -2875,7 +3305,28 @@
2875	3305	{
2876	3306	if (bRep != null)
2877	3307	{
	3308	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
2878	3309	bRep.GenerateNormals(crease);
	3310	+ if (!bRep.trimmed)
	3311	+ bRep.MergeNormals();
	3312	+ Touch();
	3313	+ }
	3314	+ }
	3315	+
	3316	+ void GenNormalsMesh0()
	3317	+ {
	3318	+ if (bRep != null)
	3319	+ {
	3320	+ bRep.GenerateNormalsMesh();
	3321	+ Touch();
	3322	+ }
	3323	+ }
	3324	+
	3325	+ void GenNormalsMINE0()
	3326	+ {
	3327	+ if (bRep != null)
	3328	+ {
	3329	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3330	Touch();
2880	3331	}
2881	3332	}
..	..	@@ -2932,6 +3383,132 @@
2932	3383	blockloop = false;
2933	3384	}
2934	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	+
	3485	+ void TransformChildren()
	3486	+ {
	3487	+ if (toParent != null)
	3488	+ {
	3489	+ for (int i=Size(); --i>=0;)
	3490	+ {
	3491	+ Object3D v = get(i);
	3492	+
	3493	+ if (v.toParent == null)
	3494	+ {
	3495	+ v.toParent = LA.newMatrix();
	3496	+ v.fromParent = LA.newMatrix();
	3497	+ }
	3498	+
	3499	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3500	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3501	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3502	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3503	+ }
	3504	+
	3505	+ toParent = null; // LA.matIdentity(toParent);
	3506	+ fromParent = null; // LA.matIdentity(fromParent);
	3507	+
	3508	+ Touch();
	3509	+ }
	3510	+ }
	3511	+
2935	3512	void TransformGeometry()
2936	3513	{
2937	3514	Object3D obj = this;
..	..	@@ -3147,15 +3724,18 @@
3147	3724	if (bRep != null)
3148	3725	{
3149	3726	//bRep.RemoveOneTriangle();
	3727	+ System.out.println();
3150	3728	System.out.println("Reducing " + this);
3151	3729	if (name != null && name.contains("lockpickstraps"))
3152	3730	name = name;
3153	3731
3154	3732	BoundaryRep sup = bRep.support;
3155	3733	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3734	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3735	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3736	+
	3737	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3738	+
3159	3739	bRep = temprep;
3160	3740	bRep.support = sup;
3161	3741	Touch();
..	..	@@ -3256,15 +3836,47 @@
3256	3836
3257	3837	void ClearMaterials()
3258	3838	{
	3839	+ if (blockloop)
	3840	+ return;
	3841	+
	3842	+ blockloop = true;
	3843	+
3259	3844	ClearMaterial();
3260		- for (int i = 0; i < size(); i++)
	3845	+ for (int i = 0; i < Size(); i++)
3261	3846	{
3262		- Object3D child = (Object3D) reserve(i);
	3847	+ Object3D child = (Object3D) get(i);
3263	3848	if (child == null)
3264	3849	continue;
3265	3850	child.ClearMaterials();
3266		- release(i);
3267	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;
3268	3880	}
3269	3881
3270	3882	void FlipV(boolean flip)
..	..	@@ -3292,7 +3904,8 @@
3292	3904	if (blockloop)
3293	3905	return;
3294	3906
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3907	+ if (//marked \|\| // does not make sense
	3908	+ (bRep != null \|\| material != null)) // borderline...
3296	3909	live = h;
3297	3910
3298	3911	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3926,8 @@
3313	3926	return;
3314	3927
3315	3928	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3929	+ if (//marked \|\| // does not make sense
	3930	+ (bRep != null \|\| material != null)) // borderline...
3317	3931	link2master = h;
3318	3932
3319	3933	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3947,8 @@
3333	3947	if (blockloop)
3334	3948	return;
3335	3949
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3950	+ if (//marked \|\| // does not make sense
	3951	+ (bRep != null \|\| material != null)) // borderline...
3337	3952	hide = h;
3338	3953
3339	3954	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3968,7 @@
3353	3968	if (blockloop)
3354	3969	return;
3355	3970
3356		- if (bRep != null && material != null) // borderline...
	3971	+ if (bRep != null \|\| material != null) // borderline...
3357	3972	marked = h;
3358	3973
3359	3974	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3978,46 @@
3363	3978	continue;
3364	3979	blockloop = true;
3365	3980	child.MarkLeaves(h);
	3981	+ blockloop = false;
	3982	+ // release(i);
	3983	+ }
	3984	+ }
	3985	+
	3986	+ void RewindLeaves(boolean h)
	3987	+ {
	3988	+ if (blockloop)
	3989	+ return;
	3990	+
	3991	+ if (bRep != null \|\| material != null) // borderline...
	3992	+ rewind = h;
	3993	+
	3994	+ for (int i = 0; i < Size(); i++)
	3995	+ {
	3996	+ Object3D child = (Object3D) get(i); // reserve(i);
	3997	+ if (child == null)
	3998	+ continue;
	3999	+ blockloop = true;
	4000	+ child.RewindLeaves(h);
	4001	+ blockloop = false;
	4002	+ // release(i);
	4003	+ }
	4004	+ }
	4005	+
	4006	+ void RandomLeaves(boolean h)
	4007	+ {
	4008	+ if (blockloop)
	4009	+ return;
	4010	+
	4011	+ if (bRep != null \|\| material != null) // borderline...
	4012	+ random = h;
	4013	+
	4014	+ for (int i = 0; i < Size(); i++)
	4015	+ {
	4016	+ Object3D child = (Object3D) get(i); // reserve(i);
	4017	+ if (child == null)
	4018	+ continue;
	4019	+ blockloop = true;
	4020	+ child.RandomLeaves(h);
3366	4021	blockloop = false;
3367	4022	// release(i);
3368	4023	}
..	..	@@ -3400,6 +4055,7 @@
3400	4055
3401	4056	void RevertMeshes()
3402	4057	{
	4058	+ // BLOCKLOOP
3403	4059	if (this instanceof cMesh)
3404	4060	{
3405	4061	((cMesh)this).Revert();
..	..	@@ -3430,11 +4086,6 @@
3430	4086	Touch();
3431	4087	}
3432	4088
3433		- ResetRecur();
3434		- }
3435		-
3436		- void ResetRecur()
3437		- {
3438	4089	for (int i = 0; i < size(); i++)
3439	4090	{
3440	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3457,11 +4108,6 @@
3457	4108	Step();
3458	4109	Touch();
3459	4110
3460		- StepRecur();
3461		- }
3462		-
3463		- void StepRecur()
3464		- {
3465	4111	for (int i = 0; i < size(); i++)
3466	4112	{
3467	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3648,8 +4294,8 @@
3648	4294	Touch();
3649	4295	}
3650	4296
3651		- transient cVector min = new cVector();
3652		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
3653	4299
3654	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
3655	4301	{
..	..	@@ -3665,19 +4311,19 @@
3665	4311	if (blockloop)
3666	4312	return;
3667	4313
3668		- if (min == null) // ???
	4314	+ if (min == null)
3669	4315	{
3670	4316	min = new cVector();
3671	4317	max = new cVector();
3672	4318	}
3673	4319
3674		- for (int i = 0; i<size(); i++)
	4320	+ for (int i = 0; i<Size(); i++)
3675	4321	{
3676		- Object3D child = (Object3D) reserve(i);
	4322	+ Object3D child = (Object3D) get(i); //reserve(i);
3677	4323	if (child == null)
3678	4324	continue;
3679	4325
3680		- if (GrafreeD.RENDERME > 0)
	4326	+ if (Grafreed.RENDERME > 0)
3681	4327	{
3682	4328	if (child instanceof Merge)
3683	4329	((Merge)child).renderme();
..	..	@@ -3692,21 +4338,21 @@
3692	4338	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3693	4339	//if (child.hide)
3694	4340	{
3695		- release(i);
	4341	+ //release(i);
3696	4342	continue;
3697	4343	}
3698	4344
3699	4345	blockloop = true;
3700	4346	child.getBounds(min, max, true); // xform);
3701	4347	blockloop = false;
3702		- release(i);
	4348	+ //release(i);
3703	4349
3704	4350	MinMax(minima, maxima);
3705	4351	}
3706	4352
3707	4353	if (bRep != null)
3708	4354	{
3709		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
3710	4356	}
3711	4357
3712	4358	if (false) // xform)
..	..	@@ -3828,7 +4474,7 @@
3828	4474	if (child == null)
3829	4475	continue;
3830	4476
3831		- if (GrafreeD.RENDERME > 0)
	4477	+ if (Grafreed.RENDERME > 0)
3832	4478	{
3833	4479	if (child instanceof Merge)
3834	4480	((Merge)child).renderme();
..	..	@@ -4023,7 +4669,7 @@
4023	4669	if (child == null)
4024	4670	continue;
4025	4671
4026		- if (GrafreeD.RENDERME > 0)
	4672	+ if (Grafreed.RENDERME > 0)
4027	4673	{
4028	4674	if (child instanceof Merge)
4029	4675	((Merge)child).renderme();
..	..	@@ -4111,7 +4757,7 @@
4111	4757	if (blockloop)
4112	4758	return;
4113	4759
4114		- for (int i=0; i<size(); i++)
	4760	+ for (int i=0; i<Size(); i++)
4115	4761	{
4116	4762	if (get(i).parent != this)
4117	4763	{
..	..	@@ -4120,6 +4766,71 @@
4120	4766	}
4121	4767	blockloop = true;
4122	4768	get(i).RepairParent();
	4769	+ blockloop = false;
	4770	+ }
	4771	+ }
	4772	+
	4773	+ void RepairShadow()
	4774	+ {
	4775	+ if (blockloop)
	4776	+ return;
	4777	+
	4778	+ if (this.material != null)
	4779	+ this.InitOthers();
	4780	+
	4781	+ for (int i=0; i<Size(); i++)
	4782	+ {
	4783	+ blockloop = true;
	4784	+ get(i).RepairShadow();
	4785	+ blockloop = false;
	4786	+ }
	4787	+ }
	4788	+
	4789	+ void RepairSOV()
	4790	+ {
	4791	+ if (blockloop)
	4792	+ return;
	4793	+
	4794	+ String texname = this.GetPigmentTexture();
	4795	+
	4796	+ if (texname.startsWith("sov"))
	4797	+ {
	4798	+ String[] s = texname.split("/");
	4799	+
	4800	+ String[] sname = s[1].split("Color.pn");
	4801	+
	4802	+ texname = sname[0];
	4803	+
	4804	+ if (sname.length > 1)
	4805	+ {
	4806	+ texname += "Color.jpg";
	4807	+ }
	4808	+
	4809	+ this.SetPigmentTexture("sov/" + texname);
	4810	+ }
	4811	+
	4812	+ texname = this.GetBumpTexture();
	4813	+
	4814	+ if (texname.startsWith("sov"))
	4815	+ {
	4816	+ String[] s = texname.split("/");
	4817	+
	4818	+ String[] sname = s[1].split("Bump.pn");
	4819	+
	4820	+ texname = sname[0];
	4821	+
	4822	+ if (sname.length > 1)
	4823	+ {
	4824	+ texname += "Bump.jpg";
	4825	+ }
	4826	+
	4827	+ this.SetBumpTexture("sov/" + texname);
	4828	+ }
	4829	+
	4830	+ for (int i=0; i<Size(); i++)
	4831	+ {
	4832	+ blockloop = true;
	4833	+ get(i).RepairSOV();
4123	4834	blockloop = false;
4124	4835	}
4125	4836	}
..	..	@@ -4614,7 +5325,7 @@
4614	5325
4615	5326	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	5327	{
4617		- if (hide)
	5328	+ if (hide \|\| dontselect)
4618	5329	return null;
4619	5330
4620	5331	if (count <= 0)
..	..	@@ -4638,9 +5349,17 @@
4638	5349	}
4639	5350	}
4640	5351
	5352	+ ObjEditor GetWindow()
	5353	+ {
	5354	+ if (editWindow != null)
	5355	+ return editWindow;
	5356	+
	5357	+ return manipWindow;
	5358	+ }
	5359	+
4641	5360	cTreePath Select(int indexcount, boolean deselect)
4642	5361	{
4643		- if (hide)
	5362	+ if (hide \|\| dontselect)
4644	5363	return null;
4645	5364
4646	5365	if (count <= 0)
..	..	@@ -4674,10 +5393,11 @@
4674	5393	if (leaf != null)
4675	5394	{
4676	5395	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5396	+ ObjEditor window = GetWindow();
	5397	+ if (window != null)
4678	5398	{
4679	5399	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5400	+ window.Select(tp, deselect, true);
4681	5401	}
4682	5402
4683	5403	return tp;
..	..	@@ -4694,6 +5414,7 @@
4694	5414
4695	5415	if (child == null)
4696	5416	continue;
	5417	+
4697	5418	if (child.HasTransparency() && child.size() != 0)
4698	5419	{
4699	5420	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5424,10 @@
4703	5424	if (leaf != null)
4704	5425	{
4705	5426	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5427	+ ObjEditor window = GetWindow();
	5428	+ if (window != null)
4707	5429	{
4708		- editWindow.Select(tp, deselect, true);
	5430	+ window.Select(tp, deselect, true);
4709	5431	}
4710	5432
4711	5433	return tp;
..	..	@@ -4790,7 +5512,7 @@
4790	5512	return globalTransform;
4791	5513	}
4792	5514
4793		- void PreprocessOcclusion(CameraPane cp)
	5515	+ void PreprocessOcclusion(iCameraPane cp)
4794	5516	{
4795	5517	/*
4796	5518	if (AOdone)
..	..	@@ -4937,7 +5659,8 @@
4937	5659	} else //
4938	5660	if (editWindow != null)
4939	5661	{
4940		- editWindow.cameraView.lighttouched = true;
	5662	+ //editWindow.cameraView.lighttouched = true;
	5663	+ Globals.lighttouched = true;
4941	5664	}
4942	5665	}
4943	5666
..	..	@@ -5029,6 +5752,51 @@
5029	5752	blockloop = false;
5030	5753	}
5031	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	+
5032	5800	boolean IsSelected()
5033	5801	{
5034	5802	if (parent == null)
..	..	@@ -5089,12 +5857,41 @@
5089	5857	if (fullname == null)
5090	5858	return "";
5091	5859
	5860	+ if (fullname.pigment != null)
	5861	+ {
	5862	+ return fullname.pigment;
	5863	+ }
	5864	+
5092	5865	// System.out.println("Fullname = " + fullname);
5093	5866
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5867	+ // Does not work on Windows due to C:
	5868	+// if (fullname.name.indexOf(":") == -1)
	5869	+// return fullname.name;
	5870	+//
	5871	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5872
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5873	+ String[] split = fullname.name.split(":");
	5874	+
	5875	+ if (split.length == 0)
	5876	+ {
	5877	+ return fullname.pigment = "";
	5878	+ }
	5879	+
	5880	+ if (split.length <= 2)
	5881	+ {
	5882	+ if (fullname.name.endsWith(":"))
	5883	+ {
	5884	+ // Windows
	5885	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5886	+ }
	5887	+
	5888	+ return fullname.pigment = split[0];
	5889	+ }
	5890	+
	5891	+ // Windows
	5892	+ assert(split.length == 4);
	5893	+
	5894	+ return fullname.pigment = split[0] + ":" + split[1];
5098	5895	}
5099	5896
5100	5897	static String GetBump(cTexture fullname)
..	..	@@ -5102,11 +5899,44 @@
5102	5899	if (fullname == null)
5103	5900	return "";
5104	5901
	5902	+ if (fullname.bump != null)
	5903	+ {
	5904	+ return fullname.bump;
	5905	+ }
	5906	+
5105	5907	// System.out.println("Fullname = " + fullname);
5106		- if (fullname.name.indexOf(":") == -1)
5107		- return "";
5108		-
5109		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5908	+ // Does not work on Windows due to C:
	5909	+// if (fullname.name.indexOf(":") == -1)
	5910	+// return "";
	5911	+//
	5912	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5913	+ String[] split = fullname.name.split(":");
	5914	+
	5915	+ if (split.length == 0)
	5916	+ {
	5917	+ return fullname.bump = "";
	5918	+ }
	5919	+
	5920	+ if (split.length == 1)
	5921	+ {
	5922	+ return fullname.bump = "";
	5923	+ }
	5924	+
	5925	+ if (split.length == 2)
	5926	+ {
	5927	+ if (fullname.name.endsWith(":"))
	5928	+ {
	5929	+ // Windows
	5930	+ return fullname.bump = "";
	5931	+ }
	5932	+
	5933	+ return fullname.bump = split[1];
	5934	+ }
	5935	+
	5936	+ // Windows
	5937	+ assert(split.length == 4);
	5938	+
	5939	+ return fullname.bump = split[2] + ":" + split[3];
5110	5940	}
5111	5941
5112	5942	String GetPigmentTexture()
..	..	@@ -5180,7 +6010,7 @@
5180	6010	System.out.print("; textures = " + textures);
5181	6011	System.out.println("; usedtextures = " + usedtextures);
5182	6012
5183		- if (GetTextures() == null)
	6013	+ if (GetTextures() == null) // What is that??
5184	6014	GetTextures().name = ":";
5185	6015
5186	6016	String texname = tex;
..	..	@@ -5189,6 +6019,9 @@
5189	6019	texname = "";
5190	6020
5191	6021	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6022	+
	6023	+ GetTextures().pigment = null;
	6024	+
5192	6025	Touch();
5193	6026	}
5194	6027
..	..	@@ -5213,6 +6046,43 @@
5213	6046	}
5214	6047	}
5215	6048
	6049	+ UUID GetUUID()
	6050	+ {
	6051	+ if (uuid == null)
	6052	+ {
	6053	+ // Serial
	6054	+ uuid = UUID.randomUUID();
	6055	+ }
	6056	+
	6057	+ return uuid;
	6058	+ }
	6059	+
	6060	+ Object3D GetObject(UUID uid)
	6061	+ {
	6062	+ if (blockloop)
	6063	+ return null;
	6064	+
	6065	+ if (GetUUID().equals(uid))
	6066	+ return this;
	6067	+
	6068	+ int nb = Size();
	6069	+ for (int i = 0; i < nb; i++)
	6070	+ {
	6071	+ Object3D child = (Object3D) get(i);
	6072	+
	6073	+ if (child == null)
	6074	+ continue;
	6075	+
	6076	+ blockloop = true;
	6077	+ Object3D obj = child.GetObject(uid);
	6078	+ blockloop = false;
	6079	+ if (obj != null)
	6080	+ return obj;
	6081	+ }
	6082	+
	6083	+ return null;
	6084	+ }
	6085	+
5216	6086	void SetBumpTexture(String tex)
5217	6087	{
5218	6088	if (GetTextures() == null)
..	..	@@ -5224,6 +6094,8 @@
5224	6094	texname = "";
5225	6095
5226	6096	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	6097	+
	6098	+ GetTextures().bump = null;
5227	6099
5228	6100	Touch();
5229	6101	}
..	..	@@ -5249,25 +6121,79 @@
5249	6121	}
5250	6122	}
5251	6123
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	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	+
	6156	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	6157	{
5254	6158	Draw(display, root, selected, blocked);
5255	6159	}
5256	6160
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	6161	boolean NeedSupport()
5262	6162	{
5263	6163	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	6164	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5265	6165	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	6166	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	6167	}
5268	6168
	6169	+ static boolean DEBUG_SELECTION = false;
5269	6170
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6171	+ boolean IsLive()
	6172	+ {
	6173	+ if (live)
	6174	+ return true;
	6175	+
	6176	+ if (parent == null)
	6177	+ return false;
	6178	+
	6179	+ return parent.IsLive();
	6180	+ }
	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	+
	6196	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	6197	{
5272	6198	Invariants(); // june 2013
5273	6199
..	..	@@ -5276,8 +6202,31 @@
5276	6202	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	6203	}
5278	6204
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	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	+ }
	6226	+ }
	6227	+
	6228	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	6229	+ (hide \|\| dontselect))
5281	6230	return;
5282	6231
5283	6232	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +6244,7 @@
5295	6244	if (this instanceof Checker)
5296	6245	return;
5297	6246
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	6247	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	6248	return;
5300	6249
5301	6250	if (count <= 0)
..	..	@@ -5303,13 +6252,13 @@
5303	6252	return;
5304	6253	}
5305	6254
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	6255	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	6256	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	6257	{
5309	6258	return;
5310	6259	}
5311	6260
5312		- javax.media.opengl.GL gl = display.GetGL();
	6261	+ //javax.media.opengl.GL gl = display.GetGL();
5313	6262
5314	6263	/*
5315	6264	if (touched)
..	..	@@ -5327,8 +6276,11 @@
5327	6276	if (support != null)
5328	6277	support = support;
5329	6278
5330		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5331		- boolean usecalllists = false; // 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.
5332	6284
5333	6285	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	6286	{
..	..	@@ -5336,32 +6288,36 @@
5336	6288	bRep.displaylist = 0;
5337	6289	}
5338	6290	// usecalllists &= !(parent instanceof RandomNode);
5339		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
5340	6293
5341		- if (GetBRep() != null)
5342		- usecalllists = usecalllists;
	6294	+ if (display.DrawMode() == display.SHADOW)
	6295	+ //GetBRep() != null)
	6296	+ usecalllists = !!usecalllists;
5343	6297	//System.out.println("draw " + this);
5344	6298	//new Exception().printStackTrace();
5345	6299
5346	6300	boolean compiled = false;
5347	6301
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6302	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	6303
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6304	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	6305	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	6307	{
5353		- display.lighttouched = true;
	6308	+ Globals.lighttouched = true;
5354	6309	} // all panes...
5355		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5356		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	6310	+
	6311	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	6312	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	6313	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	6314	{
5359	6315	if (!(this instanceof Composite))
5360	6316	touched = false;
5361	6317	//if (displaylist == -1 && usecalllists)
5362		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6318	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5363	6319	{
5364		- bRep.displaylist = gl.glGenLists(1);
	6320	+ bRep.displaylist = display.GenList();
5365	6321	assert(bRep.displaylist != 0);
5366	6322	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	6323	//System.out.println("\tgen list " + list);
..	..	@@ -5370,25 +6326,27 @@
5370	6326
5371	6327	//System.out.println("\tnew list " + list);
5372	6328	//gl.glDrawBuffer(gl.GL_NONE);
5373		- if (usecalllists)
	6329	+ if (usecalllists && bRep.displaylist > 0)
5374	6330	{
5375	6331	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6332	+ display.NewList(bRep.displaylist);
5377	6333	}
	6334	+
5378	6335	CallList(display, root, selected, blocked);
	6336	+
5379	6337	// compiled = true;
5380		- if (usecalllists)
	6338	+ if (usecalllists && bRep.displaylist > 0)
5381	6339	{
5382	6340	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	6341	+ display.EndList();
5384	6342	}
5385	6343	//gl.glDrawBuffer(gl.GL_BACK);
5386	6344	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	6345	+ Globals.lighttouched = true; // all panes...
5388	6346	}
5389	6347
5390		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5391		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
5392	6350
5393	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
5394	6352	{
..	..	@@ -5423,12 +6381,12 @@
5423	6381
5424	6382	// frustum culling
5425	6383	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	6384	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	6385	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	6386	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	6387	{
5430		- if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
	6389	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6390	{
5433	6391	//System.out.print("CULLED");
5434	6392	culled = true;
..	..	@@ -5436,7 +6394,7 @@
5436	6394	}
5437	6395	else
5438	6396	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6397	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6398	culled = true;
5441	6399
5442	6400	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6430,12 @@
5472	6430
5473	6431
5474	6432	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6433	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6434	{
5477	6435	if (GetBRep() != null)
5478	6436	{
5479		- CameraPane.NextIndex(this, gl);
	6437	+ display.NextIndex();
	6438	+
5480	6439	// vertex color conflict : gl.glCallList(list);
5481	6440	DrawNode(display, root, selected);
5482	6441	if (this instanceof BezierPatch)
..	..	@@ -5488,6 +6447,20 @@
5488	6447	{
5489	6448	drawSelf(display, root, selected, blocked);
5490	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	+// }
5491	6464	} else
5492	6465	{
5493	6466	/*
..	..	@@ -5498,53 +6471,7 @@
5498	6471	color[2] /= 2;
5499	6472	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6473	*/
5501		- if (material != null)
5502		- {
5503		- materialstack[materialdepth] = material;
5504		- selectedstack[materialdepth] = selected;
5505		- cStatic.objectstack[materialdepth++] = this;
5506		- //System.out.println("material " + material);
5507		- //Applet3D.tracein(this, selected);
5508		- display.vector2buffer = projectedVertices;
5509		- if (this instanceof Camera)
5510		- {
5511		- display.options1[0] = material.shift;
5512		- //System.out.println("shift " + material.shift);
5513		- display.options1[1] = material.lightarea;
5514		- display.options1[2] = material.shadowbias;
5515		- display.options1[3] = material.aniso;
5516		- display.options1[4] = material.anisoV;
5517		- display.options2[0] = material.opacity;
5518		- display.options2[1] = material.diffuse;
5519		- display.options2[2] = material.factor;
5520		-
5521		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options3[3] = material.cameralight/0.2f;
5523		-
5524		- // if (display.CURRENTANTIALIAS > 0)
5525		- // display.options3[3] /= 4;
5526		-
5527		- /*
5528		- System.out.println("Focus = " + display.options1[0]);
5529		- System.out.println("Aperture = " + display.options1[1]);
5530		- System.out.println("ShadowBlur = " + display.options1[2]);
5531		- System.out.println("Antialiasing = " + display.options1[3]);
5532		- System.out.println("Fog = " + display.options2[0]);
5533		- System.out.println("Intensity = " + display.options2[1]);
5534		- System.out.println("Elevation = " + display.options2[2]);
5535		- /**/
5536		- } else
5537		- {
5538		- material.Draw(display, selected);
5539		- }
5540		- } else
5541		- {
5542		- if (selected && CameraPane.flash)
5543		- {
5544		- display.modelParams4[1] = 100;
5545		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5546		- }
5547		- }
	6474	+ display.PushMaterial(this, selected);
5548	6475
5549	6476	//System.out.println("call list " + list);
5550	6477	//System.out.println();
..	..	@@ -5563,7 +6490,29 @@
5563	6490	tex = GetTextures();
5564	6491	}
5565	6492
5566		- display.BindTextures(tex, texres);
	6493	+ boolean failedPigment = false;
	6494	+ boolean failedBump = false;
	6495	+
	6496	+ CameraPane.lastObject = this;
	6497	+ try
	6498	+ {
	6499	+ display.BindPigmentTexture(tex, texres);
	6500	+ }
	6501	+ catch (Exception e)
	6502	+ {
	6503	+ // System.err.println("FAILED: " + this);
	6504	+ failedPigment = true;
	6505	+ }
	6506	+
	6507	+ try
	6508	+ {
	6509	+ display.BindBumpTexture(tex, texres);
	6510	+ }
	6511	+ catch (Exception e)
	6512	+ {
	6513	+ //System.err.println("FAILED: " + this);
	6514	+ failedBump = true;
	6515	+ }
5567	6516
5568	6517	if (!compiled)
5569	6518	{
..	..	@@ -5579,30 +6528,33 @@
5579	6528
5580	6529	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	6530	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	6531	+ display.CallList(bRep.displaylist);
5583	6532	// june 2013 drawSelf(display, root, selected);
5584	6533	}
5585	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	+// }
	6548	+ }
5586	6549	}
5587	6550
5588		- display.ReleaseTextures(tex);
5589		-
5590		- //if (parent != null && parent.GetMaterial() != null)
5591		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5592		- if (material != null)
5593		- {
5594		- materialdepth -= 1;
5595		- if (materialdepth > 0)
5596		- {
5597		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5598		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5599		- }
5600		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5601		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5602		- {
5603		- display.modelParams4[1] = GetMaterial().cameralight;
5604		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5605		- }
	6551	+ if (!failedBump)
	6552	+ display.ReleaseBumpTexture(tex);
	6553	+
	6554	+ if (!failedPigment)
	6555	+ display.ReleasePigmentTexture(tex);
	6556	+
	6557	+ display.PopMaterial(this, selected);
5606	6558	}
5607	6559
5608	6560	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,18 +6596,19 @@
5644	6596	// resetMasterNode();
5645	6597	}
5646	6598
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6599	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	6600	{
5649		- if (GetBRep() == null)
5650		- {
5651		- drawSelf(display, root, selected, blocked);
5652		- } else
	6601	+ if (GetBRep() != null)
5653	6602	{
5654	6603	DrawNode(display, root, selected);
5655	6604	if (this instanceof BezierPatch)
5656	6605	{
5657	6606	//drawSelf(display, root, selected);
5658	6607	}
	6608	+ }
	6609	+ else
	6610	+ {
	6611	+ drawSelf(display, root, selected, blocked);
5659	6612	}
5660	6613	}
5661	6614
..	..	@@ -5727,8 +6680,11 @@
5727	6680	boolean flipV = false; // true;
5728	6681	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	6682
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6683	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6684	{
	6685	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6686	+ return;
	6687	+
5732	6688	if (hide)
5733	6689	return;
5734	6690	// shadow optimisation
..	..	@@ -5786,16 +6742,7 @@
5786	6742	// // ??????????????????????????? Touch();
5787	6743	// }
5788	6744
5789		- if (material != null)
5790		- {
5791		- materialstack[materialdepth] = material;
5792		- selectedstack[materialdepth] = selected;
5793		- cStatic.objectstack[materialdepth++] = this;
5794		- //System.out.println("material " + material);
5795		- //Applet3D.tracein("selected ", selected);
5796		- display.vector2buffer = projectedVertices;
5797		- material.Draw(display, selected);
5798		- }
	6745	+display.PushMaterial2(this, selected);
5799	6746
5800	6747	Object3D child;
5801	6748	boolean sel;
..	..	@@ -5847,19 +6794,7 @@
5847	6794	*/
5848	6795	//depth += 1;
5849	6796
5850		- if (material != null)
5851		- {
5852		- materialdepth -= 1;
5853		- if (materialdepth > 0)
5854		- {
5855		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5856		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5857		- }
5858		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5859		- //else
5860		- //material.Draw(display, false);
5861		- }
5862		-
	6797	+display.PopMaterial2(this);
5863	6798	/*
5864	6799	display.ReleaseTextures(tex);
5865	6800	*/
..	..	@@ -5870,10 +6805,13 @@
5870	6805
5871	6806	//static cVector min,max;
5872	6807
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6808	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6809	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6810	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6811	return; // no shadow for transparent objects
	6812	+
	6813	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6814	+ return;
5877	6815
5878	6816	if (hide)
5879	6817	return;
..	..	@@ -5915,11 +6853,13 @@
5915	6853	return;
5916	6854	}
5917	6855
	6856	+ //bRep.GenUV(1/material.diffuseness);
5918	6857	// bRep.lock = true;
5919	6858
5920		- javax.media.opengl.GL gl = display.GetGL();
	6859	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6860
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
5923	6863	{
5924	6864	int fc = bRep.FaceCount();
5925	6865	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6874,7 @@
5934	6874
5935	6875	bRep.getMinMax(min, max, 100);
5936	6876
5937		- gl.glBegin(gl.GL_LINES);
5938		-
5939		- gl.glVertex3d(min.x, min.y, min.z);
5940		- gl.glVertex3d(min.x, min.y, max.z);
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, max.y, min.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(max.x, min.y, min.z);
5945		-
5946		- gl.glVertex3d(max.x, max.y, max.z);
5947		- gl.glVertex3d(min.x, max.y, max.z);
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(max.x, min.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, max.y, min.z);
5952		-
5953		- gl.glEnd();
	6877	+ display.DrawBox(min, max);
5954	6878
5955	6879	return;
5956	6880	}
..	..	@@ -5994,7 +6918,7 @@
5994	6918	{
5995	6919	//throw new Error();
5996	6920
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6921	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6922
5999	6923	int[] strips = bRep.getRawIndices();
6000	6924
..	..	@@ -6004,178 +6928,19 @@
6004	6928	new Exception().printStackTrace();
6005	6929	return;
6006	6930	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
	6931	+
	6932	+ if (dontselect)
6010	6933	{
6011		- float[] v = bRep.getRawVertices();
6012		- float[] n = bRep.getRawNormals();
6013		- float[] c = bRep.getRawColors();
6014		- float[] uv = bRep.getRawUVMap();
6015		-
6016		- int count2 = 0;
6017		- int count3 = 0;
6018		-
6019		- if (n.length > 0)
6020		- {
6021		- for (int i = 0; i < strips.length; i++)
6022		- {
6023		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6024		-
6025		- /*
6026		- boolean locked = false;
6027		- float eps = 0.1f;
6028		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6029		-
6030		- int dot = 0;
6031		-
6032		- if ((dot&1) == 0)
6033		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6034		-
6035		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6036		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6037		- else
6038		- {
6039		- locked = true;
6040		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6041		- }
6042		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6043		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6044		- if (hasnorm)
6045		- {
6046		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6047		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6048		- }
6049		-
6050		- if ((dot&4) == 0)
6051		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6052		-
6053		- if (wrap \|\| !locked && (dot&8) != 0)
6054		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6055		- else
6056		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6057		-
6058		- f.dot = dot;
6059		- */
6060		-
6061		- if (!selectmode)
6062		- {
6063		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6064		- {
6065		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6066		- } else
6067		- {
6068		- gl.glNormal3f(0, 0, 1);
6069		- }
6070		-
6071		- if (c != null)
6072		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6073		- {
6074		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6075		- }
6076		- }
6077		- if (flipV)
6078		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6079		- else
6080		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6081		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6082		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6083		-
6084		- count2 += 2;
6085		- count3 += 3;
6086		- if (!selectmode)
6087		- {
6088		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6089		- {
6090		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6091		- } else
6092		- {
6093		- gl.glNormal3f(0, 0, 1);
6094		- }
6095		- if (c != null)
6096		- {
6097		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6098		- }
6099		- }
6100		- if (flipV)
6101		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6102		- else
6103		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6104		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6105		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6106		-
6107		- count2 += 2;
6108		- count3 += 3;
6109		- for (int j = 0; j < strips[i] - 2; j++)
6110		- {
6111		- //gl.glTexCoord2d(...);
6112		- if (!selectmode)
6113		- {
6114		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6115		- {
6116		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6117		- } else
6118		- {
6119		- gl.glNormal3f(0, 0, 1);
6120		- }
6121		- if (c != null)
6122		- {
6123		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6124		- }
6125		- }
6126		-
6127		- if (flipV)
6128		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6129		- else
6130		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6131		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6132		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6133		- count2 += 2;
6134		- count3 += 3;
6135		- }
6136		-
6137		- gl.glEnd();
6138		- }
6139		- }
6140		-
6141		- assert count3 == v.length;
	6934	+ //bRep.GenerateNormalsMINE();
6142	6935	}
6143		- else // !trimmed
6144		- {
6145		- int count = 0;
6146		- for (int i = 0; i < strips.length; i++)
6147		- {
6148		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6149		-
6150		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6151		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6152		-
6153		- drawVertex(gl, p, selectmode);
6154		- drawVertex(gl, q, selectmode);
6155		-
6156		- for (int j = 0; j < strips[i] - 2; j++)
6157		- {
6158		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6159		-
6160		-// if (j%2 == 0)
6161		-// drawFace(p, q, r, display, null);
6162		-// else
6163		-// drawFace(p, r, q, display, null);
6164		-
6165		-// p = q;
6166		-// q = r;
6167		- drawVertex(gl, r, selectmode);
6168		- }
6169		-
6170		- gl.glEnd();
6171		- }
6172		- }
	6936	+
	6937	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6938	} else // catch (Error e)
6174	6939	{
6175	6940	// TRIANGLE ARRAY
6176	6941	if (IsOpaque()) // Static())
6177	6942	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6943	+ display.StartTriangles();
6179	6944	int facecount = bRep.FaceCount();
6180	6945	for (int i = 0; i < facecount; i++)
6181	6946	{
..	..	@@ -6238,9 +7003,9 @@
6238	7003	// // r.norm.dot(v3) > -0.5)
6239	7004	// // continue;
6240	7005
6241		- drawFace(p, q, r, display, face);
	7006	+ display.DrawFace(this, p, q, r, face);
6242	7007	}
6243		- gl.glEnd();
	7008	+ display.EndTriangles();
6244	7009	}
6245	7010	else
6246	7011	{
..	..	@@ -6256,7 +7021,7 @@
6256	7021	facescompare[k] = new FaceCompare(k);
6257	7022	}
6258	7023
6259		- center = new cVector();
	7024	+ centertriangle = new cVector();
6260	7025	}
6261	7026	else
6262	7027	{
..	..	@@ -6269,8 +7034,8 @@
6269	7034	//System.out.println("SORT");
6270	7035
6271	7036	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	7037	+
	7038	+ display.StartTriangles();
6274	7039	for (int i = 0; i < facecount; i++)
6275	7040	{
6276	7041	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +7047,14 @@
6282	7047	Vertex q = bRep.GetVertex(face.q);
6283	7048	Vertex r = bRep.GetVertex(face.r);
6284	7049
6285		- drawFace(p, q, r, display, face);
	7050	+ display.DrawFace(this, p, q, r, face);
6286	7051	}
6287		- gl.glEnd();
	7052	+ display.EndTriangles();
6288	7053	}
6289	7054
6290	7055	if (false) // live && support != null && support.bRep != null) // debug weights
6291	7056	{
	7057	+ /*
6292	7058	gl.glDisable(gl.GL_LIGHTING);
6293	7059	float[] colorV = new float[3];
6294	7060
..	..	@@ -6367,6 +7133,7 @@
6367	7133	// gl.glEnd();
6368	7134	}
6369	7135	}
	7136	+ */
6370	7137	}
6371	7138	}
6372	7139
..	..	@@ -6377,7 +7144,7 @@
6377	7144	*/
6378	7145	}
6379	7146
6380		- transient cVector center;
	7147	+ transient cVector centertriangle;
6381	7148
6382	7149	class FaceCompare implements Comparable
6383	7150	{
..	..	@@ -6406,14 +7173,14 @@
6406	7173	Vertex q = bRep.GetVertex(face.q);
6407	7174	Vertex r = bRep.GetVertex(face.r);
6408	7175
6409		- center.set(p);
6410		- center.add(q);
6411		- center.add(r);
6412		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
6413	7180
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6415	7182
6416		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
6417	7184	}
6418	7185
6419	7186	return distance;
..	..	@@ -6422,347 +7189,11 @@
6422	7189
6423	7190	transient FaceCompare[] facescompare = null;
6424	7191
6425		- void SetColor(CameraPane display, Vertex p0)
6426		- {
6427		- if (display.RENDERPROGRAM == 0)
6428		- {
6429		- float r = 0;
6430		- if (bRep != null)
6431		- {
6432		- if (bRep.stripified)
6433		- {
6434		- r = 1;
6435		- }
6436		- }
6437		- float g = 0;
6438		- if (bRep != null)
6439		- {
6440		- if (bRep.trimmed)
6441		- {
6442		- g = 1;
6443		- }
6444		- }
6445		- float b = 0;
6446		- if (support != null && link2master)
6447		- {
6448		- b = 1;
6449		- }
6450		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6451		- return;
6452		- }
6453		-
6454		- if (display.drawMode != CameraPane.SHADOW)
6455		- return;
6456		-
6457		- javax.media.opengl.GL gl = display.GetGL();
6458		-// if (true) return;
6459		-// float ao = p.AO;
6460		-//
6461		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6462		-// // ao = 1;
6463		-//
6464		-// gl.glColor4f(ao, ao, ao, 1);
6465		-
6466		-// CameraPane.selectedpoint.
6467		-// getAverage(cStatic.point1, true);
6468		- if (CameraPane.pointflow == null) // !random) // live)
6469		- {
6470		- return;
6471		- }
6472		-
6473		- cStatic.point1.set(0,0,0);
6474		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6475		-
6476		- cStatic.point1.sub(p0);
6477		-
6478		-
6479		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6480		-// {
6481		-// return;
6482		-// }
6483		-
6484		- //if (true)
6485		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6486		- {
6487		- return;
6488		- }
6489		-
6490		- float[] colorV = new float[3];
6491		-
6492		- if (false) // marked)
6493		- {
6494		- // debug rigging weights
6495		- for (int object = 0; object < p0.vertexlinks.length; object++)
6496		- {
6497		- float weight = p0.weights[object] / p0.totalweight;
6498		-
6499		- // if (weight < 0.1)
6500		- // {
6501		- // assert(weight == 0);
6502		- // continue;
6503		- // }
6504		-
6505		- if (p0.vertexlinks[object] == -1)
6506		- continue;
6507		-
6508		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6509		-
6510		- int color = //1 << object; //
6511		- //p.vertexlinks.length;
6512		- support.bRep.supports[p0.closestsupport].links[object];
6513		- colorV[2] += (color & 1) * weight;
6514		- colorV[1] += ((color & 2) >> 1) * weight;
6515		- colorV[0] += ((color & 4) >> 2) * weight;
6516		- }
6517		- }
6518		- else
6519		- {
6520		- if (drawingstarted)
6521		- {
6522		- // find next point
6523		- if (bRep.GetVertex(0).faceindices == null)
6524		- {
6525		- bRep.InitFaceIndices();
6526		- }
6527		-
6528		- double ymin = p0.y;
6529		-
6530		- Vertex newp = p0;
6531		-
6532		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6533		- {
6534		- int fi = p0.faceindices[fii];
6535		-
6536		- if (fi == -1)
6537		- break;
6538		-
6539		- Face f = bRep.GetFace(fi);
6540		-
6541		- Vertex p = bRep.GetVertex(f.p);
6542		- Vertex q = bRep.GetVertex(f.q);
6543		- Vertex r = bRep.GetVertex(f.r);
6544		-
6545		- int swap = (int)(Math.random()*3);
6546		-
6547		-// for (int s=swap; --s>=0;)
6548		-// {
6549		-// Vertex t = p;
6550		-// p = q;
6551		-// q = r;
6552		-// r = t;
6553		-// }
6554		- if (ymin > p.y)
6555		- {
6556		- ymin = p.y;
6557		- newp = p;
6558		-// break;
6559		- }
6560		- if (ymin > q.y)
6561		- {
6562		- ymin = q.y;
6563		- newp = q;
6564		-// break;
6565		- }
6566		- if (ymin > r.y)
6567		- {
6568		- ymin = r.y;
6569		- newp = r;
6570		-// break;
6571		- }
6572		- }
6573		-
6574		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6575		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6576		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6577		-
6578		- drawingstarted = false;
6579		-
6580		- // return;
6581		- }
6582		-
6583		- if (false) // CameraPane.DRAW
6584		- {
6585		- p0.AO = colorV[0] = 2;
6586		- colorV[1] = 2;
6587		- colorV[2] = 2;
6588		- }
6589		-
6590		- CameraPane.pointflow.add(p0);
6591		- CameraPane.pointflow.Touch();
6592		- }
6593		-
6594		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6595		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6596		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6597		- }
6598		-
6599	7192	void Print(Vertex v)
6600	7193	{
6601	7194	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	7195	}
6603	7196
6604		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6605		- {
6606		- if (!selectmode)
6607		- {
6608		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6609		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6610		-
6611		- if (flipV)
6612		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6613		- else
6614		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6615		- }
6616		-
6617		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6618		- }
6619		-
6620		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6621		- CameraPane display, Face face)
6622		- {
6623		- if (pv.y == -10000 \|\|
6624		- qv.y == -10000 \|\|
6625		- rv.y == -10000)
6626		- return;
6627		-
6628		-// float b = f.nbiterations & 1;
6629		-// float g = (f.nbiterations>>1) & 1;
6630		-// float r = (f.nbiterations>>2) & 1;
6631		-//
6632		-// //if (f.weight == 10000)
6633		-// //{
6634		-// // r = 1; g = b = 0;
6635		-// //}
6636		-// //else
6637		-// //{
6638		-// // assert(f.weight < 10000);
6639		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6640		-// if (r<0)
6641		-// assert(r>=0);
6642		-// //}
6643		-
6644		- javax.media.opengl.GL gl = display.GetGL();
6645		-
6646		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6647		-
6648		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6649		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6650		- {
6651		- //gl.glBegin(gl.GL_TRIANGLES);
6652		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6653		- if (!hasnorm)
6654		- {
6655		- // System.out.println("FUCK!!");
6656		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6657		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6658		- LA.vecCross(v0, v1, v2);
6659		- LA.vecNormalize(v2);
6660		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661		- }
6662		-
6663		- if (hasnorm)
6664		- {
6665		-// if (!pv.norm.normalized())
6666		-// assert(pv.norm.normalized());
6667		-
6668		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6670		- }
6671		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672		- SetColor(display, pv);
6673		- //gl.glColor4f(r, g, b, 1);
6674		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6675		- if (flipV)
6676		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6677		- else
6678		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6681		-// Print(pv);
6682		- if (hasnorm)
6683		- {
6684		-// assert(qv.norm.normalized());
6685		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6687		- }
6688		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689		- // boolean locked = false;
6690		- // float eps = 0.1f;
6691		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6692		-
6693		- // int dot = 0; //*/ (int)f.dot;
6694		-
6695		- // if ((dot&1) == 0)
6696		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6697		-
6698		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6699		- if (flipV)
6700		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6701		- else
6702		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6703		- // else
6704		- // {
6705		- // locked = true;
6706		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6707		- // }
6708		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709		- SetColor(display, qv);
6710		- //gl.glColor4f(r, g, b, 1);
6711		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6714		-// Print(qv);
6715		- if (hasnorm)
6716		- {
6717		-// assert(rv.norm.normalized());
6718		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6720		- }
6721		-
6722		- // if ((dot&4) == 0)
6723		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6724		-
6725		- // if (wrap \|\| !locked && (dot&8) != 0)
6726		- if (flipV)
6727		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6728		- else
6729		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6730		- // else
6731		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6732		-
6733		- // f.dot = dot;
6734		-
6735		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6736		- SetColor(display, rv);
6737		- //gl.glColor4f(r, g, b, 1);
6738		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6741		-// Print(rv);
6742		- //gl.glEnd();
6743		- }
6744		- else
6745		- {
6746		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6747		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6748		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6749		-
6750		- }
6751		-
6752		- if (false) // (attributes & WIREFRAME) != 0)
6753		- {
6754		- gl.glDisable(gl.GL_LIGHTING);
6755		-
6756		- gl.glBegin(gl.GL_LINE_LOOP);
6757		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6758		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6759		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6760		- gl.glEnd();
6761		-
6762		- gl.glEnable(gl.GL_LIGHTING);
6763		- }
6764		- }
6765		-
6766	7197	void drawSelf(ClickInfo info, int level, boolean select)
6767	7198	{
6768	7199	if (bRep == null)
..	..	@@ -7286,20 +7717,23 @@
7286	7717	}
7287	7718	}
7288	7719
7289		- 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)
7290	7724	{
7291		- int hc = info.bounds.x + info.bounds.width / 2;
7292		- int vc = info.bounds.y + info.bounds.height / 2;
7293		- 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;
7294	7728	if (toscreen == null)
7295	7729	{
7296		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7730	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7297	7731	}
7298	7732	cVector vec = in;
7299	7733	LA.xformPos(in, toscreen, in);
7300	7734	//System.out.println("Distance = " + info.camera.Distance());
7301		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7302		- 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();
7303	7737	outPt.x = hc + (int) vec.x;
7304	7738	outPt.y = vc - (int) vec.y;
7305	7739	outRec.x = outPt.x - 3;
..	..	@@ -7307,15 +7741,18 @@
7307	7741	outRec.width = outRec.height = 6;
7308	7742	}
7309	7743
7310		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7744	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7745	+ )
7311	7746	{
7312	7747	Point pt = new Point(0, 0);
7313	7748	Rectangle rec = new Rectangle();
7314		- calcHotSpot(in, info, pt, rec);
	7749	+ calcHotSpot(in, //clickInfo,
	7750	+ pt, rec);
7315	7751	return rec;
7316	7752	}
7317	7753
7318		- void drawEditHandles0(ClickInfo info, int level)
	7754	+ void drawEditHandles0(//ClickInfo clickInfo,
	7755	+ int level)
7319	7756	{
7320	7757	if (level == 0)
7321	7758	{
..	..	@@ -7324,98 +7761,104 @@
7324	7761	{
7325	7762	cVector origin = new cVector();
7326	7763	//LA.xformPos(origin, toParent, origin);
7327		- Rectangle spot = calcHotSpot(origin, info);
	7764	+ if (this.clickInfo == null)
	7765	+ this.clickInfo = new ClickInfo();
	7766	+
	7767	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7328	7768	Rectangle boundary = new Rectangle();
7329	7769	boundary.x = spot.x - 30;
7330	7770	boundary.y = spot.y - 30;
7331	7771	boundary.width = spot.width + 60;
7332	7772	boundary.height = spot.height + 60;
7333		- info.g.setColor(Color.red);
	7773	+ clickInfo.g.setColor(Color.white);
7334	7774	int spotw = spot.x + spot.width;
7335	7775	int spoth = spot.y + spot.height;
7336		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7337		- if (CameraPane.Xmin > spot.x)
7338		- {
7339		- CameraPane.Xmin = spot.x;
7340		- }
7341		- if (CameraPane.Xmax < spotw)
7342		- {
7343		- CameraPane.Xmax = spotw;
7344		- }
7345		- if (CameraPane.Ymin > spot.y)
7346		- {
7347		- CameraPane.Ymin = spot.y;
7348		- }
7349		- if (CameraPane.Ymax < spoth)
7350		- {
7351		- CameraPane.Ymax = spoth;
7352		- }
7353		- spot.translate(32, 32);
	7776	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7777	+// if (CameraPane.Xmin > spot.x)
	7778	+// {
	7779	+// CameraPane.Xmin = spot.x;
	7780	+// }
	7781	+// if (CameraPane.Xmax < spotw)
	7782	+// {
	7783	+// CameraPane.Xmax = spotw;
	7784	+// }
	7785	+// if (CameraPane.Ymin > spot.y)
	7786	+// {
	7787	+// CameraPane.Ymin = spot.y;
	7788	+// }
	7789	+// if (CameraPane.Ymax < spoth)
	7790	+// {
	7791	+// CameraPane.Ymax = spoth;
	7792	+// }
	7793	+// if (CameraPane.Xmin > spot.x)
	7794	+// {
	7795	+// CameraPane.Xmin = spot.x;
	7796	+// }
	7797	+// if (CameraPane.Xmax < spotw)
	7798	+// {
	7799	+// CameraPane.Xmax = spotw;
	7800	+// }
	7801	+// if (CameraPane.Ymin > spot.y)
	7802	+// {
	7803	+// CameraPane.Ymin = spot.y;
	7804	+// }
	7805	+// if (CameraPane.Ymax < spoth)
	7806	+// {
	7807	+// CameraPane.Ymax = spoth;
	7808	+// }
	7809	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7810	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7811	+ spot.translate(32, 0);
	7812	+ clickInfo.g.setColor(Color.yellow);
	7813	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7814	+
	7815	+ spot.translate(32, 64);
7354	7816	spotw = spot.x + spot.width;
7355	7817	spoth = spot.y + spot.height;
7356		- info.g.setColor(Color.blue);
7357		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7358		- if (CameraPane.Xmin > spot.x)
7359		- {
7360		- CameraPane.Xmin = spot.x;
7361		- }
7362		- if (CameraPane.Xmax < spotw)
7363		- {
7364		- CameraPane.Xmax = spotw;
7365		- }
7366		- if (CameraPane.Ymin > spot.y)
7367		- {
7368		- CameraPane.Ymin = spot.y;
7369		- }
7370		- if (CameraPane.Ymax < spoth)
7371		- {
7372		- CameraPane.Ymax = spoth;
7373		- }
7374		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7375		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7376		- spot.translate(0, -32);
7377		- info.g.setColor(Color.green);
7378		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7379		- if (CameraPane.Xmin > spot.x)
7380		- {
7381		- CameraPane.Xmin = spot.x;
7382		- }
7383		- if (CameraPane.Xmax < spotw)
7384		- {
7385		- CameraPane.Xmax = spotw;
7386		- }
7387		- if (CameraPane.Ymin > spot.y)
7388		- {
7389		- CameraPane.Ymin = spot.y;
7390		- }
7391		- if (CameraPane.Ymax < spoth)
7392		- {
7393		- CameraPane.Ymax = spoth;
7394		- }
7395		- info.g.drawArc(boundary.x, boundary.y,
7396		- boundary.width, boundary.height, 0, 360);
	7818	+ clickInfo.g.setColor(Color.cyan);
	7819	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7820	+// if (CameraPane.Xmin > spot.x)
	7821	+// {
	7822	+// CameraPane.Xmin = spot.x;
	7823	+// }
	7824	+// if (CameraPane.Xmax < spotw)
	7825	+// {
	7826	+// CameraPane.Xmax = spotw;
	7827	+// }
	7828	+// if (CameraPane.Ymin > spot.y)
	7829	+// {
	7830	+// CameraPane.Ymin = spot.y;
	7831	+// }
	7832	+// if (CameraPane.Ymax < spoth)
	7833	+// {
	7834	+// CameraPane.Ymax = spoth;
	7835	+// }
	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);
7397	7839	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7398		- if (CameraPane.Xmin > boundary.x)
7399		- {
7400		- CameraPane.Xmin = boundary.x;
7401		- }
7402		- if (CameraPane.Xmax < boundary.x + boundary.width)
7403		- {
7404		- CameraPane.Xmax = boundary.x + boundary.width;
7405		- }
7406		- if (CameraPane.Ymin > boundary.y)
7407		- {
7408		- CameraPane.Ymin = boundary.y;
7409		- }
7410		- if (CameraPane.Ymax < boundary.y + boundary.height)
7411		- {
7412		- CameraPane.Ymax = boundary.y + boundary.height;
7413		- }
	7840	+// if (CameraPane.Xmin > boundary.x)
	7841	+// {
	7842	+// CameraPane.Xmin = boundary.x;
	7843	+// }
	7844	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7845	+// {
	7846	+// CameraPane.Xmax = boundary.x + boundary.width;
	7847	+// }
	7848	+// if (CameraPane.Ymin > boundary.y)
	7849	+// {
	7850	+// CameraPane.Ymin = boundary.y;
	7851	+// }
	7852	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7853	+// {
	7854	+// CameraPane.Ymax = boundary.y + boundary.height;
	7855	+// }
7414	7856	return;
7415	7857	}
7416	7858	}
7417	7859
7418		- boolean doEditClick0(ClickInfo info, int level)
	7860	+ boolean doEditClick0(//ClickInfo clickInfo,
	7861	+ int level)
7419	7862	{
7420	7863	if (level == 0)
7421	7864	{
..	..	@@ -7424,10 +7867,10 @@
7424	7867
7425	7868	boolean retval = false;
7426	7869
7427		- startX = info.x;
7428		- startY = info.y;
	7870	+ startX = clickInfo.x;
	7871	+ startY = clickInfo.y;
7429	7872
7430		- hitSomething = 0;
	7873	+ hitSomething = -1;
7431	7874	cVector origin = new cVector();
7432	7875	//LA.xformPos(origin, toParent, origin);
7433	7876	Rectangle spot = new Rectangle();
..	..	@@ -7435,22 +7878,53 @@
7435	7878	{
7436	7879	centerPt = new Point(0, 0);
7437	7880	}
7438		- calcHotSpot(origin, info, centerPt, spot);
7439		- if (spot.contains(info.x, info.y))
	7881	+ calcHotSpot(origin, //info,
	7882	+ centerPt, spot);
	7883	+ if (spot.contains(clickInfo.x, clickInfo.y))
7440	7884	{
7441	7885	hitSomething = hitCenter;
7442	7886	retval = true;
7443	7887	}
7444	7888	spot.translate(32, 0);
7445		- if (spot.contains(info.x, info.y))
	7889	+ if (spot.contains(clickInfo.x, clickInfo.y))
7446	7890	{
7447	7891	hitSomething = hitRotate;
7448	7892	retval = true;
7449	7893	}
7450	7894	spot.translate(0, 32);
7451		- 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))
7452	7898	{
7453	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	+
7454	7928	retval = true;
7455	7929	}
7456	7930
..	..	@@ -7460,7 +7934,7 @@
7460	7934	}
7461	7935
7462	7936	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7937	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7938	//System.out.println("modified = " + modified);
7465	7939	//new Exception().printStackTrace();
7466	7940	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7962,8 @@
7488	7962	return true;
7489	7963	}
7490	7964
7491		- void doEditDrag0(ClickInfo info)
	7965	+ void doEditDrag0(//ClickInfo info,
	7966	+ boolean opposite)
7492	7967	{
7493	7968	if (hitSomething == 0)
7494	7969	{
..	..	@@ -7502,7 +7977,8 @@
7502	7977
7503	7978	//System.out.println("hitSomething = " + hitSomething);
7504	7979
7505		- double scale = 0.005f * info.camera.Distance();
	7980	+ double scale = 0.005f * clickInfo.camera.Distance();
	7981	+
7506	7982	cVector xlate = new cVector();
7507	7983	//cVector xlate2 = new cVector();
7508	7984	switch (hitSomething)
..	..	@@ -7513,9 +7989,11 @@
7513	7989
7514	7990	case hitCenter: // Translate
7515	7991
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7992	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7993
7518		- if (modified)
	7994	+ // Modified could snap
	7995	+ if (//modified \|\|
	7996	+ opposite)
7519	7997	{
7520	7998	//assert(false);
7521	7999	/*
..	..	@@ -7535,8 +8013,8 @@
7535	8013	toParent[3][i] = xlate.get(i);
7536	8014	LA.matInvert(toParent, fromParent);
7537	8015	*/
7538		- cVector delta = LA.newVector(0, 0, startY - info.y);
7539		- 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);
7540	8018
7541	8019	LA.matCopy(startMat, toParent);
7542	8020	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7545,7 +8023,7 @@
7545	8023	} else
7546	8024	{
7547	8025	//LA.xformDir(delta, info.camera.fromScreen, delta);
7548		- cVector up = new cVector(info.camera.up);
	8026	+ cVector up = new cVector(clickInfo.camera.up);
7549	8027	cVector away = new cVector();
7550	8028	//cVector right2 = new cVector();
7551	8029	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7561,20 +8039,20 @@
7561	8039	}
7562	8040	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	8041	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7565		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8042	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	8043	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7566	8044	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	8045	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	8046	//LA.vecCross(up, cVector.Z, right2);
7569	8047
7570		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8048	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7571	8049
7572	8050	//System.out.println("DELTA0 = " + delta);
7573	8051	//System.out.println("AWAY = " + info.camera.away);
7574	8052	//System.out.println("UP = " + info.camera.up);
7575	8053	if (away.z > 0)
7576	8054	{
7577		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8055	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7578	8056	{
7579	8057	delta.x = -delta.x;
7580	8058	} else
..	..	@@ -7589,7 +8067,7 @@
7589	8067	//System.out.println("DELTA1 = " + delta);
7590	8068	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7591	8069	//System.out.println("DELTA2 = " + delta);
7592		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8070	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7593	8071	LA.matCopy(startMat, toParent);
7594	8072	//System.out.println("DELTA3 = " + delta);
7595	8073	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7599,8 +8077,8 @@
7599	8077	break;
7600	8078
7601	8079	case hitRotate: // rotate
7602		- int dx = info.x - centerPt.x;
7603		- int dy = -(info.y - centerPt.y);
	8080	+ int dx = clickInfo.x - centerPt.x;
	8081	+ int dy = -(clickInfo.y - centerPt.y);
7604	8082	double angle = (double) Math.atan2(dx, dy);
7605	8083	angle = -(1.570796 - angle);
7606	8084
..	..	@@ -7609,6 +8087,7 @@
7609	8087
7610	8088	if (modified)
7611	8089	{
	8090	+ // Rotate 45 degrees
7612	8091	angle /= (Math.PI / 4);
7613	8092	angle = Math.floor(angle + 0.5);
7614	8093	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +8101,7 @@
7622	8101	}
7623	8102	/**/
7624	8103
7625		- switch (info.pane.renderCamera.viewCode)
	8104	+ switch (clickInfo.pane.RenderCamera().viewCode)
7626	8105	{
7627	8106	case 1: // '\001'
7628	8107	LA.matZRotate(toParent, angle);
..	..	@@ -7649,26 +8128,30 @@
7649	8128	break;
7650	8129
7651	8130	case hitScale: // scale
7652		- double hScale = (double) (info.x - centerPt.x) / 32;
	8131	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	8132	+ double sign = 1;
	8133	+ if (hScale < 0)
	8134	+ {
	8135	+ sign = -1;
	8136	+ }
	8137	+ hScale = signMath.pow(signhScale, scale * 50);
7653	8138	if (hScale < 0.01)
7654	8139	{
7655		- hScale = 0.01;
	8140	+ //hScale = 0.01;
7656	8141	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
	8142	+
	8143	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	8144	+ sign = 1;
	8145	+ if (vScale < 0)
7659	8146	{
7660		- hScale = 0.01;
	8147	+ sign = -1;
7661	8148	}
7662		- double vScale = (double) (info.y - centerPt.y) / 32;
	8149	+ vScale = signMath.pow(signvScale, scale * 50);
7663	8150	if (vScale < 0.01)
7664	8151	{
7665		- vScale = 0.01;
	8152	+ //vScale = 0.01;
7666	8153	}
7667		- vScale = Math.pow(vScale, scale * 50);
7668		- if (vScale < 0.01)
7669		- {
7670		- vScale = 0.01;
7671		- }
	8154	+
7672	8155	LA.matCopy(startMat, toParent);
7673	8156	/**/
7674	8157	for (int i = 0; i < 3; i++)
..	..	@@ -7678,39 +8161,56 @@
7678	8161	}
7679	8162	/**/
7680	8163
7681		- switch (info.pane.renderCamera.viewCode)
	8164	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	8165	+
	8166	+ if (totalScale < 0.01)
	8167	+ {
	8168	+ totalScale = 0.01;
	8169	+ }
	8170	+
	8171	+ switch (clickInfo.pane.RenderCamera().viewCode)
7682	8172	{
7683	8173	case 3: // '\001'
7684		- if (modified)
	8174	+ if (modified \|\| opposite)
7685	8175	{
	8176	+ if (modified) // && opposite)
	8177	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8178	+ else
7686	8179	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	8180	+ LA.matScale(toParent, totalScale, 1, 1);
7688	8181	} // vScale, 1);
7689	8182	else
7690	8183	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	8184	+ // EXCEPTION!
	8185	+ LA.matScale(toParent, 1, totalScale, totalScale);
7692	8186	} // vScale, 1);
7693	8187	break;
7694	8188
7695	8189	case 2: // '\002'
7696		- if (modified)
	8190	+ if (modified \|\| opposite)
7697	8191	{
7698		- //LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 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);
7700	8197	} else
7701	8198	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	8199	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	8200	}
7704	8201	break;
7705	8202
7706	8203	case 1: // '\003'
7707		- if (modified)
	8204	+ if (modified \|\| opposite)
7708	8205	{
7709		- //LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	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);
7711	8211	} else
7712	8212	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	8213	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	8214	}
7715	8215	break;
7716	8216	}
..	..	@@ -7731,7 +8231,7 @@
7731	8231	if (parent == null)
7732	8232	{
7733	8233	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	8234	+ //new Exception().printStackTrace();
7735	8235	} else
7736	8236	{
7737	8237	if (parent instanceof BezierPatch)
..	..	@@ -7744,7 +8244,7 @@
7744	8244	} // NEW ...
7745	8245
7746	8246
7747		- info.pane.repaint();
	8247	+ clickInfo.pane.repaint();
7748	8248	}
7749	8249
7750	8250	boolean overflow = false;
..	..	@@ -7843,19 +8343,27 @@
7843	8343	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	8344	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	8345	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8346	+
	8347	+ String objname;
	8348	+
7846	8349	if (false) //parent != null)
7847	8350	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8351	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	8352	} else
7850	8353	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8354	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	8355	} // + super.toString();
7853	8356	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8357	+
	8358	+ if (!Globals.ADVANCED)
	8359	+ return objname;
	8360	+
	8361	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7854	8362	}
7855	8363
7856	8364	public int hashCode()
7857	8365	{
7858		- // Fuck Vector...
	8366	+ // Do not use Vector...
7859	8367	return System.identityHashCode(this);
7860	8368	}
7861	8369
..	..	@@ -7906,6 +8414,7 @@
7906	8414	objectUI.closeUI();
7907	8415	if (editWindow != null)
7908	8416	{
	8417	+ editWindow.ctrlPanel.FlushUI();
7909	8418	editWindow.refreshContents();
7910	8419	} // ? new
7911	8420	objectUI = null;
..	..	@@ -7914,6 +8423,10 @@
7914	8423	{
7915	8424	editWindow = null;
7916	8425	} // ?
	8426	+ }
	8427	+ else
	8428	+ {
	8429	+ //editWindow.closeUI();
7917	8430	}
7918	8431	}
7919	8432
..	..	@@ -7926,7 +8439,7 @@
7926	8439	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	8440
7928	8441	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	8442	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	8443
7931	8444	double[][] toParent; // dynamic matrix
7932	8445	double[][] fromParent;
..	..	@@ -8041,7 +8554,7 @@
8041	8554	{
8042	8555	assert(bRep != null);
8043	8556	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GrafreeD.Assert(support.bRep == bRep.support);
	8557	+ Grafreed.Assert(support.bRep == bRep.support);
8045	8558	}
8046	8559	else
8047	8560	{
..	..	@@ -8072,6 +8585,10 @@
8072	8585	}
8073	8586
8074	8587	transient ObjEditor editWindow;
	8588	+ transient ObjEditor manipWindow;
	8589	+
	8590	+ transient boolean pinned;
	8591	+
8075	8592	transient ObjectUI objectUI;
8076	8593	public static int povDepth = 0;
8077	8594	private static cVector tbMin = new cVector();
..	..	@@ -8086,13 +8603,13 @@
8086	8603	private static cVector2 qq2 = new cVector2();
8087	8604	private static cVector2 rr2 = new cVector2();
8088	8605	private static cVector2 ss2 = new cVector2();
8089		- private static cVector edge1 = new cVector();
8090		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
8091	8608	//private static cVector norm = new cVector();
8092	8609	/transient private/ int hitSomething;
8093		- private static final int hitCenter = 1;
8094		- private static final int hitScale = 2;
8095		- private static final int hitRotate = 3;
	8610	+ static final int hitCenter = 1;
	8611	+ static final int hitScale = 2;
	8612	+ static final int hitRotate = 3;
8096	8613	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	8614	/transient/ private Point centerPt;
8098	8615	/transient/ private int startX;
..	..	@@ -8123,6 +8640,8 @@
8123	8640	void SetAttributes(Object3D obj, int mask)
8124	8641	{
8125	8642	Object3D targ = this;
	8643	+
	8644	+ targ.NORMALPUSH = obj.NORMALPUSH;
8126	8645
8127	8646	if (obj.material != null)
8128	8647	{
..	..	@@ -8283,7 +8802,275 @@
8283	8802
8284	8803	Touch();
8285	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
8286	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	+ }
8287	9074
8288	9075	public int Size()
8289	9076	{