~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,15 +22,37 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
30	31	//
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
31	40
32	41	ScriptNode scriptnode;
33	42
	43	+ int VersionCount()
	44	+ {
	45	+ int count = 0;
	46	+
	47	+ for (int i = versionlist.length; --i >= 0;)
	48	+ {
	49	+ if (versionlist[i] != null)
	50	+ count++;
	51	+ }
	52	+
	53	+ return count;
	54	+ }
	55	+
34	56	void InitOthers()
35	57	{
36	58	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -170,24 +192,35 @@
170	192
171	193	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	194	{
	195	+ Object3D o;
	196	+
173	197	if (hashtable.containsKey(GetUUID()))
174	198	{
175		- Object3D o = hashtable.get(GetUUID());
	199	+ o = hashtable.get(GetUUID());
176	200
177	201	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	202	+ //if (this.bRep != null)
	203	+ // assert(this.bRep.support == o.transientrep);
	204	+ if (this.support != null)
	205	+ assert(this.support.bRep == o.transientrep);
	206	+ }
	207	+ else
	208	+ {
	209	+ o = new Object3D("copy of " + this.name);
180	210
181		- return;
	211	+ hashtable.put(GetUUID(), o);
182	212	}
183	213
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	214	+ if (!blockloop)
189	215	{
190		- get(i).ExtractBigData(hashtable);
	216	+ blockloop = true;
	217	+
	218	+ for (int i=0; i<Size(); i++)
	219	+ {
	220	+ get(i).ExtractBigData(hashtable);
	221	+ }
	222	+
	223	+ blockloop = false;
191	224	}
192	225
193	226	ExtractBigData(o);
..	..	@@ -195,11 +228,26 @@
195	228
196	229	void ExtractBigData(Object3D o)
197	230	{
	231	+ if (o.bRep != null)
	232	+ Grafreed.Assert(o.bRep == this.bRep);
	233	+
198	234	o.bRep = this.bRep;
199		- if (this.bRep != null)
	235	+// July 2019 if (this.bRep != null)
	236	+// {
	237	+// o.transientrep = this.bRep.support;
	238	+// o.bRep.support = null;
	239	+// }
	240	+ o.selection = this.selection;
	241	+ o.versionlist = this.versionlist;
	242	+ o.versionindex = this.versionindex;
	243	+
	244	+ if (this.support != null)
200	245	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	246	+ if (o.transientrep != null)
	247	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	248	+
	249	+ o.transientrep = this.support.bRep;
	250	+ this.support.bRep = null;
203	251	}
204	252
205	253	// o.support = this.support;
..	..	@@ -214,6 +262,73 @@
214	262	// this.fileparent = null;
215	263	}
216	264
	265	+// Object3D GetObject(java.util.UUID uuid)
	266	+// {
	267	+// if (this.uuid.equals(uuid))
	268	+// return this;
	269	+//
	270	+// if (blockloop)
	271	+// return null;
	272	+//
	273	+// blockloop = true;
	274	+//
	275	+// for (int i=0; i<Size(); i++)
	276	+// {
	277	+// Object3D o = get(i).GetObject(uuid);
	278	+//
	279	+// if (o != null)
	280	+// return o;
	281	+// }
	282	+//
	283	+// blockloop = false;
	284	+//
	285	+// return null;
	286	+// }
	287	+
	288	+ transient boolean tag;
	289	+
	290	+ void TagObjects(Object3D o, boolean tag)
	291	+ {
	292	+ if (blockloop)
	293	+ return;
	294	+
	295	+ o.tag = tag;
	296	+
	297	+ if (o == this)
	298	+ return;
	299	+
	300	+ blockloop = true;
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
	307	+ blockloop = false;
	308	+ }
	309	+
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
	314	+
	315	+ blockloop = true;
	316	+
	317	+ boolean hasTags = false;
	318	+
	319	+ for (int i=0; i<Size(); i++)
	320	+ {
	321	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	322	+
	323	+ if (hasTags)
	324	+ break;
	325	+ }
	326	+
	327	+ blockloop = false;
	328	+
	329	+ return hasTags;
	330	+ }
	331	+
217	332	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	333	{
219	334	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +338,35 @@
223	338
224	339	RestoreBigData(o);
225	340
226		- hashtable.remove(GetUUID());
	341	+ if (blockloop)
	342	+ return;
	343	+
	344	+ blockloop = true;
	345	+
	346	+ //hashtable.remove(GetUUID());
227	347
228	348	for (int i=0; i<Size(); i++)
229	349	{
230	350	get(i).RestoreBigData(hashtable);
231	351	}
	352	+
	353	+ blockloop = false;
232	354	}
233	355
234	356	void RestoreBigData(Object3D o)
235	357	{
236	358	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	359	+ if (this.support != null && o.transientrep != null)
	360	+ {
	361	+ this.support.bRep = o.transientrep;
	362	+ }
	363	+
	364	+ this.selection = o.selection;
	365	+
	366	+ this.versionlist = o.versionlist;
	367	+ this.versionindex = o.versionindex;
	368	+// July 2019 if (this.bRep != null)
	369	+// this.bRep.support = o.transientrep;
239	370	// this.support = o.support;
240	371	// this.fileparent = o.fileparent;
241	372	}
..	..	@@ -381,6 +512,7 @@
381	512	}
382	513
383	514	boolean live = false;
	515	+ transient boolean keepdontselect;
384	516	boolean dontselect = false;
385	517	boolean hide = false;
386	518	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -449,11 +581,11 @@
449	581	}
450	582	}
451	583
452		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
453	585
454	586	int MemorySize()
455	587	{
456		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
457	589	{
458	590	try
459	591	{
..	..	@@ -568,7 +700,7 @@
568	700	{
569	701	if (maxcount != 1)
570	702	{
571		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
572	704	}
573	705
574	706	toParentMarked = LA.newMatrix();
..	..	@@ -881,7 +1013,7 @@
881	1013
882	1014	if (marked && Globals.isLIVE() && live &&
883	1015	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1016	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	1017	currentframe != Globals.framecount)
886	1018	{
887	1019	currentframe = Globals.framecount;
..	..	@@ -966,6 +1098,10 @@
966	1098	if (material == null \|\| material.multiply)
967	1099	return true;
968	1100
	1101	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1102	+ return false;
	1103	+
	1104	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1105	return material.opacity > 0.99;
970	1106	}
971	1107
..	..	@@ -1366,6 +1502,7 @@
1366	1502	toParent = LA.newMatrix();
1367	1503	fromParent = LA.newMatrix();
1368	1504	}
	1505	+
1369	1506	LA.matCopy(other.toParent, toParent);
1370	1507	LA.matCopy(other.fromParent, fromParent);
1371	1508
..	..	@@ -2245,11 +2382,6 @@
2245	2382
2246	2383	InitOthers();
2247	2384
2248		- if (this instanceof Camera)
2249		- {
2250		- material.shift = 90;
2251		- }
2252		-
2253	2385	material.multiply = multiply;
2254	2386
2255	2387	if (multiply)
..	..	@@ -2387,6 +2519,15 @@
2387	2519	}
2388	2520	*/
2389	2521	}
	2522	+ else
	2523	+ {
	2524	+ //((ObjEditor)editWindow).SetupUI2(null);
	2525	+ if (objectUI != null)
	2526	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2527	+ else
	2528	+ //new Exception().printStackTrace();
	2529	+ System.err.println("objectUI is null");
	2530	+ }
2390	2531	}
2391	2532
2392	2533	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2569,14 @@
2428	2569	{
2429	2570	editWindow.refreshContents();
2430	2571	}
	2572	+ else
	2573	+ {
	2574	+ if (manipWindow != null)
	2575	+ {
	2576	+ manipWindow.refreshContents();
	2577	+ }
	2578	+ }
	2579	+
2431	2580	//if (parent != null)
2432	2581	//parent.refreshEditWindow();
2433	2582	}
..	..	@@ -2507,7 +2656,8 @@
2507	2656	private static final int editSelf = 1;
2508	2657	private static final int editChild = 2;
2509	2658
2510		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2511	2661	{
2512	2662	if (level == 0)
2513	2663	{
..	..	@@ -2515,7 +2665,8 @@
2515	2665	return;
2516	2666
2517	2667	Object3D selectee;
2518		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2668	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2669	+ level + 1))
2519	2670	{
2520	2671	selectee = (Object3D) e.nextElement();
2521	2672	}
..	..	@@ -2523,19 +2674,22 @@
2523	2674	} else
2524	2675	{
2525	2676	//super.
2526		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2527	2679	}
2528	2680	}
2529	2681
2530		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2531	2684	{
2532	2685	doSomething = 0;
2533	2686	if (level == 0)
2534	2687	{
2535		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2536	2689	}
2537	2690	if (//super.
2538		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2539	2693	{
2540	2694	doSomething = 1;
2541	2695	return true;
..	..	@@ -2545,7 +2699,7 @@
2545	2699	}
2546	2700	}
2547	2701
2548		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2549	2703	{
2550	2704	if (selection == null)
2551	2705	{
..	..	@@ -2558,7 +2712,8 @@
2558	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2713	{
2560	2714	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2562	2717	{
2563	2718	childToDrag = selectee;
2564	2719	doSomething = 2;
..	..	@@ -2570,13 +2725,15 @@
2570	2725	return retval;
2571	2726	}
2572	2727
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2574	2730	{
2575	2731	switch (doSomething)
2576	2732	{
2577	2733	case 1: // '\001'
2578	2734	//super.
2579		- doEditDrag0(info, opposite);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2580	2737	break;
2581	2738
2582	2739	case 2: // '\002'
..	..	@@ -2589,11 +2746,13 @@
2589	2746	{
2590	2747	//sel.hitSomething = childToDrag.hitSomething;
2591	2748	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2593	2751	} else
2594	2752	{
2595	2753	//super.
2596		- doEditDrag0(info, opposite);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2597	2756	}
2598	2757	}
2599	2758	break;
..	..	@@ -2611,6 +2770,9 @@
2611	2770	{
2612	2771	deselectAll();
2613	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2614	2776	ClickInfo newInfo = new ClickInfo();
2615	2777	newInfo.flags = info.flags;
2616	2778	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3220,7 @@
3058	3220	{
3059	3221	if (bRep != null)
3060	3222	{
3061		- bRep.GenerateNormalsMINE();
	3223	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3224	Touch();
3063	3225	}
3064	3226	}
..	..	@@ -3115,6 +3277,93 @@
3115	3277	blockloop = false;
3116	3278	}
3117	3279
	3280	+ public void ResetTransform(int mask)
	3281	+ {
	3282	+ Object3D obj = this;
	3283	+
	3284	+ if (mask == -1)
	3285	+ {
	3286	+ if (obj instanceof Camera) // jan 2014
	3287	+ {
	3288	+ LA.matIdentity(obj.toParent);
	3289	+ LA.matIdentity(obj.fromParent);
	3290	+ }
	3291	+ else
	3292	+ {
	3293	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3294	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3295	+ }
	3296	+ return;
	3297	+ }
	3298	+
	3299	+ if ((mask&2) != 0) // Scale/rotation
	3300	+ {
	3301	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3302	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3303	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3304	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3305	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3306	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3307	+ }
	3308	+ if ((mask&1) != 0) // Translation
	3309	+ {
	3310	+ if (obj.toParent != null)
	3311	+ {
	3312	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3313	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3314	+ }
	3315	+ }
	3316	+ }
	3317	+
	3318	+ public void TextureRatioTransform(int axis)
	3319	+ {
	3320	+ cTexture tex = GetTextures();
	3321	+
	3322	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3323	+
	3324	+ try
	3325	+ {
	3326	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3327	+ }
	3328	+ catch (Exception e)
	3329	+ {
	3330	+ System.err.println("FAIL TextureRatio: " + this);
	3331	+ }
	3332	+
	3333	+ LA.matIdentity(Object3D.mat);
	3334	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3335	+
	3336	+ if (toParent == null)
	3337	+ {
	3338	+ toParent = LA.newMatrix();
	3339	+ fromParent = LA.newMatrix();
	3340	+ }
	3341	+
	3342	+ ResetTransform(2);
	3343	+
	3344	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3345	+ LA.matInvert(fromParent, toParent);
	3346	+ }
	3347	+
	3348	+ void TextureRatio(int axis)
	3349	+ {
	3350	+ if (blockloop)
	3351	+ return;
	3352	+
	3353	+ blockloop = true;
	3354	+
	3355	+ TextureRatioTransform(axis);
	3356	+
	3357	+ for (int i=Size(); --i>=0;)
	3358	+ {
	3359	+ Object3D v = get(i);
	3360	+
	3361	+ v.TextureRatio(axis);
	3362	+ }
	3363	+
	3364	+ blockloop = false;
	3365	+ }
	3366	+
3118	3367	void TransformChildren()
3119	3368	{
3120	3369	if (toParent != null)
..	..	@@ -3468,15 +3717,47 @@
3468	3717
3469	3718	void ClearMaterials()
3470	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3471	3725	ClearMaterial();
3472		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3473	3727	{
3474		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3475	3729	if (child == null)
3476	3730	continue;
3477	3731	child.ClearMaterials();
3478		- release(i);
3479	3732	}
	3733	+
	3734	+ blockloop = false;
	3735	+ }
	3736	+
	3737	+ void ClearVersionList()
	3738	+ {
	3739	+ this.versionlist = null;
	3740	+ this.versionindex = -1;
	3741	+ this.versiontable = null;
	3742	+ }
	3743	+
	3744	+ void ClearVersions()
	3745	+ {
	3746	+ if (blockloop)
	3747	+ return;
	3748	+
	3749	+ blockloop = true;
	3750	+
	3751	+ ClearVersionList();
	3752	+ for (int i = 0; i < Size(); i++)
	3753	+ {
	3754	+ Object3D child = (Object3D) get(i);
	3755	+ if (child == null)
	3756	+ continue;
	3757	+ child.ClearVersions();
	3758	+ }
	3759	+
	3760	+ blockloop = false;
3480	3761	}
3481	3762
3482	3763	void FlipV(boolean flip)
..	..	@@ -4958,6 +5239,14 @@
4958	5239	}
4959	5240	}
4960	5241
	5242	+ ObjEditor GetWindow()
	5243	+ {
	5244	+ if (editWindow != null)
	5245	+ return editWindow;
	5246	+
	5247	+ return manipWindow;
	5248	+ }
	5249	+
4961	5250	cTreePath Select(int indexcount, boolean deselect)
4962	5251	{
4963	5252	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5283,11 @@
4994	5283	if (leaf != null)
4995	5284	{
4996	5285	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5286	+ ObjEditor window = GetWindow();
	5287	+ if (window != null)
4998	5288	{
4999	5289	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5290	+ window.Select(tp, deselect, true);
5001	5291	}
5002	5292
5003	5293	return tp;
..	..	@@ -5014,6 +5304,7 @@
5014	5304
5015	5305	if (child == null)
5016	5306	continue;
	5307	+
5017	5308	if (child.HasTransparency() && child.size() != 0)
5018	5309	{
5019	5310	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5314,10 @@
5023	5314	if (leaf != null)
5024	5315	{
5025	5316	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5317	+ ObjEditor window = GetWindow();
	5318	+ if (window != null)
5027	5319	{
5028		- editWindow.Select(tp, deselect, true);
	5320	+ window.Select(tp, deselect, true);
5029	5321	}
5030	5322
5031	5323	return tp;
..	..	@@ -5350,6 +5642,51 @@
5350	5642	blockloop = false;
5351	5643	}
5352	5644
	5645	+ void ResetSelectable()
	5646	+ {
	5647	+ if (blockloop)
	5648	+ return;
	5649	+
	5650	+ blockloop = true;
	5651	+
	5652	+ keepdontselect = dontselect;
	5653	+ dontselect = true;
	5654	+
	5655	+ Object3D child;
	5656	+ int nb = Size();
	5657	+ for (int i = 0; i < nb; i++)
	5658	+ {
	5659	+ child = (Object3D) get(i);
	5660	+ if (child == null)
	5661	+ continue;
	5662	+ child.ResetSelectable();
	5663	+ }
	5664	+
	5665	+ blockloop = false;
	5666	+ }
	5667	+
	5668	+ void RestoreSelectable()
	5669	+ {
	5670	+ if (blockloop)
	5671	+ return;
	5672	+
	5673	+ blockloop = true;
	5674	+
	5675	+ dontselect = keepdontselect;
	5676	+
	5677	+ Object3D child;
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ child = (Object3D) get(i);
	5682	+ if (child == null)
	5683	+ continue;
	5684	+ child.RestoreSelectable();
	5685	+ }
	5686	+
	5687	+ blockloop = false;
	5688	+ }
	5689	+
5353	5690	boolean IsSelected()
5354	5691	{
5355	5692	if (parent == null)
..	..	@@ -5410,6 +5747,11 @@
5410	5747	if (fullname == null)
5411	5748	return "";
5412	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5413	5755	// System.out.println("Fullname = " + fullname);
5414	5756
5415	5757	// Does not work on Windows due to C:
..	..	@@ -5422,7 +5764,7 @@
5422	5764
5423	5765	if (split.length == 0)
5424	5766	{
5425		- return "";
	5767	+ return fullname.pigment = "";
5426	5768	}
5427	5769
5428	5770	if (split.length <= 2)
..	..	@@ -5430,22 +5772,27 @@
5430	5772	if (fullname.name.endsWith(":"))
5431	5773	{
5432	5774	// Windows
5433		- return fullname.name.substring(0, fullname.name.length()-1);
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5434	5776	}
5435	5777
5436		- return split[0];
	5778	+ return fullname.pigment = split[0];
5437	5779	}
5438	5780
5439	5781	// Windows
5440	5782	assert(split.length == 4);
5441	5783
5442		- return split[0] + ":" + split[1];
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5443	5785	}
5444	5786
5445	5787	static String GetBump(cTexture fullname)
5446	5788	{
5447	5789	if (fullname == null)
5448	5790	return "";
	5791	+
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
5449	5796
5450	5797	// System.out.println("Fullname = " + fullname);
5451	5798	// Does not work on Windows due to C:
..	..	@@ -5457,12 +5804,12 @@
5457	5804
5458	5805	if (split.length == 0)
5459	5806	{
5460		- return "";
	5807	+ return fullname.bump = "";
5461	5808	}
5462	5809
5463	5810	if (split.length == 1)
5464	5811	{
5465		- return "";
	5812	+ return fullname.bump = "";
5466	5813	}
5467	5814
5468	5815	if (split.length == 2)
..	..	@@ -5470,16 +5817,16 @@
5470	5817	if (fullname.name.endsWith(":"))
5471	5818	{
5472	5819	// Windows
5473		- return "";
	5820	+ return fullname.bump = "";
5474	5821	}
5475	5822
5476		- return split[1];
	5823	+ return fullname.bump = split[1];
5477	5824	}
5478	5825
5479	5826	// Windows
5480	5827	assert(split.length == 4);
5481	5828
5482		- return split[2] + ":" + split[3];
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5483	5830	}
5484	5831
5485	5832	String GetPigmentTexture()
..	..	@@ -5562,6 +5909,9 @@
5562	5909	texname = "";
5563	5910
5564	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5565	5915	Touch();
5566	5916	}
5567	5917
..	..	@@ -5635,6 +5985,8 @@
5635	5985
5636	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5637	5987
	5988	+ GetTextures().bump = null;
	5989	+
5638	5990	Touch();
5639	5991	}
5640	5992
..	..	@@ -5655,6 +6007,38 @@
5655	6007
5656	6008	blockloop = true;
5657	6009	child.ResetBumpTexture();
	6010	+ blockloop = false;
	6011	+ }
	6012	+ }
	6013	+
	6014	+ void EmbedTextures(boolean embed)
	6015	+ {
	6016	+ if (blockloop)
	6017	+ return;
	6018	+
	6019	+ //if (GetTextures() != null)
	6020	+ if (embed)
	6021	+ CameraPane.EmbedTextures(GetTextures());
	6022	+ else
	6023	+ {
	6024	+ GetTextures().pigmentdata = null;
	6025	+ GetTextures().bumpdata = null;
	6026	+ GetTextures().pw = 0;
	6027	+ GetTextures().ph = 0;
	6028	+ GetTextures().bw = 0;
	6029	+ GetTextures().bh = 0;
	6030	+ }
	6031	+
	6032	+ int nb = Size();
	6033	+ for (int i = 0; i < nb; i++)
	6034	+ {
	6035	+ Object3D child = (Object3D) get(i);
	6036	+
	6037	+ if (child == null)
	6038	+ continue;
	6039	+
	6040	+ blockloop = true;
	6041	+ child.EmbedTextures(embed);
5658	6042	blockloop = false;
5659	6043	}
5660	6044	}
..	..	@@ -5683,6 +6067,11 @@
5683	6067	return false;
5684	6068
5685	6069	return parent.IsLive();
	6070	+ }
	6071	+
	6072	+ boolean IsDynamic()
	6073	+ {
	6074	+ return live && bRep != null;
5686	6075	}
5687	6076
5688	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
..	..	@@ -5745,8 +6134,11 @@
5745	6134	if (support != null)
5746	6135	support = support;
5747	6136
5748		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6137	+ boolean usecalllists = !IsDynamic() &&
	6138	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6139	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6140	+
	6141	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5750	6142
5751	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	6144	{
..	..	@@ -5756,8 +6148,9 @@
5756	6148	// usecalllists &= !(parent instanceof RandomNode);
5757	6149	// usecalllists = false;
5758	6150
5759		- if (GetBRep() != null)
5760		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5761	6154	//System.out.println("draw " + this);
5762	6155	//new Exception().printStackTrace();
5763	6156
..	..	@@ -5767,7 +6160,7 @@
5767	6160
5768	6161	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	6162	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6163	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	6164	{
5772	6165	Globals.lighttouched = true;
5773	6166	} // all panes...
..	..	@@ -5779,7 +6172,7 @@
5779	6172	if (!(this instanceof Composite))
5780	6173	touched = false;
5781	6174	//if (displaylist == -1 && usecalllists)
5782		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5783	6176	{
5784	6177	bRep.displaylist = display.GenList();
5785	6178	assert(bRep.displaylist != 0);
..	..	@@ -5790,7 +6183,7 @@
5790	6183
5791	6184	//System.out.println("\tnew list " + list);
5792	6185	//gl.glDrawBuffer(gl.GL_NONE);
5793		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5794	6187	{
5795	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5796	6189	display.NewList(bRep.displaylist);
..	..	@@ -5799,7 +6192,7 @@
5799	6192	CallList(display, root, selected, blocked);
5800	6193
5801	6194	// compiled = true;
5802		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5803	6196	{
5804	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5805	6198	display.EndList();
..	..	@@ -5899,6 +6292,7 @@
5899	6292	if (GetBRep() != null)
5900	6293	{
5901	6294	display.NextIndex();
	6295	+
5902	6296	// vertex color conflict : gl.glCallList(list);
5903	6297	DrawNode(display, root, selected);
5904	6298	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6753,11 @@
6359	6753	// dec 2012
6360	6754	new Exception().printStackTrace();
6361	6755	return;
	6756	+ }
	6757	+
	6758	+ if (dontselect)
	6759	+ {
	6760	+ //bRep.GenerateNormalsMINE();
6362	6761	}
6363	6762
6364	6763	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7543,23 @@
7144	7543	}
7145	7544	}
7146	7545
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7546	+ static ClickInfo clickInfo = new ClickInfo();
	7547	+
	7548	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7549	+ Point outPt, Rectangle outRec)
7148	7550	{
7149		- int hc = info.bounds.x + info.bounds.width / 2;
7150		- int vc = info.bounds.y + info.bounds.height / 2;
7151		- double[][] toscreen = info.toScreen;
	7551	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7552	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7553	+ double[][] toscreen = clickInfo.toScreen;
7152	7554	if (toscreen == null)
7153	7555	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7557	}
7156	7558	cVector vec = in;
7157	7559	LA.xformPos(in, toscreen, in);
7158	7560	//System.out.println("Distance = " + info.camera.Distance());
7159		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7160		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7561	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7562	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7563	outPt.x = hc + (int) vec.x;
7162	7564	outPt.y = vc - (int) vec.y;
7163	7565	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7567,18 @@
7165	7567	outRec.width = outRec.height = 6;
7166	7568	}
7167	7569
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
7169	7572	{
7170	7573	Point pt = new Point(0, 0);
7171	7574	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
7173	7577	return rec;
7174	7578	}
7175	7579
7176		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
7177	7582	{
7178	7583	if (level == 0)
7179	7584	{
..	..	@@ -7182,16 +7587,19 @@
7182	7587	{
7183	7588	cVector origin = new cVector();
7184	7589	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7594	Rectangle boundary = new Rectangle();
7187	7595	boundary.x = spot.x - 30;
7188	7596	boundary.y = spot.y - 30;
7189	7597	boundary.width = spot.width + 60;
7190	7598	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
7192	7600	int spotw = spot.x + spot.width;
7193	7601	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7603	// if (CameraPane.Xmin > spot.x)
7196	7604	// {
7197	7605	// CameraPane.Xmin = spot.x;
..	..	@@ -7208,11 +7616,6 @@
7208	7616	// {
7209	7617	// CameraPane.Ymax = spoth;
7210	7618	// }
7211		- spot.translate(32, 32);
7212		- spotw = spot.x + spot.width;
7213		- spoth = spot.y + spot.height;
7214		- info.g.setColor(Color.cyan);
7215		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7216	7619	// if (CameraPane.Xmin > spot.x)
7217	7620	// {
7218	7621	// CameraPane.Xmin = spot.x;
..	..	@@ -7231,10 +7634,15 @@
7231	7634	// }
7232	7635	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7636	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7234		- spot.translate(0, -32);
7235		- info.g.setColor(Color.yellow);
7236		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237		- info.g.setColor(Color.green);
	7637	+ spot.translate(32, 0);
	7638	+ clickInfo.g.setColor(Color.yellow);
	7639	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7640	+
	7641	+ spot.translate(32, 64);
	7642	+ spotw = spot.x + spot.width;
	7643	+ spoth = spot.y + spot.height;
	7644	+ clickInfo.g.setColor(Color.cyan);
	7645	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7238	7646	// if (CameraPane.Xmin > spot.x)
7239	7647	// {
7240	7648	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7659,9 @@
7251	7659	// {
7252	7660	// CameraPane.Ymax = spoth;
7253	7661	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7662	+ clickInfo.g.setColor(Color.green);
	7663	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7664	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7666	// if (CameraPane.Xmin > boundary.x)
7258	7667	// {
..	..	@@ -7274,7 +7683,8 @@
7274	7683	}
7275	7684	}
7276	7685
7277		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
7278	7688	{
7279	7689	if (level == 0)
7280	7690	{
..	..	@@ -7283,8 +7693,8 @@
7283	7693
7284	7694	boolean retval = false;
7285	7695
7286		- startX = info.x;
7287		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7288	7698
7289	7699	hitSomething = -1;
7290	7700	cVector origin = new cVector();
..	..	@@ -7294,22 +7704,53 @@
7294	7704	{
7295	7705	centerPt = new Point(0, 0);
7296	7706	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7710	{
7300	7711	hitSomething = hitCenter;
7301	7712	retval = true;
7302	7713	}
7303	7714	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7716	{
7306	7717	hitSomething = hitRotate;
7307	7718	retval = true;
7308	7719	}
7309	7720	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7721	+ spot.translate(32, 0);
	7722	+ spot.translate(0, 32);
	7723	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7724	{
7312	7725	hitSomething = hitScale;
	7726	+
	7727	+ double scale = 0.005f * clickInfo.camera.Distance();
	7728	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7729	+ double sign = 1;
	7730	+ if (hScale < 0)
	7731	+ {
	7732	+ sign = -1;
	7733	+ }
	7734	+ hScale = signMath.pow(signhScale, scale * 50);
	7735	+ if (hScale < 0.01)
	7736	+ {
	7737	+ //hScale = 0.01;
	7738	+ }
	7739	+
	7740	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7741	+ sign = 1;
	7742	+ if (vScale < 0)
	7743	+ {
	7744	+ sign = -1;
	7745	+ }
	7746	+ vScale = signMath.pow(signvScale, scale * 50);
	7747	+ if (vScale < 0.01)
	7748	+ {
	7749	+ //vScale = 0.01;
	7750	+ }
	7751	+
	7752	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7753	+
7313	7754	retval = true;
7314	7755	}
7315	7756
..	..	@@ -7319,7 +7760,7 @@
7319	7760	}
7320	7761
7321	7762	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7764	//System.out.println("modified = " + modified);
7324	7765	//new Exception().printStackTrace();
7325	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7788,8 @@
7347	7788	return true;
7348	7789	}
7349	7790
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7351	7793	{
7352	7794	if (hitSomething == 0)
7353	7795	{
..	..	@@ -7361,7 +7803,7 @@
7361	7803
7362	7804	//System.out.println("hitSomething = " + hitSomething);
7363	7805
7364		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7807
7366	7808	cVector xlate = new cVector();
7367	7809	//cVector xlate2 = new cVector();
..	..	@@ -7375,7 +7817,9 @@
7375	7817
7376	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7377	7819
7378		- if (modified \|\| opposite)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7379	7823	{
7380	7824	//assert(false);
7381	7825	/*
..	..	@@ -7395,8 +7839,8 @@
7395	7839	toParent[3][i] = xlate.get(i);
7396	7840	LA.matInvert(toParent, fromParent);
7397	7841	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7842	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7843	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7844
7401	7845	LA.matCopy(startMat, toParent);
7402	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7849,7 @@
7405	7849	} else
7406	7850	{
7407	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7409	7853	cVector away = new cVector();
7410	7854	//cVector right2 = new cVector();
7411	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7866,19 @@
7422	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7867	// if (!CameraPane.LOCALTRANSFORM)
7424	7868	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7870	// if (!CameraPane.LOCALTRANSFORM)
7427	7871	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7872	//LA.vecCross(up, cVector.Z, right2);
7429	7873
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7875
7432	7876	//System.out.println("DELTA0 = " + delta);
7433	7877	//System.out.println("AWAY = " + info.camera.away);
7434	7878	//System.out.println("UP = " + info.camera.up);
7435	7879	if (away.z > 0)
7436	7880	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7882	{
7439	7883	delta.x = -delta.x;
7440	7884	} else
..	..	@@ -7449,7 +7893,7 @@
7449	7893	//System.out.println("DELTA1 = " + delta);
7450	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7895	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7897	LA.matCopy(startMat, toParent);
7454	7898	//System.out.println("DELTA3 = " + delta);
7455	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7903,8 @@
7459	7903	break;
7460	7904
7461	7905	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7464	7908	double angle = (double) Math.atan2(dx, dy);
7465	7909	angle = -(1.570796 - angle);
7466	7910
..	..	@@ -7469,7 +7913,7 @@
7469	7913
7470	7914	if (modified)
7471	7915	{
7472		- // Rotate 90 degrees
	7916	+ // Rotate 45 degrees
7473	7917	angle /= (Math.PI / 4);
7474	7918	angle = Math.floor(angle + 0.5);
7475	7919	angle *= (Math.PI / 4);
..	..	@@ -7483,7 +7927,7 @@
7483	7927	}
7484	7928	/**/
7485	7929
7486		- switch (info.pane.RenderCamera().viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7931	{
7488	7932	case 1: // '\001'
7489	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7954,7 @@
7510	7954	break;
7511	7955
7512	7956	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7514	7958	double sign = 1;
7515	7959	if (hScale < 0)
7516	7960	{
..	..	@@ -7522,7 +7966,7 @@
7522	7966	//hScale = 0.01;
7523	7967	}
7524	7968
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7526	7970	sign = 1;
7527	7971	if (vScale < 0)
7528	7972	{
..	..	@@ -7533,6 +7977,7 @@
7533	7977	{
7534	7978	//vScale = 0.01;
7535	7979	}
	7980	+
7536	7981	LA.matCopy(startMat, toParent);
7537	7982	/**/
7538	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7542,33 +7987,39 @@
7542	7987	}
7543	7988	/**/
7544	7989
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7990	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7991
7547	7992	if (totalScale < 0.01)
7548	7993	{
7549	7994	totalScale = 0.01;
7550	7995	}
7551	7996
7552		- switch (info.pane.RenderCamera().viewCode)
	7997	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7998	{
7554	7999	case 3: // '\001'
7555	8000	if (modified \|\| opposite)
7556	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7557	8005	//LA.matScale(toParent, 1, hScale, vScale);
7558		- LA.matScale(toParent, totalScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7559	8007	} // vScale, 1);
7560	8008	else
7561	8009	{
7562	8010	// EXCEPTION!
7563		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7564	8012	} // vScale, 1);
7565	8013	break;
7566	8014
7567	8015	case 2: // '\002'
7568	8016	if (modified \|\| opposite)
7569	8017	{
7570		- //LA.matScale(toParent, hScale, 1, vScale);
7571		- LA.matScale(toParent, 1, totalScale, 1);
	8018	+ if (modified) // && opposite)
	8019	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8020	+ else
	8021	+ //LA.matScale(toParent, hScale, 1, vScale);
	8022	+ LA.matScale(toParent, 1, totalScale, 1);
7572	8023	} else
7573	8024	{
7574	8025	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7578,8 +8029,11 @@
7578	8029	case 1: // '\003'
7579	8030	if (modified \|\| opposite)
7580	8031	{
7581		- //LA.matScale(toParent, hScale, vScale, 1);
7582		- LA.matScale(toParent, 1, 1, totalScale);
	8032	+ if (modified) // && opposite)
	8033	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8034	+ else
	8035	+ //LA.matScale(toParent, hScale, vScale, 1);
	8036	+ LA.matScale(toParent, 1, 1, totalScale);
7583	8037	} else
7584	8038	{
7585	8039	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7616,7 +8070,7 @@
7616	8070	} // NEW ...
7617	8071
7618	8072
7619		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7620	8074	}
7621	8075
7622	8076	boolean overflow = false;
..	..	@@ -7727,10 +8181,10 @@
7727	8181	} // + super.toString();
7728	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7729	8183
7730		- if (!Globals.ADVANCED)
7731		- return objname;
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
7732	8186
7733		- return objname + " " + System.identityHashCode(this);
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7734	8188	}
7735	8189
7736	8190	public int hashCode()
..	..	@@ -7795,6 +8249,10 @@
7795	8249	{
7796	8250	editWindow = null;
7797	8251	} // ?
	8252	+ }
	8253	+ else
	8254	+ {
	8255	+ //editWindow.closeUI();
7798	8256	}
7799	8257	}
7800	8258
..	..	@@ -7953,6 +8411,10 @@
7953	8411	}
7954	8412
7955	8413	transient ObjEditor editWindow;
	8414	+ transient ObjEditor manipWindow;
	8415	+
	8416	+ transient boolean pinned;
	8417	+
7956	8418	transient ObjectUI objectUI;
7957	8419	public static int povDepth = 0;
7958	8420	private static cVector tbMin = new cVector();