~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -56,8 +56,6 @@
56	56	static int CURRENTANTIALIAS = 0; // 1;
57	57	/static/ boolean RENDERSHADOW = true;
58	58	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	59
62	60	boolean DISPLAYTEXT = false;
63	61	//boolean REDUCETEXTURE = true;
..	..	@@ -86,7 +84,7 @@
86	84	static boolean FULLSCREEN = false;
87	85	static boolean SUPPORT = true;
88	86	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	87	+static boolean FAST = false;
90	88	static boolean SLOWPOSE = false;
91	89	static boolean FOOTCONTACT = true;
92	90
..	..	@@ -108,7 +106,7 @@
108	106	static boolean OEIL = true;
109	107	static boolean OEILONCE = false; // do oeilon then oeiloff
110	108	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	109	+static boolean SWITCH = true; // false;
112	110	static boolean HANDLES = false; // selection doesn't work!!
113	111	static boolean PAINTMODE = false;
114	112
..	..	@@ -2269,7 +2267,7 @@
2269	2267
2270	2268	void ToggleRandom()
2271	2269	{
2272		- RANDOM ^= true;
	2270	+ SWITCH ^= true;
2273	2271	}
2274	2272
2275	2273	void ToggleHandles()
..	..	@@ -8077,12 +8075,16 @@
8077	8075	{
8078	8076	String texname = tex;
8079	8077
8080		- String[] split = tex.split("Textures");
8081		- if (split.length > 1)
8082		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8083		- else
8084		- if (!texname.startsWith("/"))
8085		- texname = "/Users/nbriere/Textures/" + texname;
	8078	+// String[] split = tex.split("Textures");
	8079	+// if (split.length > 1)
	8080	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8081	+// else
	8082	+// if (!texname.startsWith("/"))
	8083	+// texname = "/Users/nbriere/Textures/" + texname;
	8084	+ if (!new File(tex).exists())
	8085	+ {
	8086	+ texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8087	+ }
8086	8088
8087	8089	if (CACHETEXTURE)
8088	8090	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -9395,7 +9397,7 @@
9395	9397	//gl.glFlush();
9396	9398	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9397	9399
9398		- if (ANIMATION && ABORTED)
	9400	+ if (Globals.ANIMATION && ABORTED)
9399	9401	{
9400	9402	System.err.println(" ABORTED FRAME");
9401	9403	break;
..	..	@@ -9425,7 +9427,7 @@
9425	9427	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9426	9428
9427	9429	// save image
9428		- if (ANIMATION && !ABORTED)
	9430	+ if (Globals.ANIMATION && !ABORTED)
9429	9431	{
9430	9432	VPwidth = viewport[2];
9431	9433	VPheight = viewport[3];
..	..	@@ -9536,7 +9538,7 @@
9536	9538
9537	9539	// imagecount++;
9538	9540
9539		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9541	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9540	9542
9541	9543	if (!BOXMODE)
9542	9544	{
..	..	@@ -11260,8 +11262,14 @@
11260	11262	{
11261	11263	renderpass++;
11262	11264	// System.out.println("Draw object... ");
	11265	+ STEP = 1;
11263	11266	if (FAST) // in case there is no script
11264		- STEP = 16;
	11267	+ STEP = 8;
	11268	+
	11269	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11270	+ {
	11271	+ STEP *= 4;
	11272	+ }
11265	11273
11266	11274	//object.FullInvariants();
11267	11275
..	..	@@ -12599,8 +12607,10 @@
12599	12607	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12600	12608
12601	12609	"SUB temp.x, one.x, ndotl.x;" +
12602		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12603		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12610	+ // Tuning for default skin
	12611	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12612	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12613	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12604	12614	"MUL temp.x, temp.x, temp.y;" +
12605	12615
12606	12616	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12748,7 +12758,7 @@
12748	12758	"MUL final.y, fragment.texcoord[0].x, c256;" +
12749	12759	"FLR final.x, final.y;" +
12750	12760	"SUB final.y, final.y, final.x;" +
12751		- //"MUL final.x, final.x, c256i;" +
	12761	+ "MUL final.x, final.x, c256i;" +
12752	12762	"MOV final.z, zero.x;" +
12753	12763	"MOV final.a, one.w;":""
12754	12764	) +
..	..	@@ -12756,7 +12766,7 @@
12756	12766	"MUL final.y, fragment.texcoord[0].y, c256;" +
12757	12767	"FLR final.x, final.y;" +
12758	12768	"SUB final.y, final.y, final.x;" +
12759		- //"MUL final.x, final.x, c256i;" +
	12769	+ "MUL final.x, final.x, c256i;" +
12760	12770	"MOV final.z, zero.x;" +
12761	12771	"MOV final.a, one.w;":""
12762	12772	) +
..	..	@@ -14479,7 +14489,7 @@
14479	14489	}
14480	14490
14481	14491	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482		- if (capsLocked \|\| (modifiers & META) == META)
	14492	+ if (capsLocked) // \|\| (modifiers & META) == META)
14483	14493	{
14484	14494	mouseMode \|= VR; // BACKFORTH;
14485	14495	}
..	..	@@ -15116,7 +15126,7 @@
15116	15126	{
15117	15127	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15118	15128	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15129	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15120	15130	{
15121	15131	mouseMoved(e);
15122	15132	} else