~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()
..	..	@@ -4208,6 +4206,7 @@
4208	4206
4209	4207	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4208	{
	4209	+ new Exception().printStackTrace();
4211	4210	System.exit(0);
4212	4211	com.sun.opengl.util.texture.Texture texture = null;
4213	4212
..	..	@@ -8076,12 +8075,16 @@
8076	8075	{
8077	8076	String texname = tex;
8078	8077
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- 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	+ }
8085	8088
8086	8089	if (CACHETEXTURE)
8087	8090	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -9394,7 +9397,7 @@
9394	9397	//gl.glFlush();
9395	9398	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9399
9397		- if (ANIMATION && ABORTED)
	9400	+ if (Globals.ANIMATION && ABORTED)
9398	9401	{
9399	9402	System.err.println(" ABORTED FRAME");
9400	9403	break;
..	..	@@ -9424,7 +9427,7 @@
9424	9427	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9428
9426	9429	// save image
9427		- if (ANIMATION && !ABORTED)
	9430	+ if (Globals.ANIMATION && !ABORTED)
9428	9431	{
9429	9432	VPwidth = viewport[2];
9430	9433	VPheight = viewport[3];
..	..	@@ -9535,11 +9538,11 @@
9535	9538
9536	9539	// imagecount++;
9537	9540
9538		- 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;
9539	9542
9540	9543	if (!BOXMODE)
9541	9544	{
9542		- 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) + ")");
9543	9546	}
9544	9547
9545	9548	if (!BOXMODE)
..	..	@@ -9577,7 +9580,7 @@
9577	9580	ABORTED = false;
9578	9581	}
9579	9582	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9583	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9584
9582	9585	if (false)
9583	9586	{
..	..	@@ -10240,11 +10243,11 @@
10240	10243
10241	10244	public void display(GLAutoDrawable drawable)
10242	10245	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10246	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10247	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10248	+ Grafreed.wav.save();
	10249	+ Grafreed.savesound = false;
	10250	+ Grafreed.hassound = false;
10248	10251	}
10249	10252	// if (DEBUG_SELECTION)
10250	10253	// {
..	..	@@ -10374,7 +10377,7 @@
10374	10377	Object3D theobject = object;
10375	10378	Object3D theparent = object.parent;
10376	10379	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10380	+ object = (Object3D)Grafreed.clone(object);
10378	10381	object.Stripify();
10379	10382	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10383	theobject.PreprocessOcclusion(this);
..	..	@@ -11259,8 +11262,14 @@
11259	11262	{
11260	11263	renderpass++;
11261	11264	// System.out.println("Draw object... ");
	11265	+ STEP = 1;
11262	11266	if (FAST) // in case there is no script
11263		- STEP = 16;
	11267	+ STEP = 8;
	11268	+
	11269	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11270	+ {
	11271	+ STEP *= 4;
	11272	+ }
11264	11273
11265	11274	//object.FullInvariants();
11266	11275
..	..	@@ -11274,8 +11283,8 @@
11274	11283	e.printStackTrace();
11275	11284	}
11276	11285
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11286	+ if (Grafreed.RENDERME > 0)
	11287	+ Grafreed.RENDERME--; // mechante magouille
11279	11288
11280	11289	Globals.ONESTEP = false;
11281	11290	}
..	..	@@ -12598,8 +12607,10 @@
12598	12607	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	12608
12600	12609	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "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
12603	12614	"MUL temp.x, temp.x, temp.y;" +
12604	12615
12605	12616	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +12758,7 @@
12747	12758	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	12759	"FLR final.x, final.y;" +
12749	12760	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	12761	+ "MUL final.x, final.x, c256i;" +
12751	12762	"MOV final.z, zero.x;" +
12752	12763	"MOV final.a, one.w;":""
12753	12764	) +
..	..	@@ -12755,7 +12766,7 @@
12755	12766	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	12767	"FLR final.x, final.y;" +
12757	12768	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	12769	+ "MUL final.x, final.x, c256i;" +
12759	12770	"MOV final.z, zero.x;" +
12760	12771	"MOV final.a, one.w;":""
12761	12772	) +
..	..	@@ -13508,7 +13519,7 @@
13508	13519	public void mousePressed(MouseEvent e)
13509	13520	{
13510	13521	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13522	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	13523	}
13513	13524
13514	13525	static long prevtime = 0;
..	..	@@ -13584,8 +13595,8 @@
13584	13595	// mode \|= META;
13585	13596	//}
13586	13597
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13598	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13599	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	13600	anchorX = ax;
13590	13601	anchorY = ay;
13591	13602	prevX = px;
..	..	@@ -13645,6 +13656,10 @@
13645	13656	// wasliveok = true;
13646	13657	// waslive = false;
13647	13658
	13659	+ // May 2019 Forget it:
	13660	+ if (true)
	13661	+ return;
	13662	+
13648	13663	// source == timer
13649	13664	if (mouseDown)
13650	13665	{
..	..	@@ -13683,7 +13698,7 @@
13683	13698
13684	13699	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	13700
13686		- void clickStart(int x, int y, int modifiers)
	13701	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	13702	{
13688	13703	if (!wasliveok)
13689	13704	return;
..	..	@@ -13700,7 +13715,7 @@
13700	13715	// touched = true; // main DL
13701	13716	if (isRenderer)
13702	13717	{
13703		- SetMouseMode(modifiers);
	13718	+ SetMouseMode(modifiers, modifiersex);
13704	13719	}
13705	13720
13706	13721	selectX = anchorX = x;
..	..	@@ -13713,7 +13728,7 @@
13713	13728	clicked = true;
13714	13729	hold = false;
13715	13730
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13731	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	13732	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	13733	{
13719	13734	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13744,7 +13759,7 @@
13744	13759	info.camera = renderCamera;
13745	13760	info.x = x;
13746	13761	info.y = y;
13747		- info.modifiers = modifiers;
	13762	+ info.modifiers = modifiersex;
13748	13763	editObj = object.doEditClick(info, 0);
13749	13764	if (!editObj)
13750	13765	{
..	..	@@ -13773,7 +13788,7 @@
13773	13788	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	13789	}
13775	13790	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13791	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	13792
13778	13793	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	13794	}
..	..	@@ -13946,6 +13961,7 @@
13946	13961
13947	13962	public void run()
13948	13963	{
	13964	+ new Exception().printStackTrace();
13949	13965	System.exit(0);
13950	13966	for (;;)
13951	13967	{
..	..	@@ -14009,7 +14025,7 @@
14009	14025	{
14010	14026	Globals.lighttouched = true;
14011	14027	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14028	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14029	}
14014	14030	//else
14015	14031	}
..	..	@@ -14109,7 +14125,7 @@
14109	14125	int X, Y;
14110	14126	boolean SX, SY;
14111	14127
14112		- void drag(int x, int y, int modifiers)
	14128	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14129	{
14114	14130	if (IsFrozen())
14115	14131	{
..	..	@@ -14118,17 +14134,17 @@
14118	14134
14119	14135	drag = true; // NEW
14120	14136
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14137	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14138
14123	14139	X = x;
14124	14140	Y = y;
14125	14141	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14142	+ MODIFIERS = modifiersex;
	14143	+ modifiersex &= ~1024;
14128	14144	if (false) // modifiers != 0)
14129	14145	{
14130	14146	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14147	+ System.out.println("mouseDragged: " + modifiersex);
14132	14148	System.out.println("SHIFT = " + SHIFT);
14133	14149	System.out.println("CONTROL = " + COMMAND);
14134	14150	System.out.println("META = " + META);
..	..	@@ -14148,7 +14164,7 @@
14148	14164	info.camera = renderCamera;
14149	14165	info.x = x;
14150	14166	info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14167	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14168	} else
14153	14169	{
14154	14170	if (x < startX)
..	..	@@ -14347,9 +14363,9 @@
14347	14363	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14364	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14365
14350		- if (control \|\| command \|\| IsFrozen())
	14366	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14367	timeout = true;
14352		- else
	14368	+// ?? May 2019 else
14353	14369	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14370	mouseDown = false;
14355	14371	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14475,7 @@
14459	14475	System.out.println("keyReleased: " + e);
14460	14476	}
14461	14477
14462		- void SetMouseMode(int modifiers)
	14478	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14479	{
14464	14480	//System.out.println("SetMouseMode = " + modifiers);
14465	14481	//modifiers &= ~1024;
..	..	@@ -14471,25 +14487,25 @@
14471	14487	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	14488	// return;
14473	14489	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	14490	+ if ((modifiersex & WHEEL) == WHEEL)
14475	14491	{
14476	14492	mouseMode \|= ZOOM;
14477	14493	}
14478	14494
14479	14495	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	14496	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	14497	{
14482	14498	mouseMode \|= VR; // BACKFORTH;
14483	14499	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14500	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	14501	{
14486	14502	mouseMode \|= SELECT;
14487	14503	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	14504	+ if ((modifiersex & COMMAND) == COMMAND)
14489	14505	{
14490	14506	mouseMode \|= SELECT;
14491	14507	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14508	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	14509	{
14494	14510	mouseMode &= ~VR;
14495	14511	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +14534,7 @@
14518	14534
14519	14535	if (isRenderer) //
14520	14536	{
14521		- SetMouseMode(modifiers);
	14537	+ SetMouseMode(0, modifiers);
14522	14538	}
14523	14539
14524	14540	Globals.theRenderer.keyPressed(key);
..	..	@@ -14978,7 +14994,7 @@
14978	14994	//mode = ROTATE;
14979	14995	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	14996	{
14981		- SetMouseMode(modifiers);
	14997	+ SetMouseMode(0, modifiers);
14982	14998	}
14983	14999	}
14984	15000
..	..	@@ -15114,7 +15130,7 @@
15114	15130	{
15115	15131	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15132	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- 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)
15118	15134	{
15119	15135	mouseMoved(e);
15120	15136	} else
..	..	@@ -15144,6 +15160,7 @@
15144	15160
15145	15161	void SelectParent()
15146	15162	{
	15163	+ new Exception().printStackTrace();
15147	15164	System.exit(0);
15148	15165	Composite group = (Composite) object;
15149	15166	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15167,6 +15184,7 @@
15167	15184
15168	15185	void SelectChildren()
15169	15186	{
	15187	+ new Exception().printStackTrace();
15170	15188	System.exit(0);
15171	15189	/*
15172	15190	Composite group = (Composite) object;
..	..	@@ -15549,6 +15567,7 @@
15549	15567	public boolean mouseDown(Event evt, int x, int y)
15550	15568	{
15551	15569	System.out.println("mouseDown: " + evt);
	15570	+ System.exit(0);
15552	15571	/*
15553	15572	locked = true;
15554	15573	drag = false;
..	..	@@ -15592,7 +15611,7 @@
15592	15611	{
15593	15612	keyPressed(0, modifiers);
15594	15613	}
15595		- clickStart(x, y, modifiers);
	15614	+ // clickStart(x, y, modifiers);
15596	15615	return true;
15597	15616	}
15598	15617
..	..	@@ -15710,7 +15729,7 @@
15710	15729	{
15711	15730	keyReleased(0, 0);
15712	15731	}
15713		- drag(x, y, modifiers);
	15732	+ drag(x, y, 0, modifiers);
15714	15733	return true;
15715	15734	}
15716	15735
..	..	@@ -16280,6 +16299,7 @@
16280	16299	{
16281	16300	if (!selection)
16282	16301	{
	16302	+ new Exception().printStackTrace();
16283	16303	System.exit(0);
16284	16304	return;
16285	16305	}
..	..	@@ -16407,16 +16427,16 @@
16407	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]));
16408	16428	}
16409	16429
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16430	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	16431	}
16412	16432	}
16413	16433
16414	16434	if (!movingcamera && !PAINTMODE)
16415	16435	object.editWindow.ScreenFitPoint(); // fev 2014
16416	16436
16417		- 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)
16418	16438	{
16419		- 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);
16420	16440
16421	16441	Object3D group = new Object3D("inst" + paintcount++);
16422	16442