~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -462,10 +463,12 @@
462	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	464	{
464	465	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	466	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	467	+ // TEST LIVE NORMALS && !obj.dontselect
	468	+ ;
466	469	if (!hasnorm)
467	470	{
468		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
469	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1193,12 @@
1190	1193	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1194	}
1192	1195	}
	1196	+
1193	1197	if (flipV)
1194	1198	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1199	else
1196	1200	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
1197	1202	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1203	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1204
..	..	@@ -1213,10 +1218,12 @@
1213	1218	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1219	}
1215	1220	}
	1221	+
1216	1222	if (flipV)
1217	1223	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1224	else
1219	1225	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
1220	1227	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1228	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1229
..	..	@@ -1244,8 +1251,10 @@
1244	1251	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1252	else
1246	1253	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
1247	1255	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1256	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
1249	1258	count2 += 2;
1250	1259	count3 += 3;
1251	1260	}
..	..	@@ -1888,7 +1897,7 @@
1888	1897	void PushMatrix(double[][] matrix)
1889	1898	{
1890	1899	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1892	1901	}
1893	1902
1894	1903	void PushMatrix()
..	..	@@ -2257,7 +2266,7 @@
2257	2266
2258	2267	void ToggleDebug()
2259	2268	{
2260		- DEBUG ^= true;
	2269	+ Globals.DEBUG ^= true;
2261	2270	}
2262	2271
2263	2272	void ToggleLookAt()
..	..	@@ -2265,7 +2274,7 @@
2265	2274	LOOKAT ^= true;
2266	2275	}
2267	2276
2268		- void ToggleRandom()
	2277	+ void ToggleSwitch()
2269	2278	{
2270	2279	SWITCH ^= true;
2271	2280	}
..	..	@@ -2374,7 +2383,7 @@
2374	2383	{
2375	2384	return currentGL;
2376	2385	}
2377		-
	2386	+
2378	2387	/**/
2379	2388	class CacheTexture
2380	2389	{
..	..	@@ -7919,6 +7928,64 @@
7919	7928	ReleaseTexture(pigment, false);
7920	7929	}
7921	7930
	7931	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7932	+ {
	7933	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7934	+ {
	7935	+ return;
	7936	+ }
	7937	+
	7938	+ if (tex == null)
	7939	+ {
	7940	+ ReleaseTexture(null, false);
	7941	+ return;
	7942	+ }
	7943	+
	7944	+ String pigment = Object3D.GetPigment(tex);
	7945	+
	7946	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7947	+ {
	7948	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7949	+ // System.out.println("; bump = " + bump);
	7950	+ }
	7951	+
	7952	+ if (pigment.equals(""))
	7953	+ {
	7954	+ pigment = null;
	7955	+ }
	7956	+
	7957	+ ReleaseTexture(pigment, false);
	7958	+ }
	7959	+
	7960	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7961	+ {
	7962	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7963	+ {
	7964	+ return;
	7965	+ }
	7966	+
	7967	+ if (tex == null)
	7968	+ {
	7969	+ ReleaseTexture(null, true);
	7970	+ return;
	7971	+ }
	7972	+
	7973	+ String bump = Object3D.GetBump(tex);
	7974	+
	7975	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7976	+ {
	7977	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7978	+ // System.out.println("; bump = " + bump);
	7979	+ }
	7980	+
	7981	+ if (bump.equals(""))
	7982	+ {
	7983	+ bump = null;
	7984	+ }
	7985	+
	7986	+ ReleaseTexture(bump, true);
	7987	+ }
	7988	+
7922	7989	void ReleaseTexture(String tex, boolean bump)
7923	7990	{
7924	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8067,6 +8134,93 @@
8067	8134	return; // true;
8068	8135	}
8069	8136
	8137	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8138	+ {
	8139	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8140	+ ambientOcclusion ) // \|\| !textureon)
	8141	+ {
	8142	+ return; // false;
	8143	+ }
	8144	+
	8145	+ if (tex == null)
	8146	+ {
	8147	+ BindTexture(null,false,resolution);
	8148	+ return;
	8149	+ }
	8150	+
	8151	+ String pigment = Object3D.GetPigment(tex);
	8152	+
	8153	+ usedtextures.put(pigment, pigment);
	8154	+
	8155	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8156	+ {
	8157	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8158	+ // System.out.println("; bump = " + bump);
	8159	+ }
	8160	+
	8161	+ if (pigment.equals(""))
	8162	+ {
	8163	+ pigment = null;
	8164	+ }
	8165	+
	8166	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8167	+ BindTexture(pigment, false, resolution);
	8168	+ }
	8169	+
	8170	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8171	+ {
	8172	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8173	+ ambientOcclusion ) // \|\| !textureon)
	8174	+ {
	8175	+ return; // false;
	8176	+ }
	8177	+
	8178	+ if (tex == null)
	8179	+ {
	8180	+ BindTexture(null,true,resolution);
	8181	+ return;
	8182	+ }
	8183	+
	8184	+ String bump = Object3D.GetBump(tex);
	8185	+
	8186	+ usedtextures.put(bump, bump);
	8187	+
	8188	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8189	+ {
	8190	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8191	+ // System.out.println("; bump = " + bump);
	8192	+ }
	8193	+
	8194	+ if (bump.equals(""))
	8195	+ {
	8196	+ bump = null;
	8197	+ }
	8198	+
	8199	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8200	+ BindTexture(bump, true, resolution);
	8201	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8202	+ }
	8203	+
	8204	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8205	+
	8206	+ private boolean FileExists(String tex)
	8207	+ {
	8208	+ if (missingTextures.contains(tex))
	8209	+ {
	8210	+ return false;
	8211	+ }
	8212	+
	8213	+ boolean fileExists = new File(tex).exists();
	8214	+
	8215	+ if (!fileExists)
	8216	+ {
	8217	+ // If file exists, the "new File()" is not executed sgain
	8218	+ missingTextures.add(tex);
	8219	+ }
	8220	+
	8221	+ return fileExists;
	8222	+ }
	8223	+
8070	8224	CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8071	8225	{
8072	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
..	..	@@ -8075,15 +8229,17 @@
8075	8229	{
8076	8230	String texname = tex;
8077	8231
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
8078	8234	// String[] split = tex.split("Textures");
8079	8235	// if (split.length > 1)
8080	8236	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8237	// else
8082	8238	// if (!texname.startsWith("/"))
8083	8239	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8240	+ if (!FileExists(tex))
8085	8241	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8242	+ texname = fallbackTextureName;
8087	8243	}
8088	8244
8089	8245	if (CACHETEXTURE)
..	..	@@ -8153,7 +8309,7 @@
8153	8309	}
8154	8310
8155	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
8157	8313	cachename = texname;
8158	8314	else
8159	8315	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8331,7 @@
8175	8331	}
8176	8332
8177	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
8179	8335	cachename = texname;
8180	8336	else
8181	8337	processbump = false; // don't process bump map again
..	..	@@ -9310,8 +9466,8 @@
9310	9466	assert (parentcam != renderCamera);
9311	9467
9312	9468	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9315	9471
9316	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9473
..	..	@@ -9326,8 +9482,8 @@
9326	9482	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9483
9328	9484	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9331	9487
9332	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9489
..	..	@@ -10525,8 +10681,8 @@
10525	10681
10526	10682	// if (parentcam != renderCamera) // not a light
10527	10683	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10684	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10685	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10530	10686
10531	10687	for (int j = 0; j < 4; j++)
10532	10688	{
..	..	@@ -10540,8 +10696,8 @@
10540	10696
10541	10697	// if (parentcam != renderCamera) // not a light
10542	10698	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10699	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10700	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10545	10701
10546	10702	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	10703
..	..	@@ -10934,8 +11090,8 @@
10934	11090	System.err.println("parentcam != renderCamera");
10935	11091
10936	11092	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11093	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11094	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10939	11095	}
10940	11096
10941	11097	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11112,8 @@
10956	11112	if (true) // TODO
10957	11113	{
10958	11114	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11115	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11116	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10961	11117	}
10962	11118
10963	11119	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11302,6 +11458,24 @@
11302	11458
11303	11459	static boolean zoomonce = false;
11304	11460
	11461	+ void CreateSelectedPoint()
	11462	+ {
	11463	+ if (selectedpoint == null)
	11464	+ {
	11465	+ debugpointG = new Sphere();
	11466	+ debugpointP = new Sphere();
	11467	+ debugpointC = new Sphere();
	11468	+ debugpointR = new Sphere();
	11469	+
	11470	+ selectedpoint = new Superellipsoid();
	11471	+
	11472	+ for (int i=0; i<8; i++)
	11473	+ {
	11474	+ debugpoints[i] = new Sphere();
	11475	+ }
	11476	+ }
	11477	+ }
	11478	+
11305	11479	void DrawObject(GL gl, boolean draw)
11306	11480	{
11307	11481	//System.out.println("DRAW OBJECT " + mouseDown);
..	..	@@ -11382,8 +11556,9 @@
11382	11556
11383	11557	if (DrawMode() == DEFAULT)
11384	11558	{
11385		- if (DEBUG)
	11559	+ if (Globals.DEBUG)
11386	11560	{
	11561	+ CreateSelectedPoint();
11387	11562	float radius = 0.05f;
11388	11563	if (selectedpoint.radius != radius)
11389	11564	{
..	..	@@ -11869,8 +12044,8 @@
11869	12044	//obj.TransformToWorld(light, light);
11870	12045	for (int i = tp.size(); --i >= 0;)
11871	12046	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- LA.xformPos(light, tp.get(i).toParent, light);
	12047	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12048	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11874	12049	}
11875	12050
11876	12051
..	..	@@ -11887,8 +12062,8 @@
11887	12062	parentcam = cameras[0];
11888	12063	}
11889	12064
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12065	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12066	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11892	12067
11893	12068	LA.xformPos(light, renderCamera.toScreen, light);
11894	12069
..	..	@@ -13809,9 +13984,12 @@
13809	13984
13810	13985	public void mouseDragged(MouseEvent e)
13811	13986	{
	13987	+ Globals.MOUSEDRAGGED = true;
	13988	+
13812	13989	//System.out.println("mouseDragged: " + e);
13813	13990	if (isRenderer)
13814	13991	movingcamera = true;
	13992	+
13815	13993	//if (drawing)
13816	13994	//return;
13817	13995	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14373,6 +14551,8 @@
14373	14551
14374	14552	public void mouseReleased(MouseEvent e)
14375	14553	{
	14554	+ Globals.MOUSEDRAGGED = false;
	14555	+
14376	14556	movingcamera = false;
14377	14557	X = Y = 0;
14378	14558	//System.out.println("mouseReleased: " + e);
..	..	@@ -14740,8 +14920,14 @@
14740	14920	RevertCamera();
14741	14921	repaint();
14742	14922	break;
14743		- case 'L':
14744	14923	case 'l':
	14924	+ lightMode ^= true;
	14925	+ Globals.lighttouched = true;
	14926	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14927	+ targetLookAt.set(manipCamera.lookAt);
	14928	+ repaint();
	14929	+ break;
	14930	+ case 'L':
14745	14931	if (lightMode)
14746	14932	{
14747	14933	lightMode = false;
..	..	@@ -14888,16 +15074,14 @@
14888	15074	kompactbit = 6;
14889	15075	break;
14890	15076	case ' ':
14891		- lightMode ^= true;
14892		- Globals.lighttouched = true;
14893		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14894		- targetLookAt.set(manipCamera.lookAt);
	15077	+ ObjEditor.theFrame.ToggleFullScreen();
14895	15078	repaint();
14896	15079	break;
14897	15080	//case '`' :
14898	15081	case ESC:
14899	15082	RENDERPROGRAM += 1;
14900	15083	RENDERPROGRAM %= 3;
	15084	+
14901	15085	repaint();
14902	15086	break;
14903	15087	case 'Z':
..	..	@@ -15488,12 +15672,17 @@
15488	15672	{
15489	15673	switch (object.selection.get(0).hitSomething)
15490	15674	{
15491		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15493		- case Object3D.hitScale: gr.setColor(Color.cyan); break;
	15675	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15676	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15677	+ break;
	15678	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15679	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15680	+ break;
	15681	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15682	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15683	+ break;
15494	15684	}
15495	15685
15496		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15497	15686	}
15498	15687	}
15499	15688	}
..	..	@@ -15911,7 +16100,7 @@
15911	16100	Object3D object;
15912	16101	static Object3D trackedobject;
15913	16102	Camera renderCamera; // Light or Eye (or Occlusion)
15914		- /static/ Camera manipCamera; // Light or Eye
	16103	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15915	16104	/static/ Camera eyeCamera;
15916	16105	/static/ Camera lightCamera;
15917	16106	int cameracount;
..	..	@@ -17068,23 +17257,15 @@
17068	17257	int AAbuffersize = 0;
17069	17258
17070	17259	//double[] selectedpoint = new double[3];
17071		- static Superellipsoid selectedpoint = new Superellipsoid();
	17260	+ static Superellipsoid selectedpoint;
17072	17261	static Sphere previousselectedpoint = null;
17073		- static Sphere debugpointG = new Sphere();
17074		- static Sphere debugpointP = new Sphere();
17075		- static Sphere debugpointC = new Sphere();
17076		- static Sphere debugpointR = new Sphere();
	17262	+ static Sphere debugpointG;
	17263	+ static Sphere debugpointP;
	17264	+ static Sphere debugpointC;
	17265	+ static Sphere debugpointR;
17077	17266
17078	17267	static Sphere debugpoints[] = new Sphere[8];
17079	17268
17080		- static
17081		- {
17082		- for (int i=0; i<8; i++)
17083		- {
17084		- debugpoints[i] = new Sphere();
17085		- }
17086		- }
17087		-
17088	17269	static void InitPoints(float radius)
17089	17270	{
17090	17271	for (int i=0; i<8; i++)