~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,30 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
22	27	ScriptNode scriptnode;
	28	+
	29	+ void InitOthers()
	30	+ {
	31	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	32	+ {
	33	+ projectedVertices = new Object3D.cVector2[3];
	34	+ }
	35	+ for (int i = 0; i < 3; i++)
	36	+ {
	37	+ projectedVertices[i] = new cVector2(); // Others
	38	+ }
	39	+ projectedVertices[0].x = 100; // bump
	40	+ }
23	41
24	42	void MinMax(cVector minima, cVector maxima)
25	43	{
..	..	@@ -286,6 +304,7 @@
286	304	}
287	305
288	306	boolean live = false;
	307	+ boolean dontselect = false;
289	308	boolean hide = false;
290	309	boolean link2master = false; // performs reset support/master at each frame
291	310	boolean marked = false; // animation node
..	..	@@ -295,6 +314,8 @@
295	314	boolean random = false;
296	315	boolean speedup = false;
297	316	boolean rewind = false;
	317	+
	318	+ float NORMALPUSH = 0;
298	319
299	320	Object3D support;
300	321
..	..	@@ -415,16 +436,16 @@
415	436	{
416	437	Object3D copy = this;
417	438
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	439	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	440
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	441	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	442	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	443	+ parentcam = Globals.theRenderer.Cameras()[1];
423	444	}
424	445
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	446	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	447	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	448	+ parentcam = Globals.theRenderer.Cameras()[0];
428	449	}
429	450
430	451	if (this == parentcam)
..	..	@@ -432,7 +453,7 @@
432	453	//assert(this instanceof Camera);
433	454
434	455	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	456	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	457	}
437	458
438	459	copy.marked ^= true;
..	..	@@ -452,7 +473,7 @@
452	473	//assert(this instanceof Camera);
453	474
454	475	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	476	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	477	}
457	478
458	479	copy.Touch(); // display list issue
..	..	@@ -587,7 +608,7 @@
587	608	return;
588	609	}
589	610
590		- if (CameraPane.fromscript)
	611	+ if (Globals.fromscript)
591	612	{
592	613	transformcount = 0;
593	614	return;
..	..	@@ -745,7 +766,7 @@
745	766
746	767	int GetTransformCount()
747	768	{
748		- // marde pour serialization de Texture
	769	+ // patch pour serialization de Texture
749	770	resetmaxcount();
750	771	resettransformcount();
751	772	resetstep();
..	..	@@ -758,7 +779,7 @@
758	779	if (step == 0)
759	780	step = 1;
760	781	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	782	+ maxcount = 128; // 2048; // 4;
762	783	// if (acceleration == 0)
763	784	// acceleration = 10;
764	785	if (delay == 0) // serial
..	..	@@ -779,9 +800,12 @@
779	800	// factor = CameraPane.STEP;
780	801	// }
781	802
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	803	+ if (marked && Globals.isLIVE() && live &&
	804	+ //TEMP21aug2018
	805	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	806	+ currentframe != Globals.framecount)
783	807	{
784		- currentframe = CameraPane.framecount;
	808	+ currentframe = Globals.framecount;
785	809
786	810	// System.err.println("transformcount = " + transformcount);
787	811	// System.err.println("factor = " + factor);
..	..	@@ -893,6 +917,11 @@
893	917	fromParent = null; // LA.newMatrix();
894	918	bRep = null; // new BoundaryRep();
895	919
	920	+ if (oname != null && oname.equals("LeftHand"))
	921	+ {
	922	+ name = oname;
	923	+ }
	924	+
896	925	/*
897	926	float hue = (float)Math.random();
898	927	Color col;
..	..	@@ -935,7 +964,7 @@
935	964
936	965	public Object clone()
937	966	{
938		- return GrafreeD.clone(this);
	967	+ return Grafreed.clone(this);
939	968	}
940	969
941	970	Object3D copyExpand()
..	..	@@ -1451,7 +1480,7 @@
1451	1480	BoundaryRep.SEUIL = other.material.cameralight;
1452	1481
1453	1482	// Set default to 0.1
1454		- BoundaryRep.SEUIL /= 2;
	1483	+ BoundaryRep.SEUIL /= 4; // 2;
1455	1484	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1456	1485	}
1457	1486
..	..	@@ -1710,7 +1739,7 @@
1710	1739	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1711	1740	o.bRep = transientrep;
1712	1741	if (clone)
1713		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1742	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1714	1743	o.CreateMaterial();
1715	1744	o.SetAttributes(this, -1);
1716	1745	//parent
..	..	@@ -1723,7 +1752,7 @@
1723	1752	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1724	1753	o.bRep = bRep;
1725	1754	if (clone)
1726		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1755	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1727	1756	o.CreateMaterial();
1728	1757	//o.overwriteThis(this, -1);
1729	1758	o.SetAttributes(this, -1);
..	..	@@ -1810,12 +1839,15 @@
1810	1839	if (obj.name == null)
1811	1840	continue; // can't be a null one
1812	1841
	1842	+ // Try perfect match first.
1813	1843	if (n.equals(obj.name))
1814	1844	{
1815	1845	theobj = obj;
1816	1846	count++;
1817	1847	}
1818	1848	}
	1849	+
	1850	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1819	1851
1820	1852	if (count != 1)
1821	1853	for (int i=Size(); --i>=0;)
..	..	@@ -2130,15 +2162,8 @@
2130	2162	if (/parent != null &&/ material == null)
2131	2163	{
2132	2164	material = new cMaterial(GetMaterial());
2133		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2134		- {
2135		- projectedVertices = new Object3D.cVector2[3];
2136		- }
2137		- for (int i = 0; i < 3; i++)
2138		- {
2139		- projectedVertices[i] = new cVector2(); // Others
2140		- }
2141		- projectedVertices[0].x = 100; // bump
	2165	+
	2166	+ InitOthers();
2142	2167
2143	2168	if (this instanceof Camera)
2144	2169	{
..	..	@@ -2288,6 +2313,7 @@
2288	2313	{
2289	2314	if (newWindow)
2290	2315	{
	2316	+ new Exception().printStackTrace();
2291	2317	System.exit(0);
2292	2318	if (parent != null)
2293	2319	{
..	..	@@ -2464,13 +2490,13 @@
2464	2490	return retval;
2465	2491	}
2466	2492
2467		- void doEditDrag(ClickInfo info)
	2493	+ void doEditDrag(ClickInfo info, boolean opposite)
2468	2494	{
2469	2495	switch (doSomething)
2470	2496	{
2471	2497	case 1: // '\001'
2472	2498	//super.
2473		- doEditDrag0(info);
	2499	+ doEditDrag0(info, opposite);
2474	2500	break;
2475	2501
2476	2502	case 2: // '\002'
..	..	@@ -2483,11 +2509,11 @@
2483	2509	{
2484	2510	//sel.hitSomething = childToDrag.hitSomething;
2485	2511	//childToDrag.doEditDrag(info);
2486		- sel.doEditDrag(info);
	2512	+ sel.doEditDrag(info, opposite);
2487	2513	} else
2488	2514	{
2489	2515	//super.
2490		- doEditDrag0(info);
	2516	+ doEditDrag0(info, opposite);
2491	2517	}
2492	2518	}
2493	2519	break;
..	..	@@ -2894,7 +2920,8 @@
2894	2920	{
2895	2921	if (bRep != null)
2896	2922	{
2897		- bRep.GenUV();
	2923	+ bRep.GenUV(); //1);
	2924	+ //bRep.UnfoldUV();
2898	2925	Touch();
2899	2926	}
2900	2927	}
..	..	@@ -2969,6 +2996,33 @@
2969	2996	blockloop = false;
2970	2997	}
2971	2998
	2999	+ void TransformChildren()
	3000	+ {
	3001	+ if (toParent != null)
	3002	+ {
	3003	+ for (int i=Size(); --i>=0;)
	3004	+ {
	3005	+ Object3D v = get(i);
	3006	+
	3007	+ if (v.toParent == null)
	3008	+ {
	3009	+ v.toParent = LA.newMatrix();
	3010	+ v.fromParent = LA.newMatrix();
	3011	+ }
	3012	+
	3013	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3014	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3015	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3016	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3017	+ }
	3018	+
	3019	+ toParent = null; // LA.matIdentity(toParent);
	3020	+ fromParent = null; // LA.matIdentity(fromParent);
	3021	+
	3022	+ Touch();
	3023	+ }
	3024	+ }
	3025	+
2972	3026	void TransformGeometry()
2973	3027	{
2974	3028	Object3D obj = this;
..	..	@@ -3190,9 +3244,11 @@
3190	3244
3191	3245	BoundaryRep sup = bRep.support;
3192	3246	bRep.support = null;
3193		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3247	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3194	3248	// bRep.SplitInTwo(onlyone); // thread...
3195		- temprep.SplitInTwo(reduction34, onlyone);
	3249	+
	3250	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3251	+
3196	3252	bRep = temprep;
3197	3253	bRep.support = sup;
3198	3254	Touch();
..	..	@@ -3714,7 +3770,7 @@
3714	3770	if (child == null)
3715	3771	continue;
3716	3772
3717		- if (GrafreeD.RENDERME > 0)
	3773	+ if (Grafreed.RENDERME > 0)
3718	3774	{
3719	3775	if (child instanceof Merge)
3720	3776	((Merge)child).renderme();
..	..	@@ -3865,7 +3921,7 @@
3865	3921	if (child == null)
3866	3922	continue;
3867	3923
3868		- if (GrafreeD.RENDERME > 0)
	3924	+ if (Grafreed.RENDERME > 0)
3869	3925	{
3870	3926	if (child instanceof Merge)
3871	3927	((Merge)child).renderme();
..	..	@@ -4060,7 +4116,7 @@
4060	4116	if (child == null)
4061	4117	continue;
4062	4118
4063		- if (GrafreeD.RENDERME > 0)
	4119	+ if (Grafreed.RENDERME > 0)
4064	4120	{
4065	4121	if (child instanceof Merge)
4066	4122	((Merge)child).renderme();
..	..	@@ -4157,6 +4213,22 @@
4157	4213	}
4158	4214	blockloop = true;
4159	4215	get(i).RepairParent();
	4216	+ blockloop = false;
	4217	+ }
	4218	+ }
	4219	+
	4220	+ void RepairShadow()
	4221	+ {
	4222	+ if (blockloop)
	4223	+ return;
	4224	+
	4225	+ if (this.material != null)
	4226	+ this.InitOthers();
	4227	+
	4228	+ for (int i=0; i<Size(); i++)
	4229	+ {
	4230	+ blockloop = true;
	4231	+ get(i).RepairShadow();
4160	4232	blockloop = false;
4161	4233	}
4162	4234	}
..	..	@@ -4651,7 +4723,7 @@
4651	4723
4652	4724	cTreePath SelectLeaf(int indexcount, boolean deselect)
4653	4725	{
4654		- if (hide)
	4726	+ if (hide \|\| dontselect)
4655	4727	return null;
4656	4728
4657	4729	if (count <= 0)
..	..	@@ -4677,7 +4749,7 @@
4677	4749
4678	4750	cTreePath Select(int indexcount, boolean deselect)
4679	4751	{
4680		- if (hide)
	4752	+ if (hide \|\| dontselect)
4681	4753	return null;
4682	4754
4683	4755	if (count <= 0)
..	..	@@ -4827,7 +4899,7 @@
4827	4899	return globalTransform;
4828	4900	}
4829	4901
4830		- void PreprocessOcclusion(CameraPane cp)
	4902	+ void PreprocessOcclusion(iCameraPane cp)
4831	4903	{
4832	4904	/*
4833	4905	if (AOdone)
..	..	@@ -4974,7 +5046,8 @@
4974	5046	} else //
4975	5047	if (editWindow != null)
4976	5048	{
4977		- editWindow.cameraView.lighttouched = true;
	5049	+ //editWindow.cameraView.lighttouched = true;
	5050	+ Globals.lighttouched = true;
4978	5051	}
4979	5052	}
4980	5053
..	..	@@ -5128,10 +5201,34 @@
5128	5201
5129	5202	// System.out.println("Fullname = " + fullname);
5130	5203
5131		- if (fullname.name.indexOf(":") == -1)
5132		- return fullname.name;
	5204	+ // Does not work on Windows due to C:
	5205	+// if (fullname.name.indexOf(":") == -1)
	5206	+// return fullname.name;
	5207	+//
	5208	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5133	5209
5134		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5210	+ String[] split = fullname.name.split(":");
	5211	+
	5212	+ if (split.length == 0)
	5213	+ {
	5214	+ return "";
	5215	+ }
	5216	+
	5217	+ if (split.length <= 2)
	5218	+ {
	5219	+ if (fullname.name.endsWith(":"))
	5220	+ {
	5221	+ // Windows
	5222	+ return fullname.name.substring(0, fullname.name.length()-1);
	5223	+ }
	5224	+
	5225	+ return split[0];
	5226	+ }
	5227	+
	5228	+ // Windows
	5229	+ assert(split.length == 4);
	5230	+
	5231	+ return split[0] + ":" + split[1];
5135	5232	}
5136	5233
5137	5234	static String GetBump(cTexture fullname)
..	..	@@ -5140,10 +5237,38 @@
5140	5237	return "";
5141	5238
5142	5239	// System.out.println("Fullname = " + fullname);
5143		- if (fullname.name.indexOf(":") == -1)
5144		- return "";
5145		-
5146		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5240	+ // Does not work on Windows due to C:
	5241	+// if (fullname.name.indexOf(":") == -1)
	5242	+// return "";
	5243	+//
	5244	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5245	+ String[] split = fullname.name.split(":");
	5246	+
	5247	+ if (split.length == 0)
	5248	+ {
	5249	+ return "";
	5250	+ }
	5251	+
	5252	+ if (split.length == 1)
	5253	+ {
	5254	+ return "";
	5255	+ }
	5256	+
	5257	+ if (split.length == 2)
	5258	+ {
	5259	+ if (fullname.name.endsWith(":"))
	5260	+ {
	5261	+ // Windows
	5262	+ return "";
	5263	+ }
	5264	+
	5265	+ return split[1];
	5266	+ }
	5267	+
	5268	+ // Windows
	5269	+ assert(split.length == 4);
	5270	+
	5271	+ return split[2] + ":" + split[3];
5147	5272	}
5148	5273
5149	5274	String GetPigmentTexture()
..	..	@@ -5217,7 +5342,7 @@
5217	5342	System.out.print("; textures = " + textures);
5218	5343	System.out.println("; usedtextures = " + usedtextures);
5219	5344
5220		- if (GetTextures() == null)
	5345	+ if (GetTextures() == null) // What is that??
5221	5346	GetTextures().name = ":";
5222	5347
5223	5348	String texname = tex;
..	..	@@ -5248,6 +5373,43 @@
5248	5373	child.ResetPigmentTexture();
5249	5374	blockloop = false;
5250	5375	}
	5376	+ }
	5377	+
	5378	+ UUID GetUUID()
	5379	+ {
	5380	+ if (uuid == null)
	5381	+ {
	5382	+ // Serial
	5383	+ uuid = UUID.randomUUID();
	5384	+ }
	5385	+
	5386	+ return uuid;
	5387	+ }
	5388	+
	5389	+ Object3D GetObject(UUID uid)
	5390	+ {
	5391	+ if (blockloop)
	5392	+ return null;
	5393	+
	5394	+ if (GetUUID().equals(uid))
	5395	+ return this;
	5396	+
	5397	+ int nb = Size();
	5398	+ for (int i = 0; i < nb; i++)
	5399	+ {
	5400	+ Object3D child = (Object3D) get(i);
	5401	+
	5402	+ if (child == null)
	5403	+ continue;
	5404	+
	5405	+ blockloop = true;
	5406	+ Object3D obj = child.GetObject(uid);
	5407	+ blockloop = false;
	5408	+ if (obj != null)
	5409	+ return obj;
	5410	+ }
	5411	+
	5412	+ return null;
5251	5413	}
5252	5414
5253	5415	void SetBumpTexture(String tex)
..	..	@@ -5286,25 +5448,22 @@
5286	5448	}
5287	5449	}
5288	5450
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5451	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5452	{
5291	5453	Draw(display, root, selected, blocked);
5292	5454	}
5293	5455
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5456	boolean NeedSupport()
5299	5457	{
5300	5458	return
5301		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5459	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5302	5460	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5461	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5304	5462	}
5305	5463
	5464	+ static boolean DEBUG_SELECTION = false;
5306	5465
5307		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5466	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5308	5467	{
5309	5468	Invariants(); // june 2013
5310	5469
..	..	@@ -5313,8 +5472,8 @@
5313	5472	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5473	}
5315	5474
5316		- if (display.drawMode == CameraPane.SELECTION &&
5317		- hide)
	5475	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5476	+ (hide \|\| dontselect))
5318	5477	return;
5319	5478
5320	5479	if (name != null && name.contains("sclera"))
..	..	@@ -5332,7 +5491,7 @@
5332	5491	if (this instanceof Checker)
5333	5492	return;
5334	5493
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5494	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5495	return;
5337	5496
5338	5497	if (count <= 0)
..	..	@@ -5340,13 +5499,13 @@
5340	5499	return;
5341	5500	}
5342	5501
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5502	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5503	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5504	{
5346	5505	return;
5347	5506	}
5348	5507
5349		- javax.media.opengl.GL gl = display.GetGL();
	5508	+ //javax.media.opengl.GL gl = display.GetGL();
5350	5509
5351	5510	/*
5352	5511	if (touched)
..	..	@@ -5382,15 +5541,15 @@
5382	5541
5383	5542	boolean compiled = false;
5384	5543
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5544	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5545
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5546	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5388	5547	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5389	5548	{
5390		- display.lighttouched = true;
	5549	+ Globals.lighttouched = true;
5391	5550	} // all panes...
5392		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5393		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5551	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5552	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5394	5553	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5554	{
5396	5555	if (!(this instanceof Composite))
..	..	@@ -5398,7 +5557,7 @@
5398	5557	//if (displaylist == -1 && usecalllists)
5399	5558	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5400	5559	{
5401		- bRep.displaylist = gl.glGenLists(1);
	5560	+ bRep.displaylist = display.GenList();
5402	5561	assert(bRep.displaylist != 0);
5403	5562	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5404	5563	//System.out.println("\tgen list " + list);
..	..	@@ -5410,18 +5569,20 @@
5410	5569	if (usecalllists)
5411	5570	{
5412	5571	// System.err.println("new list " + bRep.displaylist + " for " + this);
5413		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5572	+ display.NewList(bRep.displaylist);
5414	5573	}
	5574	+
5415	5575	CallList(display, root, selected, blocked);
	5576	+
5416	5577	// compiled = true;
5417	5578	if (usecalllists)
5418	5579	{
5419	5580	// System.err.println("end list " + bRep.displaylist + " for " + this);
5420		- gl.glEndList();
	5581	+ display.EndList();
5421	5582	}
5422	5583	//gl.glDrawBuffer(gl.GL_BACK);
5423	5584	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	5585	+ Globals.lighttouched = true; // all panes...
5425	5586	}
5426	5587
5427	5588	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +5621,12 @@
5460	5621
5461	5622	// frustum culling
5462	5623	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	5624	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	5625	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	5626	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	5627	{
5467	5628	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5629	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5469	5630	{
5470	5631	//System.out.print("CULLED");
5471	5632	culled = true;
..	..	@@ -5473,7 +5634,7 @@
5473	5634	}
5474	5635	else
5475	5636	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5637	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5477	5638	culled = true;
5478	5639
5479	5640	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,11 +5670,11 @@
5509	5670
5510	5671
5511	5672	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5673	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	5674	{
5514	5675	if (GetBRep() != null)
5515	5676	{
5516		- CameraPane.NextIndex(this, gl);
	5677	+ display.NextIndex();
5517	5678	// vertex color conflict : gl.glCallList(list);
5518	5679	DrawNode(display, root, selected);
5519	5680	if (this instanceof BezierPatch)
..	..	@@ -5535,55 +5696,7 @@
5535	5696	color[2] /= 2;
5536	5697	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	5698	*/
5538		- if (material != null)
5539		- {
5540		- materialstack[materialdepth] = material;
5541		- selectedstack[materialdepth] = selected;
5542		- cStatic.objectstack[materialdepth++] = this;
5543		- //System.out.println("material " + material);
5544		- //Applet3D.tracein(this, selected);
5545		- display.vector2buffer = projectedVertices;
5546		- if (this instanceof Camera)
5547		- {
5548		- display.options1[0] = material.shift;
5549		- //System.out.println("shift " + material.shift);
5550		- display.options1[1] = material.lightarea;
5551		- display.options1[2] = material.shadowbias;
5552		- display.options1[3] = material.aniso;
5553		- display.options1[4] = material.anisoV;
5554		- display.options2[0] = material.opacity;
5555		- display.options2[1] = material.diffuse;
5556		- display.options2[2] = material.factor;
5557		-
5558		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5559		- display.options4[0] = material.cameralight/0.2f;
5560		- display.options4[1] = material.subsurface;
5561		- display.options4[2] = material.sheen;
5562		-
5563		- // if (display.CURRENTANTIALIAS > 0)
5564		- // display.options3[3] /= 4;
5565		-
5566		- /*
5567		- System.out.println("Focus = " + display.options1[0]);
5568		- System.out.println("Aperture = " + display.options1[1]);
5569		- System.out.println("ShadowBlur = " + display.options1[2]);
5570		- System.out.println("Antialiasing = " + display.options1[3]);
5571		- System.out.println("Fog = " + display.options2[0]);
5572		- System.out.println("Intensity = " + display.options2[1]);
5573		- System.out.println("Elevation = " + display.options2[2]);
5574		- /**/
5575		- } else
5576		- {
5577		- material.Draw(display, selected);
5578		- }
5579		- } else
5580		- {
5581		- if (selected && CameraPane.flash)
5582		- {
5583		- display.modelParams4[1] = 100;
5584		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5585		- }
5586		- }
	5699	+ display.PushMaterial(this, selected);
5587	5700
5588	5701	//System.out.println("call list " + list);
5589	5702	//System.out.println();
..	..	@@ -5602,7 +5715,17 @@
5602	5715	tex = GetTextures();
5603	5716	}
5604	5717
5605		- display.BindTextures(tex, texres);
	5718	+ boolean failed = false;
	5719	+
	5720	+ try
	5721	+ {
	5722	+ display.BindTextures(tex, texres);
	5723	+ }
	5724	+ catch (Exception e)
	5725	+ {
	5726	+ System.err.println("FAILED: " + this);
	5727	+ failed = true;
	5728	+ }
5606	5729
5607	5730	if (!compiled)
5608	5731	{
..	..	@@ -5618,30 +5741,16 @@
5618	5741
5619	5742	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5620	5743	assert(bRep.displaylist != 0);
5621		- gl.glCallList(bRep.displaylist);
	5744	+ display.CallList(bRep.displaylist);
5622	5745	// june 2013 drawSelf(display, root, selected);
5623	5746	}
5624	5747	}
5625	5748	}
5626	5749
5627		- display.ReleaseTextures(tex);
5628		-
5629		- //if (parent != null && parent.GetMaterial() != null)
5630		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5631		- if (material != null)
5632		- {
5633		- materialdepth -= 1;
5634		- if (materialdepth > 0)
5635		- {
5636		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5637		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5638		- }
5639		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5640		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5641		- {
5642		- display.modelParams4[1] = GetMaterial().cameralight;
5643		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5644		- }
	5750	+ if (!failed)
	5751	+ display.ReleaseTextures(tex);
	5752	+
	5753	+ display.PopMaterial(this, selected);
5645	5754	}
5646	5755
5647	5756	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +5792,7 @@
5683	5792	// resetMasterNode();
5684	5793	}
5685	5794
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5795	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	5796	{
5688	5797	if (GetBRep() == null)
5689	5798	{
..	..	@@ -5766,8 +5875,11 @@
5766	5875	boolean flipV = false; // true;
5767	5876	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	5877
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5878	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	5879	{
	5880	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5881	+ return;
	5882	+
5771	5883	if (hide)
5772	5884	return;
5773	5885	// shadow optimisation
..	..	@@ -5825,16 +5937,7 @@
5825	5937	// // ??????????????????????????? Touch();
5826	5938	// }
5827	5939
5828		- if (material != null)
5829		- {
5830		- materialstack[materialdepth] = material;
5831		- selectedstack[materialdepth] = selected;
5832		- cStatic.objectstack[materialdepth++] = this;
5833		- //System.out.println("material " + material);
5834		- //Applet3D.tracein("selected ", selected);
5835		- display.vector2buffer = projectedVertices;
5836		- material.Draw(display, selected);
5837		- }
	5940	+display.PushMaterial2(this, selected);
5838	5941
5839	5942	Object3D child;
5840	5943	boolean sel;
..	..	@@ -5886,19 +5989,7 @@
5886	5989	*/
5887	5990	//depth += 1;
5888	5991
5889		- if (material != null)
5890		- {
5891		- materialdepth -= 1;
5892		- if (materialdepth > 0)
5893		- {
5894		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5895		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5896		- }
5897		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5898		- //else
5899		- //material.Draw(display, false);
5900		- }
5901		-
	5992	+display.PopMaterial2(this);
5902	5993	/*
5903	5994	display.ReleaseTextures(tex);
5904	5995	*/
..	..	@@ -5909,10 +6000,13 @@
5909	6000
5910	6001	//static cVector min,max;
5911	6002
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6003	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	6004	{
5914		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6005	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5915	6006	return; // no shadow for transparent objects
	6007	+
	6008	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6009	+ return;
5916	6010
5917	6011	if (hide)
5918	6012	return;
..	..	@@ -5954,11 +6048,12 @@
5954	6048	return;
5955	6049	}
5956	6050
	6051	+ //bRep.GenUV(1/material.diffuseness);
5957	6052	// bRep.lock = true;
5958	6053
5959		- javax.media.opengl.GL gl = display.GetGL();
	6054	+ //javax.media.opengl.GL gl = display.GetGL();
5960	6055
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6056	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	6057	{
5963	6058	int fc = bRep.FaceCount();
5964	6059	int vc = bRep.VertexCount();
..	..	@@ -5973,23 +6068,7 @@
5973	6068
5974	6069	bRep.getMinMax(min, max, 100);
5975	6070
5976		- gl.glBegin(gl.GL_LINES);
5977		-
5978		- gl.glVertex3d(min.x, min.y, min.z);
5979		- gl.glVertex3d(min.x, min.y, max.z);
5980		- gl.glVertex3d(min.x, min.y, min.z);
5981		- gl.glVertex3d(min.x, max.y, min.z);
5982		- gl.glVertex3d(min.x, min.y, min.z);
5983		- gl.glVertex3d(max.x, min.y, min.z);
5984		-
5985		- gl.glVertex3d(max.x, max.y, max.z);
5986		- gl.glVertex3d(min.x, max.y, max.z);
5987		- gl.glVertex3d(max.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, min.y, max.z);
5989		- gl.glVertex3d(max.x, max.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, min.z);
5991		-
5992		- gl.glEnd();
	6071	+ display.DrawBox(min, max);
5993	6072
5994	6073	return;
5995	6074	}
..	..	@@ -6033,7 +6112,7 @@
6033	6112	{
6034	6113	//throw new Error();
6035	6114
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6115	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	6116
6038	6117	int[] strips = bRep.getRawIndices();
6039	6118
..	..	@@ -6043,178 +6122,14 @@
6043	6122	new Exception().printStackTrace();
6044	6123	return;
6045	6124	}
6046		-
6047		- // TRIANGLE STRIP ARRAY
6048		- if (bRep.trimmed)
6049		- {
6050		- float[] v = bRep.getRawVertices();
6051		- float[] n = bRep.getRawNormals();
6052		- float[] c = bRep.getRawColors();
6053		- float[] uv = bRep.getRawUVMap();
6054		-
6055		- int count2 = 0;
6056		- int count3 = 0;
6057		-
6058		- if (n.length > 0)
6059		- {
6060		- for (int i = 0; i < strips.length; i++)
6061		- {
6062		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6063		-
6064		- /*
6065		- boolean locked = false;
6066		- float eps = 0.1f;
6067		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6068		-
6069		- int dot = 0;
6070		-
6071		- if ((dot&1) == 0)
6072		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6073		-
6074		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6075		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6076		- else
6077		- {
6078		- locked = true;
6079		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6080		- }
6081		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6082		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6083		- if (hasnorm)
6084		- {
6085		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6086		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6087		- }
6088		-
6089		- if ((dot&4) == 0)
6090		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6091		-
6092		- if (wrap \|\| !locked && (dot&8) != 0)
6093		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6094		- else
6095		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6096		-
6097		- f.dot = dot;
6098		- */
6099		-
6100		- if (!selectmode)
6101		- {
6102		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6103		- {
6104		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6105		- } else
6106		- {
6107		- gl.glNormal3f(0, 0, 1);
6108		- }
6109		-
6110		- if (c != null)
6111		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6112		- {
6113		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6114		- }
6115		- }
6116		- if (flipV)
6117		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6118		- else
6119		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6120		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6121		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6122		-
6123		- count2 += 2;
6124		- count3 += 3;
6125		- if (!selectmode)
6126		- {
6127		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6128		- {
6129		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6130		- } else
6131		- {
6132		- gl.glNormal3f(0, 0, 1);
6133		- }
6134		- if (c != null)
6135		- {
6136		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6137		- }
6138		- }
6139		- if (flipV)
6140		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6141		- else
6142		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6143		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6144		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6145		-
6146		- count2 += 2;
6147		- count3 += 3;
6148		- for (int j = 0; j < strips[i] - 2; j++)
6149		- {
6150		- //gl.glTexCoord2d(...);
6151		- if (!selectmode)
6152		- {
6153		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6154		- {
6155		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6156		- } else
6157		- {
6158		- gl.glNormal3f(0, 0, 1);
6159		- }
6160		- if (c != null)
6161		- {
6162		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6163		- }
6164		- }
6165		-
6166		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		- count2 += 2;
6173		- count3 += 3;
6174		- }
6175		-
6176		- gl.glEnd();
6177		- }
6178		- }
6179		-
6180		- assert count3 == v.length;
6181		- }
6182		- else // !trimmed
6183		- {
6184		- int count = 0;
6185		- for (int i = 0; i < strips.length; i++)
6186		- {
6187		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6188		-
6189		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6190		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6191		-
6192		- drawVertex(gl, p, selectmode);
6193		- drawVertex(gl, q, selectmode);
6194		-
6195		- for (int j = 0; j < strips[i] - 2; j++)
6196		- {
6197		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6198		-
6199		-// if (j%2 == 0)
6200		-// drawFace(p, q, r, display, null);
6201		-// else
6202		-// drawFace(p, r, q, display, null);
6203		-
6204		-// p = q;
6205		-// q = r;
6206		- drawVertex(gl, r, selectmode);
6207		- }
6208		-
6209		- gl.glEnd();
6210		- }
6211		- }
	6125	+
	6126	+ display.DrawGeometry(bRep, flipV, selectmode);
6212	6127	} else // catch (Error e)
6213	6128	{
6214	6129	// TRIANGLE ARRAY
6215	6130	if (IsOpaque()) // Static())
6216	6131	{
6217		- gl.glBegin(gl.GL_TRIANGLES);
	6132	+ display.StartTriangles();
6218	6133	int facecount = bRep.FaceCount();
6219	6134	for (int i = 0; i < facecount; i++)
6220	6135	{
..	..	@@ -6277,9 +6192,9 @@
6277	6192	// // r.norm.dot(v3) > -0.5)
6278	6193	// // continue;
6279	6194
6280		- drawFace(p, q, r, display, face);
	6195	+ display.DrawFace(this, p, q, r, face);
6281	6196	}
6282		- gl.glEnd();
	6197	+ display.EndTriangles();
6283	6198	}
6284	6199	else
6285	6200	{
..	..	@@ -6308,8 +6223,8 @@
6308	6223	//System.out.println("SORT");
6309	6224
6310	6225	java.util.Arrays.sort(facescompare);
6311		-
6312		- gl.glBegin(gl.GL_TRIANGLES);
	6226	+
	6227	+ display.StartTriangles();
6313	6228	for (int i = 0; i < facecount; i++)
6314	6229	{
6315	6230	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6321,13 +6236,14 @@
6321	6236	Vertex q = bRep.GetVertex(face.q);
6322	6237	Vertex r = bRep.GetVertex(face.r);
6323	6238
6324		- drawFace(p, q, r, display, face);
	6239	+ display.DrawFace(this, p, q, r, face);
6325	6240	}
6326		- gl.glEnd();
	6241	+ display.EndTriangles();
6327	6242	}
6328	6243
6329	6244	if (false) // live && support != null && support.bRep != null) // debug weights
6330	6245	{
	6246	+ /*
6331	6247	gl.glDisable(gl.GL_LIGHTING);
6332	6248	float[] colorV = new float[3];
6333	6249
..	..	@@ -6406,6 +6322,7 @@
6406	6322	// gl.glEnd();
6407	6323	}
6408	6324	}
	6325	+ */
6409	6326	}
6410	6327	}
6411	6328
..	..	@@ -6450,7 +6367,7 @@
6450	6367	center.add(r);
6451	6368	center.mul(1.0/3);
6452	6369
6453		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6370	+ center.sub(Globals.theRenderer.EyeCamera().location);
6454	6371
6455	6372	distance = center.dot(center);
6456	6373	}
..	..	@@ -6461,347 +6378,11 @@
6461	6378
6462	6379	transient FaceCompare[] facescompare = null;
6463	6380
6464		- void SetColor(CameraPane display, Vertex p0)
6465		- {
6466		- if (display.RENDERPROGRAM == 0)
6467		- {
6468		- float r = 0;
6469		- if (bRep != null)
6470		- {
6471		- if (bRep.stripified)
6472		- {
6473		- r = 1;
6474		- }
6475		- }
6476		- float g = 0;
6477		- if (bRep != null)
6478		- {
6479		- if (bRep.trimmed)
6480		- {
6481		- g = 1;
6482		- }
6483		- }
6484		- float b = 0;
6485		- if (support != null && link2master)
6486		- {
6487		- b = 1;
6488		- }
6489		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6490		- return;
6491		- }
6492		-
6493		- if (display.drawMode != CameraPane.SHADOW)
6494		- return;
6495		-
6496		- javax.media.opengl.GL gl = display.GetGL();
6497		-// if (true) return;
6498		-// float ao = p.AO;
6499		-//
6500		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6501		-// // ao = 1;
6502		-//
6503		-// gl.glColor4f(ao, ao, ao, 1);
6504		-
6505		-// CameraPane.selectedpoint.
6506		-// getAverage(cStatic.point1, true);
6507		- if (CameraPane.pointflow == null) // !random) // live)
6508		- {
6509		- return;
6510		- }
6511		-
6512		- cStatic.point1.set(0,0,0);
6513		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6514		-
6515		- cStatic.point1.sub(p0);
6516		-
6517		-
6518		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6519		-// {
6520		-// return;
6521		-// }
6522		-
6523		- //if (true)
6524		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6525		- {
6526		- return;
6527		- }
6528		-
6529		- float[] colorV = new float[3];
6530		-
6531		- if (false) // marked)
6532		- {
6533		- // debug rigging weights
6534		- for (int object = 0; object < p0.vertexlinks.length; object++)
6535		- {
6536		- float weight = p0.weights[object] / p0.totalweight;
6537		-
6538		- // if (weight < 0.1)
6539		- // {
6540		- // assert(weight == 0);
6541		- // continue;
6542		- // }
6543		-
6544		- if (p0.vertexlinks[object] == -1)
6545		- continue;
6546		-
6547		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6548		-
6549		- int color = //1 << object; //
6550		- //p.vertexlinks.length;
6551		- support.bRep.supports[p0.closestsupport].links[object];
6552		- colorV[2] += (color & 1) * weight;
6553		- colorV[1] += ((color & 2) >> 1) * weight;
6554		- colorV[0] += ((color & 4) >> 2) * weight;
6555		- }
6556		- }
6557		- else
6558		- {
6559		- if (drawingstarted)
6560		- {
6561		- // find next point
6562		- if (bRep.GetVertex(0).faceindices == null)
6563		- {
6564		- bRep.InitFaceIndices();
6565		- }
6566		-
6567		- double ymin = p0.y;
6568		-
6569		- Vertex newp = p0;
6570		-
6571		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6572		- {
6573		- int fi = p0.faceindices[fii];
6574		-
6575		- if (fi == -1)
6576		- break;
6577		-
6578		- Face f = bRep.GetFace(fi);
6579		-
6580		- Vertex p = bRep.GetVertex(f.p);
6581		- Vertex q = bRep.GetVertex(f.q);
6582		- Vertex r = bRep.GetVertex(f.r);
6583		-
6584		- int swap = (int)(Math.random()*3);
6585		-
6586		-// for (int s=swap; --s>=0;)
6587		-// {
6588		-// Vertex t = p;
6589		-// p = q;
6590		-// q = r;
6591		-// r = t;
6592		-// }
6593		- if (ymin > p.y)
6594		- {
6595		- ymin = p.y;
6596		- newp = p;
6597		-// break;
6598		- }
6599		- if (ymin > q.y)
6600		- {
6601		- ymin = q.y;
6602		- newp = q;
6603		-// break;
6604		- }
6605		- if (ymin > r.y)
6606		- {
6607		- ymin = r.y;
6608		- newp = r;
6609		-// break;
6610		- }
6611		- }
6612		-
6613		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6614		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6615		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6616		-
6617		- drawingstarted = false;
6618		-
6619		- // return;
6620		- }
6621		-
6622		- if (false) // CameraPane.DRAW
6623		- {
6624		- p0.AO = colorV[0] = 2;
6625		- colorV[1] = 2;
6626		- colorV[2] = 2;
6627		- }
6628		-
6629		- CameraPane.pointflow.add(p0);
6630		- CameraPane.pointflow.Touch();
6631		- }
6632		-
6633		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6634		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6635		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6636		- }
6637		-
6638	6381	void Print(Vertex v)
6639	6382	{
6640	6383	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6641	6384	}
6642	6385
6643		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6644		- {
6645		- if (!selectmode)
6646		- {
6647		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6648		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6649		-
6650		- if (flipV)
6651		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6652		- else
6653		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6654		- }
6655		-
6656		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6657		- }
6658		-
6659		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6660		- CameraPane display, Face face)
6661		- {
6662		- if (pv.y == -10000 \|\|
6663		- qv.y == -10000 \|\|
6664		- rv.y == -10000)
6665		- return;
6666		-
6667		-// float b = f.nbiterations & 1;
6668		-// float g = (f.nbiterations>>1) & 1;
6669		-// float r = (f.nbiterations>>2) & 1;
6670		-//
6671		-// //if (f.weight == 10000)
6672		-// //{
6673		-// // r = 1; g = b = 0;
6674		-// //}
6675		-// //else
6676		-// //{
6677		-// // assert(f.weight < 10000);
6678		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6679		-// if (r<0)
6680		-// assert(r>=0);
6681		-// //}
6682		-
6683		- javax.media.opengl.GL gl = display.GetGL();
6684		-
6685		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6686		-
6687		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6688		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6689		- {
6690		- //gl.glBegin(gl.GL_TRIANGLES);
6691		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6692		- if (!hasnorm)
6693		- {
6694		- // System.out.println("FUCK!!");
6695		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6696		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6697		- LA.vecCross(v0, v1, v2);
6698		- LA.vecNormalize(v2);
6699		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6700		- }
6701		-
6702		- if (hasnorm)
6703		- {
6704		-// if (!pv.norm.normalized())
6705		-// assert(pv.norm.normalized());
6706		-
6707		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6708		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6709		- }
6710		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6711		- SetColor(display, pv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6716		- else
6717		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6718		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6719		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6720		-// Print(pv);
6721		- if (hasnorm)
6722		- {
6723		-// assert(qv.norm.normalized());
6724		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6725		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6726		- }
6727		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6728		- // boolean locked = false;
6729		- // float eps = 0.1f;
6730		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6731		-
6732		- // int dot = 0; //*/ (int)f.dot;
6733		-
6734		- // if ((dot&1) == 0)
6735		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6736		-
6737		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6738		- if (flipV)
6739		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6740		- else
6741		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6742		- // else
6743		- // {
6744		- // locked = true;
6745		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6746		- // }
6747		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6748		- SetColor(display, qv);
6749		- //gl.glColor4f(r, g, b, 1);
6750		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6751		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6752		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6753		-// Print(qv);
6754		- if (hasnorm)
6755		- {
6756		-// assert(rv.norm.normalized());
6757		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6758		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6759		- }
6760		-
6761		- // if ((dot&4) == 0)
6762		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6763		-
6764		- // if (wrap \|\| !locked && (dot&8) != 0)
6765		- if (flipV)
6766		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6767		- else
6768		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6769		- // else
6770		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6771		-
6772		- // f.dot = dot;
6773		-
6774		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6775		- SetColor(display, rv);
6776		- //gl.glColor4f(r, g, b, 1);
6777		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6778		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6779		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6780		-// Print(rv);
6781		- //gl.glEnd();
6782		- }
6783		- else
6784		- {
6785		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6786		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6787		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6788		-
6789		- }
6790		-
6791		- if (false) // (attributes & WIREFRAME) != 0)
6792		- {
6793		- gl.glDisable(gl.GL_LIGHTING);
6794		-
6795		- gl.glBegin(gl.GL_LINE_LOOP);
6796		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6797		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6798		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6799		- gl.glEnd();
6800		-
6801		- gl.glEnable(gl.GL_LIGHTING);
6802		- }
6803		- }
6804		-
6805	6386	void drawSelf(ClickInfo info, int level, boolean select)
6806	6387	{
6807	6388	if (bRep == null)
..	..	@@ -7373,83 +6954,83 @@
7373	6954	int spotw = spot.x + spot.width;
7374	6955	int spoth = spot.y + spot.height;
7375	6956	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7376		- if (CameraPane.Xmin > spot.x)
7377		- {
7378		- CameraPane.Xmin = spot.x;
7379		- }
7380		- if (CameraPane.Xmax < spotw)
7381		- {
7382		- CameraPane.Xmax = spotw;
7383		- }
7384		- if (CameraPane.Ymin > spot.y)
7385		- {
7386		- CameraPane.Ymin = spot.y;
7387		- }
7388		- if (CameraPane.Ymax < spoth)
7389		- {
7390		- CameraPane.Ymax = spoth;
7391		- }
	6957	+// if (CameraPane.Xmin > spot.x)
	6958	+// {
	6959	+// CameraPane.Xmin = spot.x;
	6960	+// }
	6961	+// if (CameraPane.Xmax < spotw)
	6962	+// {
	6963	+// CameraPane.Xmax = spotw;
	6964	+// }
	6965	+// if (CameraPane.Ymin > spot.y)
	6966	+// {
	6967	+// CameraPane.Ymin = spot.y;
	6968	+// }
	6969	+// if (CameraPane.Ymax < spoth)
	6970	+// {
	6971	+// CameraPane.Ymax = spoth;
	6972	+// }
7392	6973	spot.translate(32, 32);
7393	6974	spotw = spot.x + spot.width;
7394	6975	spoth = spot.y + spot.height;
7395	6976	info.g.setColor(Color.blue);
7396	6977	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7397		- if (CameraPane.Xmin > spot.x)
7398		- {
7399		- CameraPane.Xmin = spot.x;
7400		- }
7401		- if (CameraPane.Xmax < spotw)
7402		- {
7403		- CameraPane.Xmax = spotw;
7404		- }
7405		- if (CameraPane.Ymin > spot.y)
7406		- {
7407		- CameraPane.Ymin = spot.y;
7408		- }
7409		- if (CameraPane.Ymax < spoth)
7410		- {
7411		- CameraPane.Ymax = spoth;
7412		- }
7413		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7414		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	6978	+// if (CameraPane.Xmin > spot.x)
	6979	+// {
	6980	+// CameraPane.Xmin = spot.x;
	6981	+// }
	6982	+// if (CameraPane.Xmax < spotw)
	6983	+// {
	6984	+// CameraPane.Xmax = spotw;
	6985	+// }
	6986	+// if (CameraPane.Ymin > spot.y)
	6987	+// {
	6988	+// CameraPane.Ymin = spot.y;
	6989	+// }
	6990	+// if (CameraPane.Ymax < spoth)
	6991	+// {
	6992	+// CameraPane.Ymax = spoth;
	6993	+// }
	6994	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	6995	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7415	6996	spot.translate(0, -32);
7416	6997	info.g.setColor(Color.green);
7417	6998	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7418		- if (CameraPane.Xmin > spot.x)
7419		- {
7420		- CameraPane.Xmin = spot.x;
7421		- }
7422		- if (CameraPane.Xmax < spotw)
7423		- {
7424		- CameraPane.Xmax = spotw;
7425		- }
7426		- if (CameraPane.Ymin > spot.y)
7427		- {
7428		- CameraPane.Ymin = spot.y;
7429		- }
7430		- if (CameraPane.Ymax < spoth)
7431		- {
7432		- CameraPane.Ymax = spoth;
7433		- }
	6999	+// if (CameraPane.Xmin > spot.x)
	7000	+// {
	7001	+// CameraPane.Xmin = spot.x;
	7002	+// }
	7003	+// if (CameraPane.Xmax < spotw)
	7004	+// {
	7005	+// CameraPane.Xmax = spotw;
	7006	+// }
	7007	+// if (CameraPane.Ymin > spot.y)
	7008	+// {
	7009	+// CameraPane.Ymin = spot.y;
	7010	+// }
	7011	+// if (CameraPane.Ymax < spoth)
	7012	+// {
	7013	+// CameraPane.Ymax = spoth;
	7014	+// }
7434	7015	info.g.drawArc(boundary.x, boundary.y,
7435	7016	boundary.width, boundary.height, 0, 360);
7436	7017	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7437		- if (CameraPane.Xmin > boundary.x)
7438		- {
7439		- CameraPane.Xmin = boundary.x;
7440		- }
7441		- if (CameraPane.Xmax < boundary.x + boundary.width)
7442		- {
7443		- CameraPane.Xmax = boundary.x + boundary.width;
7444		- }
7445		- if (CameraPane.Ymin > boundary.y)
7446		- {
7447		- CameraPane.Ymin = boundary.y;
7448		- }
7449		- if (CameraPane.Ymax < boundary.y + boundary.height)
7450		- {
7451		- CameraPane.Ymax = boundary.y + boundary.height;
7452		- }
	7018	+// if (CameraPane.Xmin > boundary.x)
	7019	+// {
	7020	+// CameraPane.Xmin = boundary.x;
	7021	+// }
	7022	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7023	+// {
	7024	+// CameraPane.Xmax = boundary.x + boundary.width;
	7025	+// }
	7026	+// if (CameraPane.Ymin > boundary.y)
	7027	+// {
	7028	+// CameraPane.Ymin = boundary.y;
	7029	+// }
	7030	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7031	+// {
	7032	+// CameraPane.Ymax = boundary.y + boundary.height;
	7033	+// }
7453	7034	return;
7454	7035	}
7455	7036	}
..	..	@@ -7466,7 +7047,7 @@
7466	7047	startX = info.x;
7467	7048	startY = info.y;
7468	7049
7469		- hitSomething = 0;
	7050	+ hitSomething = -1;
7470	7051	cVector origin = new cVector();
7471	7052	//LA.xformPos(origin, toParent, origin);
7472	7053	Rectangle spot = new Rectangle();
..	..	@@ -7499,7 +7080,7 @@
7499	7080	}
7500	7081
7501	7082	//System.out.println("info.modifiers = " + info.modifiers);
7502		- modified = (info.modifiers & CameraPane.META) != 0;
	7083	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7503	7084	//System.out.println("modified = " + modified);
7504	7085	//new Exception().printStackTrace();
7505	7086	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7527,7 +7108,7 @@
7527	7108	return true;
7528	7109	}
7529	7110
7530		- void doEditDrag0(ClickInfo info)
	7111	+ void doEditDrag0(ClickInfo info, boolean opposite)
7531	7112	{
7532	7113	if (hitSomething == 0)
7533	7114	{
..	..	@@ -7542,6 +7123,7 @@
7542	7123	//System.out.println("hitSomething = " + hitSomething);
7543	7124
7544	7125	double scale = 0.005f * info.camera.Distance();
	7126	+
7545	7127	cVector xlate = new cVector();
7546	7128	//cVector xlate2 = new cVector();
7547	7129	switch (hitSomething)
..	..	@@ -7552,9 +7134,9 @@
7552	7134
7553	7135	case hitCenter: // Translate
7554	7136
7555		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7137	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7556	7138
7557		- if (modified)
	7139	+ if (modified \|\| opposite)
7558	7140	{
7559	7141	//assert(false);
7560	7142	/*
..	..	@@ -7600,10 +7182,10 @@
7600	7182	}
7601	7183	LA.xformDir(up, ClickInfo.matbuffer, up);
7602	7184	// if (!CameraPane.LOCALTRANSFORM)
7603		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7185	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7604	7186	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7605	7187	// if (!CameraPane.LOCALTRANSFORM)
7606		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7188	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7607	7189	//LA.vecCross(up, cVector.Z, right2);
7608	7190
7609	7191	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7648,6 +7230,7 @@
7648	7230
7649	7231	if (modified)
7650	7232	{
	7233	+ // Rotate 90 degrees
7651	7234	angle /= (Math.PI / 4);
7652	7235	angle = Math.floor(angle + 0.5);
7653	7236	angle *= (Math.PI / 4);
..	..	@@ -7661,7 +7244,7 @@
7661	7244	}
7662	7245	/**/
7663	7246
7664		- switch (info.pane.renderCamera.viewCode)
	7247	+ switch (info.pane.RenderCamera().viewCode)
7665	7248	{
7666	7249	case 1: // '\001'
7667	7250	LA.matZRotate(toParent, angle);
..	..	@@ -7689,24 +7272,27 @@
7689	7272
7690	7273	case hitScale: // scale
7691	7274	double hScale = (double) (info.x - centerPt.x) / 32;
	7275	+ double sign = 1;
	7276	+ if (hScale < 0)
	7277	+ {
	7278	+ sign = -1;
	7279	+ }
	7280	+ hScale = signMath.pow(signhScale, scale * 50);
7692	7281	if (hScale < 0.01)
7693	7282	{
7694		- hScale = 0.01;
	7283	+ //hScale = 0.01;
7695	7284	}
7696		- hScale = Math.pow(hScale, scale * 50);
7697		- if (hScale < 0.01)
7698		- {
7699		- hScale = 0.01;
7700		- }
	7285	+
7701	7286	double vScale = (double) (info.y - centerPt.y) / 32;
7702		- if (vScale < 0.01)
	7287	+ sign = 1;
	7288	+ if (vScale < 0)
7703	7289	{
7704		- vScale = 0.01;
	7290	+ sign = -1;
7705	7291	}
7706		- vScale = Math.pow(vScale, scale * 50);
	7292	+ vScale = signMath.pow(signvScale, scale * 50);
7707	7293	if (vScale < 0.01)
7708	7294	{
7709		- vScale = 0.01;
	7295	+ //vScale = 0.01;
7710	7296	}
7711	7297	LA.matCopy(startMat, toParent);
7712	7298	/**/
..	..	@@ -7717,17 +7303,24 @@
7717	7303	}
7718	7304	/**/
7719	7305
7720		- switch (info.pane.renderCamera.viewCode)
	7306	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7307	+
	7308	+ if (totalScale < 0.01)
	7309	+ {
	7310	+ totalScale = 0.01;
	7311	+ }
	7312	+
	7313	+ switch (info.pane.RenderCamera().viewCode)
7721	7314	{
7722	7315	case 3: // '\001'
7723	7316	if (modified)
7724	7317	{
7725	7318	//LA.matScale(toParent, 1, hScale, vScale);
7726		- LA.matScale(toParent, vScale, 1, 1);
	7319	+ LA.matScale(toParent, totalScale, 1, 1);
7727	7320	} // vScale, 1);
7728	7321	else
7729	7322	{
7730		- LA.matScale(toParent, vScale, vScale, vScale);
	7323	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7731	7324	} // vScale, 1);
7732	7325	break;
7733	7326
..	..	@@ -7735,10 +7328,10 @@
7735	7328	if (modified)
7736	7329	{
7737	7330	//LA.matScale(toParent, hScale, 1, vScale);
7738		- LA.matScale(toParent, 1, vScale, 1);
	7331	+ LA.matScale(toParent, 1, totalScale, 1);
7739	7332	} else
7740	7333	{
7741		- LA.matScale(toParent, vScale, 1, vScale);
	7334	+ LA.matScale(toParent, totalScale, 1, totalScale);
7742	7335	}
7743	7336	break;
7744	7337
..	..	@@ -7746,10 +7339,10 @@
7746	7339	if (modified)
7747	7340	{
7748	7341	//LA.matScale(toParent, hScale, vScale, 1);
7749		- LA.matScale(toParent, 1, 1, vScale);
	7342	+ LA.matScale(toParent, 1, 1, totalScale);
7750	7343	} else
7751	7344	{
7752		- LA.matScale(toParent, vScale, vScale, 1);
	7345	+ LA.matScale(toParent, totalScale, totalScale, 1);
7753	7346	}
7754	7347	break;
7755	7348	}
..	..	@@ -7882,14 +7475,22 @@
7882	7475	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7883	7476	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7884	7477	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7478	+
	7479	+ String objname;
	7480	+
7885	7481	if (false) //parent != null)
7886	7482	{
7887		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7483	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7888	7484	} else
7889	7485	{
7890		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7486	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7891	7487	} // + super.toString();
7892	7488	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7489	+
	7490	+ if (!Globals.ADVANCED)
	7491	+ return objname;
	7492	+
	7493	+ return objname + " " + System.identityHashCode(this);
7893	7494	}
7894	7495
7895	7496	public int hashCode()
..	..	@@ -7945,6 +7546,7 @@
7945	7546	objectUI.closeUI();
7946	7547	if (editWindow != null)
7947	7548	{
	7549	+ editWindow.ctrlPanel.FlushUI();
7948	7550	editWindow.refreshContents();
7949	7551	} // ? new
7950	7552	objectUI = null;
..	..	@@ -8080,7 +7682,7 @@
8080	7682	{
8081	7683	assert(bRep != null);
8082	7684	if (!(support instanceof GenericJoint)) // support.bRep != null)
8083		- GrafreeD.Assert(support.bRep == bRep.support);
	7685	+ Grafreed.Assert(support.bRep == bRep.support);
8084	7686	}
8085	7687	else
8086	7688	{
..	..	@@ -8129,9 +7731,9 @@
8129	7731	private static cVector edge2 = new cVector();
8130	7732	//private static cVector norm = new cVector();
8131	7733	/transient private/ int hitSomething;
8132		- private static final int hitCenter = 1;
8133		- private static final int hitScale = 2;
8134		- private static final int hitRotate = 3;
	7734	+ static final int hitCenter = 1;
	7735	+ static final int hitScale = 2;
	7736	+ static final int hitRotate = 3;
8135	7737	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8136	7738	/transient/ private Point centerPt;
8137	7739	/transient/ private int startX;
..	..	@@ -8163,6 +7765,8 @@
8163	7765	{
8164	7766	Object3D targ = this;
8165	7767
	7768	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7769	+
8166	7770	if (obj.material != null)
8167	7771	{
8168	7772	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))