~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -228,7 +228,7 @@
228	228	void PushMatrix(double[][] matrix, int count)
229	229	{
230	230	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	231	+ // GrafreeD.tracein(matrix);
232	232	if (matrix == null)
233	233	return; // Identity
234	234
..	..	@@ -253,13 +253,13 @@
253	253
254	254	void PushMatrix(double[][] matrix)
255	255	{
256		- // GraphreeD.tracein(matrix);
	256	+ // GrafreeD.tracein(matrix);
257	257	PushMatrix(matrix,1);
258	258	}
259	259
260	260	void PushMatrix()
261	261	{
262		- // GraphreeD.tracein(null);
	262	+ // GrafreeD.tracein(null);
263	263	if (matrixdepth++ < MAXSTACK - 1)
264	264	{
265	265	currentGL.glPushMatrix();
..	..	@@ -274,7 +274,7 @@
274	274	{
275	275	--matrixdepth;
276	276
277		- // GraphreeD.traceout(inverse);
	277	+ // GrafreeD.traceout(inverse);
278	278	if (inverse == null)
279	279	return; // Identity
280	280
..	..	@@ -292,7 +292,7 @@
292	292
293	293	void PopMatrix()
294	294	{
295		- // GraphreeD.traceout(null);
	295	+ // GrafreeD.traceout(null);
296	296	// inverse == null??
297	297	if (--matrixdepth < MAXSTACK - 1)
298	298	{
..	..	@@ -491,7 +491,7 @@
491	491	System.err.println("LIVE = " + isLIVE());
492	492
493	493	if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
	494	+ GrafreeD.savesound = true; // wav.save();
495	495	// else
496	496	repaint(); // start loop // may 2013
497	497	}
..	..	@@ -768,6 +768,8 @@
768	768	class CacheTexture
769	769	{
770	770	com.sun.opengl.util.texture.Texture texture;
	771	+ com.sun.opengl.util.texture.TextureData texturedata;
	772	+
771	773	int resolution;
772	774
773	775	CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
..	..	@@ -1998,10 +2000,12 @@
1998	2000	*/
1999	2001	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	2002	{
	2003	+ int pixelformat = texturedata.getPixelFormat();
	2004	+
2001	2005	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	2006	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	2007	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	2008	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	2009	stride = 4;
2006	2010
2007	2011	int width = texturedata.getWidth();
..	..	@@ -6331,7 +6335,7 @@
6331	6335	{
6332	6336	bumpdepth--;
6333	6337
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	6338	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	6339	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	6340	{
6337	6341	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +6365,7 @@
6361	6365	{
6362	6366	pigmentdepth--;
6363	6367
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	6368	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	6369	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	6370	{
6367	6371	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6451,7 +6455,7 @@
6451	6455	return; // true;
6452	6456	}
6453	6457
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	6458	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
6455	6459	{
6456	6460	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6457	6461
..	..	@@ -6665,6 +6669,8 @@
6665	6669	thetex.texture.dispose();
6666	6670	textures.remove(texname);
6667	6671	}
	6672	+
	6673	+ texture.texturedata = texturedata;
6668	6674	textures.put(texname, texture);
6669	6675
6670	6676	// newtex = true;
..	..	@@ -6681,18 +6687,32 @@
6681	6687	}
6682	6688	}
6683	6689
	6690	+ return texture;
	6691	+ }
	6692	+
	6693	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	6694	+ {
	6695	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	6696	+
6684	6697	if (bump)
6685	6698	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	6699	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	6700	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	6701	}
6689	6702	else
6690	6703	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	6704	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	6705	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	6706	}
6694	6707
6695	6708	return texture!=null?texture.texture:null;
	6709	+ }
	6710	+
	6711	+ com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	6712	+ {
	6713	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	6714	+
	6715	+ return texture!=null?texture.texturedata:null;
6696	6716	}
6697	6717
6698	6718	boolean BindTexture(String tex, boolean bump, int resolution)
..	..	@@ -7572,7 +7592,8 @@
7572	7592
7573	7593	float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7574	7594	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7575		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	7595	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	7596	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	7597
7577	7598	static int imagecount = 0; // movie generation
7578	7599
..	..	@@ -7610,14 +7631,14 @@
7610	7631
7611	7632	//System.out.println("start frame");
7612	7633	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	7634	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	7635	{
7615	7636	framecount++;
7616	7637
7617	7638	if (CameraPane.tickcount > 0)
7618	7639	CameraPane.tickcount--;
7619	7640
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	7641	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	7642	// restartframe = true;
7622	7643	if (options1[2] > 100 && (jitter%2==0))
7623	7644	{
..	..	@@ -7905,7 +7926,7 @@
7905	7926
7906	7927	if (!BOXMODE)
7907	7928	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	7929	+ System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
7909	7930	}
7910	7931
7911	7932	if (!BOXMODE)
..	..	@@ -7933,7 +7954,7 @@
7933	7954	{
7934	7955	if (ACSIZE > 1)
7935	7956	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	7957	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	7958	}
7938	7959	}
7939	7960
..	..	@@ -7943,7 +7964,7 @@
7943	7964	ABORTED = false;
7944	7965	}
7945	7966	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	7967	+ GrafreeD.wav.cursor += 735 * ACSIZE;
7947	7968
7948	7969	if (false)
7949	7970	{
..	..	@@ -8613,11 +8634,11 @@
8613	8634
8614	8635	public void display(GLAutoDrawable drawable)
8615	8636	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	8637	+ if (GrafreeD.savesound && GrafreeD.hassound)
8617	8638	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.hassound = false;
	8639	+ GrafreeD.wav.save();
	8640	+ GrafreeD.savesound = false;
	8641	+ GrafreeD.hassound = false;
8621	8642	}
8622	8643	// if (DEBUG_SELECTION)
8623	8644	// {
..	..	@@ -8747,7 +8768,7 @@
8747	8768	Object3D theobject = object;
8748	8769	Object3D theparent = object.parent;
8749	8770	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	8771	+ object = (Object3D)GrafreeD.clone(object);
8751	8772	object.Stripify();
8752	8773	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	8774	theobject.PreprocessOcclusion(this);
..	..	@@ -8766,7 +8787,7 @@
8766	8787	if (!IsFrozen())
8767	8788	{
8768	8789	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	8790	+ if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
8770	8791	{
8771	8792	framecount++;
8772	8793	shadowbuffer.display();
..	..	@@ -9361,6 +9382,7 @@
9361	9382
9362	9383	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	9384	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	9385	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	9386
9365	9387	options2[0] *= renderCamera.Distance();
9366	9388
..	..	@@ -9642,8 +9664,8 @@
9642	9664	e.printStackTrace();
9643	9665	}
9644	9666
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	9667	+ if (GrafreeD.RENDERME > 0)
	9668	+ GrafreeD.RENDERME--; // mechante magouille
9647	9669
9648	9670	ONESTEP = false;
9649	9671	}
..	..	@@ -9716,7 +9738,7 @@
9716	9738	BindTextures(DEFAULT_TEXTURES, 2);
9717	9739	}
9718	9740	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	9741	+// GrafreeD.traceon();
9720	9742
9721	9743	// DRAW
9722	9744	object.draw(this, /(Composite)/ object, false, false);
..	..	@@ -9747,17 +9769,31 @@
9747	9769	debugpoint2.material.color = 0.75f;
9748	9770	debugpoint2.material.modulation = 0.75f;
9749	9771
	9772	+ debugpoint3.radius = radius;
	9773	+ debugpoint3.recalculate();
	9774	+ debugpoint3.material = new cMaterial();
	9775	+ debugpoint3.material.color = 0.5f;
	9776	+ debugpoint3.material.modulation = 0.75f;
	9777	+
	9778	+ debugpoint4.radius = radius;
	9779	+ debugpoint4.recalculate();
	9780	+ debugpoint4.material = new cMaterial();
	9781	+ debugpoint4.material.color = 0f;
	9782	+ debugpoint4.material.modulation = 0.75f;
	9783	+
9750	9784	InitPoints(radius);
9751	9785	}
9752	9786	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	9787	+ debugpoint.draw(this, /(Composite)/ null, false,false);
	9788	+ debugpoint2.draw(this, /(Composite)/ null, false,false);
	9789	+ debugpoint3.draw(this, /(Composite)/ null, false,false);
	9790	+ debugpoint4.draw(this, /(Composite)/ null, false,false);
	9791	+ // DrawPoints(this);
9756	9792	}
9757	9793
9758	9794	// debugstuff.draw(this, /(Composite)/ null, false);
9759	9795	}
9760		-// GraphreeD.traceoff();
	9796	+// GrafreeD.traceoff();
9761	9797	//System.out.println(stackdepth);
9762	9798	if (drawMode == 0)
9763	9799	{
..	..	@@ -10253,7 +10289,7 @@
10253	10289	return;
10254	10290	}
10255	10291
10256		- if (obj instanceof CheckerIG)
	10292	+ if (obj instanceof Checker)
10257	10293	{
10258	10294	checker = obj;
10259	10295
..	..	@@ -10325,11 +10361,13 @@
10325	10361	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326	10362	"PARAM params7 = program.env[7];" + // noise power, opacity power
10327	10363	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	10364	+ "PARAM options1 = program.env[62];" + // fog rgb color
	10365	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	10366	"PARAM pointlight = program.env[127];" + // ...
10330	10367	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	10368	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	10369	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	10370	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	10371	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	10372	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	10373	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10390,6 +10428,10 @@
10390	10428	"TEMP R1;" +
10391	10429	"TEMP R2;" +
10392	10430	"TEMP R3;" +
	10431	+ "TEMP min;" +
	10432	+ "TEMP max;" +
	10433	+ "TEMP average;" +
	10434	+ "TEMP saturation;" +
10393	10435	"TEMP keep1;" +
10394	10436	"TEMP keep2;" +
10395	10437	"TEMP keep3;" +
..	..	@@ -10920,10 +10962,40 @@
10920	10962
10921	10963	// skin?
10922	10964	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	10965	+ /**/
	10966	+ (Skinshader?
	10967	+ "DP3 average.x, final,one;" +
	10968	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	10969	+
	10970	+ "MIN min.x, final.x,final.y;" +
	10971	+ "MIN min.x, min.x,final.z;" +
	10972	+
	10973	+ "MAX max.x, final.x,final.y;" +
	10974	+ "MAX max.x, max.x,final.z;" +
	10975	+ "MOV max, max.xxxx;" +
	10976	+
	10977	+ "SUB saturation, max, final;" +
	10978	+
	10979	+ "ADD temp.x, max.x, one10th.x;" +
	10980	+ "RCP temp.x, temp.x;" +
	10981	+ "MUL temp.x, temp.x, half.x;" +
	10982	+ "MUL saturation, saturation, temp.xxxx;" +
	10983	+
	10984	+ "DP3 ndotl.x, normald, light;" +
	10985	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	10986	+
	10987	+ "SUB temp.x, one.x, ndotl.x;" +
	10988	+ "ADD temp.x, temp.x, options2.z;" + // lightsheen
	10989	+ "ADD temp.y, one.y, options2.y;" + // sursurface
	10990	+ "MUL temp.x, temp.x, temp.y;" +
	10991	+
	10992	+ "MUL saturation, saturation, temp.xxxx;" +
	10993	+ "SUB_SAT temp, max, saturation;" +
	10994	+/**
	10995	+ "DP3 temp.x, final,one;" +
10925	10996	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	10997	+ "SUB temp, final, R2;" +
	10998	+
10927	10999	// using light angle
10928	11000	"DP3 ndotl.x, normald,light;" +
10929	11001	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +11008,6 @@
10936	11008	// using light intensity
10937	11009	"MOV ndotl.z, R2.x;" +
10938	11010	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	11011	// june 2014
10941	11012	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	11013	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +11019,7 @@
10948	11019	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	11020
10950	11021	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	11022	+/**/
10951	11023
10952	11024	// "ADD final, R2,temp;" +
10953	11025	"MOV final, temp;"
..	..	@@ -11037,7 +11109,7 @@
11037	11109	/**/
11038	11110	// HDR
11039	11111	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	11112	+ "MUL final, final,options2.x;" +
11041	11113	"MOV final.a, temp.z;" +
11042	11114	/**/
11043	11115
..	..	@@ -11074,10 +11146,17 @@
11074	11146	"MOV final.z, zero.x;" +
11075	11147	"MOV final.a, one.w;":""
11076	11148	) +
	11149	+ /*
11077	11150	(NORMALdebug?"MOV final.x, normal.x;" +
11078	11151	"MOV final.y, normal.y;" +
11079	11152	"MOV final.z, normal.z;" +
11080	11153	"MOV final.a, one.w;":""
	11154	+ ) +
	11155	+ */
	11156	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	11157	+ "SUB final.y, one.x, final.y;" +
	11158	+ "SUB final.z, one.x, final.z;" +
	11159	+ "MOV final.a, final.a;":""
11081	11160	) +
11082	11161	// "MOV final, bumpmap;" +
11083	11162	"MOV result.color, final;" +
..	..	@@ -14682,16 +14761,16 @@
14682	14761	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683	14762	}
14684	14763
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	14764	+ previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
14686	14765	}
14687	14766	}
14688	14767
14689	14768	if (!movingcamera && !PAINTMODE)
14690	14769	object.editWindow.ScreenFitPoint(); // fev 2014
14691	14770
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	14771	+ if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	14772	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	14773	+ Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	14774
14696	14775	Object3D group = new Object3D("inst" + paintcount++);
14697	14776
..	..	@@ -15265,6 +15344,8 @@
15265	15344	static Sphere previousselectedpoint = null;
15266	15345	static Sphere debugpoint = new Sphere();
15267	15346	static Sphere debugpoint2 = new Sphere();
	15347	+ static Sphere debugpoint3 = new Sphere();
	15348	+ static Sphere debugpoint4 = new Sphere();
15268	15349
15269	15350	static Sphere debugpoints[] = new Sphere[8];
15270	15351