~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
..	..	@@ -1630,7 +1628,7 @@
1630	1628
1631	1629	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1630
1633		- float[] colorV = GrafreeD.colorV;
	1631	+ float[] colorV = Grafreed.colorV;
1634	1632
1635	1633	/**/
1636	1634	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -2142,7 +2140,7 @@
2142	2140	System.err.println("LIVE = " + Globals.isLIVE());
2143	2141
2144	2142	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2143	+ Grafreed.savesound = true; // wav.save();
2146	2144	// else
2147	2145	repaint(); // start loop // may 2013
2148	2146	}
..	..	@@ -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,11 +9538,11 @@
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	{
9543		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9545	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9544	9546	}
9545	9547
9546	9548	if (!BOXMODE)
..	..	@@ -9578,7 +9580,7 @@
9578	9580	ABORTED = false;
9579	9581	}
9580	9582	else
9581		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9583	+ Grafreed.wav.cursor += 735 * ACSIZE;
9582	9584
9583	9585	if (false)
9584	9586	{
..	..	@@ -10241,11 +10243,11 @@
10241	10243
10242	10244	public void display(GLAutoDrawable drawable)
10243	10245	{
10244		- if (GrafreeD.savesound && GrafreeD.hassound)
	10246	+ if (Grafreed.savesound && Grafreed.hassound)
10245	10247	{
10246		- GrafreeD.wav.save();
10247		- GrafreeD.savesound = false;
10248		- GrafreeD.hassound = false;
	10248	+ Grafreed.wav.save();
	10249	+ Grafreed.savesound = false;
	10250	+ Grafreed.hassound = false;
10249	10251	}
10250	10252	// if (DEBUG_SELECTION)
10251	10253	// {
..	..	@@ -10375,7 +10377,7 @@
10375	10377	Object3D theobject = object;
10376	10378	Object3D theparent = object.parent;
10377	10379	object.parent = null;
10378		- object = (Object3D)GrafreeD.clone(object);
	10380	+ object = (Object3D)Grafreed.clone(object);
10379	10381	object.Stripify();
10380	10382	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10381	10383	theobject.PreprocessOcclusion(this);
..	..	@@ -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
..	..	@@ -11275,8 +11283,8 @@
11275	11283	e.printStackTrace();
11276	11284	}
11277	11285
11278		- if (GrafreeD.RENDERME > 0)
11279		- GrafreeD.RENDERME--; // mechante magouille
	11286	+ if (Grafreed.RENDERME > 0)
	11287	+ Grafreed.RENDERME--; // mechante magouille
11280	11288
11281	11289	Globals.ONESTEP = false;
11282	11290	}
..	..	@@ -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	) +
..	..	@@ -13509,7 +13519,7 @@
13509	13519	public void mousePressed(MouseEvent e)
13510	13520	{
13511	13521	//System.out.println("mousePressed: " + e);
13512		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13522	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13513	13523	}
13514	13524
13515	13525	static long prevtime = 0;
..	..	@@ -13585,8 +13595,8 @@
13585	13595	// mode \|= META;
13586	13596	//}
13587	13597
13588		- SetMouseMode(WHEEL \| e.getModifiersEx());
13589		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13598	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13599	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13590	13600	anchorX = ax;
13591	13601	anchorY = ay;
13592	13602	prevX = px;
..	..	@@ -13646,6 +13656,10 @@
13646	13656	// wasliveok = true;
13647	13657	// waslive = false;
13648	13658
	13659	+ // May 2019 Forget it:
	13660	+ if (true)
	13661	+ return;
	13662	+
13649	13663	// source == timer
13650	13664	if (mouseDown)
13651	13665	{
..	..	@@ -13684,7 +13698,7 @@
13684	13698
13685	13699	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13686	13700
13687		- void clickStart(int x, int y, int modifiers)
	13701	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13688	13702	{
13689	13703	if (!wasliveok)
13690	13704	return;
..	..	@@ -13701,7 +13715,7 @@
13701	13715	// touched = true; // main DL
13702	13716	if (isRenderer)
13703	13717	{
13704		- SetMouseMode(modifiers);
	13718	+ SetMouseMode(modifiers, modifiersex);
13705	13719	}
13706	13720
13707	13721	selectX = anchorX = x;
..	..	@@ -13714,7 +13728,7 @@
13714	13728	clicked = true;
13715	13729	hold = false;
13716	13730
13717		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13731	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13718	13732	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13719	13733	{
13720	13734	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,7 +13759,7 @@
13745	13759	info.camera = renderCamera;
13746	13760	info.x = x;
13747	13761	info.y = y;
13748		- info.modifiers = modifiers;
	13762	+ info.modifiers = modifiersex;
13749	13763	editObj = object.doEditClick(info, 0);
13750	13764	if (!editObj)
13751	13765	{
..	..	@@ -13774,7 +13788,7 @@
13774	13788	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13775	13789	}
13776	13790	else
13777		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13791	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13778	13792
13779	13793	//try { Thread.sleep(1); } catch (Exception ex) {}
13780	13794	}
..	..	@@ -14011,7 +14025,7 @@
14011	14025	{
14012	14026	Globals.lighttouched = true;
14013	14027	}
14014		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14028	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14015	14029	}
14016	14030	//else
14017	14031	}
..	..	@@ -14111,7 +14125,7 @@
14111	14125	int X, Y;
14112	14126	boolean SX, SY;
14113	14127
14114		- void drag(int x, int y, int modifiers)
	14128	+ void drag(int x, int y, int modifiers, int modifiersex)
14115	14129	{
14116	14130	if (IsFrozen())
14117	14131	{
..	..	@@ -14120,17 +14134,17 @@
14120	14134
14121	14135	drag = true; // NEW
14122	14136
14123		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14137	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14124	14138
14125	14139	X = x;
14126	14140	Y = y;
14127	14141	// floating state for animation
14128		- MODIFIERS = modifiers;
14129		- modifiers &= ~1024;
	14142	+ MODIFIERS = modifiersex;
	14143	+ modifiersex &= ~1024;
14130	14144	if (false) // modifiers != 0)
14131	14145	{
14132	14146	//new Exception().printStackTrace();
14133		- System.out.println("mouseDragged: " + modifiers);
	14147	+ System.out.println("mouseDragged: " + modifiersex);
14134	14148	System.out.println("SHIFT = " + SHIFT);
14135	14149	System.out.println("CONTROL = " + COMMAND);
14136	14150	System.out.println("META = " + META);
..	..	@@ -14150,7 +14164,7 @@
14150	14164	info.camera = renderCamera;
14151	14165	info.x = x;
14152	14166	info.y = y;
14153		- object.editWindow.copy.doEditDrag(info);
	14167	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14154	14168	} else
14155	14169	{
14156	14170	if (x < startX)
..	..	@@ -14349,9 +14363,9 @@
14349	14363	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14350	14364	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14351	14365
14352		- if (control \|\| command \|\| IsFrozen())
	14366	+// No delay if (control \|\| command \|\| IsFrozen())
14353	14367	timeout = true;
14354		- else
	14368	+// ?? May 2019 else
14355	14369	// timer.setDelay((modifiers & 128) != 0?0:350);
14356	14370	mouseDown = false;
14357	14371	if (!control && !command) // june 2013
..	..	@@ -14461,7 +14475,7 @@
14461	14475	System.out.println("keyReleased: " + e);
14462	14476	}
14463	14477
14464		- void SetMouseMode(int modifiers)
	14478	+ void SetMouseMode(int modifiers, int modifiersex)
14465	14479	{
14466	14480	//System.out.println("SetMouseMode = " + modifiers);
14467	14481	//modifiers &= ~1024;
..	..	@@ -14473,25 +14487,25 @@
14473	14487	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14474	14488	// return;
14475	14489	//System.out.println("SetMode = " + modifiers);
14476		- if ((modifiers & WHEEL) == WHEEL)
	14490	+ if ((modifiersex & WHEEL) == WHEEL)
14477	14491	{
14478	14492	mouseMode \|= ZOOM;
14479	14493	}
14480	14494
14481	14495	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482		- if (capsLocked \|\| (modifiers & META) == META)
	14496	+ if (capsLocked) // \|\| (modifiers & META) == META)
14483	14497	{
14484	14498	mouseMode \|= VR; // BACKFORTH;
14485	14499	}
14486		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14500	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14487	14501	{
14488	14502	mouseMode \|= SELECT;
14489	14503	}
14490		- if ((modifiers & COMMAND) == COMMAND)
	14504	+ if ((modifiersex & COMMAND) == COMMAND)
14491	14505	{
14492	14506	mouseMode \|= SELECT;
14493	14507	}
14494		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14508	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14495	14509	{
14496	14510	mouseMode &= ~VR;
14497	14511	mouseMode \|= TRANSLATE;
..	..	@@ -14520,7 +14534,7 @@
14520	14534
14521	14535	if (isRenderer) //
14522	14536	{
14523		- SetMouseMode(modifiers);
	14537	+ SetMouseMode(0, modifiers);
14524	14538	}
14525	14539
14526	14540	Globals.theRenderer.keyPressed(key);
..	..	@@ -14856,7 +14870,7 @@
14856	14870	//RESIZETEXTURE ^= true;
14857	14871	//break;
14858	14872	case 'z':
14859		- RENDERSHADOW ^= true;
	14873	+ Globals.RENDERSHADOW ^= true;
14860	14874	Globals.lighttouched = true;
14861	14875	repaint();
14862	14876	break;
..	..	@@ -14980,7 +14994,7 @@
14980	14994	//mode = ROTATE;
14981	14995	if ((MODIFIERS & COMMAND) == 0) // VR??
14982	14996	{
14983		- SetMouseMode(modifiers);
	14997	+ SetMouseMode(0, modifiers);
14984	14998	}
14985	14999	}
14986	15000
..	..	@@ -15116,7 +15130,7 @@
15116	15130	{
15117	15131	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15118	15132	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15133	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15120	15134	{
15121	15135	mouseMoved(e);
15122	15136	} else
..	..	@@ -15553,6 +15567,7 @@
15553	15567	public boolean mouseDown(Event evt, int x, int y)
15554	15568	{
15555	15569	System.out.println("mouseDown: " + evt);
	15570	+ System.exit(0);
15556	15571	/*
15557	15572	locked = true;
15558	15573	drag = false;
..	..	@@ -15596,7 +15611,7 @@
15596	15611	{
15597	15612	keyPressed(0, modifiers);
15598	15613	}
15599		- clickStart(x, y, modifiers);
	15614	+ // clickStart(x, y, modifiers);
15600	15615	return true;
15601	15616	}
15602	15617
..	..	@@ -15714,7 +15729,7 @@
15714	15729	{
15715	15730	keyReleased(0, 0);
15716	15731	}
15717		- drag(x, y, modifiers);
	15732	+ drag(x, y, 0, modifiers);
15718	15733	return true;
15719	15734	}
15720	15735
..	..	@@ -16412,16 +16427,16 @@
16412	16427	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]));
16413	16428	}
16414	16429
16415		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16430	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16416	16431	}
16417	16432	}
16418	16433
16419	16434	if (!movingcamera && !PAINTMODE)
16420	16435	object.editWindow.ScreenFitPoint(); // fev 2014
16421	16436
16422		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16437	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16423	16438	{
16424		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16439	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16425	16440
16426	16441	Object3D group = new Object3D("inst" + paintcount++);
16427	16442
..	..	@@ -16577,7 +16592,7 @@
16577	16592	gl.glDisable(gl.GL_CULL_FACE);
16578	16593	}
16579	16594
16580		- if (!RENDERSHADOW)
	16595	+ if (!Globals.RENDERSHADOW)
16581	16596	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16582	16597
16583	16598	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16587,7 +16602,7 @@
16587	16602	//gl.glColorMask(false, false, false, false);
16588	16603
16589	16604	//render_scene_from_light_view(gl, drawable, 0, 0);
16590		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16605	+ if (Globals.RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16591	16606	{
16592	16607	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	16608