~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,10 +22,115 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
	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;
26	45
27	46	ScriptNode scriptnode;
28	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	+
29	134	void InitOthers()
30	135	{
31	136	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -37,6 +142,7 @@
37	142	projectedVertices[i] = new cVector2(); // Others
38	143	}
39	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
40	146	}
41	147
42	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -104,117 +210,286 @@
104	210
105	211	// transient boolean reduced; // for morph reduction
106	212
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-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
109	215
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	216	+ transient Object3D transientsupport; // for cloning
	217	+ transient boolean transientlink2master;
112	218
113		-void SaveSupports()
114		-{
115		- if (blockloop)
116		- return;
117		-
118		- transientsupport = support;
119		- transientlink2master = link2master;
120		-
121		- support = null;
122		- link2master = false;
123		-
124		- if (bRep != null)
	219	+ void SaveSupports()
125	220	{
126		- 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	+ }
127	244	}
128		-
129		- for (int i = 0; i < Size(); i++)
	245	+
	246	+ void RestoreSupports()
130	247	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- 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	+
134	282	blockloop = true;
135		- 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	+
136	424	blockloop = false;
137	425	}
138		-}
139	426
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	427	+ boolean HasTags()
	428	+ {
	429	+ if (blockloop)
	430	+ return false;
144	431
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
151		- {
152		- bRep.RestoreSupports();
153		- }
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160	432	blockloop = true;
161		- 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	+
162	470	blockloop = false;
163	471	}
164		-}
165	472
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
169		- return;
170		-
171		- Object3D o = new Object3D();
172		- o.bRep = this.bRep;
173		- if (this.bRep != null)
	473	+ void RestoreBigData(Object3D o)
174	474	{
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
	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;
177	492	}
178		-
179		-// o.support = this.support;
180		-// o.fileparent = this.fileparent;
181		-// if (this.bRep != null)
182		-// o.bRep = this.bRep.support;
183		-
184		- hashtable.put(GetUUID(), o);
185		-
186		- this.bRep = null;
187		-// if (this.bRep != null)
188		-// this.bRep.support = null;
189		-// this.support = null;
190		-// this.fileparent = null;
191		-
192		- for (int i=0; i<Size(); i++)
193		- {
194		- get(i).ExtractBigData(hashtable);
195		- }
196		-}
197		-
198		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199		-{
200		- if (!hashtable.containsKey(GetUUID()))
201		- return;
202		-
203		- Object3D o = hashtable.get(GetUUID());
204		-
205		- this.bRep = o.bRep;
206		- if (this.bRep != null)
207		- this.bRep.support = o.transientrep;
208		-// this.support = o.support;
209		-// this.fileparent = o.fileparent;
210		-
211		- hashtable.remove(GetUUID());
212		-
213		- for (int i=0; i<Size(); i++)
214		- {
215		- get(i).RestoreBigData(hashtable);
216		- }
217		-}
218	493
219	494	// MOCAP SUPPORT
220	495	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,9 +632,13 @@
357	632	}
358	633
359	634	boolean live = false;
	635	+ transient boolean keepdontselect;
360	636	boolean dontselect = false;
361	637	boolean hide = false;
362		- 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	+
363	642	boolean marked = false; // animation node
364	643	boolean skip = false; // centroid issue
365	644	boolean skipmocap = false; // mocap data
..	..	@@ -367,6 +646,9 @@
367	646	boolean random = false;
368	647	boolean speedup = false;
369	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
370	652
371	653	float NORMALPUSH = 0;
372	654
..	..	@@ -385,7 +667,7 @@
385	667	{
386	668	sorted = true;
387	669
388		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
389	671	{
390	672	Object3D obji = get(i);
391	673	Object3D objj = get(i+1);
..	..	@@ -409,7 +691,7 @@
409	691	{
410	692	sorted = true;
411	693
412		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
413	695	{
414	696	Object3D obji = get(i);
415	697	Object3D objj = get(i+1);
..	..	@@ -425,11 +707,11 @@
425	707	}
426	708	}
427	709
428		- int memorysize;
	710	+ transient int memorysize; // needs to be transient, dunno why
429	711
430	712	int MemorySize()
431	713	{
432		- if (true) // memorysize == 0)
	714	+ if (memorysize == 0)
433	715	{
434	716	try
435	717	{
..	..	@@ -539,12 +821,14 @@
539	821	toParent = LA.newMatrix();
540	822	fromParent = LA.newMatrix();
541	823	}
	824	+
542	825	if (toParentMarked == null)
543	826	{
544	827	if (maxcount != 1)
545	828	{
546		- new Exception().printStackTrace();
	829	+ //new Exception().printStackTrace();
547	830	}
	831	+
548	832	toParentMarked = LA.newMatrix();
549	833	fromParentMarked = LA.newMatrix();
550	834	}
..	..	@@ -744,7 +1028,7 @@
744	1028
745	1029	void Step()
746	1030	{
747		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
748	1032	resetmaxcount();
749	1033	resettransformcount();
750	1034	resetstep();
..	..	@@ -855,7 +1139,7 @@
855	1139
856	1140	if (marked && Globals.isLIVE() && live &&
857	1141	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1142	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	1143	currentframe != Globals.framecount)
860	1144	{
861	1145	currentframe = Globals.framecount;
..	..	@@ -867,7 +1151,8 @@
867	1151
868	1152	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	1153
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1154	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1155	+ (step == 1 && changedir))
871	1156	{
872	1157	countdown = 1;
873	1158	delay = speedup?8:1;
..	..	@@ -936,20 +1221,28 @@
936	1221	{
937	1222	// return true;
938	1223
939		- if (material == null \|\| material.multiply)
940		- 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;
941	1232
942		- return material.opacity > 0.99;
	1233	+ return !sort;
943	1234	}
944	1235
945	1236	boolean IsOpaque()
946	1237	{
947	1238	// return true;
948	1239
949		- if (material == null \|\| material.multiply)
950		- return true;
	1240	+// if (material == null \|\| material.multiply)
	1241	+// return true;
	1242	+//
	1243	+// return material.opacity > 0.99;
951	1244
952		- return material.opacity > 0.99;
	1245	+ return !sort;
953	1246	}
954	1247
955	1248	Object3D()
..	..	@@ -1027,8 +1320,10 @@
1027	1320
1028	1321	// will share the geometry
1029	1322	assert (!(this instanceof Composite));
1030		- return deepCopy(); // Never called for Composite
1031		-
	1323	+
	1324	+ Object3D obj = deepCopy(); // Never called for Composite
	1325	+ obj.count = 2;
	1326	+ return obj;
1032	1327	}
1033	1328
1034	1329	boolean HasLoops()
..	..	@@ -1036,6 +1331,30 @@
1036	1331	return false;
1037	1332	}
1038	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	+
1039	1358	boolean IsInfinite()
1040	1359	{
1041	1360	if (blockloop)
..	..	@@ -1106,78 +1425,16 @@
1106	1425	return;
1107	1426
1108	1427	blockloop = true;
	1428	+
	1429	+ other.parent = parent;
	1430	+
1109	1431	//System.out.println("COPY " + this + " to " + other);
1110	1432	//new Exception().printStackTrace();
	1433	+ deepCopyNode(other);
1111	1434
1112		- other.parent = parent;
1113		- if (toParent != null)
1114		- {
1115		- other.toParent = LA.newMatrix();
1116		- other.fromParent = LA.newMatrix();
1117		- LA.matCopy(toParent, other.toParent);
1118		- LA.matCopy(fromParent, other.fromParent);
1119		- if (toParentMarked != null)
1120		- {
1121		- other.toParentMarked = LA.newMatrix();
1122		- other.fromParentMarked = LA.newMatrix();
1123		- LA.matCopy(toParentMarked, other.toParentMarked);
1124		- LA.matCopy(fromParentMarked, other.fromParentMarked);
1125		- }
1126		- }
1127		- else
1128		- {
1129		- if (other.toParent == null)
1130		-// assert(other.toParent == null);
1131		-// new Exception().printStackTrace();
1132		- System.err.println("null parent: " + other);
1133		- }
1134		- /*
1135		- double ident[][] = LA.newMatrix();
1136		- if (bRep == null)
1137		- other.bRep = null;
1138		- else
1139		- other.bRep = new BoundaryRep(bRep, ident);
1140		- */
1141		- // Really new...
1142	1435	other.bRep = bRep; // Share the geometry
1143	1436
1144	1437	other.support = support; // Share the support
1145		-
1146		- //other.editWindow = null;
1147		- if (name == null)
1148		- other.name = null;
1149		- else
1150		- other.name = new String(name);
1151		-
1152		- if (material != null)
1153		- {
1154		- other.material = new cMaterial(material);
1155		- } else
1156		- {
1157		- other.material = null;
1158		- }
1159		-
1160		- other.GetTextures().name = GetTextures().name;
1161		-
1162		- CopyExtraMaterial(other);
1163		-
1164		- other.touched = touched;
1165		- other.softtouched = softtouched;
1166		-
1167		- other.random = random;
1168		- other.link2master = link2master;
1169		- other.transformcount = transformcount;
1170		- other.marked = marked;
1171		- other.skip = skip;
1172		- other.count = count;
1173		- other.flipV = flipV;
1174		- other.live = live;
1175		- other.rewind = rewind;
1176		- other.hide = hide;
1177		- other.texres = texres;
1178		- other.speedup = speedup;
1179		- other.height = height;
1180		- other.depth = depth;
1181	1438
1182	1439	// aout 2013 if (/displaylist != -1 &&/other.displaylist != displaylist)
1183	1440	// {
..	..	@@ -1233,17 +1490,24 @@
1233	1490	if ((mask & GEOMETRY) != 0)
1234	1491	{
1235	1492	if (bRep != null)
1236		- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1237		- else
1238		- assert(other.bRep == null);
1239		-
1240		- if (bRep != null)
1241	1493	{
	1494	+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1242	1495	CameraPane.RemoveList(bRep.displaylist);
1243	1496	bRep.displaylist = 0; // june 2013 -1;
1244	1497	}
1245	1498	else
1246		- 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;
1247	1511	}
1248	1512
1249	1513	/* Use a MASK = GEO/MAT
..	..	@@ -1339,6 +1603,7 @@
1339	1603	toParent = LA.newMatrix();
1340	1604	fromParent = LA.newMatrix();
1341	1605	}
	1606	+
1342	1607	LA.matCopy(other.toParent, toParent);
1343	1608	LA.matCopy(other.fromParent, fromParent);
1344	1609
..	..	@@ -2218,11 +2483,6 @@
2218	2483
2219	2484	InitOthers();
2220	2485
2221		- if (this instanceof Camera)
2222		- {
2223		- material.shift = 90;
2224		- }
2225		-
2226	2486	material.multiply = multiply;
2227	2487
2228	2488	if (multiply)
..	..	@@ -2360,6 +2620,15 @@
2360	2620	}
2361	2621	*/
2362	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	+ }
2363	2632	}
2364	2633
2365	2634	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2670,14 @@
2401	2670	{
2402	2671	editWindow.refreshContents();
2403	2672	}
	2673	+ else
	2674	+ {
	2675	+ if (manipWindow != null)
	2676	+ {
	2677	+ manipWindow.refreshContents();
	2678	+ }
	2679	+ }
	2680	+
2404	2681	//if (parent != null)
2405	2682	//parent.refreshEditWindow();
2406	2683	}
..	..	@@ -2480,7 +2757,8 @@
2480	2757	private static final int editSelf = 1;
2481	2758	private static final int editChild = 2;
2482	2759
2483		- void drawEditHandles(ClickInfo info, int level)
	2760	+ void drawEditHandles(//ClickInfo info,
	2761	+ int level)
2484	2762	{
2485	2763	if (level == 0)
2486	2764	{
..	..	@@ -2488,7 +2766,8 @@
2488	2766	return;
2489	2767
2490	2768	Object3D selectee;
2491		- 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))
2492	2771	{
2493	2772	selectee = (Object3D) e.nextElement();
2494	2773	}
..	..	@@ -2496,19 +2775,22 @@
2496	2775	} else
2497	2776	{
2498	2777	//super.
2499		- drawEditHandles0(info, level + 1);
	2778	+ drawEditHandles0(//info,
	2779	+ level + 1);
2500	2780	}
2501	2781	}
2502	2782
2503		- boolean doEditClick(ClickInfo info, int level)
	2783	+ boolean doEditClick(//ClickInfo info,
	2784	+ int level)
2504	2785	{
2505	2786	doSomething = 0;
2506	2787	if (level == 0)
2507	2788	{
2508		- return doParentClick(info);
	2789	+ return doParentClick(); //info);
2509	2790	}
2510	2791	if (//super.
2511		- doEditClick0(info, level))
	2792	+ doEditClick0(//info,
	2793	+ level))
2512	2794	{
2513	2795	doSomething = 1;
2514	2796	return true;
..	..	@@ -2518,7 +2800,7 @@
2518	2800	}
2519	2801	}
2520	2802
2521		- boolean doParentClick(ClickInfo info)
	2803	+ boolean doParentClick() //ClickInfo info)
2522	2804	{
2523	2805	if (selection == null)
2524	2806	{
..	..	@@ -2531,7 +2813,8 @@
2531	2813	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2532	2814	{
2533	2815	Object3D selectee = (Object3D) e.nextElement();
2534		- if (selectee.doEditClick(info, 1))
	2816	+ if (selectee.doEditClick(//info,
	2817	+ 1))
2535	2818	{
2536	2819	childToDrag = selectee;
2537	2820	doSomething = 2;
..	..	@@ -2543,13 +2826,15 @@
2543	2826	return retval;
2544	2827	}
2545	2828
2546		- void doEditDrag(ClickInfo info, boolean opposite)
	2829	+ void doEditDrag(//ClickInfo clickInfo,
	2830	+ boolean opposite)
2547	2831	{
2548	2832	switch (doSomething)
2549	2833	{
2550	2834	case 1: // '\001'
2551	2835	//super.
2552		- doEditDrag0(info, opposite);
	2836	+ doEditDrag0(//clickInfo,
	2837	+ opposite);
2553	2838	break;
2554	2839
2555	2840	case 2: // '\002'
..	..	@@ -2562,11 +2847,13 @@
2562	2847	{
2563	2848	//sel.hitSomething = childToDrag.hitSomething;
2564	2849	//childToDrag.doEditDrag(info);
2565		- sel.doEditDrag(info, opposite);
	2850	+ sel.doEditDrag(//clickInfo,
	2851	+ opposite);
2566	2852	} else
2567	2853	{
2568	2854	//super.
2569		- doEditDrag0(info, opposite);
	2855	+ doEditDrag0(//clickInfo,
	2856	+ opposite);
2570	2857	}
2571	2858	}
2572	2859	break;
..	..	@@ -2584,6 +2871,9 @@
2584	2871	{
2585	2872	deselectAll();
2586	2873	}
	2874	+
	2875	+ new Exception().printStackTrace();
	2876	+
2587	2877	ClickInfo newInfo = new ClickInfo();
2588	2878	newInfo.flags = info.flags;
2589	2879	newInfo.bounds = info.bounds;
..	..	@@ -2676,6 +2966,18 @@
2676	2966	void GenNormalsS(boolean crease)
2677	2967	{
2678	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();
2679	2981	// for (int i=0; i<selection.size(); i++)
2680	2982	// {
2681	2983	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2816,6 +3118,24 @@
2816	3118	if (child == null)
2817	3119	continue;
2818	3120	child.GenNormals(crease);
	3121	+// Children().release(i);
	3122	+ }
	3123	+ blockloop = false;
	3124	+ }
	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();
2819	3139	// Children().release(i);
2820	3140	}
2821	3141	blockloop = false;
..	..	@@ -2983,7 +3303,19 @@
2983	3303	{
2984	3304	if (bRep != null)
2985	3305	{
	3306	+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
2986	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();
2987	3319	Touch();
2988	3320	}
2989	3321	}
..	..	@@ -2992,7 +3324,7 @@
2992	3324	{
2993	3325	if (bRep != null)
2994	3326	{
2995		- bRep.GenerateNormalsMINE();
	3327	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3328	Touch();
2997	3329	}
2998	3330	}
..	..	@@ -3049,6 +3381,105 @@
3049	3381	blockloop = false;
3050	3382	}
3051	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	+
3052	3483	void TransformChildren()
3053	3484	{
3054	3485	if (toParent != null)
..	..	@@ -3291,6 +3722,7 @@
3291	3722	if (bRep != null)
3292	3723	{
3293	3724	//bRep.RemoveOneTriangle();
	3725	+ System.out.println();
3294	3726	System.out.println("Reducing " + this);
3295	3727	if (name != null && name.contains("lockpickstraps"))
3296	3728	name = name;
..	..	@@ -3402,15 +3834,47 @@
3402	3834
3403	3835	void ClearMaterials()
3404	3836	{
	3837	+ if (blockloop)
	3838	+ return;
	3839	+
	3840	+ blockloop = true;
	3841	+
3405	3842	ClearMaterial();
3406		- for (int i = 0; i < size(); i++)
	3843	+ for (int i = 0; i < Size(); i++)
3407	3844	{
3408		- Object3D child = (Object3D) reserve(i);
	3845	+ Object3D child = (Object3D) get(i);
3409	3846	if (child == null)
3410	3847	continue;
3411	3848	child.ClearMaterials();
3412		- release(i);
3413	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;
3414	3878	}
3415	3879
3416	3880	void FlipV(boolean flip)
..	..	@@ -3438,7 +3902,8 @@
3438	3902	if (blockloop)
3439	3903	return;
3440	3904
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3905	+ if (//marked \|\| // does not make sense
	3906	+ (bRep != null \|\| material != null)) // borderline...
3442	3907	live = h;
3443	3908
3444	3909	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3924,8 @@
3459	3924	return;
3460	3925
3461	3926	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3927	+ if (//marked \|\| // does not make sense
	3928	+ (bRep != null \|\| material != null)) // borderline...
3463	3929	link2master = h;
3464	3930
3465	3931	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3945,8 @@
3479	3945	if (blockloop)
3480	3946	return;
3481	3947
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3948	+ if (//marked \|\| // does not make sense
	3949	+ (bRep != null \|\| material != null)) // borderline...
3483	3950	hide = h;
3484	3951
3485	3952	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3966,7 @@
3499	3966	if (blockloop)
3500	3967	return;
3501	3968
3502		- if (bRep != null && material != null) // borderline...
	3969	+ if (bRep != null \|\| material != null) // borderline...
3503	3970	marked = h;
3504	3971
3505	3972	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3976,46 @@
3509	3976	continue;
3510	3977	blockloop = true;
3511	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);
3512	4019	blockloop = false;
3513	4020	// release(i);
3514	4021	}
..	..	@@ -3546,6 +4053,7 @@
3546	4053
3547	4054	void RevertMeshes()
3548	4055	{
	4056	+ // BLOCKLOOP
3549	4057	if (this instanceof cMesh)
3550	4058	{
3551	4059	((cMesh)this).Revert();
..	..	@@ -3576,11 +4084,6 @@
3576	4084	Touch();
3577	4085	}
3578	4086
3579		- ResetRecur();
3580		- }
3581		-
3582		- void ResetRecur()
3583		- {
3584	4087	for (int i = 0; i < size(); i++)
3585	4088	{
3586	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3603,11 +4106,6 @@
3603	4106	Step();
3604	4107	Touch();
3605	4108
3606		- StepRecur();
3607		- }
3608		-
3609		- void StepRecur()
3610		- {
3611	4109	for (int i = 0; i < size(); i++)
3612	4110	{
3613	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -3794,8 +4292,8 @@
3794	4292	Touch();
3795	4293	}
3796	4294
3797		- transient cVector min = new cVector();
3798		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
3799	4297
3800	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
3801	4299	{
..	..	@@ -3811,15 +4309,15 @@
3811	4309	if (blockloop)
3812	4310	return;
3813	4311
3814		- if (min == null) // ???
	4312	+ if (min == null)
3815	4313	{
3816	4314	min = new cVector();
3817	4315	max = new cVector();
3818	4316	}
3819	4317
3820		- for (int i = 0; i<size(); i++)
	4318	+ for (int i = 0; i<Size(); i++)
3821	4319	{
3822		- Object3D child = (Object3D) reserve(i);
	4320	+ Object3D child = (Object3D) get(i); //reserve(i);
3823	4321	if (child == null)
3824	4322	continue;
3825	4323
..	..	@@ -3838,21 +4336,21 @@
3838	4336	if (child.hide && !(child instanceof Merge) \|\| child.skip)
3839	4337	//if (child.hide)
3840	4338	{
3841		- release(i);
	4339	+ //release(i);
3842	4340	continue;
3843	4341	}
3844	4342
3845	4343	blockloop = true;
3846	4344	child.getBounds(min, max, true); // xform);
3847	4345	blockloop = false;
3848		- release(i);
	4346	+ //release(i);
3849	4347
3850	4348	MinMax(minima, maxima);
3851	4349	}
3852	4350
3853	4351	if (bRep != null)
3854	4352	{
3855		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
3856	4354	}
3857	4355
3858	4356	if (false) // xform)
..	..	@@ -4282,6 +4780,55 @@
4282	4780	{
4283	4781	blockloop = true;
4284	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();
4285	4832	blockloop = false;
4286	4833	}
4287	4834	}
..	..	@@ -4800,6 +5347,14 @@
4800	5347	}
4801	5348	}
4802	5349
	5350	+ ObjEditor GetWindow()
	5351	+ {
	5352	+ if (editWindow != null)
	5353	+ return editWindow;
	5354	+
	5355	+ return manipWindow;
	5356	+ }
	5357	+
4803	5358	cTreePath Select(int indexcount, boolean deselect)
4804	5359	{
4805	5360	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5391,11 @@
4836	5391	if (leaf != null)
4837	5392	{
4838	5393	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5394	+ ObjEditor window = GetWindow();
	5395	+ if (window != null)
4840	5396	{
4841	5397	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5398	+ window.Select(tp, deselect, true);
4843	5399	}
4844	5400
4845	5401	return tp;
..	..	@@ -4856,6 +5412,7 @@
4856	5412
4857	5413	if (child == null)
4858	5414	continue;
	5415	+
4859	5416	if (child.HasTransparency() && child.size() != 0)
4860	5417	{
4861	5418	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5422,10 @@
4865	5422	if (leaf != null)
4866	5423	{
4867	5424	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5425	+ ObjEditor window = GetWindow();
	5426	+ if (window != null)
4869	5427	{
4870		- editWindow.Select(tp, deselect, true);
	5428	+ window.Select(tp, deselect, true);
4871	5429	}
4872	5430
4873	5431	return tp;
..	..	@@ -5192,6 +5750,51 @@
5192	5750	blockloop = false;
5193	5751	}
5194	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	+
5195	5798	boolean IsSelected()
5196	5799	{
5197	5800	if (parent == null)
..	..	@@ -5252,6 +5855,11 @@
5252	5855	if (fullname == null)
5253	5856	return "";
5254	5857
	5858	+ if (fullname.pigment != null)
	5859	+ {
	5860	+ return fullname.pigment;
	5861	+ }
	5862	+
5255	5863	// System.out.println("Fullname = " + fullname);
5256	5864
5257	5865	// Does not work on Windows due to C:
..	..	@@ -5264,7 +5872,7 @@
5264	5872
5265	5873	if (split.length == 0)
5266	5874	{
5267		- return "";
	5875	+ return fullname.pigment = "";
5268	5876	}
5269	5877
5270	5878	if (split.length <= 2)
..	..	@@ -5272,22 +5880,27 @@
5272	5880	if (fullname.name.endsWith(":"))
5273	5881	{
5274	5882	// Windows
5275		- return fullname.name.substring(0, fullname.name.length()-1);
	5883	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5276	5884	}
5277	5885
5278		- return split[0];
	5886	+ return fullname.pigment = split[0];
5279	5887	}
5280	5888
5281	5889	// Windows
5282	5890	assert(split.length == 4);
5283	5891
5284		- return split[0] + ":" + split[1];
	5892	+ return fullname.pigment = split[0] + ":" + split[1];
5285	5893	}
5286	5894
5287	5895	static String GetBump(cTexture fullname)
5288	5896	{
5289	5897	if (fullname == null)
5290	5898	return "";
	5899	+
	5900	+ if (fullname.bump != null)
	5901	+ {
	5902	+ return fullname.bump;
	5903	+ }
5291	5904
5292	5905	// System.out.println("Fullname = " + fullname);
5293	5906	// Does not work on Windows due to C:
..	..	@@ -5299,12 +5912,12 @@
5299	5912
5300	5913	if (split.length == 0)
5301	5914	{
5302		- return "";
	5915	+ return fullname.bump = "";
5303	5916	}
5304	5917
5305	5918	if (split.length == 1)
5306	5919	{
5307		- return "";
	5920	+ return fullname.bump = "";
5308	5921	}
5309	5922
5310	5923	if (split.length == 2)
..	..	@@ -5312,16 +5925,16 @@
5312	5925	if (fullname.name.endsWith(":"))
5313	5926	{
5314	5927	// Windows
5315		- return "";
	5928	+ return fullname.bump = "";
5316	5929	}
5317	5930
5318		- return split[1];
	5931	+ return fullname.bump = split[1];
5319	5932	}
5320	5933
5321	5934	// Windows
5322	5935	assert(split.length == 4);
5323	5936
5324		- return split[2] + ":" + split[3];
	5937	+ return fullname.bump = split[2] + ":" + split[3];
5325	5938	}
5326	5939
5327	5940	String GetPigmentTexture()
..	..	@@ -5404,6 +6017,9 @@
5404	6017	texname = "";
5405	6018
5406	6019	GetTextures().name = texname + ":" + GetBump(GetTextures());
	6020	+
	6021	+ GetTextures().pigment = null;
	6022	+
5407	6023	Touch();
5408	6024	}
5409	6025
..	..	@@ -5477,6 +6093,8 @@
5477	6093
5478	6094	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5479	6095
	6096	+ GetTextures().bump = null;
	6097	+
5480	6098	Touch();
5481	6099	}
5482	6100
..	..	@@ -5501,6 +6119,38 @@
5501	6119	}
5502	6120	}
5503	6121
	6122	+ void EmbedTextures(boolean embed)
	6123	+ {
	6124	+ if (blockloop)
	6125	+ return;
	6126	+
	6127	+ //if (GetTextures() != null)
	6128	+ if (embed)
	6129	+ CameraPane.EmbedTextures(GetTextures());
	6130	+ else
	6131	+ {
	6132	+ GetTextures().pigmentdata = null;
	6133	+ GetTextures().bumpdata = null;
	6134	+ GetTextures().pw = 0;
	6135	+ GetTextures().ph = 0;
	6136	+ GetTextures().bw = 0;
	6137	+ GetTextures().bh = 0;
	6138	+ }
	6139	+
	6140	+ int nb = Size();
	6141	+ for (int i = 0; i < nb; i++)
	6142	+ {
	6143	+ Object3D child = (Object3D) get(i);
	6144	+
	6145	+ if (child == null)
	6146	+ continue;
	6147	+
	6148	+ blockloop = true;
	6149	+ child.EmbedTextures(embed);
	6150	+ blockloop = false;
	6151	+ }
	6152	+ }
	6153	+
5504	6154	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	6155	{
5506	6156	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +6159,37 @@
5509	6159	boolean NeedSupport()
5510	6160	{
5511	6161	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	6162	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
5513	6163	// PROBLEM with CROWD!!
5514	6164	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	6165	}
5516	6166
5517	6167	static boolean DEBUG_SELECTION = false;
	6168	+
	6169	+ boolean IsLive()
	6170	+ {
	6171	+ if (live)
	6172	+ return true;
	6173	+
	6174	+ if (parent == null)
	6175	+ return false;
	6176	+
	6177	+ return parent.IsLive();
	6178	+ }
	6179	+
	6180	+ boolean IsDynamic()
	6181	+ {
	6182	+ return live && bRep != null;
	6183	+ }
	6184	+
	6185	+ boolean Link2Support()
	6186	+ {
	6187	+ return link2master \|\| link2support;
	6188	+ }
	6189	+
	6190	+ static cVector minima = new cVector();
	6191	+ static cVector maxima = new cVector();
	6192	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
5518	6193
5519	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	6195	{
..	..	@@ -5523,6 +6198,29 @@
5523	6198	if (support != null)
5524	6199	{
5525	6200	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6201	+ }
	6202	+
	6203	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6204	+ {
	6205	+ getBounds(minima, maxima, true);
	6206	+ center.x = (minima.x + maxima.x) / 2;
	6207	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6208	+ center.z = (minima.z + maxima.z) / 2;
	6209	+
	6210	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6211	+
	6212	+ IntersectResult res = new IntersectResult();
	6213	+ res.t = Double.POSITIVE_INFINITY;
	6214	+
	6215	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6216	+ {
	6217	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6218	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6219	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6220	+
	6221	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6222	+ LA.matInvert(toParent, fromParent);
	6223	+ }
5526	6224	}
5527	6225
5528	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -5576,8 +6274,11 @@
5576	6274	if (support != null)
5577	6275	support = support;
5578	6276
5579		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580		- 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.
5581	6282
5582	6283	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	6284	{
..	..	@@ -5585,10 +6286,12 @@
5585	6286	bRep.displaylist = 0;
5586	6287	}
5587	6288	// usecalllists &= !(parent instanceof RandomNode);
5588		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
5589	6291
5590		- if (GetBRep() != null)
5591		- usecalllists = usecalllists;
	6292	+ if (display.DrawMode() == display.SHADOW)
	6293	+ //GetBRep() != null)
	6294	+ usecalllists = !!usecalllists;
5592	6295	//System.out.println("draw " + this);
5593	6296	//new Exception().printStackTrace();
5594	6297
..	..	@@ -5597,10 +6300,12 @@
5597	6300	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	6301
5599	6302	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6303	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6304	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	6305	{
5602	6306	Globals.lighttouched = true;
5603	6307	} // all panes...
	6308	+
5604	6309	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	6310	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	6311	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5608,7 +6313,7 @@
5608	6313	if (!(this instanceof Composite))
5609	6314	touched = false;
5610	6315	//if (displaylist == -1 && usecalllists)
5611		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6316	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5612	6317	{
5613	6318	bRep.displaylist = display.GenList();
5614	6319	assert(bRep.displaylist != 0);
..	..	@@ -5619,7 +6324,7 @@
5619	6324
5620	6325	//System.out.println("\tnew list " + list);
5621	6326	//gl.glDrawBuffer(gl.GL_NONE);
5622		- if (usecalllists)
	6327	+ if (usecalllists && bRep.displaylist > 0)
5623	6328	{
5624	6329	// System.err.println("new list " + bRep.displaylist + " for " + this);
5625	6330	display.NewList(bRep.displaylist);
..	..	@@ -5628,7 +6333,7 @@
5628	6333	CallList(display, root, selected, blocked);
5629	6334
5630	6335	// compiled = true;
5631		- if (usecalllists)
	6336	+ if (usecalllists && bRep.displaylist > 0)
5632	6337	{
5633	6338	// System.err.println("end list " + bRep.displaylist + " for " + this);
5634	6339	display.EndList();
..	..	@@ -5638,8 +6343,8 @@
5638	6343	Globals.lighttouched = true; // all panes...
5639	6344	}
5640	6345
5641		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
5642		- //touched = false;
	6346	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6347	+ touched = false;
5643	6348
5644	6349	if (this instanceof Texture \|\| this instanceof TextureNode)
5645	6350	{
..	..	@@ -5678,7 +6383,7 @@
5678	6383	{
5679	6384	if (display.DrawMode() == iCameraPane.SHADOW)
5680	6385	{
5681		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
5682	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5683	6388	{
5684	6389	//System.out.print("CULLED");
..	..	@@ -5728,6 +6433,7 @@
5728	6433	if (GetBRep() != null)
5729	6434	{
5730	6435	display.NextIndex();
	6436	+
5731	6437	// vertex color conflict : gl.glCallList(list);
5732	6438	DrawNode(display, root, selected);
5733	6439	if (this instanceof BezierPatch)
..	..	@@ -5739,6 +6445,20 @@
5739	6445	{
5740	6446	drawSelf(display, root, selected, blocked);
5741	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	+// }
5742	6462	} else
5743	6463	{
5744	6464	/*
..	..	@@ -5768,16 +6488,28 @@
5768	6488	tex = GetTextures();
5769	6489	}
5770	6490
5771		- boolean failed = false;
	6491	+ boolean failedPigment = false;
	6492	+ boolean failedBump = false;
5772	6493
	6494	+ CameraPane.lastObject = this;
5773	6495	try
5774	6496	{
5775		- display.BindTextures(tex, texres);
	6497	+ display.BindPigmentTexture(tex, texres);
5776	6498	}
5777	6499	catch (Exception e)
5778	6500	{
5779		- System.err.println("FAILED: " + this);
5780		- failed = true;
	6501	+ // System.err.println("FAILED: " + this);
	6502	+ failedPigment = true;
	6503	+ }
	6504	+
	6505	+ try
	6506	+ {
	6507	+ display.BindBumpTexture(tex, texres);
	6508	+ }
	6509	+ catch (Exception e)
	6510	+ {
	6511	+ //System.err.println("FAILED: " + this);
	6512	+ failedBump = true;
5781	6513	}
5782	6514
5783	6515	if (!compiled)
..	..	@@ -5798,10 +6530,27 @@
5798	6530	// june 2013 drawSelf(display, root, selected);
5799	6531	}
5800	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	+ }
5801	6547	}
5802	6548
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6549	+ if (!failedBump)
	6550	+ display.ReleaseBumpTexture(tex);
	6551	+
	6552	+ if (!failedPigment)
	6553	+ display.ReleasePigmentTexture(tex);
5805	6554
5806	6555	display.PopMaterial(this, selected);
5807	6556	}
..	..	@@ -5847,16 +6596,17 @@
5847	6596
5848	6597	void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5849	6598	{
5850		- if (GetBRep() == null)
5851		- {
5852		- drawSelf(display, root, selected, blocked);
5853		- } else
	6599	+ if (GetBRep() != null)
5854	6600	{
5855	6601	DrawNode(display, root, selected);
5856	6602	if (this instanceof BezierPatch)
5857	6603	{
5858	6604	//drawSelf(display, root, selected);
5859	6605	}
	6606	+ }
	6607	+ else
	6608	+ {
	6609	+ drawSelf(display, root, selected, blocked);
5860	6610	}
5861	6611	}
5862	6612
..	..	@@ -6106,7 +6856,7 @@
6106	6856
6107	6857	//javax.media.opengl.GL gl = display.GetGL();
6108	6858
6109		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
6110	6860	{
6111	6861	int fc = bRep.FaceCount();
6112	6862	int vc = bRep.VertexCount();
..	..	@@ -6174,6 +6924,11 @@
6174	6924	// dec 2012
6175	6925	new Exception().printStackTrace();
6176	6926	return;
	6927	+ }
	6928	+
	6929	+ if (dontselect)
	6930	+ {
	6931	+ //bRep.GenerateNormalsMINE();
6177	6932	}
6178	6933
6179	6934	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6263,7 +7018,7 @@
6263	7018	facescompare[k] = new FaceCompare(k);
6264	7019	}
6265	7020
6266		- center = new cVector();
	7021	+ centertriangle = new cVector();
6267	7022	}
6268	7023	else
6269	7024	{
..	..	@@ -6386,7 +7141,7 @@
6386	7141	*/
6387	7142	}
6388	7143
6389		- transient cVector center;
	7144	+ transient cVector centertriangle;
6390	7145
6391	7146	class FaceCompare implements Comparable
6392	7147	{
..	..	@@ -6415,14 +7170,14 @@
6415	7170	Vertex q = bRep.GetVertex(face.q);
6416	7171	Vertex r = bRep.GetVertex(face.r);
6417	7172
6418		- center.set(p);
6419		- center.add(q);
6420		- center.add(r);
6421		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
6422	7177
6423		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
6424	7179
6425		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
6426	7181	}
6427	7182
6428	7183	return distance;
..	..	@@ -6959,20 +7714,23 @@
6959	7714	}
6960	7715	}
6961	7716
6962		- 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)
6963	7721	{
6964		- int hc = info.bounds.x + info.bounds.width / 2;
6965		- int vc = info.bounds.y + info.bounds.height / 2;
6966		- 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;
6967	7725	if (toscreen == null)
6968	7726	{
6969		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7727	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6970	7728	}
6971	7729	cVector vec = in;
6972	7730	LA.xformPos(in, toscreen, in);
6973	7731	//System.out.println("Distance = " + info.camera.Distance());
6974		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6975		- 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();
6976	7734	outPt.x = hc + (int) vec.x;
6977	7735	outPt.y = vc - (int) vec.y;
6978	7736	outRec.x = outPt.x - 3;
..	..	@@ -6980,15 +7738,18 @@
6980	7738	outRec.width = outRec.height = 6;
6981	7739	}
6982	7740
6983		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7741	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7742	+ )
6984	7743	{
6985	7744	Point pt = new Point(0, 0);
6986	7745	Rectangle rec = new Rectangle();
6987		- calcHotSpot(in, info, pt, rec);
	7746	+ calcHotSpot(in, //clickInfo,
	7747	+ pt, rec);
6988	7748	return rec;
6989	7749	}
6990	7750
6991		- void drawEditHandles0(ClickInfo info, int level)
	7751	+ void drawEditHandles0(//ClickInfo clickInfo,
	7752	+ int level)
6992	7753	{
6993	7754	if (level == 0)
6994	7755	{
..	..	@@ -6997,16 +7758,19 @@
6997	7758	{
6998	7759	cVector origin = new cVector();
6999	7760	//LA.xformPos(origin, toParent, origin);
7000		- Rectangle spot = calcHotSpot(origin, info);
	7761	+ if (this.clickInfo == null)
	7762	+ this.clickInfo = new ClickInfo();
	7763	+
	7764	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7001	7765	Rectangle boundary = new Rectangle();
7002	7766	boundary.x = spot.x - 30;
7003	7767	boundary.y = spot.y - 30;
7004	7768	boundary.width = spot.width + 60;
7005	7769	boundary.height = spot.height + 60;
7006		- info.g.setColor(Color.red);
	7770	+ clickInfo.g.setColor(Color.white);
7007	7771	int spotw = spot.x + spot.width;
7008	7772	int spoth = spot.y + spot.height;
7009		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7773	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7010	7774	// if (CameraPane.Xmin > spot.x)
7011	7775	// {
7012	7776	// CameraPane.Xmin = spot.x;
..	..	@@ -7023,11 +7787,33 @@
7023	7787	// {
7024	7788	// CameraPane.Ymax = spoth;
7025	7789	// }
7026		- spot.translate(32, 32);
	7790	+// if (CameraPane.Xmin > spot.x)
	7791	+// {
	7792	+// CameraPane.Xmin = spot.x;
	7793	+// }
	7794	+// if (CameraPane.Xmax < spotw)
	7795	+// {
	7796	+// CameraPane.Xmax = spotw;
	7797	+// }
	7798	+// if (CameraPane.Ymin > spot.y)
	7799	+// {
	7800	+// CameraPane.Ymin = spot.y;
	7801	+// }
	7802	+// if (CameraPane.Ymax < spoth)
	7803	+// {
	7804	+// CameraPane.Ymax = spoth;
	7805	+// }
	7806	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7807	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7808	+ spot.translate(32, 0);
	7809	+ clickInfo.g.setColor(Color.yellow);
	7810	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7811	+
	7812	+ spot.translate(32, 64);
7027	7813	spotw = spot.x + spot.width;
7028	7814	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
7030		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7815	+ clickInfo.g.setColor(Color.cyan);
	7816	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7817	// if (CameraPane.Xmin > spot.x)
7032	7818	// {
7033	7819	// CameraPane.Xmin = spot.x;
..	..	@@ -7044,29 +7830,9 @@
7044	7830	// {
7045	7831	// CameraPane.Ymax = spoth;
7046	7832	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7049		- spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
7051		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7052		-// if (CameraPane.Xmin > spot.x)
7053		-// {
7054		-// CameraPane.Xmin = spot.x;
7055		-// }
7056		-// if (CameraPane.Xmax < spotw)
7057		-// {
7058		-// CameraPane.Xmax = spotw;
7059		-// }
7060		-// if (CameraPane.Ymin > spot.y)
7061		-// {
7062		-// CameraPane.Ymin = spot.y;
7063		-// }
7064		-// if (CameraPane.Ymax < spoth)
7065		-// {
7066		-// CameraPane.Ymax = spoth;
7067		-// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- boundary.width, boundary.height, 0, 360);
	7833	+ clickInfo.g.setColor(Color.green);
	7834	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7835	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7070	7836	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7837	// if (CameraPane.Xmin > boundary.x)
7072	7838	// {
..	..	@@ -7088,7 +7854,8 @@
7088	7854	}
7089	7855	}
7090	7856
7091		- boolean doEditClick0(ClickInfo info, int level)
	7857	+ boolean doEditClick0(//ClickInfo clickInfo,
	7858	+ int level)
7092	7859	{
7093	7860	if (level == 0)
7094	7861	{
..	..	@@ -7097,8 +7864,8 @@
7097	7864
7098	7865	boolean retval = false;
7099	7866
7100		- startX = info.x;
7101		- startY = info.y;
	7867	+ startX = clickInfo.x;
	7868	+ startY = clickInfo.y;
7102	7869
7103	7870	hitSomething = -1;
7104	7871	cVector origin = new cVector();
..	..	@@ -7108,22 +7875,53 @@
7108	7875	{
7109	7876	centerPt = new Point(0, 0);
7110	7877	}
7111		- calcHotSpot(origin, info, centerPt, spot);
7112		- if (spot.contains(info.x, info.y))
	7878	+ calcHotSpot(origin, //info,
	7879	+ centerPt, spot);
	7880	+ if (spot.contains(clickInfo.x, clickInfo.y))
7113	7881	{
7114	7882	hitSomething = hitCenter;
7115	7883	retval = true;
7116	7884	}
7117	7885	spot.translate(32, 0);
7118		- if (spot.contains(info.x, info.y))
	7886	+ if (spot.contains(clickInfo.x, clickInfo.y))
7119	7887	{
7120	7888	hitSomething = hitRotate;
7121	7889	retval = true;
7122	7890	}
7123	7891	spot.translate(0, 32);
7124		- 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))
7125	7895	{
7126	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	+
7127	7925	retval = true;
7128	7926	}
7129	7927
..	..	@@ -7133,7 +7931,7 @@
7133	7931	}
7134	7932
7135	7933	//System.out.println("info.modifiers = " + info.modifiers);
7136		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7934	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7137	7935	//System.out.println("modified = " + modified);
7138	7936	//new Exception().printStackTrace();
7139	7937	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7161,7 +7959,8 @@
7161	7959	return true;
7162	7960	}
7163	7961
7164		- void doEditDrag0(ClickInfo info, boolean opposite)
	7962	+ void doEditDrag0(//ClickInfo info,
	7963	+ boolean opposite)
7165	7964	{
7166	7965	if (hitSomething == 0)
7167	7966	{
..	..	@@ -7175,7 +7974,7 @@
7175	7974
7176	7975	//System.out.println("hitSomething = " + hitSomething);
7177	7976
7178		- double scale = 0.005f * info.camera.Distance();
	7977	+ double scale = 0.005f * clickInfo.camera.Distance();
7179	7978
7180	7979	cVector xlate = new cVector();
7181	7980	//cVector xlate2 = new cVector();
..	..	@@ -7189,7 +7988,9 @@
7189	7988
7190	7989	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7191	7990
7192		- if (modified \|\| opposite)
	7991	+ // Modified could snap
	7992	+ if (//modified \|\|
	7993	+ opposite)
7193	7994	{
7194	7995	//assert(false);
7195	7996	/*
..	..	@@ -7209,8 +8010,8 @@
7209	8010	toParent[3][i] = xlate.get(i);
7210	8011	LA.matInvert(toParent, fromParent);
7211	8012	*/
7212		- cVector delta = LA.newVector(0, 0, startY - info.y);
7213		- 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);
7214	8015
7215	8016	LA.matCopy(startMat, toParent);
7216	8017	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7219,7 +8020,7 @@
7219	8020	} else
7220	8021	{
7221	8022	//LA.xformDir(delta, info.camera.fromScreen, delta);
7222		- cVector up = new cVector(info.camera.up);
	8023	+ cVector up = new cVector(clickInfo.camera.up);
7223	8024	cVector away = new cVector();
7224	8025	//cVector right2 = new cVector();
7225	8026	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7236,19 +8037,19 @@
7236	8037	LA.xformDir(up, ClickInfo.matbuffer, up);
7237	8038	// if (!CameraPane.LOCALTRANSFORM)
7238	8039	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7239		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	8040	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7240	8041	// if (!CameraPane.LOCALTRANSFORM)
7241	8042	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7242	8043	//LA.vecCross(up, cVector.Z, right2);
7243	8044
7244		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	8045	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7245	8046
7246	8047	//System.out.println("DELTA0 = " + delta);
7247	8048	//System.out.println("AWAY = " + info.camera.away);
7248	8049	//System.out.println("UP = " + info.camera.up);
7249	8050	if (away.z > 0)
7250	8051	{
7251		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	8052	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7252	8053	{
7253	8054	delta.x = -delta.x;
7254	8055	} else
..	..	@@ -7263,7 +8064,7 @@
7263	8064	//System.out.println("DELTA1 = " + delta);
7264	8065	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7265	8066	//System.out.println("DELTA2 = " + delta);
7266		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	8067	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7267	8068	LA.matCopy(startMat, toParent);
7268	8069	//System.out.println("DELTA3 = " + delta);
7269	8070	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7273,8 +8074,8 @@
7273	8074	break;
7274	8075
7275	8076	case hitRotate: // rotate
7276		- int dx = info.x - centerPt.x;
7277		- int dy = -(info.y - centerPt.y);
	8077	+ int dx = clickInfo.x - centerPt.x;
	8078	+ int dy = -(clickInfo.y - centerPt.y);
7278	8079	double angle = (double) Math.atan2(dx, dy);
7279	8080	angle = -(1.570796 - angle);
7280	8081
..	..	@@ -7283,7 +8084,7 @@
7283	8084
7284	8085	if (modified)
7285	8086	{
7286		- // Rotate 90 degrees
	8087	+ // Rotate 45 degrees
7287	8088	angle /= (Math.PI / 4);
7288	8089	angle = Math.floor(angle + 0.5);
7289	8090	angle *= (Math.PI / 4);
..	..	@@ -7297,7 +8098,7 @@
7297	8098	}
7298	8099	/**/
7299	8100
7300		- switch (info.pane.RenderCamera().viewCode)
	8101	+ switch (clickInfo.pane.RenderCamera().viewCode)
7301	8102	{
7302	8103	case 1: // '\001'
7303	8104	LA.matZRotate(toParent, angle);
..	..	@@ -7324,7 +8125,7 @@
7324	8125	break;
7325	8126
7326	8127	case hitScale: // scale
7327		- double hScale = (double) (info.x - centerPt.x) / 32;
	8128	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7328	8129	double sign = 1;
7329	8130	if (hScale < 0)
7330	8131	{
..	..	@@ -7336,7 +8137,7 @@
7336	8137	//hScale = 0.01;
7337	8138	}
7338	8139
7339		- double vScale = (double) (info.y - centerPt.y) / 32;
	8140	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7340	8141	sign = 1;
7341	8142	if (vScale < 0)
7342	8143	{
..	..	@@ -7347,6 +8148,7 @@
7347	8148	{
7348	8149	//vScale = 0.01;
7349	8150	}
	8151	+
7350	8152	LA.matCopy(startMat, toParent);
7351	8153	/**/
7352	8154	for (int i = 0; i < 3; i++)
..	..	@@ -7356,32 +8158,39 @@
7356	8158	}
7357	8159	/**/
7358	8160
7359		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	8161	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7360	8162
7361	8163	if (totalScale < 0.01)
7362	8164	{
7363	8165	totalScale = 0.01;
7364	8166	}
7365	8167
7366		- switch (info.pane.RenderCamera().viewCode)
	8168	+ switch (clickInfo.pane.RenderCamera().viewCode)
7367	8169	{
7368	8170	case 3: // '\001'
7369		- if (modified)
	8171	+ if (modified \|\| opposite)
7370	8172	{
	8173	+ if (modified) // && opposite)
	8174	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8175	+ else
7371	8176	//LA.matScale(toParent, 1, hScale, vScale);
7372		- LA.matScale(toParent, totalScale, 1, 1);
	8177	+ LA.matScale(toParent, totalScale, 1, 1);
7373	8178	} // vScale, 1);
7374	8179	else
7375	8180	{
7376		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8181	+ // EXCEPTION!
	8182	+ LA.matScale(toParent, 1, totalScale, totalScale);
7377	8183	} // vScale, 1);
7378	8184	break;
7379	8185
7380	8186	case 2: // '\002'
7381		- if (modified)
	8187	+ if (modified \|\| opposite)
7382	8188	{
7383		- //LA.matScale(toParent, hScale, 1, vScale);
7384		- LA.matScale(toParent, 1, totalScale, 1);
	8189	+ if (modified) // && opposite)
	8190	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8191	+ else
	8192	+ //LA.matScale(toParent, hScale, 1, vScale);
	8193	+ LA.matScale(toParent, 1, totalScale, 1);
7385	8194	} else
7386	8195	{
7387	8196	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7389,10 +8198,13 @@
7389	8198	break;
7390	8199
7391	8200	case 1: // '\003'
7392		- if (modified)
	8201	+ if (modified \|\| opposite)
7393	8202	{
7394		- //LA.matScale(toParent, hScale, vScale, 1);
7395		- LA.matScale(toParent, 1, 1, totalScale);
	8203	+ if (modified) // && opposite)
	8204	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8205	+ else
	8206	+ //LA.matScale(toParent, hScale, vScale, 1);
	8207	+ LA.matScale(toParent, 1, 1, totalScale);
7396	8208	} else
7397	8209	{
7398	8210	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7429,7 +8241,7 @@
7429	8241	} // NEW ...
7430	8242
7431	8243
7432		- info.pane.repaint();
	8244	+ clickInfo.pane.repaint();
7433	8245	}
7434	8246
7435	8247	boolean overflow = false;
..	..	@@ -7543,12 +8355,12 @@
7543	8355	if (!Globals.ADVANCED)
7544	8356	return objname;
7545	8357
7546		- return objname + " " + System.identityHashCode(this);
	8358	+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
7547	8359	}
7548	8360
7549	8361	public int hashCode()
7550	8362	{
7551		- // Fuck Vector...
	8363	+ // Do not use Vector...
7552	8364	return System.identityHashCode(this);
7553	8365	}
7554	8366
..	..	@@ -7608,6 +8420,10 @@
7608	8420	{
7609	8421	editWindow = null;
7610	8422	} // ?
	8423	+ }
	8424	+ else
	8425	+ {
	8426	+ //editWindow.closeUI();
7611	8427	}
7612	8428	}
7613	8429
..	..	@@ -7766,6 +8582,10 @@
7766	8582	}
7767	8583
7768	8584	transient ObjEditor editWindow;
	8585	+ transient ObjEditor manipWindow;
	8586	+
	8587	+ transient boolean pinned;
	8588	+
7769	8589	transient ObjectUI objectUI;
7770	8590	public static int povDepth = 0;
7771	8591	private static cVector tbMin = new cVector();
..	..	@@ -7780,8 +8600,8 @@
7780	8600	private static cVector2 qq2 = new cVector2();
7781	8601	private static cVector2 rr2 = new cVector2();
7782	8602	private static cVector2 ss2 = new cVector2();
7783		- private static cVector edge1 = new cVector();
7784		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
7785	8605	//private static cVector norm = new cVector();
7786	8606	/transient private/ int hitSomething;
7787	8607	static final int hitCenter = 1;
..	..	@@ -7979,7 +8799,275 @@
7979	8799
7980	8800	Touch();
7981	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
7982	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	+ }
7983	9071
7984	9072	public int Size()
7985	9073	{