~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	+ int tabIndex;
	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,12 @@
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	+ currentframe = Globals.framecount;
785	1146
786	1147	// System.err.println("transformcount = " + transformcount);
787	1148	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +1151,8 @@
790	1151
791	1152	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	1153
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1154	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1155	+ (step == 1 && changedir))
794	1156	{
795	1157	countdown = 1;
796	1158	delay = speedup?8:1;
..	..	@@ -859,20 +1221,28 @@
859	1221	{
860	1222	// return true;
861	1223
862		- if (material == null \|\| material.multiply)
863		- return true;
	1224	+// if (material == null \|\| material.multiply)
	1225	+// return true;
	1226	+//
	1227	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1228	+// return false;
	1229	+//
	1230	+// // Transparent objects are dynamic because we have to sort the triangles.
	1231	+// return material.opacity > 0.99;
864	1232
865		- return material.opacity > 0.99;
	1233	+ return !sort;
866	1234	}
867	1235
868	1236	boolean IsOpaque()
869	1237	{
870	1238	// return true;
871	1239
872		- if (material == null \|\| material.multiply)
873		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
874	1244
875		- return material.opacity > 0.99;
	1245	+ return !sort;
876	1246	}
877	1247
878	1248	Object3D()
..	..	@@ -893,6 +1263,11 @@
893	1263	fromParent = null; // LA.newMatrix();
894	1264	bRep = null; // new BoundaryRep();
895	1265
	1266	+ if (oname != null && oname.equals("LeftHand"))
	1267	+ {
	1268	+ name = oname;
	1269	+ }
	1270	+
896	1271	/*
897	1272	float hue = (float)Math.random();
898	1273	Color col;
..	..	@@ -935,7 +1310,7 @@
935	1310
936	1311	public Object clone()
937	1312	{
938		- return GrafreeD.clone(this);
	1313	+ return Grafreed.clone(this);
939	1314	}
940	1315
941	1316	Object3D copyExpand()
..	..	@@ -945,8 +1320,10 @@
945	1320
946	1321	// will share the geometry
947	1322	assert (!(this instanceof Composite));
948		- return deepCopy(); // Never called for Composite
949		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
950	1327	}
951	1328
952	1329	boolean HasLoops()
..	..	@@ -954,6 +1331,30 @@
954	1331	return false;
955	1332	}
956	1333
	1334	+ void ResetUUIDs()
	1335	+ {
	1336	+ if (blockloop)
	1337	+ {
	1338	+ return;
	1339	+ }
	1340	+
	1341	+ this.uuid = null;
	1342	+
	1343	+ blockloop = true;
	1344	+
	1345	+ for (int i = 0; i < Size(); i++)
	1346	+ {
	1347	+ Object3D obj = (Object3D) Children().get(i);
	1348	+
	1349	+ if (obj != null)
	1350	+ {
	1351	+ obj.ResetUUIDs();
	1352	+ }
	1353	+ }
	1354	+
	1355	+ blockloop = false;
	1356	+ }
	1357	+
957	1358	boolean IsInfinite()
958	1359	{
959	1360	if (blockloop)
..	..	@@ -1024,78 +1425,16 @@
1024	1425	return;
1025	1426
1026	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1027	1431	//System.out.println("COPY " + this + " to " + other);
1028	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1029	1434
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	1435	other.bRep = bRep; // Share the geometry
1061	1436
1062	1437	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	1438
1100	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1101	1440	// {
..	..	@@ -1151,17 +1490,24 @@
1151	1490	if ((mask & GEOMETRY) != 0)
1152	1491	{
1153	1492	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	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1160	1495	CameraPane.RemoveList(bRep.displaylist);
1161	1496	bRep.displaylist = 0; // june 2013 -1;
1162	1497	}
1163	1498	else
1164		- bRep = bRep;
	1499	+ {
	1500	+ //assert(other.bRep == null);
	1501	+ bRep = other.bRep;
	1502	+ }
	1503	+
	1504	+// if (bRep != null)
	1505	+// {
	1506	+// CameraPane.RemoveList(bRep.displaylist);
	1507	+// bRep.displaylist = 0; // june 2013 -1;
	1508	+// }
	1509	+// else
	1510	+// bRep = bRep;
1165	1511	}
1166	1512
1167	1513	/* Use a MASK = GEO/MAT
..	..	@@ -1257,6 +1603,7 @@
1257	1603	toParent = LA.newMatrix();
1258	1604	fromParent = LA.newMatrix();
1259	1605	}
	1606	+
1260	1607	LA.matCopy(other.toParent, toParent);
1261	1608	LA.matCopy(other.fromParent, fromParent);
1262	1609
..	..	@@ -1446,7 +1793,16 @@
1446	1793	// if (other == null)
1447	1794	// return;
1448	1795
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1796	+ if (other != null)
	1797	+ {
	1798	+ BoundaryRep.SEUIL = other.material.cameralight;
	1799	+
	1800	+ // Set default to 0.1
	1801	+ BoundaryRep.SEUIL /= 4; // 2;
	1802	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1803	+ }
	1804	+
	1805	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1806
1451	1807	//if (bRep != null)
1452	1808	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +2057,7 @@
1701	2057	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	2058	o.bRep = transientrep;
1703	2059	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	2060	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	2061	o.CreateMaterial();
1706	2062	o.SetAttributes(this, -1);
1707	2063	//parent
..	..	@@ -1714,7 +2070,7 @@
1714	2070	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	2071	o.bRep = bRep;
1716	2072	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	2073	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	2074	o.CreateMaterial();
1719	2075	//o.overwriteThis(this, -1);
1720	2076	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +2157,15 @@
1801	2157	if (obj.name == null)
1802	2158	continue; // can't be a null one
1803	2159
	2160	+ // Try perfect match first.
1804	2161	if (n.equals(obj.name))
1805	2162	{
1806	2163	theobj = obj;
1807	2164	count++;
1808	2165	}
1809	2166	}
	2167	+
	2168	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	2169
1811	2170	if (count != 1)
1812	2171	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +2175,9 @@
1816	2175	if (obj.name == null)
1817	2176	continue; // can't be a null one
1818	2177
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	2178	+ String name = obj.name.split(":")[0]; // Poser generates a count
	2179	+ //if (n.startsWith(obj.name))
	2180	+ if (n.contains(name))
1821	2181	{
1822	2182	theobj = obj;
1823	2183	count++;
..	..	@@ -2120,21 +2480,9 @@
2120	2480	if (/parent != null &&/ material == null)
2121	2481	{
2122	2482	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	2483
2133		- if (this instanceof Camera)
2134		- {
2135		- material.shift = 90;
2136		- }
2137		-
	2484	+ InitOthers();
	2485	+
2138	2486	material.multiply = multiply;
2139	2487
2140	2488	if (multiply)
..	..	@@ -2272,12 +2620,22 @@
2272	2620	}
2273	2621	*/
2274	2622	}
	2623	+ else
	2624	+ {
	2625	+ //((ObjEditor)editWindow).SetupUI2(null);
	2626	+ if (objectUI != null)
	2627	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2628	+ else
	2629	+ //new Exception().printStackTrace();
	2630	+ System.err.println("objectUI is null");
	2631	+ }
2275	2632	}
2276	2633
2277	2634	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2635	{
2279	2636	if (newWindow)
2280	2637	{
	2638	+ new Exception().printStackTrace();
2281	2639	System.exit(0);
2282	2640	if (parent != null)
2283	2641	{
..	..	@@ -2312,6 +2670,14 @@
2312	2670	{
2313	2671	editWindow.refreshContents();
2314	2672	}
	2673	+ else
	2674	+ {
	2675	+ if (manipWindow != null)
	2676	+ {
	2677	+ manipWindow.refreshContents();
	2678	+ }
	2679	+ }
	2680	+
2315	2681	//if (parent != null)
2316	2682	//parent.refreshEditWindow();
2317	2683	}
..	..	@@ -2391,7 +2757,8 @@
2391	2757	private static final int editSelf = 1;
2392	2758	private static final int editChild = 2;
2393	2759
2394		- void drawEditHandles(ClickInfo info, int level)
	2760	+ void drawEditHandles(//ClickInfo info,
	2761	+ int level)
2395	2762	{
2396	2763	if (level == 0)
2397	2764	{
..	..	@@ -2399,7 +2766,8 @@
2399	2766	return;
2400	2767
2401	2768	Object3D selectee;
2402		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2769	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2770	+ level + 1))
2403	2771	{
2404	2772	selectee = (Object3D) e.nextElement();
2405	2773	}
..	..	@@ -2407,19 +2775,22 @@
2407	2775	} else
2408	2776	{
2409	2777	//super.
2410		- drawEditHandles0(info, level + 1);
	2778	+ drawEditHandles0(//info,
	2779	+ level + 1);
2411	2780	}
2412	2781	}
2413	2782
2414		- boolean doEditClick(ClickInfo info, int level)
	2783	+ boolean doEditClick(//ClickInfo info,
	2784	+ int level)
2415	2785	{
2416	2786	doSomething = 0;
2417	2787	if (level == 0)
2418	2788	{
2419		- return doParentClick(info);
	2789	+ return doParentClick(); //info);
2420	2790	}
2421	2791	if (//super.
2422		- doEditClick0(info, level))
	2792	+ doEditClick0(//info,
	2793	+ level))
2423	2794	{
2424	2795	doSomething = 1;
2425	2796	return true;
..	..	@@ -2429,7 +2800,7 @@
2429	2800	}
2430	2801	}
2431	2802
2432		- boolean doParentClick(ClickInfo info)
	2803	+ boolean doParentClick() //ClickInfo info)
2433	2804	{
2434	2805	if (selection == null)
2435	2806	{
..	..	@@ -2442,7 +2813,8 @@
2442	2813	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2443	2814	{
2444	2815	Object3D selectee = (Object3D) e.nextElement();
2445		- if (selectee.doEditClick(info, 1))
	2816	+ if (selectee.doEditClick(//info,
	2817	+ 1))
2446	2818	{
2447	2819	childToDrag = selectee;
2448	2820	doSomething = 2;
..	..	@@ -2454,13 +2826,15 @@
2454	2826	return retval;
2455	2827	}
2456	2828
2457		- void doEditDrag(ClickInfo info)
	2829	+ void doEditDrag(//ClickInfo clickInfo,
	2830	+ boolean opposite)
2458	2831	{
2459	2832	switch (doSomething)
2460	2833	{
2461	2834	case 1: // '\001'
2462	2835	//super.
2463		- doEditDrag0(info);
	2836	+ doEditDrag0(//clickInfo,
	2837	+ opposite);
2464	2838	break;
2465	2839
2466	2840	case 2: // '\002'
..	..	@@ -2473,11 +2847,13 @@
2473	2847	{
2474	2848	//sel.hitSomething = childToDrag.hitSomething;
2475	2849	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2850	+ sel.doEditDrag(//clickInfo,
	2851	+ opposite);
2477	2852	} else
2478	2853	{
2479	2854	//super.
2480		- doEditDrag0(info);
	2855	+ doEditDrag0(//clickInfo,
	2856	+ opposite);
2481	2857	}
2482	2858	}
2483	2859	break;
..	..	@@ -2495,6 +2871,9 @@
2495	2871	{
2496	2872	deselectAll();
2497	2873	}
	2874	+
	2875	+ new Exception().printStackTrace();
	2876	+
2498	2877	ClickInfo newInfo = new ClickInfo();
2499	2878	newInfo.flags = info.flags;
2500	2879	newInfo.bounds = info.bounds;
..	..	@@ -2587,6 +2966,18 @@
2587	2966	void GenNormalsS(boolean crease)
2588	2967	{
2589	2968	selection.GenNormals(crease);
	2969	+// for (int i=0; i<selection.size(); i++)
	2970	+// {
	2971	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2972	+// selectee.GenNormals(crease);
	2973	+// }
	2974	+
	2975	+ //Touch();
	2976	+ }
	2977	+
	2978	+ void GenNormalsMeshS()
	2979	+ {
	2980	+ selection.GenNormalsMesh();
2590	2981	// for (int i=0; i<selection.size(); i++)
2591	2982	// {
2592	2983	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +3123,42 @@
2732	3123	blockloop = false;
2733	3124	}
2734	3125
	3126	+ void GenNormalsMesh()
	3127	+ {
	3128	+ if (blockloop)
	3129	+ return;
	3130	+
	3131	+ blockloop = true;
	3132	+ GenNormalsMesh0();
	3133	+ for (int i = 0; i < Children().Size(); i++)
	3134	+ {
	3135	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3136	+ if (child == null)
	3137	+ continue;
	3138	+ child.GenNormalsMesh();
	3139	+// Children().release(i);
	3140	+ }
	3141	+ blockloop = false;
	3142	+ }
	3143	+
	3144	+ void GenNormalsMINE()
	3145	+ {
	3146	+ if (blockloop)
	3147	+ return;
	3148	+
	3149	+ blockloop = true;
	3150	+ GenNormalsMINE0();
	3151	+ for (int i = 0; i < Children().Size(); i++)
	3152	+ {
	3153	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3154	+ if (child == null)
	3155	+ continue;
	3156	+ child.GenNormalsMINE();
	3157	+// Children().release(i);
	3158	+ }
	3159	+ blockloop = false;
	3160	+ }
	3161	+
2735	3162	void ClearColors()
2736	3163	{
2737	3164	if (blockloop)
..	..	@@ -2866,7 +3293,8 @@
2866	3293	{
2867	3294	if (bRep != null)
2868	3295	{
2869		- bRep.GenUV();
	3296	+ bRep.GenUV(); //1);
	3297	+ //bRep.UnfoldUV();
2870	3298	Touch();
2871	3299	}
2872	3300	}
..	..	@@ -2875,7 +3303,28 @@
2875	3303	{
2876	3304	if (bRep != null)
2877	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
2878	3307	bRep.GenerateNormals(crease);
	3308	+ if (!bRep.trimmed)
	3309	+ bRep.MergeNormals();
	3310	+ Touch();
	3311	+ }
	3312	+ }
	3313	+
	3314	+ void GenNormalsMesh0()
	3315	+ {
	3316	+ if (bRep != null)
	3317	+ {
	3318	+ bRep.GenerateNormalsMesh();
	3319	+ Touch();
	3320	+ }
	3321	+ }
	3322	+
	3323	+ void GenNormalsMINE0()
	3324	+ {
	3325	+ if (bRep != null)
	3326	+ {
	3327	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3328	Touch();
2880	3329	}
2881	3330	}
..	..	@@ -2932,6 +3381,132 @@
2932	3381	blockloop = false;
2933	3382	}
2934	3383
	3384	+ public void ResetTransform(int mask)
	3385	+ {
	3386	+ Object3D obj = this;
	3387	+
	3388	+ if (mask == -1)
	3389	+ {
	3390	+ if (obj instanceof Camera) // jan 2014
	3391	+ {
	3392	+ LA.matIdentity(obj.toParent);
	3393	+ LA.matIdentity(obj.fromParent);
	3394	+ }
	3395	+ else
	3396	+ {
	3397	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3398	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3399	+ }
	3400	+ return;
	3401	+ }
	3402	+
	3403	+ if ((mask&2) != 0) // Scale/rotation
	3404	+ {
	3405	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3406	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3407	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3408	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3409	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3410	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3411	+ }
	3412	+ if ((mask&1) != 0) // Translation
	3413	+ {
	3414	+ if (obj.toParent != null)
	3415	+ {
	3416	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3417	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3418	+ }
	3419	+ }
	3420	+ }
	3421	+
	3422	+ public void Scale(int scale)
	3423	+ {
	3424	+ Object3D obj = this;
	3425	+
	3426	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
	3427	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3428	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3429	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
	3430	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3431	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3432	+ }
	3433	+
	3434	+ public void TextureRatioTransform(int axis)
	3435	+ {
	3436	+ cTexture tex = GetTextures();
	3437	+
	3438	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3439	+
	3440	+ try
	3441	+ {
	3442	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3443	+ }
	3444	+ catch (Exception e)
	3445	+ {
	3446	+ System.err.println("FAIL TextureRatio: " + this);
	3447	+ }
	3448	+
	3449	+ LA.matIdentity(Object3D.mat);
	3450	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3451	+
	3452	+ if (toParent == null)
	3453	+ {
	3454	+ toParent = LA.newMatrix();
	3455	+ fromParent = LA.newMatrix();
	3456	+ }
	3457	+
	3458	+ ResetTransform(2);
	3459	+
	3460	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3461	+ LA.matInvert(fromParent, toParent);
	3462	+ }
	3463	+
	3464	+ void TextureRatio(int axis)
	3465	+ {
	3466	+ if (blockloop)
	3467	+ return;
	3468	+
	3469	+ blockloop = true;
	3470	+
	3471	+ TextureRatioTransform(axis);
	3472	+
	3473	+ for (int i=Size(); --i>=0;)
	3474	+ {
	3475	+ Object3D v = get(i);
	3476	+
	3477	+ v.TextureRatio(axis);
	3478	+ }
	3479	+
	3480	+ blockloop = false;
	3481	+ }
	3482	+
	3483	+ void TransformChildren()
	3484	+ {
	3485	+ if (toParent != null)
	3486	+ {
	3487	+ for (int i=Size(); --i>=0;)
	3488	+ {
	3489	+ Object3D v = get(i);
	3490	+
	3491	+ if (v.toParent == null)
	3492	+ {
	3493	+ v.toParent = LA.newMatrix();
	3494	+ v.fromParent = LA.newMatrix();
	3495	+ }
	3496	+
	3497	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3498	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3499	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3500	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3501	+ }
	3502	+
	3503	+ toParent = null; // LA.matIdentity(toParent);
	3504	+ fromParent = null; // LA.matIdentity(fromParent);
	3505	+
	3506	+ Touch();
	3507	+ }
	3508	+ }
	3509	+
2935	3510	void TransformGeometry()
2936	3511	{
2937	3512	Object3D obj = this;
..	..	@@ -3147,15 +3722,18 @@
3147	3722	if (bRep != null)
3148	3723	{
3149	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3150	3726	System.out.println("Reducing " + this);
3151	3727	if (name != null && name.contains("lockpickstraps"))
3152	3728	name = name;
3153	3729
3154	3730	BoundaryRep sup = bRep.support;
3155	3731	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3732	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3733	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3734	+
	3735	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3736	+
3159	3737	bRep = temprep;
3160	3738	bRep.support = sup;
3161	3739	Touch();
..	..	@@ -3256,15 +3834,47 @@
3256	3834
3257	3835	void ClearMaterials()
3258	3836	{
	3837	+ if (blockloop)
	3838	+ return;
	3839	+
	3840	+ blockloop = true;
	3841	+
3259	3842	ClearMaterial();
3260		- for (int i = 0; i < size(); i++)
	3843	+ for (int i = 0; i < Size(); i++)
3261	3844	{
3262		- Object3D child = (Object3D) reserve(i);
	3845	+ Object3D child = (Object3D) get(i);
3263	3846	if (child == null)
3264	3847	continue;
3265	3848	child.ClearMaterials();
3266		- release(i);
3267	3849	}
	3850	+
	3851	+ blockloop = false;
	3852	+ }
	3853	+
	3854	+ void ClearVersionList()
	3855	+ {
	3856	+ this.versionlist = null;
	3857	+ this.versionindex = -1;
	3858	+ this.versiontable = null;
	3859	+ }
	3860	+
	3861	+ void ClearVersions()
	3862	+ {
	3863	+ if (blockloop)
	3864	+ return;
	3865	+
	3866	+ blockloop = true;
	3867	+
	3868	+ ClearVersionList();
	3869	+ for (int i = 0; i < Size(); i++)
	3870	+ {
	3871	+ Object3D child = (Object3D) get(i);
	3872	+ if (child == null)
	3873	+ continue;
	3874	+ child.ClearVersions();
	3875	+ }
	3876	+
	3877	+ blockloop = false;
3268	3878	}
3269	3879
3270	3880	void FlipV(boolean flip)
..	..	@@ -3292,7 +3902,8 @@
3292	3902	if (blockloop)
3293	3903	return;
3294	3904
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3905	+ if (//marked \|\| // does not make sense
	3906	+ (bRep != null \|\| material != null)) // borderline...
3296	3907	live = h;
3297	3908
3298	3909	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3924,8 @@
3313	3924	return;
3314	3925
3315	3926	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3927	+ if (//marked \|\| // does not make sense
	3928	+ (bRep != null \|\| material != null)) // borderline...
3317	3929	link2master = h;
3318	3930
3319	3931	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3945,8 @@
3333	3945	if (blockloop)
3334	3946	return;
3335	3947
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3948	+ if (//marked \|\| // does not make sense
	3949	+ (bRep != null \|\| material != null)) // borderline...
3337	3950	hide = h;
3338	3951
3339	3952	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3966,7 @@
3353	3966	if (blockloop)
3354	3967	return;
3355	3968
3356		- if (bRep != null && material != null) // borderline...
	3969	+ if (bRep != null \|\| material != null) // borderline...
3357	3970	marked = h;
3358	3971
3359	3972	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3976,46 @@
3363	3976	continue;
3364	3977	blockloop = true;
3365	3978	child.MarkLeaves(h);
	3979	+ blockloop = false;
	3980	+ // release(i);
	3981	+ }
	3982	+ }
	3983	+
	3984	+ void RewindLeaves(boolean h)
	3985	+ {
	3986	+ if (blockloop)
	3987	+ return;
	3988	+
	3989	+ if (bRep != null \|\| material != null) // borderline...
	3990	+ rewind = h;
	3991	+
	3992	+ for (int i = 0; i < Size(); i++)
	3993	+ {
	3994	+ Object3D child = (Object3D) get(i); // reserve(i);
	3995	+ if (child == null)
	3996	+ continue;
	3997	+ blockloop = true;
	3998	+ child.RewindLeaves(h);
	3999	+ blockloop = false;
	4000	+ // release(i);
	4001	+ }
	4002	+ }
	4003	+
	4004	+ void RandomLeaves(boolean h)
	4005	+ {
	4006	+ if (blockloop)
	4007	+ return;
	4008	+
	4009	+ if (bRep != null \|\| material != null) // borderline...
	4010	+ random = h;
	4011	+
	4012	+ for (int i = 0; i < Size(); i++)
	4013	+ {
	4014	+ Object3D child = (Object3D) get(i); // reserve(i);
	4015	+ if (child == null)
	4016	+ continue;
	4017	+ blockloop = true;
	4018	+ child.RandomLeaves(h);
3366	4019	blockloop = false;
3367	4020	// release(i);
3368	4021	}
..	..	@@ -3400,6 +4053,7 @@
3400	4053
3401	4054	void RevertMeshes()
3402	4055	{
	4056	+ // BLOCKLOOP
3403	4057	if (this instanceof cMesh)
3404	4058	{
3405	4059	((cMesh)this).Revert();
..	..	@@ -3430,11 +4084,6 @@
3430	4084	Touch();
3431	4085	}
3432	4086
3433		- ResetRecur();
3434		- }
3435		-
3436		- void ResetRecur()
3437		- {
3438	4087	for (int i = 0; i < size(); i++)
3439	4088	{
3440	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3457,11 +4106,6 @@
3457	4106	Step();
3458	4107	Touch();
3459	4108
3460		- StepRecur();
3461		- }
3462		-
3463		- void StepRecur()
3464		- {
3465	4109	for (int i = 0; i < size(); i++)
3466	4110	{
3467	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3648,8 +4292,8 @@
3648	4292	Touch();
3649	4293	}
3650	4294
3651		- transient cVector min = new cVector();
3652		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
3653	4297
3654	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
3655	4299	{
..	..	@@ -3665,19 +4309,19 @@
3665	4309	if (blockloop)
3666	4310	return;
3667	4311
3668		- if (min == null) // ???
	4312	+ if (min == null)
3669	4313	{
3670	4314	min = new cVector();
3671	4315	max = new cVector();
3672	4316	}
3673	4317
3674		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
3675	4319	{
3676		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
3677	4321	if (child == null)
3678	4322	continue;
3679	4323
3680		- if (GrafreeD.RENDERME > 0)
	4324	+ if (Grafreed.RENDERME > 0)
3681	4325	{
3682	4326	if (child instanceof Merge)
3683	4327	((Merge)child).renderme();
..	..	@@ -3692,21 +4336,21 @@
3692	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3693	4337	//if (child.hide)
3694	4338	{
3695		- release(i);
	4339	+ //release(i);
3696	4340	continue;
3697	4341	}
3698	4342
3699	4343	blockloop = true;
3700	4344	child.getBounds(min, max, true); // xform);
3701	4345	blockloop = false;
3702		- release(i);
	4346	+ //release(i);
3703	4347
3704	4348	MinMax(minima, maxima);
3705	4349	}
3706	4350
3707	4351	if (bRep != null)
3708	4352	{
3709		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
3710	4354	}
3711	4355
3712	4356	if (false) // xform)
..	..	@@ -3828,7 +4472,7 @@
3828	4472	if (child == null)
3829	4473	continue;
3830	4474
3831		- if (GrafreeD.RENDERME > 0)
	4475	+ if (Grafreed.RENDERME > 0)
3832	4476	{
3833	4477	if (child instanceof Merge)
3834	4478	((Merge)child).renderme();
..	..	@@ -4023,7 +4667,7 @@
4023	4667	if (child == null)
4024	4668	continue;
4025	4669
4026		- if (GrafreeD.RENDERME > 0)
	4670	+ if (Grafreed.RENDERME > 0)
4027	4671	{
4028	4672	if (child instanceof Merge)
4029	4673	((Merge)child).renderme();
..	..	@@ -4111,7 +4755,7 @@
4111	4755	if (blockloop)
4112	4756	return;
4113	4757
4114		- for (int i=0; i<size(); i++)
	4758	+ for (int i=0; i<Size(); i++)
4115	4759	{
4116	4760	if (get(i).parent != this)
4117	4761	{
..	..	@@ -4120,6 +4764,71 @@
4120	4764	}
4121	4765	blockloop = true;
4122	4766	get(i).RepairParent();
	4767	+ blockloop = false;
	4768	+ }
	4769	+ }
	4770	+
	4771	+ void RepairShadow()
	4772	+ {
	4773	+ if (blockloop)
	4774	+ return;
	4775	+
	4776	+ if (this.material != null)
	4777	+ this.InitOthers();
	4778	+
	4779	+ for (int i=0; i<Size(); i++)
	4780	+ {
	4781	+ blockloop = true;
	4782	+ get(i).RepairShadow();
	4783	+ blockloop = false;
	4784	+ }
	4785	+ }
	4786	+
	4787	+ void RepairSOV()
	4788	+ {
	4789	+ if (blockloop)
	4790	+ return;
	4791	+
	4792	+ String texname = this.GetPigmentTexture();
	4793	+
	4794	+ if (texname.startsWith("sov"))
	4795	+ {
	4796	+ String[] s = texname.split("/");
	4797	+
	4798	+ String[] sname = s[1].split("Color.pn");
	4799	+
	4800	+ texname = sname[0];
	4801	+
	4802	+ if (sname.length > 1)
	4803	+ {
	4804	+ texname += "Color.jpg";
	4805	+ }
	4806	+
	4807	+ this.SetPigmentTexture("sov/" + texname);
	4808	+ }
	4809	+
	4810	+ texname = this.GetBumpTexture();
	4811	+
	4812	+ if (texname.startsWith("sov"))
	4813	+ {
	4814	+ String[] s = texname.split("/");
	4815	+
	4816	+ String[] sname = s[1].split("Bump.pn");
	4817	+
	4818	+ texname = sname[0];
	4819	+
	4820	+ if (sname.length > 1)
	4821	+ {
	4822	+ texname += "Bump.jpg";
	4823	+ }
	4824	+
	4825	+ this.SetBumpTexture("sov/" + texname);
	4826	+ }
	4827	+
	4828	+ for (int i=0; i<Size(); i++)
	4829	+ {
	4830	+ blockloop = true;
	4831	+ get(i).RepairSOV();
4123	4832	blockloop = false;
4124	4833	}
4125	4834	}
..	..	@@ -4614,7 +5323,7 @@
4614	5323
4615	5324	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	5325	{
4617		- if (hide)
	5326	+ if (hide \|\| dontselect)
4618	5327	return null;
4619	5328
4620	5329	if (count <= 0)
..	..	@@ -4638,9 +5347,17 @@
4638	5347	}
4639	5348	}
4640	5349
	5350	+ ObjEditor GetWindow()
	5351	+ {
	5352	+ if (editWindow != null)
	5353	+ return editWindow;
	5354	+
	5355	+ return manipWindow;
	5356	+ }
	5357	+
4641	5358	cTreePath Select(int indexcount, boolean deselect)
4642	5359	{
4643		- if (hide)
	5360	+ if (hide \|\| dontselect)
4644	5361	return null;
4645	5362
4646	5363	if (count <= 0)
..	..	@@ -4674,10 +5391,11 @@
4674	5391	if (leaf != null)
4675	5392	{
4676	5393	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5394	+ ObjEditor window = GetWindow();
	5395	+ if (window != null)
4678	5396	{
4679	5397	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5398	+ window.Select(tp, deselect, true);
4681	5399	}
4682	5400
4683	5401	return tp;
..	..	@@ -4694,6 +5412,7 @@
4694	5412
4695	5413	if (child == null)
4696	5414	continue;
	5415	+
4697	5416	if (child.HasTransparency() && child.size() != 0)
4698	5417	{
4699	5418	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5422,10 @@
4703	5422	if (leaf != null)
4704	5423	{
4705	5424	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5425	+ ObjEditor window = GetWindow();
	5426	+ if (window != null)
4707	5427	{
4708		- editWindow.Select(tp, deselect, true);
	5428	+ window.Select(tp, deselect, true);
4709	5429	}
4710	5430
4711	5431	return tp;
..	..	@@ -4790,7 +5510,7 @@
4790	5510	return globalTransform;
4791	5511	}
4792	5512
4793		- void PreprocessOcclusion(CameraPane cp)
	5513	+ void PreprocessOcclusion(iCameraPane cp)
4794	5514	{
4795	5515	/*
4796	5516	if (AOdone)
..	..	@@ -4937,7 +5657,8 @@
4937	5657	} else //
4938	5658	if (editWindow != null)
4939	5659	{
4940		- editWindow.cameraView.lighttouched = true;
	5660	+ //editWindow.cameraView.lighttouched = true;
	5661	+ Globals.lighttouched = true;
4941	5662	}
4942	5663	}
4943	5664
..	..	@@ -5029,6 +5750,51 @@
5029	5750	blockloop = false;
5030	5751	}
5031	5752
	5753	+ void ResetSelectable()
	5754	+ {
	5755	+ if (blockloop)
	5756	+ return;
	5757	+
	5758	+ blockloop = true;
	5759	+
	5760	+ keepdontselect = dontselect;
	5761	+ dontselect = true;
	5762	+
	5763	+ Object3D child;
	5764	+ int nb = Size();
	5765	+ for (int i = 0; i < nb; i++)
	5766	+ {
	5767	+ child = (Object3D) get(i);
	5768	+ if (child == null)
	5769	+ continue;
	5770	+ child.ResetSelectable();
	5771	+ }
	5772	+
	5773	+ blockloop = false;
	5774	+ }
	5775	+
	5776	+ void RestoreSelectable()
	5777	+ {
	5778	+ if (blockloop)
	5779	+ return;
	5780	+
	5781	+ blockloop = true;
	5782	+
	5783	+ dontselect = keepdontselect;
	5784	+
	5785	+ Object3D child;
	5786	+ int nb = Size();
	5787	+ for (int i = 0; i < nb; i++)
	5788	+ {
	5789	+ child = (Object3D) get(i);
	5790	+ if (child == null)
	5791	+ continue;
	5792	+ child.RestoreSelectable();
	5793	+ }
	5794	+
	5795	+ blockloop = false;
	5796	+ }
	5797	+
5032	5798	boolean IsSelected()
5033	5799	{
5034	5800	if (parent == null)
..	..	@@ -5089,12 +5855,41 @@
5089	5855	if (fullname == null)
5090	5856	return "";
5091	5857
	5858	+ if (fullname.pigment != null)
	5859	+ {
	5860	+ return fullname.pigment;
	5861	+ }
	5862	+
5092	5863	// System.out.println("Fullname = " + fullname);
5093	5864
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5865	+ // Does not work on Windows due to C:
	5866	+// if (fullname.name.indexOf(":") == -1)
	5867	+// return fullname.name;
	5868	+//
	5869	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5870
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5871	+ String[] split = fullname.name.split(":");
	5872	+
	5873	+ if (split.length == 0)
	5874	+ {
	5875	+ return fullname.pigment = "";
	5876	+ }
	5877	+
	5878	+ if (split.length <= 2)
	5879	+ {
	5880	+ if (fullname.name.endsWith(":"))
	5881	+ {
	5882	+ // Windows
	5883	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5884	+ }
	5885	+
	5886	+ return fullname.pigment = split[0];
	5887	+ }
	5888	+
	5889	+ // Windows
	5890	+ assert(split.length == 4);
	5891	+
	5892	+ return fullname.pigment = split[0] + ":" + split[1];
5098	5893	}
5099	5894
5100	5895	static String GetBump(cTexture fullname)
..	..	@@ -5102,11 +5897,44 @@
5102	5897	if (fullname == null)
5103	5898	return "";
5104	5899
	5900	+ if (fullname.bump != null)
	5901	+ {
	5902	+ return fullname.bump;
	5903	+ }
	5904	+
5105	5905	// 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());
	5906	+ // Does not work on Windows due to C:
	5907	+// if (fullname.name.indexOf(":") == -1)
	5908	+// return "";
	5909	+//
	5910	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5911	+ String[] split = fullname.name.split(":");
	5912	+
	5913	+ if (split.length == 0)
	5914	+ {
	5915	+ return fullname.bump = "";
	5916	+ }
	5917	+
	5918	+ if (split.length == 1)
	5919	+ {
	5920	+ return fullname.bump = "";
	5921	+ }
	5922	+
	5923	+ if (split.length == 2)
	5924	+ {
	5925	+ if (fullname.name.endsWith(":"))
	5926	+ {
	5927	+ // Windows
	5928	+ return fullname.bump = "";
	5929	+ }
	5930	+
	5931	+ return fullname.bump = split[1];
	5932	+ }
	5933	+
	5934	+ // Windows
	5935	+ assert(split.length == 4);
	5936	+
	5937	+ return fullname.bump = split[2] + ":" + split[3];
5110	5938	}
5111	5939
5112	5940	String GetPigmentTexture()
..	..	@@ -5180,7 +6008,7 @@
5180	6008	System.out.print("; textures = " + textures);
5181	6009	System.out.println("; usedtextures = " + usedtextures);
5182	6010
5183		- if (GetTextures() == null)
	6011	+ if (GetTextures() == null) // What is that??
5184	6012	GetTextures().name = ":";
5185	6013
5186	6014	String texname = tex;
..	..	@@ -5189,6 +6017,9 @@
5189	6017	texname = "";
5190	6018
5191	6019	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6020	+
	6021	+ GetTextures().pigment = null;
	6022	+
5192	6023	Touch();
5193	6024	}
5194	6025
..	..	@@ -5213,6 +6044,43 @@
5213	6044	}
5214	6045	}
5215	6046
	6047	+ UUID GetUUID()
	6048	+ {
	6049	+ if (uuid == null)
	6050	+ {
	6051	+ // Serial
	6052	+ uuid = UUID.randomUUID();
	6053	+ }
	6054	+
	6055	+ return uuid;
	6056	+ }
	6057	+
	6058	+ Object3D GetObject(UUID uid)
	6059	+ {
	6060	+ if (blockloop)
	6061	+ return null;
	6062	+
	6063	+ if (GetUUID().equals(uid))
	6064	+ return this;
	6065	+
	6066	+ int nb = Size();
	6067	+ for (int i = 0; i < nb; i++)
	6068	+ {
	6069	+ Object3D child = (Object3D) get(i);
	6070	+
	6071	+ if (child == null)
	6072	+ continue;
	6073	+
	6074	+ blockloop = true;
	6075	+ Object3D obj = child.GetObject(uid);
	6076	+ blockloop = false;
	6077	+ if (obj != null)
	6078	+ return obj;
	6079	+ }
	6080	+
	6081	+ return null;
	6082	+ }
	6083	+
5216	6084	void SetBumpTexture(String tex)
5217	6085	{
5218	6086	if (GetTextures() == null)
..	..	@@ -5224,6 +6092,8 @@
5224	6092	texname = "";
5225	6093
5226	6094	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	6095	+
	6096	+ GetTextures().bump = null;
5227	6097
5228	6098	Touch();
5229	6099	}
..	..	@@ -5249,25 +6119,79 @@
5249	6119	}
5250	6120	}
5251	6121
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6122	+ void EmbedTextures(boolean embed)
	6123	+ {
	6124	+ if (blockloop)
	6125	+ return;
	6126	+
	6127	+ //if (GetTextures() != null)
	6128	+ if (embed)
	6129	+ CameraPane.EmbedTextures(GetTextures());
	6130	+ else
	6131	+ {
	6132	+ GetTextures().pigmentdata = null;
	6133	+ GetTextures().bumpdata = null;
	6134	+ GetTextures().pw = 0;
	6135	+ GetTextures().ph = 0;
	6136	+ GetTextures().bw = 0;
	6137	+ GetTextures().bh = 0;
	6138	+ }
	6139	+
	6140	+ int nb = Size();
	6141	+ for (int i = 0; i < nb; i++)
	6142	+ {
	6143	+ Object3D child = (Object3D) get(i);
	6144	+
	6145	+ if (child == null)
	6146	+ continue;
	6147	+
	6148	+ blockloop = true;
	6149	+ child.EmbedTextures(embed);
	6150	+ blockloop = false;
	6151	+ }
	6152	+ }
	6153	+
	6154	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	6155	{
5254	6156	Draw(display, root, selected, blocked);
5255	6157	}
5256	6158
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	6159	boolean NeedSupport()
5262	6160	{
5263	6161	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	6162	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5265	6163	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	6164	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	6165	}
5268	6166
	6167	+ static boolean DEBUG_SELECTION = false;
5269	6168
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6169	+ boolean IsLive()
	6170	+ {
	6171	+ if (live)
	6172	+ return true;
	6173	+
	6174	+ if (parent == null)
	6175	+ return false;
	6176	+
	6177	+ return parent.IsLive();
	6178	+ }
	6179	+
	6180	+ boolean IsDynamic()
	6181	+ {
	6182	+ return live && bRep != null;
	6183	+ }
	6184	+
	6185	+ boolean Link2Support()
	6186	+ {
	6187	+ return link2master \|\| link2support;
	6188	+ }
	6189	+
	6190	+ static cVector minima = new cVector();
	6191	+ static cVector maxima = new cVector();
	6192	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6193	+
	6194	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	6195	{
5272	6196	Invariants(); // june 2013
5273	6197
..	..	@@ -5276,8 +6200,31 @@
5276	6200	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	6201	}
5278	6202
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	6203	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6204	+ {
	6205	+ getBounds(minima, maxima, true);
	6206	+ center.x = (minima.x + maxima.x) / 2;
	6207	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6208	+ center.z = (minima.z + maxima.z) / 2;
	6209	+
	6210	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6211	+
	6212	+ IntersectResult res = new IntersectResult();
	6213	+ res.t = Double.POSITIVE_INFINITY;
	6214	+
	6215	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6216	+ {
	6217	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6218	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6219	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6220	+
	6221	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6222	+ LA.matInvert(toParent, fromParent);
	6223	+ }
	6224	+ }
	6225	+
	6226	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	6227	+ (hide \|\| dontselect))
5281	6228	return;
5282	6229
5283	6230	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +6242,7 @@
5295	6242	if (this instanceof Checker)
5296	6243	return;
5297	6244
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	6245	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	6246	return;
5300	6247
5301	6248	if (count <= 0)
..	..	@@ -5303,13 +6250,13 @@
5303	6250	return;
5304	6251	}
5305	6252
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	6253	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	6254	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	6255	{
5309	6256	return;
5310	6257	}
5311	6258
5312		- javax.media.opengl.GL gl = display.GetGL();
	6259	+ //javax.media.opengl.GL gl = display.GetGL();
5313	6260
5314	6261	/*
5315	6262	if (touched)
..	..	@@ -5327,8 +6274,11 @@
5327	6274	if (support != null)
5328	6275	support = support;
5329	6276
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);
	6277	+ boolean usecalllists = !IsDynamic() &&
	6278	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6279	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6280	+
	6281	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5332	6282
5333	6283	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	6284	{
..	..	@@ -5336,32 +6286,36 @@
5336	6286	bRep.displaylist = 0;
5337	6287	}
5338	6288	// usecalllists &= !(parent instanceof RandomNode);
5339		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
5340	6291
5341		- if (GetBRep() != null)
5342		- usecalllists = usecalllists;
	6292	+ if (display.DrawMode() == display.SHADOW)
	6293	+ //GetBRep() != null)
	6294	+ usecalllists = !!usecalllists;
5343	6295	//System.out.println("draw " + this);
5344	6296	//new Exception().printStackTrace();
5345	6297
5346	6298	boolean compiled = false;
5347	6299
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6300	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	6301
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6302	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	6303	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6304	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	6305	{
5353		- display.lighttouched = true;
	6306	+ Globals.lighttouched = true;
5354	6307	} // 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 &&
	6308	+
	6309	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	6310	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	6311	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	6312	{
5359	6313	if (!(this instanceof Composite))
5360	6314	touched = false;
5361	6315	//if (displaylist == -1 && usecalllists)
5362		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6316	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5363	6317	{
5364		- bRep.displaylist = gl.glGenLists(1);
	6318	+ bRep.displaylist = display.GenList();
5365	6319	assert(bRep.displaylist != 0);
5366	6320	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	6321	//System.out.println("\tgen list " + list);
..	..	@@ -5370,25 +6324,27 @@
5370	6324
5371	6325	//System.out.println("\tnew list " + list);
5372	6326	//gl.glDrawBuffer(gl.GL_NONE);
5373		- if (usecalllists)
	6327	+ if (usecalllists && bRep.displaylist > 0)
5374	6328	{
5375	6329	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6330	+ display.NewList(bRep.displaylist);
5377	6331	}
	6332	+
5378	6333	CallList(display, root, selected, blocked);
	6334	+
5379	6335	// compiled = true;
5380		- if (usecalllists)
	6336	+ if (usecalllists && bRep.displaylist > 0)
5381	6337	{
5382	6338	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	6339	+ display.EndList();
5384	6340	}
5385	6341	//gl.glDrawBuffer(gl.GL_BACK);
5386	6342	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	6343	+ Globals.lighttouched = true; // all panes...
5388	6344	}
5389	6345
5390		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5391		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
5392	6348
5393	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
5394	6350	{
..	..	@@ -5423,12 +6379,12 @@
5423	6379
5424	6380	// frustum culling
5425	6381	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	6382	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	6383	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	6384	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	6385	{
5430		- if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
	6387	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6388	{
5433	6389	//System.out.print("CULLED");
5434	6390	culled = true;
..	..	@@ -5436,7 +6392,7 @@
5436	6392	}
5437	6393	else
5438	6394	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6395	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6396	culled = true;
5441	6397
5442	6398	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6428,12 @@
5472	6428
5473	6429
5474	6430	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6431	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6432	{
5477	6433	if (GetBRep() != null)
5478	6434	{
5479		- CameraPane.NextIndex(this, gl);
	6435	+ display.NextIndex();
	6436	+
5480	6437	// vertex color conflict : gl.glCallList(list);
5481	6438	DrawNode(display, root, selected);
5482	6439	if (this instanceof BezierPatch)
..	..	@@ -5488,6 +6445,20 @@
5488	6445	{
5489	6446	drawSelf(display, root, selected, blocked);
5490	6447	}
	6448	+
	6449	+// if (!(this instanceof Composite))
	6450	+// {
	6451	+// for (int i = 0; i < size(); i++)
	6452	+// {
	6453	+// Object3D child = (Object3D) reserve(i);
	6454	+// if (child == null)
	6455	+// continue;
	6456	+//
	6457	+// child.draw(display, root, selected, blocked);
	6458	+//
	6459	+// release(i);
	6460	+// }
	6461	+// }
5491	6462	} else
5492	6463	{
5493	6464	/*
..	..	@@ -5498,53 +6469,7 @@
5498	6469	color[2] /= 2;
5499	6470	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6471	*/
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		- }
	6472	+ display.PushMaterial(this, selected);
5548	6473
5549	6474	//System.out.println("call list " + list);
5550	6475	//System.out.println();
..	..	@@ -5563,7 +6488,29 @@
5563	6488	tex = GetTextures();
5564	6489	}
5565	6490
5566		- display.BindTextures(tex, texres);
	6491	+ boolean failedPigment = false;
	6492	+ boolean failedBump = false;
	6493	+
	6494	+ CameraPane.lastObject = this;
	6495	+ try
	6496	+ {
	6497	+ display.BindPigmentTexture(tex, texres);
	6498	+ }
	6499	+ catch (Exception e)
	6500	+ {
	6501	+ // System.err.println("FAILED: " + this);
	6502	+ failedPigment = true;
	6503	+ }
	6504	+
	6505	+ try
	6506	+ {
	6507	+ display.BindBumpTexture(tex, texres);
	6508	+ }
	6509	+ catch (Exception e)
	6510	+ {
	6511	+ //System.err.println("FAILED: " + this);
	6512	+ failedBump = true;
	6513	+ }
5567	6514
5568	6515	if (!compiled)
5569	6516	{
..	..	@@ -5579,30 +6526,33 @@
5579	6526
5580	6527	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	6528	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	6529	+ display.CallList(bRep.displaylist);
5583	6530	// june 2013 drawSelf(display, root, selected);
5584	6531	}
5585	6532	}
	6533	+
	6534	+ assert (!(this instanceof Composite));
	6535	+ {
	6536	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6537	+// {
	6538	+// Object3D child = (Object3D) reserve(i);
	6539	+// if (child == null)
	6540	+// continue;
	6541	+//
	6542	+// child.draw(display, root, selected, blocked);
	6543	+//
	6544	+// release(i);
	6545	+// }
	6546	+ }
5586	6547	}
5587	6548
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		- }
	6549	+ if (!failedBump)
	6550	+ display.ReleaseBumpTexture(tex);
	6551	+
	6552	+ if (!failedPigment)
	6553	+ display.ReleasePigmentTexture(tex);
	6554	+
	6555	+ display.PopMaterial(this, selected);
5606	6556	}
5607	6557
5608	6558	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,18 +6594,19 @@
5644	6594	// resetMasterNode();
5645	6595	}
5646	6596
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6597	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	6598	{
5649		- if (GetBRep() == null)
5650		- {
5651		- drawSelf(display, root, selected, blocked);
5652		- } else
	6599	+ if (GetBRep() != null)
5653	6600	{
5654	6601	DrawNode(display, root, selected);
5655	6602	if (this instanceof BezierPatch)
5656	6603	{
5657	6604	//drawSelf(display, root, selected);
5658	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
5659	6610	}
5660	6611	}
5661	6612
..	..	@@ -5727,8 +6678,11 @@
5727	6678	boolean flipV = false; // true;
5728	6679	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	6680
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6681	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6682	{
	6683	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6684	+ return;
	6685	+
5732	6686	if (hide)
5733	6687	return;
5734	6688	// shadow optimisation
..	..	@@ -5786,16 +6740,7 @@
5786	6740	// // ??????????????????????????? Touch();
5787	6741	// }
5788	6742
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		- }
	6743	+display.PushMaterial2(this, selected);
5799	6744
5800	6745	Object3D child;
5801	6746	boolean sel;
..	..	@@ -5847,19 +6792,7 @@
5847	6792	*/
5848	6793	//depth += 1;
5849	6794
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		-
	6795	+display.PopMaterial2(this);
5863	6796	/*
5864	6797	display.ReleaseTextures(tex);
5865	6798	*/
..	..	@@ -5870,10 +6803,13 @@
5870	6803
5871	6804	//static cVector min,max;
5872	6805
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6806	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6807	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6808	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6809	return; // no shadow for transparent objects
	6810	+
	6811	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6812	+ return;
5877	6813
5878	6814	if (hide)
5879	6815	return;
..	..	@@ -5915,11 +6851,12 @@
5915	6851	return;
5916	6852	}
5917	6853
	6854	+ //bRep.GenUV(1/material.diffuseness);
5918	6855	// bRep.lock = true;
5919	6856
5920		- javax.media.opengl.GL gl = display.GetGL();
	6857	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6858
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
5923	6860	{
5924	6861	int fc = bRep.FaceCount();
5925	6862	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6871,7 @@
5934	6871
5935	6872	bRep.getMinMax(min, max, 100);
5936	6873
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();
	6874	+ display.DrawBox(min, max);
5954	6875
5955	6876	return;
5956	6877	}
..	..	@@ -5994,7 +6915,7 @@
5994	6915	{
5995	6916	//throw new Error();
5996	6917
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6918	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6919
5999	6920	int[] strips = bRep.getRawIndices();
6000	6921
..	..	@@ -6004,178 +6925,19 @@
6004	6925	new Exception().printStackTrace();
6005	6926	return;
6006	6927	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
	6928	+
	6929	+ if (dontselect)
6010	6930	{
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;
	6931	+ //bRep.GenerateNormalsMINE();
6142	6932	}
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		- }
	6933	+
	6934	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6935	} else // catch (Error e)
6174	6936	{
6175	6937	// TRIANGLE ARRAY
6176	6938	if (IsOpaque()) // Static())
6177	6939	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6940	+ display.StartTriangles();
6179	6941	int facecount = bRep.FaceCount();
6180	6942	for (int i = 0; i < facecount; i++)
6181	6943	{
..	..	@@ -6238,9 +7000,9 @@
6238	7000	// // r.norm.dot(v3) > -0.5)
6239	7001	// // continue;
6240	7002
6241		- drawFace(p, q, r, display, face);
	7003	+ display.DrawFace(this, p, q, r, face);
6242	7004	}
6243		- gl.glEnd();
	7005	+ display.EndTriangles();
6244	7006	}
6245	7007	else
6246	7008	{
..	..	@@ -6256,7 +7018,7 @@
6256	7018	facescompare[k] = new FaceCompare(k);
6257	7019	}
6258	7020
6259		- center = new cVector();
	7021	+ centertriangle = new cVector();
6260	7022	}
6261	7023	else
6262	7024	{
..	..	@@ -6269,8 +7031,8 @@
6269	7031	//System.out.println("SORT");
6270	7032
6271	7033	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	7034	+
	7035	+ display.StartTriangles();
6274	7036	for (int i = 0; i < facecount; i++)
6275	7037	{
6276	7038	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +7044,14 @@
6282	7044	Vertex q = bRep.GetVertex(face.q);
6283	7045	Vertex r = bRep.GetVertex(face.r);
6284	7046
6285		- drawFace(p, q, r, display, face);
	7047	+ display.DrawFace(this, p, q, r, face);
6286	7048	}
6287		- gl.glEnd();
	7049	+ display.EndTriangles();
6288	7050	}
6289	7051
6290	7052	if (false) // live && support != null && support.bRep != null) // debug weights
6291	7053	{
	7054	+ /*
6292	7055	gl.glDisable(gl.GL_LIGHTING);
6293	7056	float[] colorV = new float[3];
6294	7057
..	..	@@ -6367,6 +7130,7 @@
6367	7130	// gl.glEnd();
6368	7131	}
6369	7132	}
	7133	+ */
6370	7134	}
6371	7135	}
6372	7136
..	..	@@ -6377,7 +7141,7 @@
6377	7141	*/
6378	7142	}
6379	7143
6380		- transient cVector center;
	7144	+ transient cVector centertriangle;
6381	7145
6382	7146	class FaceCompare implements Comparable
6383	7147	{
..	..	@@ -6406,14 +7170,14 @@
6406	7170	Vertex q = bRep.GetVertex(face.q);
6407	7171	Vertex r = bRep.GetVertex(face.r);
6408	7172
6409		- center.set(p);
6410		- center.add(q);
6411		- center.add(r);
6412		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
6413	7177
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6415	7179
6416		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
6417	7181	}
6418	7182
6419	7183	return distance;
..	..	@@ -6422,347 +7186,11 @@
6422	7186
6423	7187	transient FaceCompare[] facescompare = null;
6424	7188
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	7189	void Print(Vertex v)
6600	7190	{
6601	7191	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	7192	}
6603	7193
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	7194	void drawSelf(ClickInfo info, int level, boolean select)
6767	7195	{
6768	7196	if (bRep == null)
..	..	@@ -7286,20 +7714,23 @@
7286	7714	}
7287	7715	}
7288	7716
7289		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7717	+ static ClickInfo clickInfo = new ClickInfo();
	7718	+
	7719	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7720	+ Point outPt, Rectangle outRec)
7290	7721	{
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;
	7722	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7723	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7724	+ double[][] toscreen = clickInfo.toScreen;
7294	7725	if (toscreen == null)
7295	7726	{
7296		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7727	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7297	7728	}
7298	7729	cVector vec = in;
7299	7730	LA.xformPos(in, toscreen, in);
7300	7731	//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();
	7732	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7733	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7303	7734	outPt.x = hc + (int) vec.x;
7304	7735	outPt.y = vc - (int) vec.y;
7305	7736	outRec.x = outPt.x - 3;
..	..	@@ -7307,15 +7738,18 @@
7307	7738	outRec.width = outRec.height = 6;
7308	7739	}
7309	7740
7310		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7741	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7742	+ )
7311	7743	{
7312	7744	Point pt = new Point(0, 0);
7313	7745	Rectangle rec = new Rectangle();
7314		- calcHotSpot(in, info, pt, rec);
	7746	+ calcHotSpot(in, //clickInfo,
	7747	+ pt, rec);
7315	7748	return rec;
7316	7749	}
7317	7750
7318		- void drawEditHandles0(ClickInfo info, int level)
	7751	+ void drawEditHandles0(//ClickInfo clickInfo,
	7752	+ int level)
7319	7753	{
7320	7754	if (level == 0)
7321	7755	{
..	..	@@ -7324,98 +7758,104 @@
7324	7758	{
7325	7759	cVector origin = new cVector();
7326	7760	//LA.xformPos(origin, toParent, origin);
7327		- Rectangle spot = calcHotSpot(origin, info);
	7761	+ if (this.clickInfo == null)
	7762	+ this.clickInfo = new ClickInfo();
	7763	+
	7764	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7328	7765	Rectangle boundary = new Rectangle();
7329	7766	boundary.x = spot.x - 30;
7330	7767	boundary.y = spot.y - 30;
7331	7768	boundary.width = spot.width + 60;
7332	7769	boundary.height = spot.height + 60;
7333		- info.g.setColor(Color.red);
	7770	+ clickInfo.g.setColor(Color.white);
7334	7771	int spotw = spot.x + spot.width;
7335	7772	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);
	7773	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7774	+// if (CameraPane.Xmin > spot.x)
	7775	+// {
	7776	+// CameraPane.Xmin = spot.x;
	7777	+// }
	7778	+// if (CameraPane.Xmax < spotw)
	7779	+// {
	7780	+// CameraPane.Xmax = spotw;
	7781	+// }
	7782	+// if (CameraPane.Ymin > spot.y)
	7783	+// {
	7784	+// CameraPane.Ymin = spot.y;
	7785	+// }
	7786	+// if (CameraPane.Ymax < spoth)
	7787	+// {
	7788	+// CameraPane.Ymax = spoth;
	7789	+// }
	7790	+// if (CameraPane.Xmin > spot.x)
	7791	+// {
	7792	+// CameraPane.Xmin = spot.x;
	7793	+// }
	7794	+// if (CameraPane.Xmax < spotw)
	7795	+// {
	7796	+// CameraPane.Xmax = spotw;
	7797	+// }
	7798	+// if (CameraPane.Ymin > spot.y)
	7799	+// {
	7800	+// CameraPane.Ymin = spot.y;
	7801	+// }
	7802	+// if (CameraPane.Ymax < spoth)
	7803	+// {
	7804	+// CameraPane.Ymax = spoth;
	7805	+// }
	7806	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7807	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7808	+ spot.translate(32, 0);
	7809	+ clickInfo.g.setColor(Color.yellow);
	7810	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7811	+
	7812	+ spot.translate(32, 64);
7354	7813	spotw = spot.x + spot.width;
7355	7814	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);
	7815	+ clickInfo.g.setColor(Color.cyan);
	7816	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7817	+// if (CameraPane.Xmin > spot.x)
	7818	+// {
	7819	+// CameraPane.Xmin = spot.x;
	7820	+// }
	7821	+// if (CameraPane.Xmax < spotw)
	7822	+// {
	7823	+// CameraPane.Xmax = spotw;
	7824	+// }
	7825	+// if (CameraPane.Ymin > spot.y)
	7826	+// {
	7827	+// CameraPane.Ymin = spot.y;
	7828	+// }
	7829	+// if (CameraPane.Ymax < spoth)
	7830	+// {
	7831	+// CameraPane.Ymax = spoth;
	7832	+// }
	7833	+ clickInfo.g.setColor(Color.green);
	7834	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7835	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7397	7836	//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		- }
	7837	+// if (CameraPane.Xmin > boundary.x)
	7838	+// {
	7839	+// CameraPane.Xmin = boundary.x;
	7840	+// }
	7841	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7842	+// {
	7843	+// CameraPane.Xmax = boundary.x + boundary.width;
	7844	+// }
	7845	+// if (CameraPane.Ymin > boundary.y)
	7846	+// {
	7847	+// CameraPane.Ymin = boundary.y;
	7848	+// }
	7849	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7850	+// {
	7851	+// CameraPane.Ymax = boundary.y + boundary.height;
	7852	+// }
7414	7853	return;
7415	7854	}
7416	7855	}
7417	7856
7418		- boolean doEditClick0(ClickInfo info, int level)
	7857	+ boolean doEditClick0(//ClickInfo clickInfo,
	7858	+ int level)
7419	7859	{
7420	7860	if (level == 0)
7421	7861	{
..	..	@@ -7424,10 +7864,10 @@
7424	7864
7425	7865	boolean retval = false;
7426	7866
7427		- startX = info.x;
7428		- startY = info.y;
	7867	+ startX = clickInfo.x;
	7868	+ startY = clickInfo.y;
7429	7869
7430		- hitSomething = 0;
	7870	+ hitSomething = -1;
7431	7871	cVector origin = new cVector();
7432	7872	//LA.xformPos(origin, toParent, origin);
7433	7873	Rectangle spot = new Rectangle();
..	..	@@ -7435,22 +7875,53 @@
7435	7875	{
7436	7876	centerPt = new Point(0, 0);
7437	7877	}
7438		- calcHotSpot(origin, info, centerPt, spot);
7439		- if (spot.contains(info.x, info.y))
	7878	+ calcHotSpot(origin, //info,
	7879	+ centerPt, spot);
	7880	+ if (spot.contains(clickInfo.x, clickInfo.y))
7440	7881	{
7441	7882	hitSomething = hitCenter;
7442	7883	retval = true;
7443	7884	}
7444	7885	spot.translate(32, 0);
7445		- if (spot.contains(info.x, info.y))
	7886	+ if (spot.contains(clickInfo.x, clickInfo.y))
7446	7887	{
7447	7888	hitSomething = hitRotate;
7448	7889	retval = true;
7449	7890	}
7450	7891	spot.translate(0, 32);
7451		- if (spot.contains(info.x, info.y))
	7892	+ spot.translate(32, 0);
	7893	+ spot.translate(0, 32);
	7894	+ if (spot.contains(clickInfo.x, clickInfo.y))
7452	7895	{
7453	7896	hitSomething = hitScale;
	7897	+
	7898	+ double scale = 0.005f * clickInfo.camera.Distance();
	7899	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7900	+ double sign = 1;
	7901	+ if (hScale < 0)
	7902	+ {
	7903	+ sign = -1;
	7904	+ }
	7905	+ hScale = signMath.pow(signhScale, scale * 50);
	7906	+ if (hScale < 0.01)
	7907	+ {
	7908	+ //hScale = 0.01;
	7909	+ }
	7910	+
	7911	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7912	+ sign = 1;
	7913	+ if (vScale < 0)
	7914	+ {
	7915	+ sign = -1;
	7916	+ }
	7917	+ vScale = signMath.pow(signvScale, scale * 50);
	7918	+ if (vScale < 0.01)
	7919	+ {
	7920	+ //vScale = 0.01;
	7921	+ }
	7922	+
	7923	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7924	+
7454	7925	retval = true;
7455	7926	}
7456	7927
..	..	@@ -7460,7 +7931,7 @@
7460	7931	}
7461	7932
7462	7933	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7934	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7935	//System.out.println("modified = " + modified);
7465	7936	//new Exception().printStackTrace();
7466	7937	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7959,8 @@
7488	7959	return true;
7489	7960	}
7490	7961
7491		- void doEditDrag0(ClickInfo info)
	7962	+ void doEditDrag0(//ClickInfo info,
	7963	+ boolean opposite)
7492	7964	{
7493	7965	if (hitSomething == 0)
7494	7966	{
..	..	@@ -7502,7 +7974,8 @@
7502	7974
7503	7975	//System.out.println("hitSomething = " + hitSomething);
7504	7976
7505		- double scale = 0.005f * info.camera.Distance();
	7977	+ double scale = 0.005f * clickInfo.camera.Distance();
	7978	+
7506	7979	cVector xlate = new cVector();
7507	7980	//cVector xlate2 = new cVector();
7508	7981	switch (hitSomething)
..	..	@@ -7513,9 +7986,11 @@
7513	7986
7514	7987	case hitCenter: // Translate
7515	7988
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7989	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7990
7518		- if (modified)
	7991	+ // Modified could snap
	7992	+ if (//modified \|\|
	7993	+ opposite)
7519	7994	{
7520	7995	//assert(false);
7521	7996	/*
..	..	@@ -7535,8 +8010,8 @@
7535	8010	toParent[3][i] = xlate.get(i);
7536	8011	LA.matInvert(toParent, fromParent);
7537	8012	*/
7538		- cVector delta = LA.newVector(0, 0, startY - info.y);
7539		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8013	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	8014	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7540	8015
7541	8016	LA.matCopy(startMat, toParent);
7542	8017	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7545,7 +8020,7 @@
7545	8020	} else
7546	8021	{
7547	8022	//LA.xformDir(delta, info.camera.fromScreen, delta);
7548		- cVector up = new cVector(info.camera.up);
	8023	+ cVector up = new cVector(clickInfo.camera.up);
7549	8024	cVector away = new cVector();
7550	8025	//cVector right2 = new cVector();
7551	8026	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7561,20 +8036,20 @@
7561	8036	}
7562	8037	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	8038	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7565		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8039	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	8040	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7566	8041	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	8042	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	8043	//LA.vecCross(up, cVector.Z, right2);
7569	8044
7570		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8045	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7571	8046
7572	8047	//System.out.println("DELTA0 = " + delta);
7573	8048	//System.out.println("AWAY = " + info.camera.away);
7574	8049	//System.out.println("UP = " + info.camera.up);
7575	8050	if (away.z > 0)
7576	8051	{
7577		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8052	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7578	8053	{
7579	8054	delta.x = -delta.x;
7580	8055	} else
..	..	@@ -7589,7 +8064,7 @@
7589	8064	//System.out.println("DELTA1 = " + delta);
7590	8065	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7591	8066	//System.out.println("DELTA2 = " + delta);
7592		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8067	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7593	8068	LA.matCopy(startMat, toParent);
7594	8069	//System.out.println("DELTA3 = " + delta);
7595	8070	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7599,8 +8074,8 @@
7599	8074	break;
7600	8075
7601	8076	case hitRotate: // rotate
7602		- int dx = info.x - centerPt.x;
7603		- int dy = -(info.y - centerPt.y);
	8077	+ int dx = clickInfo.x - centerPt.x;
	8078	+ int dy = -(clickInfo.y - centerPt.y);
7604	8079	double angle = (double) Math.atan2(dx, dy);
7605	8080	angle = -(1.570796 - angle);
7606	8081
..	..	@@ -7609,6 +8084,7 @@
7609	8084
7610	8085	if (modified)
7611	8086	{
	8087	+ // Rotate 45 degrees
7612	8088	angle /= (Math.PI / 4);
7613	8089	angle = Math.floor(angle + 0.5);
7614	8090	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +8098,7 @@
7622	8098	}
7623	8099	/**/
7624	8100
7625		- switch (info.pane.renderCamera.viewCode)
	8101	+ switch (clickInfo.pane.RenderCamera().viewCode)
7626	8102	{
7627	8103	case 1: // '\001'
7628	8104	LA.matZRotate(toParent, angle);
..	..	@@ -7649,26 +8125,30 @@
7649	8125	break;
7650	8126
7651	8127	case hitScale: // scale
7652		- double hScale = (double) (info.x - centerPt.x) / 32;
	8128	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	8129	+ double sign = 1;
	8130	+ if (hScale < 0)
	8131	+ {
	8132	+ sign = -1;
	8133	+ }
	8134	+ hScale = signMath.pow(signhScale, scale * 50);
7653	8135	if (hScale < 0.01)
7654	8136	{
7655		- hScale = 0.01;
	8137	+ //hScale = 0.01;
7656	8138	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
	8139	+
	8140	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	8141	+ sign = 1;
	8142	+ if (vScale < 0)
7659	8143	{
7660		- hScale = 0.01;
	8144	+ sign = -1;
7661	8145	}
7662		- double vScale = (double) (info.y - centerPt.y) / 32;
	8146	+ vScale = signMath.pow(signvScale, scale * 50);
7663	8147	if (vScale < 0.01)
7664	8148	{
7665		- vScale = 0.01;
	8149	+ //vScale = 0.01;
7666	8150	}
7667		- vScale = Math.pow(vScale, scale * 50);
7668		- if (vScale < 0.01)
7669		- {
7670		- vScale = 0.01;
7671		- }
	8151	+
7672	8152	LA.matCopy(startMat, toParent);
7673	8153	/**/
7674	8154	for (int i = 0; i < 3; i++)
..	..	@@ -7678,39 +8158,56 @@
7678	8158	}
7679	8159	/**/
7680	8160
7681		- switch (info.pane.renderCamera.viewCode)
	8161	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	8162	+
	8163	+ if (totalScale < 0.01)
	8164	+ {
	8165	+ totalScale = 0.01;
	8166	+ }
	8167	+
	8168	+ switch (clickInfo.pane.RenderCamera().viewCode)
7682	8169	{
7683	8170	case 3: // '\001'
7684		- if (modified)
	8171	+ if (modified \|\| opposite)
7685	8172	{
	8173	+ if (modified) // && opposite)
	8174	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8175	+ else
7686	8176	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	8177	+ LA.matScale(toParent, totalScale, 1, 1);
7688	8178	} // vScale, 1);
7689	8179	else
7690	8180	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	8181	+ // EXCEPTION!
	8182	+ LA.matScale(toParent, 1, totalScale, totalScale);
7692	8183	} // vScale, 1);
7693	8184	break;
7694	8185
7695	8186	case 2: // '\002'
7696		- if (modified)
	8187	+ if (modified \|\| opposite)
7697	8188	{
7698		- //LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 1);
	8189	+ if (modified) // && opposite)
	8190	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8191	+ else
	8192	+ //LA.matScale(toParent, hScale, 1, vScale);
	8193	+ LA.matScale(toParent, 1, totalScale, 1);
7700	8194	} else
7701	8195	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	8196	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	8197	}
7704	8198	break;
7705	8199
7706	8200	case 1: // '\003'
7707		- if (modified)
	8201	+ if (modified \|\| opposite)
7708	8202	{
7709		- //LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	8203	+ if (modified) // && opposite)
	8204	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8205	+ else
	8206	+ //LA.matScale(toParent, hScale, vScale, 1);
	8207	+ LA.matScale(toParent, 1, 1, totalScale);
7711	8208	} else
7712	8209	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	8210	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	8211	}
7715	8212	break;
7716	8213	}
..	..	@@ -7731,7 +8228,7 @@
7731	8228	if (parent == null)
7732	8229	{
7733	8230	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	8231	+ //new Exception().printStackTrace();
7735	8232	} else
7736	8233	{
7737	8234	if (parent instanceof BezierPatch)
..	..	@@ -7744,7 +8241,7 @@
7744	8241	} // NEW ...
7745	8242
7746	8243
7747		- info.pane.repaint();
	8244	+ clickInfo.pane.repaint();
7748	8245	}
7749	8246
7750	8247	boolean overflow = false;
..	..	@@ -7843,19 +8340,27 @@
7843	8340	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	8341	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	8342	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8343	+
	8344	+ String objname;
	8345	+
7846	8346	if (false) //parent != null)
7847	8347	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8348	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	8349	} else
7850	8350	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8351	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	8352	} // + super.toString();
7853	8353	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8354	+
	8355	+ if (!Globals.ADVANCED)
	8356	+ return objname;
	8357	+
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7854	8359	}
7855	8360
7856	8361	public int hashCode()
7857	8362	{
7858		- // Fuck Vector...
	8363	+ // Do not use Vector...
7859	8364	return System.identityHashCode(this);
7860	8365	}
7861	8366
..	..	@@ -7906,6 +8411,7 @@
7906	8411	objectUI.closeUI();
7907	8412	if (editWindow != null)
7908	8413	{
	8414	+ editWindow.ctrlPanel.FlushUI();
7909	8415	editWindow.refreshContents();
7910	8416	} // ? new
7911	8417	objectUI = null;
..	..	@@ -7914,6 +8420,10 @@
7914	8420	{
7915	8421	editWindow = null;
7916	8422	} // ?
	8423	+ }
	8424	+ else
	8425	+ {
	8426	+ //editWindow.closeUI();
7917	8427	}
7918	8428	}
7919	8429
..	..	@@ -7926,7 +8436,7 @@
7926	8436	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	8437
7928	8438	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	8439	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	8440
7931	8441	double[][] toParent; // dynamic matrix
7932	8442	double[][] fromParent;
..	..	@@ -8041,7 +8551,7 @@
8041	8551	{
8042	8552	assert(bRep != null);
8043	8553	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GrafreeD.Assert(support.bRep == bRep.support);
	8554	+ Grafreed.Assert(support.bRep == bRep.support);
8045	8555	}
8046	8556	else
8047	8557	{
..	..	@@ -8072,6 +8582,10 @@
8072	8582	}
8073	8583
8074	8584	transient ObjEditor editWindow;
	8585	+ transient ObjEditor manipWindow;
	8586	+
	8587	+ transient boolean pinned;
	8588	+
8075	8589	transient ObjectUI objectUI;
8076	8590	public static int povDepth = 0;
8077	8591	private static cVector tbMin = new cVector();
..	..	@@ -8086,13 +8600,13 @@
8086	8600	private static cVector2 qq2 = new cVector2();
8087	8601	private static cVector2 rr2 = new cVector2();
8088	8602	private static cVector2 ss2 = new cVector2();
8089		- private static cVector edge1 = new cVector();
8090		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
8091	8605	//private static cVector norm = new cVector();
8092	8606	/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;
	8607	+ static final int hitCenter = 1;
	8608	+ static final int hitScale = 2;
	8609	+ static final int hitRotate = 3;
8096	8610	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	8611	/transient/ private Point centerPt;
8098	8612	/transient/ private int startX;
..	..	@@ -8123,6 +8637,8 @@
8123	8637	void SetAttributes(Object3D obj, int mask)
8124	8638	{
8125	8639	Object3D targ = this;
	8640	+
	8641	+ targ.NORMALPUSH = obj.NORMALPUSH;
8126	8642
8127	8643	if (obj.material != null)
8128	8644	{
..	..	@@ -8283,7 +8799,275 @@
8283	8799
8284	8800	Touch();
8285	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
8286	8806
	8807	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8808	+ {
	8809	+ boolean success = false;
	8810	+
	8811	+ if (bRep.stripified)
	8812	+ {
	8813	+ int[] strips = bRep.getRawIndices();
	8814	+
	8815	+ // TRIANGLE STRIP ARRAY
	8816	+ if (bRep.trimmed)
	8817	+ {
	8818	+ float[] v = bRep.getRawVertices();
	8819	+
	8820	+ int count3 = 0;
	8821	+
	8822	+ if (v.length > 0)
	8823	+ {
	8824	+ for (int i = 0; i < strips.length; i++)
	8825	+ {
	8826	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8827	+ count3 += 3;
	8828	+
	8829	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ for (int j = 0; j < strips[i] - 2; j++)
	8833	+ {
	8834	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8835	+ count3 += 3;
	8836	+
	8837	+ if (j%2 == 0)
	8838	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8839	+ else
	8840	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8841	+
	8842	+ s1.set(s2);
	8843	+ s2.set(s3);
	8844	+ }
	8845	+ }
	8846	+ }
	8847	+
	8848	+ assert count3 == v.length;
	8849	+ }
	8850	+ else // !trimmed
	8851	+ {
	8852	+ int count = 0;
	8853	+ for (int i = 0; i < strips.length; i++)
	8854	+ {
	8855	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8856	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8857	+
	8858	+ for (int j = 0; j < strips[i] - 2; j++)
	8859	+ {
	8860	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8861	+
	8862	+ if (j%2 == 0)
	8863	+ success \|= intersectTriangle(ray, result, p, q, r);
	8864	+ else
	8865	+ success \|= intersectTriangle(ray, result, p, r, q);
	8866	+
	8867	+ p = q;
	8868	+ q = r;
	8869	+ }
	8870	+ }
	8871	+ }
	8872	+ } else // catch (Error e)
	8873	+ {
	8874	+ int facecount = bRep.FaceCount();
	8875	+ for (int i = 0; i < facecount; i++)
	8876	+ {
	8877	+ Face face = bRep.GetFace(i);
	8878	+
	8879	+ Vertex p = bRep.GetVertex(face.p);
	8880	+ Vertex q = bRep.GetVertex(face.q);
	8881	+ Vertex r = bRep.GetVertex(face.r);
	8882	+
	8883	+ success \|= intersectTriangle(ray, result, p, q, r);
	8884	+ }
	8885	+ }
	8886	+
	8887	+ return success;
	8888	+ }
	8889	+
	8890	+ static cVector eye = new cVector();
	8891	+ static cVector dir = new cVector();
	8892	+
	8893	+ transient BBox bbox = null;
	8894	+
	8895	+ boolean intersect(Ray ray, IntersectResult result)
	8896	+ {
	8897	+ double eyex = ray.eyePoint.x;
	8898	+ double eyey = ray.eyePoint.y;
	8899	+ double eyez = ray.eyePoint.z;
	8900	+
	8901	+ double dirx = ray.viewDirection.x;
	8902	+ double diry = ray.viewDirection.y;
	8903	+ double dirz = ray.viewDirection.z;
	8904	+
	8905	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8906	+ {
	8907	+ eye.x = eyex;
	8908	+ eye.y = eyey;
	8909	+ eye.z = eyez;
	8910	+ dir.x = dirx;
	8911	+ dir.y = diry;
	8912	+ dir.z = dirz;
	8913	+
	8914	+ LA.xformPos(eye, this.fromParent, eye);
	8915	+ LA.xformDir(dir, this.fromParent, dir);
	8916	+
	8917	+ ray.eyePoint.x = eye.x;
	8918	+ ray.eyePoint.y = eye.y;
	8919	+ ray.eyePoint.z = eye.z;
	8920	+
	8921	+ ray.viewDirection.x = dir.x;
	8922	+ ray.viewDirection.y = dir.y;
	8923	+ ray.viewDirection.z = dir.z;
	8924	+ }
	8925	+
	8926	+ boolean success = false;
	8927	+
	8928	+ boolean touch = false;
	8929	+
	8930	+ if (bRep != null && Link2Support())
	8931	+ {
	8932	+ if (bbox == null)
	8933	+ {
	8934	+ bbox = new BBox();
	8935	+
	8936	+ cVector min = new cVector();
	8937	+ cVector max = new cVector();
	8938	+
	8939	+ this.getBounds(min, max, true);
	8940	+
	8941	+ bbox.min.x = min.x;
	8942	+ bbox.min.y = min.y;
	8943	+ bbox.min.z = min.z;
	8944	+
	8945	+ bbox.max.x = max.x;
	8946	+ bbox.max.y = max.y;
	8947	+ bbox.max.z = max.z;
	8948	+ }
	8949	+
	8950	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8951	+ {
	8952	+ success \|= intersectMesh(ray, result);
	8953	+ }
	8954	+ else
	8955	+ {
	8956	+ //this.hide = true;
	8957	+ touch = true;
	8958	+ }
	8959	+ }
	8960	+
	8961	+ for (int i=0; i<size(); i++)
	8962	+ {
	8963	+ Object3D child = (Object3D) reserve(i);
	8964	+
	8965	+ if (child == null)
	8966	+ continue;
	8967	+
	8968	+ success \|= child.intersect(ray, result);
	8969	+ release(i);
	8970	+ }
	8971	+
	8972	+ ray.eyePoint.x = eyex;
	8973	+ ray.eyePoint.y = eyey;
	8974	+ ray.eyePoint.z = eyez;
	8975	+
	8976	+ ray.viewDirection.x = dirx;
	8977	+ ray.viewDirection.y = diry;
	8978	+ ray.viewDirection.z = dirz;
	8979	+
	8980	+// if (touch)
	8981	+// this.Touch(); // refresh display list
	8982	+
	8983	+ return success;
	8984	+ }
	8985	+
	8986	+ static Vector3d edge1 = new Vector3d();
	8987	+ static Vector3d edge2 = new Vector3d();
	8988	+ static Vector3d P = new Vector3d();
	8989	+ static Vector3d T = new Vector3d();
	8990	+ static Vector3d Q = new Vector3d();
	8991	+
	8992	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8993	+ {
	8994	+ if (false)
	8995	+ {
	8996	+ result.t = 0;
	8997	+ return true;
	8998	+ }
	8999	+
	9000	+ /*
	9001	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9002	+
	9003	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9004	+ */
	9005	+
	9006	+ // Calculate edges of the triangle
	9007	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9008	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9009	+
	9010	+ // Calculate the determinant (U parameter)
	9011	+ P.cross(ray.viewDirection, edge2);
	9012	+ double det = edge1.dot(P);
	9013	+
	9014	+ if (det > -1e-9 && det < 1e-9)
	9015	+ {
	9016	+ return false;
	9017	+ } // Ray lies in plane of triangle
	9018	+
	9019	+ double invDet = 1 / det;
	9020	+
	9021	+ // Calculate distance from vertex1 to ray origin
	9022	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9023	+
	9024	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9025	+
	9026	+ if (U < 0.f \|\| U > 1.f)
	9027	+ {
	9028	+ return false;
	9029	+ } // Intersection lies outside of the triangle
	9030	+
	9031	+ // Calculate V parameter
	9032	+ Q.cross(T, edge1);
	9033	+
	9034	+ double V = ray.viewDirection.dot(Q) * invDet;
	9035	+
	9036	+ if (V < 0.f \|\| (U + V) > 1.f)
	9037	+ {
	9038	+ return false;
	9039	+ } // Intersection lies outside of the triangle
	9040	+
	9041	+ double t = edge2.dot(Q) * invDet;
	9042	+
	9043	+ if (t > 1e-9) // Triangle and ray intersects
	9044	+ {
	9045	+ //result.isIntersected = true;
	9046	+ //result.id = id;
	9047	+
	9048	+ if (false) // isShadow)
	9049	+ {
	9050	+ result.t = t;
	9051	+ return true;
	9052	+ } else if (t < result.t)
	9053	+ {
	9054	+ result.object = this;
	9055	+
	9056	+ result.t = t;
	9057	+
	9058	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9059	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9060	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9061	+
	9062	+ result.n.cross(edge1, edge2);
	9063	+ result.n.normalize();
	9064	+ }
	9065	+
	9066	+ return true;
	9067	+ }
	9068	+
	9069	+ return false;
	9070	+ }
8287	9071
8288	9072	public int Size()
8289	9073	{