~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,11 +14,15 @@
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;
	24	+
	25	+ private UUID uuid = UUID.randomUUID();
21	26
22	27	ScriptNode scriptnode;
23	28
..	..	@@ -299,6 +304,7 @@
299	304	}
300	305
301	306	boolean live = false;
	307	+ boolean dontselect = false;
302	308	boolean hide = false;
303	309	boolean link2master = false; // performs reset support/master at each frame
304	310	boolean marked = false; // animation node
..	..	@@ -773,7 +779,7 @@
773	779	if (step == 0)
774	780	step = 1;
775	781	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	782	+ maxcount = 128; // 2048; // 4;
777	783	// if (acceleration == 0)
778	784	// acceleration = 10;
779	785	if (delay == 0) // serial
..	..	@@ -796,7 +802,7 @@
796	802
797	803	if (marked && Globals.isLIVE() && live &&
798	804	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	805	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
800	806	currentframe != Globals.framecount)
801	807	{
802	808	currentframe = Globals.framecount;
..	..	@@ -911,6 +917,11 @@
911	917	fromParent = null; // LA.newMatrix();
912	918	bRep = null; // new BoundaryRep();
913	919
	920	+ if (oname != null && oname.equals("LeftHand"))
	921	+ {
	922	+ name = oname;
	923	+ }
	924	+
914	925	/*
915	926	float hue = (float)Math.random();
916	927	Color col;
..	..	@@ -953,7 +964,7 @@
953	964
954	965	public Object clone()
955	966	{
956		- return GrafreeD.clone(this);
	967	+ return Grafreed.clone(this);
957	968	}
958	969
959	970	Object3D copyExpand()
..	..	@@ -1469,7 +1480,7 @@
1469	1480	BoundaryRep.SEUIL = other.material.cameralight;
1470	1481
1471	1482	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1483	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1484	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1485	}
1475	1486
..	..	@@ -1728,7 +1739,7 @@
1728	1739	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1740	o.bRep = transientrep;
1730	1741	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1742	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1743	o.CreateMaterial();
1733	1744	o.SetAttributes(this, -1);
1734	1745	//parent
..	..	@@ -1741,7 +1752,7 @@
1741	1752	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1753	o.bRep = bRep;
1743	1754	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1755	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1756	o.CreateMaterial();
1746	1757	//o.overwriteThis(this, -1);
1747	1758	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1839,15 @@
1828	1839	if (obj.name == null)
1829	1840	continue; // can't be a null one
1830	1841
	1842	+ // Try perfect match first.
1831	1843	if (n.equals(obj.name))
1832	1844	{
1833	1845	theobj = obj;
1834	1846	count++;
1835	1847	}
1836	1848	}
	1849	+
	1850	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1851
1838	1852	if (count != 1)
1839	1853	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2313,7 @@
2299	2313	{
2300	2314	if (newWindow)
2301	2315	{
	2316	+ new Exception().printStackTrace();
2302	2317	System.exit(0);
2303	2318	if (parent != null)
2304	2319	{
..	..	@@ -2475,13 +2490,13 @@
2475	2490	return retval;
2476	2491	}
2477	2492
2478		- void doEditDrag(ClickInfo info)
	2493	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2494	{
2480	2495	switch (doSomething)
2481	2496	{
2482	2497	case 1: // '\001'
2483	2498	//super.
2484		- doEditDrag0(info);
	2499	+ doEditDrag0(info, opposite);
2485	2500	break;
2486	2501
2487	2502	case 2: // '\002'
..	..	@@ -2494,11 +2509,11 @@
2494	2509	{
2495	2510	//sel.hitSomething = childToDrag.hitSomething;
2496	2511	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2512	+ sel.doEditDrag(info, opposite);
2498	2513	} else
2499	2514	{
2500	2515	//super.
2501		- doEditDrag0(info);
	2516	+ doEditDrag0(info, opposite);
2502	2517	}
2503	2518	}
2504	2519	break;
..	..	@@ -2905,7 +2920,8 @@
2905	2920	{
2906	2921	if (bRep != null)
2907	2922	{
2908		- bRep.GenUV();
	2923	+ bRep.GenUV(); //1);
	2924	+ //bRep.UnfoldUV();
2909	2925	Touch();
2910	2926	}
2911	2927	}
..	..	@@ -2980,6 +2996,33 @@
2980	2996	blockloop = false;
2981	2997	}
2982	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	+
2983	3026	void TransformGeometry()
2984	3027	{
2985	3028	Object3D obj = this;
..	..	@@ -3201,9 +3244,11 @@
3201	3244
3202	3245	BoundaryRep sup = bRep.support;
3203	3246	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3247	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3248	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3249	+
	3250	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3251	+
3207	3252	bRep = temprep;
3208	3253	bRep.support = sup;
3209	3254	Touch();
..	..	@@ -3725,7 +3770,7 @@
3725	3770	if (child == null)
3726	3771	continue;
3727	3772
3728		- if (GrafreeD.RENDERME > 0)
	3773	+ if (Grafreed.RENDERME > 0)
3729	3774	{
3730	3775	if (child instanceof Merge)
3731	3776	((Merge)child).renderme();
..	..	@@ -3876,7 +3921,7 @@
3876	3921	if (child == null)
3877	3922	continue;
3878	3923
3879		- if (GrafreeD.RENDERME > 0)
	3924	+ if (Grafreed.RENDERME > 0)
3880	3925	{
3881	3926	if (child instanceof Merge)
3882	3927	((Merge)child).renderme();
..	..	@@ -4071,7 +4116,7 @@
4071	4116	if (child == null)
4072	4117	continue;
4073	4118
4074		- if (GrafreeD.RENDERME > 0)
	4119	+ if (Grafreed.RENDERME > 0)
4075	4120	{
4076	4121	if (child instanceof Merge)
4077	4122	((Merge)child).renderme();
..	..	@@ -4678,7 +4723,7 @@
4678	4723
4679	4724	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4725	{
4681		- if (hide)
	4726	+ if (hide \|\| dontselect)
4682	4727	return null;
4683	4728
4684	4729	if (count <= 0)
..	..	@@ -4704,7 +4749,7 @@
4704	4749
4705	4750	cTreePath Select(int indexcount, boolean deselect)
4706	4751	{
4707		- if (hide)
	4752	+ if (hide \|\| dontselect)
4708	4753	return null;
4709	4754
4710	4755	if (count <= 0)
..	..	@@ -5156,10 +5201,34 @@
5156	5201
5157	5202	// System.out.println("Fullname = " + fullname);
5158	5203
5159		- if (fullname.name.indexOf(":") == -1)
5160		- 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(":"));
5161	5209
5162		- 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];
5163	5232	}
5164	5233
5165	5234	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5237,38 @@
5168	5237	return "";
5169	5238
5170	5239	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- 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];
5175	5272	}
5176	5273
5177	5274	String GetPigmentTexture()
..	..	@@ -5245,7 +5342,7 @@
5245	5342	System.out.print("; textures = " + textures);
5246	5343	System.out.println("; usedtextures = " + usedtextures);
5247	5344
5248		- if (GetTextures() == null)
	5345	+ if (GetTextures() == null) // What is that??
5249	5346	GetTextures().name = ":";
5250	5347
5251	5348	String texname = tex;
..	..	@@ -5276,6 +5373,43 @@
5276	5373	child.ResetPigmentTexture();
5277	5374	blockloop = false;
5278	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;
5279	5413	}
5280	5414
5281	5415	void SetBumpTexture(String tex)
..	..	@@ -5322,9 +5456,9 @@
5322	5456	boolean NeedSupport()
5323	5457	{
5324	5458	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5459	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5326	5460	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5461	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5462	}
5329	5463
5330	5464	static boolean DEBUG_SELECTION = false;
..	..	@@ -5339,7 +5473,7 @@
5339	5473	}
5340	5474
5341	5475	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5476	+ (hide \|\| dontselect))
5343	5477	return;
5344	5478
5345	5479	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5505,7 @@
5371	5505	return;
5372	5506	}
5373	5507
5374		- javax.media.opengl.GL gl = display.GetGL();
	5508	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5509
5376	5510	/*
5377	5511	if (touched)
..	..	@@ -5423,7 +5557,7 @@
5423	5557	//if (displaylist == -1 && usecalllists)
5424	5558	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5559	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5560	+ bRep.displaylist = display.GenList();
5427	5561	assert(bRep.displaylist != 0);
5428	5562	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5563	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5569,16 @@
5435	5569	if (usecalllists)
5436	5570	{
5437	5571	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5572	+ display.NewList(bRep.displaylist);
5439	5573	}
	5574	+
5440	5575	CallList(display, root, selected, blocked);
	5576	+
5441	5577	// compiled = true;
5442	5578	if (usecalllists)
5443	5579	{
5444	5580	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5581	+ display.EndList();
5446	5582	}
5447	5583	//gl.glDrawBuffer(gl.GL_BACK);
5448	5584	// XXX touched = false;
..	..	@@ -5490,7 +5626,7 @@
5490	5626	if (display.DrawMode() == iCameraPane.SHADOW)
5491	5627	{
5492	5628	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5629	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	5630	{
5495	5631	//System.out.print("CULLED");
5496	5632	culled = true;
..	..	@@ -5498,7 +5634,7 @@
5498	5634	}
5499	5635	else
5500	5636	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5637	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	5638	culled = true;
5503	5639
5504	5640	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +5674,7 @@
5538	5674	{
5539	5675	if (GetBRep() != null)
5540	5676	{
5541		- CameraPane.NextIndex(this, gl);
	5677	+ display.NextIndex();
5542	5678	// vertex color conflict : gl.glCallList(list);
5543	5679	DrawNode(display, root, selected);
5544	5680	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +5715,17 @@
5579	5715	tex = GetTextures();
5580	5716	}
5581	5717
5582		- 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	+ }
5583	5729
5584	5730	if (!compiled)
5585	5731	{
..	..	@@ -5595,13 +5741,14 @@
5595	5741
5596	5742	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	5743	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	5744	+ display.CallList(bRep.displaylist);
5599	5745	// june 2013 drawSelf(display, root, selected);
5600	5746	}
5601	5747	}
5602	5748	}
5603	5749
5604		- display.ReleaseTextures(tex);
	5750	+ if (!failed)
	5751	+ display.ReleaseTextures(tex);
5605	5752
5606	5753	display.PopMaterial(this, selected);
5607	5754	}
..	..	@@ -5730,6 +5877,9 @@
5730	5877
5731	5878	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	5879	{
	5880	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5881	+ return;
	5882	+
5733	5883	if (hide)
5734	5884	return;
5735	5885	// shadow optimisation
..	..	@@ -5855,6 +6005,9 @@
5855	6005	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6006	return; // no shadow for transparent objects
5857	6007
	6008	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6009	+ return;
	6010	+
5858	6011	if (hide)
5859	6012	return;
5860	6013
..	..	@@ -5895,9 +6048,10 @@
5895	6048	return;
5896	6049	}
5897	6050
	6051	+ //bRep.GenUV(1/material.diffuseness);
5898	6052	// bRep.lock = true;
5899	6053
5900		- javax.media.opengl.GL gl = display.GetGL();
	6054	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6055
5902	6056	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6057	{
..	..	@@ -5914,23 +6068,7 @@
5914	6068
5915	6069	bRep.getMinMax(min, max, 100);
5916	6070
5917		- gl.glBegin(gl.GL_LINES);
5918		-
5919		- gl.glVertex3d(min.x, min.y, min.z);
5920		- gl.glVertex3d(min.x, min.y, max.z);
5921		- gl.glVertex3d(min.x, min.y, min.z);
5922		- gl.glVertex3d(min.x, max.y, min.z);
5923		- gl.glVertex3d(min.x, min.y, min.z);
5924		- gl.glVertex3d(max.x, min.y, min.z);
5925		-
5926		- gl.glVertex3d(max.x, max.y, max.z);
5927		- gl.glVertex3d(min.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, max.y, max.z);
5929		- gl.glVertex3d(max.x, min.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, max.z);
5931		- gl.glVertex3d(max.x, max.y, min.z);
5932		-
5933		- gl.glEnd();
	6071	+ display.DrawBox(min, max);
5934	6072
5935	6073	return;
5936	6074	}
..	..	@@ -5984,178 +6122,14 @@
5984	6122	new Exception().printStackTrace();
5985	6123	return;
5986	6124	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
5990		- {
5991		- float[] v = bRep.getRawVertices();
5992		- float[] n = bRep.getRawNormals();
5993		- float[] c = bRep.getRawColors();
5994		- float[] uv = bRep.getRawUVMap();
5995		-
5996		- int count2 = 0;
5997		- int count3 = 0;
5998		-
5999		- if (n.length > 0)
6000		- {
6001		- for (int i = 0; i < strips.length; i++)
6002		- {
6003		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6004		-
6005		- /*
6006		- boolean locked = false;
6007		- float eps = 0.1f;
6008		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6009		-
6010		- int dot = 0;
6011		-
6012		- if ((dot&1) == 0)
6013		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6014		-
6015		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6016		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6017		- else
6018		- {
6019		- locked = true;
6020		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6021		- }
6022		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6023		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6024		- if (hasnorm)
6025		- {
6026		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6027		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6028		- }
6029		-
6030		- if ((dot&4) == 0)
6031		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6032		-
6033		- if (wrap \|\| !locked && (dot&8) != 0)
6034		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6035		- else
6036		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6037		-
6038		- f.dot = dot;
6039		- */
6040		-
6041		- if (!selectmode)
6042		- {
6043		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6044		- {
6045		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6046		- } else
6047		- {
6048		- gl.glNormal3f(0, 0, 1);
6049		- }
6050		-
6051		- if (c != null)
6052		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6053		- {
6054		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6055		- }
6056		- }
6057		- if (flipV)
6058		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6059		- else
6060		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6061		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6062		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6063		-
6064		- count2 += 2;
6065		- count3 += 3;
6066		- if (!selectmode)
6067		- {
6068		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6069		- {
6070		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6071		- } else
6072		- {
6073		- gl.glNormal3f(0, 0, 1);
6074		- }
6075		- if (c != null)
6076		- {
6077		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6078		- }
6079		- }
6080		- if (flipV)
6081		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6082		- else
6083		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6084		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6085		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6086		-
6087		- count2 += 2;
6088		- count3 += 3;
6089		- for (int j = 0; j < strips[i] - 2; j++)
6090		- {
6091		- //gl.glTexCoord2d(...);
6092		- if (!selectmode)
6093		- {
6094		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6095		- {
6096		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6097		- } else
6098		- {
6099		- gl.glNormal3f(0, 0, 1);
6100		- }
6101		- if (c != null)
6102		- {
6103		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6104		- }
6105		- }
6106		-
6107		- if (flipV)
6108		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6109		- else
6110		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6111		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6112		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6113		- count2 += 2;
6114		- count3 += 3;
6115		- }
6116		-
6117		- gl.glEnd();
6118		- }
6119		- }
6120		-
6121		- assert count3 == v.length;
6122		- }
6123		- else // !trimmed
6124		- {
6125		- int count = 0;
6126		- for (int i = 0; i < strips.length; i++)
6127		- {
6128		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6129		-
6130		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6131		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6132		-
6133		- drawVertex(gl, p, selectmode);
6134		- drawVertex(gl, q, selectmode);
6135		-
6136		- for (int j = 0; j < strips[i] - 2; j++)
6137		- {
6138		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6139		-
6140		-// if (j%2 == 0)
6141		-// drawFace(p, q, r, display, null);
6142		-// else
6143		-// drawFace(p, r, q, display, null);
6144		-
6145		-// p = q;
6146		-// q = r;
6147		- drawVertex(gl, r, selectmode);
6148		- }
6149		-
6150		- gl.glEnd();
6151		- }
6152		- }
	6125	+
	6126	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6127	} else // catch (Error e)
6154	6128	{
6155	6129	// TRIANGLE ARRAY
6156	6130	if (IsOpaque()) // Static())
6157	6131	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6132	+ display.StartTriangles();
6159	6133	int facecount = bRep.FaceCount();
6160	6134	for (int i = 0; i < facecount; i++)
6161	6135	{
..	..	@@ -6220,7 +6194,7 @@
6220	6194
6221	6195	display.DrawFace(this, p, q, r, face);
6222	6196	}
6223		- gl.glEnd();
	6197	+ display.EndTriangles();
6224	6198	}
6225	6199	else
6226	6200	{
..	..	@@ -6249,8 +6223,8 @@
6249	6223	//System.out.println("SORT");
6250	6224
6251	6225	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6226	+
	6227	+ display.StartTriangles();
6254	6228	for (int i = 0; i < facecount; i++)
6255	6229	{
6256	6230	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6238,12 @@
6264	6238
6265	6239	display.DrawFace(this, p, q, r, face);
6266	6240	}
6267		- gl.glEnd();
	6241	+ display.EndTriangles();
6268	6242	}
6269	6243
6270	6244	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6245	{
	6246	+ /*
6272	6247	gl.glDisable(gl.GL_LIGHTING);
6273	6248	float[] colorV = new float[3];
6274	6249
..	..	@@ -6347,6 +6322,7 @@
6347	6322	// gl.glEnd();
6348	6323	}
6349	6324	}
	6325	+ */
6350	6326	}
6351	6327	}
6352	6328
..	..	@@ -6405,22 +6381,6 @@
6405	6381	void Print(Vertex v)
6406	6382	{
6407	6383	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6408		- }
6409		-
6410		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6411		- {
6412		- if (!selectmode)
6413		- {
6414		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6415		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6416		-
6417		- if (flipV)
6418		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6419		- else
6420		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6421		- }
6422		-
6423		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6424	6384	}
6425	6385
6426	6386	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -7031,8 +6991,8 @@
7031	6991	// {
7032	6992	// CameraPane.Ymax = spoth;
7033	6993	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	6994	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	6995	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7036	6996	spot.translate(0, -32);
7037	6997	info.g.setColor(Color.green);
7038	6998	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7087,7 +7047,7 @@
7087	7047	startX = info.x;
7088	7048	startY = info.y;
7089	7049
7090		- hitSomething = 0;
	7050	+ hitSomething = -1;
7091	7051	cVector origin = new cVector();
7092	7052	//LA.xformPos(origin, toParent, origin);
7093	7053	Rectangle spot = new Rectangle();
..	..	@@ -7120,7 +7080,7 @@
7120	7080	}
7121	7081
7122	7082	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7083	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7084	//System.out.println("modified = " + modified);
7125	7085	//new Exception().printStackTrace();
7126	7086	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7108,7 @@
7148	7108	return true;
7149	7109	}
7150	7110
7151		- void doEditDrag0(ClickInfo info)
	7111	+ void doEditDrag0(ClickInfo info, boolean opposite)
7152	7112	{
7153	7113	if (hitSomething == 0)
7154	7114	{
..	..	@@ -7163,6 +7123,7 @@
7163	7123	//System.out.println("hitSomething = " + hitSomething);
7164	7124
7165	7125	double scale = 0.005f * info.camera.Distance();
	7126	+
7166	7127	cVector xlate = new cVector();
7167	7128	//cVector xlate2 = new cVector();
7168	7129	switch (hitSomething)
..	..	@@ -7175,7 +7136,7 @@
7175	7136
7176	7137	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7138
7178		- if (modified)
	7139	+ if (modified \|\| opposite)
7179	7140	{
7180	7141	//assert(false);
7181	7142	/*
..	..	@@ -7269,6 +7230,7 @@
7269	7230
7270	7231	if (modified)
7271	7232	{
	7233	+ // Rotate 90 degrees
7272	7234	angle /= (Math.PI / 4);
7273	7235	angle = Math.floor(angle + 0.5);
7274	7236	angle *= (Math.PI / 4);
..	..	@@ -7310,24 +7272,27 @@
7310	7272
7311	7273	case hitScale: // scale
7312	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);
7313	7281	if (hScale < 0.01)
7314	7282	{
7315		- hScale = 0.01;
	7283	+ //hScale = 0.01;
7316	7284	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
7319		- {
7320		- hScale = 0.01;
7321		- }
	7285	+
7322	7286	double vScale = (double) (info.y - centerPt.y) / 32;
7323		- if (vScale < 0.01)
	7287	+ sign = 1;
	7288	+ if (vScale < 0)
7324	7289	{
7325		- vScale = 0.01;
	7290	+ sign = -1;
7326	7291	}
7327		- vScale = Math.pow(vScale, scale * 50);
	7292	+ vScale = signMath.pow(signvScale, scale * 50);
7328	7293	if (vScale < 0.01)
7329	7294	{
7330		- vScale = 0.01;
	7295	+ //vScale = 0.01;
7331	7296	}
7332	7297	LA.matCopy(startMat, toParent);
7333	7298	/**/
..	..	@@ -7338,17 +7303,24 @@
7338	7303	}
7339	7304	/**/
7340	7305
	7306	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7307	+
	7308	+ if (totalScale < 0.01)
	7309	+ {
	7310	+ totalScale = 0.01;
	7311	+ }
	7312	+
7341	7313	switch (info.pane.RenderCamera().viewCode)
7342	7314	{
7343	7315	case 3: // '\001'
7344	7316	if (modified)
7345	7317	{
7346	7318	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7319	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7320	} // vScale, 1);
7349	7321	else
7350	7322	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7323	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7324	} // vScale, 1);
7353	7325	break;
7354	7326
..	..	@@ -7356,10 +7328,10 @@
7356	7328	if (modified)
7357	7329	{
7358	7330	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7331	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7332	} else
7361	7333	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7334	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7335	}
7364	7336	break;
7365	7337
..	..	@@ -7367,10 +7339,10 @@
7367	7339	if (modified)
7368	7340	{
7369	7341	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7342	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7343	} else
7372	7344	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7345	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7346	}
7375	7347	break;
7376	7348	}
..	..	@@ -7503,14 +7475,22 @@
7503	7475	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7476	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7477	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7478	+
	7479	+ String objname;
	7480	+
7506	7481	if (false) //parent != null)
7507	7482	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7483	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7484	} else
7510	7485	{
7511		- 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) ":"") / "";
7512	7487	} // + super.toString();
7513	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);
7514	7494	}
7515	7495
7516	7496	public int hashCode()
..	..	@@ -7566,6 +7546,7 @@
7566	7546	objectUI.closeUI();
7567	7547	if (editWindow != null)
7568	7548	{
	7549	+ editWindow.ctrlPanel.FlushUI();
7569	7550	editWindow.refreshContents();
7570	7551	} // ? new
7571	7552	objectUI = null;
..	..	@@ -7701,7 +7682,7 @@
7701	7682	{
7702	7683	assert(bRep != null);
7703	7684	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	7685	+ Grafreed.Assert(support.bRep == bRep.support);
7705	7686	}
7706	7687	else
7707	7688	{
..	..	@@ -7750,9 +7731,9 @@
7750	7731	private static cVector edge2 = new cVector();
7751	7732	//private static cVector norm = new cVector();
7752	7733	/transient private/ int hitSomething;
7753		- private static final int hitCenter = 1;
7754		- private static final int hitScale = 2;
7755		- private static final int hitRotate = 3;
	7734	+ static final int hitCenter = 1;
	7735	+ static final int hitScale = 2;
	7736	+ static final int hitRotate = 3;
7756	7737	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	7738	/transient/ private Point centerPt;
7758	7739	/transient/ private int startX;