~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
..	..	@@ -464,10 +463,12 @@
464	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	464	{
466	465	//gl.glBegin(gl.GL_TRIANGLES);
467		- 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	+ ;
468	469	if (!hasnorm)
469	470	{
470		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
471	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1193,12 @@
1192	1193	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1194	}
1194	1195	}
	1196	+
1195	1197	if (flipV)
1196	1198	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1199	else
1198	1200	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
1199	1202	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1203	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1204
..	..	@@ -1215,10 +1218,12 @@
1215	1218	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1219	}
1217	1220	}
	1221	+
1218	1222	if (flipV)
1219	1223	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1224	else
1221	1225	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
1222	1227	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1228	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1229
..	..	@@ -1246,8 +1251,10 @@
1246	1251	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1252	else
1248	1253	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
1249	1255	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1256	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
1251	1258	count2 += 2;
1252	1259	count3 += 3;
1253	1260	}
..	..	@@ -1890,7 +1897,7 @@
1890	1897	void PushMatrix(double[][] matrix)
1891	1898	{
1892	1899	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1894	1901	}
1895	1902
1896	1903	void PushMatrix()
..	..	@@ -2259,7 +2266,7 @@
2259	2266
2260	2267	void ToggleDebug()
2261	2268	{
2262		- DEBUG ^= true;
	2269	+ Globals.DEBUG ^= true;
2263	2270	}
2264	2271
2265	2272	void ToggleLookAt()
..	..	@@ -7921,6 +7928,64 @@
7921	7928	ReleaseTexture(pigment, false);
7922	7929	}
7923	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	+
7924	7989	void ReleaseTexture(String tex, boolean bump)
7925	7990	{
7926	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8067,6 +8132,73 @@
8067	8132	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068	8133
8069	8134	return; // true;
	8135	+ }
	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);
8070	8202	}
8071	8203
8072	8204	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -9335,7 +9467,7 @@
9335	9467
9336	9468	if (renderCamera != lightCamera)
9337	9469	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9339	9471
9340	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9473
..	..	@@ -9351,7 +9483,7 @@
9351	9483
9352	9484	if (renderCamera != lightCamera)
9353	9485	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9355	9487
9356	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9489
..	..	@@ -10550,7 +10682,7 @@
10550	10682	// if (parentcam != renderCamera) // not a light
10551	10683	if (cam != lightCamera)
10552	10684	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	10685	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10554	10686
10555	10687	for (int j = 0; j < 4; j++)
10556	10688	{
..	..	@@ -10565,7 +10697,7 @@
10565	10697	// if (parentcam != renderCamera) // not a light
10566	10698	if (cam != lightCamera)
10567	10699	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	10700	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10569	10701
10570	10702	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10703
..	..	@@ -10959,7 +11091,7 @@
10959	11091
10960	11092	// if (cam != lightCamera)
10961	11093	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
	11094	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10963	11095	}
10964	11096
10965	11097	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10981,7 +11113,7 @@
10981	11113	{
10982	11114	if (cam != lightCamera)
10983	11115	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10984		- LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
	11116	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10985	11117	}
10986	11118
10987	11119	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11326,6 +11458,24 @@
11326	11458
11327	11459	static boolean zoomonce = false;
11328	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	+
11329	11479	void DrawObject(GL gl, boolean draw)
11330	11480	{
11331	11481	//System.out.println("DRAW OBJECT " + mouseDown);
..	..	@@ -11406,8 +11556,9 @@
11406	11556
11407	11557	if (DrawMode() == DEFAULT)
11408	11558	{
11409		- if (DEBUG)
	11559	+ if (Globals.DEBUG)
11410	11560	{
	11561	+ CreateSelectedPoint();
11411	11562	float radius = 0.05f;
11412	11563	if (selectedpoint.radius != radius)
11413	11564	{
..	..	@@ -11894,7 +12045,7 @@
11894	12045	for (int i = tp.size(); --i >= 0;)
11895	12046	{
11896	12047	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
	12048	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11898	12049	}
11899	12050
11900	12051
..	..	@@ -11912,7 +12063,7 @@
11912	12063	}
11913	12064
11914	12065	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11915		- LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
	12066	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11916	12067
11917	12068	LA.xformPos(light, renderCamera.toScreen, light);
11918	12069
..	..	@@ -13833,6 +13984,8 @@
13833	13984
13834	13985	public void mouseDragged(MouseEvent e)
13835	13986	{
	13987	+ Globals.MOUSEDRAGGED = true;
	13988	+
13836	13989	//System.out.println("mouseDragged: " + e);
13837	13990	if (isRenderer)
13838	13991	movingcamera = true;
..	..	@@ -14398,6 +14551,8 @@
14398	14551
14399	14552	public void mouseReleased(MouseEvent e)
14400	14553	{
	14554	+ Globals.MOUSEDRAGGED = false;
	14555	+
14401	14556	movingcamera = false;
14402	14557	X = Y = 0;
14403	14558	//System.out.println("mouseReleased: " + e);
..	..	@@ -14765,8 +14920,14 @@
14765	14920	RevertCamera();
14766	14921	repaint();
14767	14922	break;
14768		- case 'L':
14769	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':
14770	14931	if (lightMode)
14771	14932	{
14772	14933	lightMode = false;
..	..	@@ -14913,16 +15074,14 @@
14913	15074	kompactbit = 6;
14914	15075	break;
14915	15076	case ' ':
14916		- lightMode ^= true;
14917		- Globals.lighttouched = true;
14918		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14919		- targetLookAt.set(manipCamera.lookAt);
	15077	+ ObjEditor.theFrame.ToggleFullScreen();
14920	15078	repaint();
14921	15079	break;
14922	15080	//case '`' :
14923	15081	case ESC:
14924	15082	RENDERPROGRAM += 1;
14925	15083	RENDERPROGRAM %= 3;
	15084	+
14926	15085	repaint();
14927	15086	break;
14928	15087	case 'Z':
..	..	@@ -15513,12 +15672,17 @@
15513	15672	{
15514	15673	switch (object.selection.get(0).hitSomething)
15515	15674	{
15516		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15517		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15518		- 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;
15519	15684	}
15520	15685
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522	15686	}
15523	15687	}
15524	15688	}
..	..	@@ -17093,23 +17257,15 @@
17093	17257	int AAbuffersize = 0;
17094	17258
17095	17259	//double[] selectedpoint = new double[3];
17096		- static Superellipsoid selectedpoint = new Superellipsoid();
	17260	+ static Superellipsoid selectedpoint;
17097	17261	static Sphere previousselectedpoint = null;
17098		- static Sphere debugpointG = new Sphere();
17099		- static Sphere debugpointP = new Sphere();
17100		- static Sphere debugpointC = new Sphere();
17101		- static Sphere debugpointR = new Sphere();
	17262	+ static Sphere debugpointG;
	17263	+ static Sphere debugpointP;
	17264	+ static Sphere debugpointC;
	17265	+ static Sphere debugpointR;
17102	17266
17103	17267	static Sphere debugpoints[] = new Sphere[8];
17104	17268
17105		- static
17106		- {
17107		- for (int i=0; i<8; i++)
17108		- {
17109		- debugpoints[i] = new Sphere();
17110		- }
17111		- }
17112		-
17113	17269	static void InitPoints(float radius)
17114	17270	{
17115	17271	for (int i=0; i<8; i++)