~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -464,10 +464,12 @@
464	464	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	465	{
466	466	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	467	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	468	+ // TEST LIVE NORMALS && !obj.dontselect
	469	+ ;
468	470	if (!hasnorm)
469	471	{
470		- // System.out.println("FUCK!!");
	472	+ // System.out.println("Mesh normal");
471	473	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	474	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	475	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1194,12 @@
1192	1194	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1195	}
1194	1196	}
	1197	+
1195	1198	if (flipV)
1196	1199	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1200	else
1198	1201	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1202	+
1199	1203	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1204	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1205
..	..	@@ -1215,10 +1219,12 @@
1215	1219	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1220	}
1217	1221	}
	1222	+
1218	1223	if (flipV)
1219	1224	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1225	else
1221	1226	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1227	+
1222	1228	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1229	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1230
..	..	@@ -1246,8 +1252,10 @@
1246	1252	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1253	else
1248	1254	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1255	+
1249	1256	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1257	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1258	+
1251	1259	count2 += 2;
1252	1260	count3 += 3;
1253	1261	}
..	..	@@ -1890,7 +1898,7 @@
1890	1898	void PushMatrix(double[][] matrix)
1891	1899	{
1892	1900	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1901	+ PushMatrix(matrix, 1);
1894	1902	}
1895	1903
1896	1904	void PushMatrix()
..	..	@@ -7921,6 +7929,64 @@
7921	7929	ReleaseTexture(pigment, false);
7922	7930	}
7923	7931
	7932	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7933	+ {
	7934	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7935	+ {
	7936	+ return;
	7937	+ }
	7938	+
	7939	+ if (tex == null)
	7940	+ {
	7941	+ ReleaseTexture(null, false);
	7942	+ return;
	7943	+ }
	7944	+
	7945	+ String pigment = Object3D.GetPigment(tex);
	7946	+
	7947	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7948	+ {
	7949	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7950	+ // System.out.println("; bump = " + bump);
	7951	+ }
	7952	+
	7953	+ if (pigment.equals(""))
	7954	+ {
	7955	+ pigment = null;
	7956	+ }
	7957	+
	7958	+ ReleaseTexture(pigment, false);
	7959	+ }
	7960	+
	7961	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7962	+ {
	7963	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7964	+ {
	7965	+ return;
	7966	+ }
	7967	+
	7968	+ if (tex == null)
	7969	+ {
	7970	+ ReleaseTexture(null, true);
	7971	+ return;
	7972	+ }
	7973	+
	7974	+ String bump = Object3D.GetBump(tex);
	7975	+
	7976	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7977	+ {
	7978	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7979	+ // System.out.println("; bump = " + bump);
	7980	+ }
	7981	+
	7982	+ if (bump.equals(""))
	7983	+ {
	7984	+ bump = null;
	7985	+ }
	7986	+
	7987	+ ReleaseTexture(bump, true);
	7988	+ }
	7989	+
7924	7990	void ReleaseTexture(String tex, boolean bump)
7925	7991	{
7926	7992	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8067,6 +8133,73 @@
8067	8133	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068	8134
8069	8135	return; // true;
	8136	+ }
	8137	+
	8138	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8139	+ {
	8140	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8141	+ ambientOcclusion ) // \|\| !textureon)
	8142	+ {
	8143	+ return; // false;
	8144	+ }
	8145	+
	8146	+ if (tex == null)
	8147	+ {
	8148	+ BindTexture(null,false,resolution);
	8149	+ return;
	8150	+ }
	8151	+
	8152	+ String pigment = Object3D.GetPigment(tex);
	8153	+
	8154	+ usedtextures.put(pigment, pigment);
	8155	+
	8156	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8157	+ {
	8158	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8159	+ // System.out.println("; bump = " + bump);
	8160	+ }
	8161	+
	8162	+ if (pigment.equals(""))
	8163	+ {
	8164	+ pigment = null;
	8165	+ }
	8166	+
	8167	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8168	+ BindTexture(pigment, false, resolution);
	8169	+ }
	8170	+
	8171	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8172	+ {
	8173	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8174	+ ambientOcclusion ) // \|\| !textureon)
	8175	+ {
	8176	+ return; // false;
	8177	+ }
	8178	+
	8179	+ if (tex == null)
	8180	+ {
	8181	+ BindTexture(null,true,resolution);
	8182	+ return;
	8183	+ }
	8184	+
	8185	+ String bump = Object3D.GetBump(tex);
	8186	+
	8187	+ usedtextures.put(bump, bump);
	8188	+
	8189	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8190	+ {
	8191	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8192	+ // System.out.println("; bump = " + bump);
	8193	+ }
	8194	+
	8195	+ if (bump.equals(""))
	8196	+ {
	8197	+ bump = null;
	8198	+ }
	8199	+
	8200	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8201	+ BindTexture(bump, true, resolution);
	8202	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8070	8203	}
8071	8204
8072	8205	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -9335,7 +9468,7 @@
9335	9468
9336	9469	if (renderCamera != lightCamera)
9337	9470	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	9471	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9339	9472
9340	9473	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9474
..	..	@@ -9351,7 +9484,7 @@
9351	9484
9352	9485	if (renderCamera != lightCamera)
9353	9486	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	9487	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9355	9488
9356	9489	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9490
..	..	@@ -10550,7 +10683,7 @@
10550	10683	// if (parentcam != renderCamera) // not a light
10551	10684	if (cam != lightCamera)
10552	10685	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10554	10687
10555	10688	for (int j = 0; j < 4; j++)
10556	10689	{
..	..	@@ -10565,7 +10698,7 @@
10565	10698	// if (parentcam != renderCamera) // not a light
10566	10699	if (cam != lightCamera)
10567	10700	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10569	10702
10570	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10704
..	..	@@ -10959,7 +11092,7 @@
10959	11092
10960	11093	// if (cam != lightCamera)
10961	11094	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
	11095	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10963	11096	}
10964	11097
10965	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10981,7 +11114,7 @@
10981	11114	{
10982	11115	if (cam != lightCamera)
10983	11116	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10984		- LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
	11117	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10985	11118	}
10986	11119
10987	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11894,7 +12027,7 @@
11894	12027	for (int i = tp.size(); --i >= 0;)
11895	12028	{
11896	12029	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
	12030	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11898	12031	}
11899	12032
11900	12033
..	..	@@ -11912,7 +12045,7 @@
11912	12045	}
11913	12046
11914	12047	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11915		- LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
	12048	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11916	12049
11917	12050	LA.xformPos(light, renderCamera.toScreen, light);
11918	12051
..	..	@@ -13833,6 +13966,8 @@
13833	13966
13834	13967	public void mouseDragged(MouseEvent e)
13835	13968	{
	13969	+ Globals.MOUSEDRAGGED = true;
	13970	+
13836	13971	//System.out.println("mouseDragged: " + e);
13837	13972	if (isRenderer)
13838	13973	movingcamera = true;
..	..	@@ -14398,6 +14533,8 @@
14398	14533
14399	14534	public void mouseReleased(MouseEvent e)
14400	14535	{
	14536	+ Globals.MOUSEDRAGGED = false;
	14537	+
14401	14538	movingcamera = false;
14402	14539	X = Y = 0;
14403	14540	//System.out.println("mouseReleased: " + e);
..	..	@@ -15513,12 +15650,17 @@
15513	15650	{
15514	15651	switch (object.selection.get(0).hitSomething)
15515	15652	{
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;
	15653	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15654	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15655	+ break;
	15656	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15657	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15658	+ break;
	15659	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15660	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15661	+ break;
15519	15662	}
15520	15663
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522	15664	}
15523	15665	}
15524	15666	}