~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1890,7 +1890,7 @@
1890	1890	void PushMatrix(double[][] matrix)
1891	1891	{
1892	1892	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1893	+ PushMatrix(matrix, 1);
1894	1894	}
1895	1895
1896	1896	void PushMatrix()
..	..	@@ -7921,6 +7921,64 @@
7921	7921	ReleaseTexture(pigment, false);
7922	7922	}
7923	7923
	7924	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7925	+ {
	7926	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7927	+ {
	7928	+ return;
	7929	+ }
	7930	+
	7931	+ if (tex == null)
	7932	+ {
	7933	+ ReleaseTexture(null, false);
	7934	+ return;
	7935	+ }
	7936	+
	7937	+ String pigment = Object3D.GetPigment(tex);
	7938	+
	7939	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7940	+ {
	7941	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7942	+ // System.out.println("; bump = " + bump);
	7943	+ }
	7944	+
	7945	+ if (pigment.equals(""))
	7946	+ {
	7947	+ pigment = null;
	7948	+ }
	7949	+
	7950	+ ReleaseTexture(pigment, false);
	7951	+ }
	7952	+
	7953	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7954	+ {
	7955	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7956	+ {
	7957	+ return;
	7958	+ }
	7959	+
	7960	+ if (tex == null)
	7961	+ {
	7962	+ ReleaseTexture(null, true);
	7963	+ return;
	7964	+ }
	7965	+
	7966	+ String bump = Object3D.GetBump(tex);
	7967	+
	7968	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7969	+ {
	7970	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7971	+ // System.out.println("; bump = " + bump);
	7972	+ }
	7973	+
	7974	+ if (bump.equals(""))
	7975	+ {
	7976	+ bump = null;
	7977	+ }
	7978	+
	7979	+ ReleaseTexture(bump, true);
	7980	+ }
	7981	+
7924	7982	void ReleaseTexture(String tex, boolean bump)
7925	7983	{
7926	7984	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8067,6 +8125,73 @@
8067	8125	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068	8126
8069	8127	return; // true;
	8128	+ }
	8129	+
	8130	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8131	+ {
	8132	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8133	+ ambientOcclusion ) // \|\| !textureon)
	8134	+ {
	8135	+ return; // false;
	8136	+ }
	8137	+
	8138	+ if (tex == null)
	8139	+ {
	8140	+ BindTexture(null,false,resolution);
	8141	+ return;
	8142	+ }
	8143	+
	8144	+ String pigment = Object3D.GetPigment(tex);
	8145	+
	8146	+ usedtextures.put(pigment, pigment);
	8147	+
	8148	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8149	+ {
	8150	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8151	+ // System.out.println("; bump = " + bump);
	8152	+ }
	8153	+
	8154	+ if (pigment.equals(""))
	8155	+ {
	8156	+ pigment = null;
	8157	+ }
	8158	+
	8159	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8160	+ BindTexture(pigment, false, resolution);
	8161	+ }
	8162	+
	8163	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8164	+ {
	8165	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8166	+ ambientOcclusion ) // \|\| !textureon)
	8167	+ {
	8168	+ return; // false;
	8169	+ }
	8170	+
	8171	+ if (tex == null)
	8172	+ {
	8173	+ BindTexture(null,true,resolution);
	8174	+ return;
	8175	+ }
	8176	+
	8177	+ String bump = Object3D.GetBump(tex);
	8178	+
	8179	+ usedtextures.put(bump, bump);
	8180	+
	8181	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8182	+ {
	8183	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8184	+ // System.out.println("; bump = " + bump);
	8185	+ }
	8186	+
	8187	+ if (bump.equals(""))
	8188	+ {
	8189	+ bump = null;
	8190	+ }
	8191	+
	8192	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8193	+ BindTexture(bump, true, resolution);
	8194	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8070	8195	}
8071	8196
8072	8197	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -9335,7 +9460,7 @@
9335	9460
9336	9461	if (renderCamera != lightCamera)
9337	9462	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	9463	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9339	9464
9340	9465	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9466
..	..	@@ -9351,7 +9476,7 @@
9351	9476
9352	9477	if (renderCamera != lightCamera)
9353	9478	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	9479	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9355	9480
9356	9481	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9482
..	..	@@ -10550,7 +10675,7 @@
10550	10675	// if (parentcam != renderCamera) // not a light
10551	10676	if (cam != lightCamera)
10552	10677	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	10678	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10554	10679
10555	10680	for (int j = 0; j < 4; j++)
10556	10681	{
..	..	@@ -10565,7 +10690,7 @@
10565	10690	// if (parentcam != renderCamera) // not a light
10566	10691	if (cam != lightCamera)
10567	10692	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	10693	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10569	10694
10570	10695	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10696
..	..	@@ -10959,7 +11084,7 @@
10959	11084
10960	11085	// if (cam != lightCamera)
10961	11086	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
	11087	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10963	11088	}
10964	11089
10965	11090	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10981,7 +11106,7 @@
10981	11106	{
10982	11107	if (cam != lightCamera)
10983	11108	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10984		- LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
	11109	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10985	11110	}
10986	11111
10987	11112	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11894,7 +12019,7 @@
11894	12019	for (int i = tp.size(); --i >= 0;)
11895	12020	{
11896	12021	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
	12022	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11898	12023	}
11899	12024
11900	12025
..	..	@@ -11912,7 +12037,7 @@
11912	12037	}
11913	12038
11914	12039	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11915		- LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
	12040	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11916	12041
11917	12042	LA.xformPos(light, renderCamera.toScreen, light);
11918	12043
..	..	@@ -13833,6 +13958,8 @@
13833	13958
13834	13959	public void mouseDragged(MouseEvent e)
13835	13960	{
	13961	+ Globals.MOUSEDRAGGED = true;
	13962	+
13836	13963	//System.out.println("mouseDragged: " + e);
13837	13964	if (isRenderer)
13838	13965	movingcamera = true;
..	..	@@ -14398,6 +14525,8 @@
14398	14525
14399	14526	public void mouseReleased(MouseEvent e)
14400	14527	{
	14528	+ Globals.MOUSEDRAGGED = false;
	14529	+
14401	14530	movingcamera = false;
14402	14531	X = Y = 0;
14403	14532	//System.out.println("mouseReleased: " + e);
..	..	@@ -15513,12 +15642,17 @@
15513	15642	{
15514	15643	switch (object.selection.get(0).hitSomething)
15515	15644	{
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;
	15645	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15646	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15647	+ break;
	15648	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15649	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15650	+ break;
	15651	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15652	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15653	+ break;
15519	15654	}
15520	15655
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522	15656	}
15523	15657	}
15524	15658	}