~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
..	..	@@ -327,7 +326,7 @@
327	326	cStatic.objectstack[materialdepth++] = obj;
328	327	//System.out.println("material " + material);
329	328	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
331	330	if (obj instanceof Camera)
332	331	{
333	332	display.options1[0] = material.shift;
..	..	@@ -359,7 +358,7 @@
359	358	/**/
360	359	} else
361	360	{
362		- DrawMaterial(material, selected);
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
363	362	}
364	363	} else
365	364	{
..	..	@@ -383,8 +382,8 @@
383	382	cStatic.objectstack[materialdepth++] = obj;
384	383	//System.out.println("material " + material);
385	384	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	387	}
389	388	}
390	389
..	..	@@ -401,8 +400,8 @@
401	400	materialdepth -= 1;
402	401	if (materialdepth > 0)
403	402	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	403	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	404	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	405	}
407	406	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	407	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +421,8 @@
422	421	materialdepth -= 1;
423	422	if (materialdepth > 0)
424	423	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	424	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	425	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	426	}
428	427	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	428	//else
..	..	@@ -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	}
..	..	@@ -1603,7 +1610,7 @@
1603	1610	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1611	}
1605	1612
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1614	{
1608	1615	CameraPane display = this;
1609	1616	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1645,7 @@
1638	1645	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1646	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1647	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1648	+ colorV[3] = 1; // material.opacity;
1642	1649
1643	1650	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1651	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1753,9 @@
1746	1753	display.modelParams7[2] = 0;
1747	1754	display.modelParams7[3] = 0;
1748	1755
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1757
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1759	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1760	{
1754	1761	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -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>();
..	..	@@ -10349,6 +10481,7 @@
10349	10481	ANTIALIAS = 0;
10350	10482	//System.out.println("RESTART");
10351	10483	AAtimer.restart();
	10484	+ Globals.TIMERRUNNING = true;
10352	10485	}
10353	10486	}
10354	10487	}
..	..	@@ -10416,7 +10549,8 @@
10416	10549	ambientOcclusion = false;
10417	10550	}
10418	10551
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10552	+ if (//Globals.lighttouched &&
	10553	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10554	{
10421	10555	//if (RENDERSHADOW) // ?
10422	10556	if (!IsFrozen())
..	..	@@ -11326,6 +11460,24 @@
11326	11460
11327	11461	static boolean zoomonce = false;
11328	11462
	11463	+ static void CreateSelectedPoint()
	11464	+ {
	11465	+ if (selectedpoint == null)
	11466	+ {
	11467	+ debugpointG = new Sphere();
	11468	+ debugpointP = new Sphere();
	11469	+ debugpointC = new Sphere();
	11470	+ debugpointR = new Sphere();
	11471	+
	11472	+ selectedpoint = new Superellipsoid();
	11473	+
	11474	+ for (int i=0; i<8; i++)
	11475	+ {
	11476	+ debugpoints[i] = new Sphere();
	11477	+ }
	11478	+ }
	11479	+ }
	11480	+
11329	11481	void DrawObject(GL gl, boolean draw)
11330	11482	{
11331	11483	//System.out.println("DRAW OBJECT " + mouseDown);
..	..	@@ -11406,8 +11558,9 @@
11406	11558
11407	11559	if (DrawMode() == DEFAULT)
11408	11560	{
11409		- if (DEBUG)
	11561	+ if (Globals.DEBUG)
11410	11562	{
	11563	+ CreateSelectedPoint();
11411	11564	float radius = 0.05f;
11412	11565	if (selectedpoint.radius != radius)
11413	11566	{
..	..	@@ -13164,7 +13317,8 @@
13164	13317	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13318	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166	13319	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13320	+
	13321	+ //Object3D.cVector2[] vector2buffer;
13168	13322
13169	13323	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13324	// OUT : diff, spec
..	..	@@ -13687,6 +13841,7 @@
13687	13841	else
13688	13842	if (evt.getSource() == AAtimer)
13689	13843	{
	13844	+ Globals.TIMERRUNNING = false;
13690	13845	if (mouseDown)
13691	13846	{
13692	13847	//new Exception().printStackTrace();
..	..	@@ -13761,6 +13916,7 @@
13761	13916	return;
13762	13917
13763	13918	AAtimer.restart(); //
	13919	+ Globals.TIMERRUNNING = true;
13764	13920
13765	13921	// waslive = LIVE;
13766	13922	// LIVE = false;
..	..	@@ -14224,7 +14380,8 @@
14224	14380	info.camera = renderCamera;
14225	14381	info.x = x;
14226	14382	info.y = y;
14227		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14383	+ object.GetWindow().copy
	14384	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14228	14385	} else
14229	14386	{
14230	14387	if (x < startX)
..	..	@@ -14388,7 +14545,9 @@
14388	14545	ci.camera = renderCamera;
14389	14546	if (!isRenderer)
14390	14547	{
14391		- if (object.editWindow.copy.doEditClick(ci, 0))
	14548	+ //ObjEditor editWindow = object.editWindow;
	14549	+ //Object3D copy = editWindow.copy;
	14550	+ if (object.doEditClick(ci, 0))
14392	14551	{
14393	14552	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14394	14553	} else
..	..	@@ -14769,8 +14928,14 @@
14769	14928	RevertCamera();
14770	14929	repaint();
14771	14930	break;
14772		- case 'L':
14773	14931	case 'l':
	14932	+ lightMode ^= true;
	14933	+ Globals.lighttouched = true;
	14934	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14935	+ targetLookAt.set(manipCamera.lookAt);
	14936	+ repaint();
	14937	+ break;
	14938	+ case 'L':
14774	14939	if (lightMode)
14775	14940	{
14776	14941	lightMode = false;
..	..	@@ -14917,16 +15082,14 @@
14917	15082	kompactbit = 6;
14918	15083	break;
14919	15084	case ' ':
14920		- lightMode ^= true;
14921		- Globals.lighttouched = true;
14922		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14923		- targetLookAt.set(manipCamera.lookAt);
	15085	+ ObjEditor.theFrame.ToggleFullScreen();
14924	15086	repaint();
14925	15087	break;
14926	15088	//case '`' :
14927	15089	case ESC:
14928	15090	RENDERPROGRAM += 1;
14929	15091	RENDERPROGRAM %= 3;
	15092	+
14930	15093	repaint();
14931	15094	break;
14932	15095	case 'Z':
..	..	@@ -15218,7 +15381,7 @@
15218	15381	}
15219	15382	*/
15220	15383
15221		- object.editWindow.EditSelection();
	15384	+ object.editWindow.EditSelection(false);
15222	15385	}
15223	15386
15224	15387	void SelectParent()
..	..	@@ -16230,16 +16393,16 @@
16230	16393	cStatic.objectstack[materialdepth++] = checker;
16231	16394	//System.out.println("material " + material);
16232	16395	//Applet3D.tracein(this, selected);
16233		- vector2buffer = checker.projectedVertices;
	16396	+ //vector2buffer = checker.projectedVertices;
16234	16397
16235	16398	//checker.GetMaterial().Draw(this, false); // true);
16236		- DrawMaterial(checker.GetMaterial(), false); // true);
	16399	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16237	16400
16238	16401	materialdepth -= 1;
16239	16402	if (materialdepth > 0)
16240	16403	{
16241		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16242		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16404	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16405	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16243	16406	}
16244	16407	//checker.GetMaterial().opacity = 1f;
16245	16408	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16462,6 +16625,8 @@
16462	16625	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16463	16626	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16464	16627	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16628	+
	16629	+ CreateSelectedPoint();
16465	16630
16466	16631	// Will fit the mesh !!!
16467	16632	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -17102,23 +17267,15 @@
17102	17267	int AAbuffersize = 0;
17103	17268
17104	17269	//double[] selectedpoint = new double[3];
17105		- static Superellipsoid selectedpoint = new Superellipsoid();
	17270	+ static Superellipsoid selectedpoint;
17106	17271	static Sphere previousselectedpoint = null;
17107		- static Sphere debugpointG = new Sphere();
17108		- static Sphere debugpointP = new Sphere();
17109		- static Sphere debugpointC = new Sphere();
17110		- static Sphere debugpointR = new Sphere();
	17272	+ static Sphere debugpointG;
	17273	+ static Sphere debugpointP;
	17274	+ static Sphere debugpointC;
	17275	+ static Sphere debugpointR;
17111	17276
17112	17277	static Sphere debugpoints[] = new Sphere[8];
17113	17278
17114		- static
17115		- {
17116		- for (int i=0; i<8; i++)
17117		- {
17118		- debugpoints[i] = new Sphere();
17119		- }
17120		- }
17121		-
17122	17279	static void InitPoints(float radius)
17123	17280	{
17124	17281	for (int i=0; i<8; i++)