~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -52,7 +52,7 @@
52	52	perspective = true;
53	53	break;
54	54	case 1: // '\001'
55		- location = LA.newVector(4, 0, 0);
	55	+ location = LA.newVector(0, 0, 4); // Needed for translation direction
56	56	perspective = false;
57	57	break;
58	58	case 2: // '\002'
..	..	@@ -63,7 +63,7 @@
63	63	//LA.matXRotate(fromScreen, LA.toRadians(90));
64	64	break;
65	65	case 3: // '\003'
66		- location = LA.newVector(0, 0, 4);
	66	+ location = LA.newVector(4, 0, 0); // Needed for translation direction
67	67	//LA.matZRotate(toScreen, LA.toRadians(-90));
68	68	//LA.matXRotate(toScreen, LA.toRadians(-90));
69	69	//LA.matXRotate(fromScreen, LA.toRadians(90));
..	..	@@ -160,6 +160,11 @@
160	160	{
161	161	if(hAspect != 0) return;
162	162
	163	+ if (CameraPane.IMAGEFLIP)
	164	+ {
	165	+ dx = -dx;
	166	+ }
	167	+
163	168	if (CameraPane.ROTATECAMERA)
164	169	{
165	170	float t = dx;
..	..	@@ -216,6 +221,11 @@
216	221	void Translate(float dx, float dy, float scale)
217	222	{
218	223	if(hAspect != 0) return;
	224	+
	225	+ if (CameraPane.IMAGEFLIP)
	226	+ {
	227	+ dx = -dx;
	228	+ }
219	229
220	230	if (CameraPane.ROTATECAMERA)
221	231	{
..	..	@@ -276,11 +286,11 @@
276	286	if (scale == 0)
277	287	{
278	288	// Zoom
	289	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	290	+
279	291	LA.vecSub(location, lookAt, location);
280	292
281	293	cVector p = location;
282		-
283		- double factor = Math.exp(-dy/300.0); // (1 + dy/100);
284	294
285	295	p.x *= factor;
286	296	p.y *= factor;
..	..	@@ -293,7 +303,7 @@
293	303	LA.vecSub(location, lookAt, direction);
294	304
295	305	//scale /= Distance();
296		- scale /= shaper_fovy/20;
	306	+ // scale /= shaper_fovy/20;
297	307
298	308	location.x -= dy * direction.x / scale;
299	309	//location.y -= dy * direction.y / scale;
..	..	@@ -314,21 +324,37 @@
314	324
315	325	void RotateInterest(float dx, float dy)
316	326	{
	327	+ right.mul(-1);
	328	+
317	329	cStatic.point1.set(location);
318	330	location.set(lookAt);
319	331	lookAt.set(cStatic.point1);
320		- right.mul(-1);
	332	+
	333	+ if (viewCode == 0 && locationBuf != null)
	334	+ {
	335	+ cStatic.point1.set(locationBuf);
	336	+ locationBuf.set(lookAtBuf);
	337	+ lookAtBuf.set(cStatic.point1);
	338	+ }
321	339	// UP.mul(-1);
322	340
323	341	RotatePosition(dx,-dy);
324	342
325	343	// UP.mul(-1);
326	344	right.mul(-1);
	345	+
327	346	cStatic.point1.set(location);
328	347	location.set(lookAt);
329	348	lookAt.set(cStatic.point1);
330	349
331		- //computeTransform();
	350	+ if (viewCode == 0 && locationBuf != null)
	351	+ {
	352	+ cStatic.point1.set(locationBuf);
	353	+ locationBuf.set(lookAtBuf);
	354	+ lookAtBuf.set(cStatic.point1);
	355	+ }
	356	+
	357	+ computeTransform();
332	358	}
333	359
334	360	//synchronized // june 2014
..	..	@@ -341,33 +367,85 @@
341	367	fromScreen = LA.newMatrix();
342	368	}
343	369
	370	+ if (locationBuf == null)
	371	+ {
	372	+ locationBuf = new cVector();
	373	+ locationBuf.set(location);
	374	+ lookAtBuf = new cVector();
	375	+ lookAtBuf.set(lookAt);
	376	+ upBuf = new cVector();
	377	+ upBuf.set(UP);
	378	+// up2Buf = new cVector();
	379	+// up2Buf.set(UP2);
	380	+ }
	381	+ else
	382	+ {
	383	+ double K = 0.25;
	384	+
	385	+ if (!CameraPane.capsLocked \|\| CameraPane.ambientOcclusion)
	386	+ K = 1;
	387	+
	388	+ locationBuf.y = location.y * K + locationBuf.y * (1 - K);
	389	+ lookAtBuf.y = lookAt.y * K + lookAtBuf.y * (1 - K);
	390	+
	391	+ int Y = 1;
	392	+
	393	+ if (UP.y < 0)
	394	+ Y = -1;
	395	+
	396	+ UP.x = 0 * K + UP.x * (1 - K);
	397	+ UP.y = Y * K + UP.y * (1 - K);
	398	+ UP.z = 0 * K + UP.z * (1 - K);
	399	+ UP.normalize();
	400	+
	401	+ if (CameraPane.capsLocked && !CameraPane.ambientOcclusion)
	402	+ K = 0.1;
	403	+
	404	+ upBuf.x = UP.x * K + upBuf.x * (1 - K);
	405	+ upBuf.y = UP.y * K + upBuf.y * (1 - K);
	406	+ upBuf.z = UP.z * K + upBuf.z * (1 - K);
	407	+ upBuf.normalize();
	408	+// up2Buf.x = UP2.x * K + up2Buf.x * (1 - K);
	409	+// up2Buf.y = UP2.y * K + up2Buf.y * (1 - K);
	410	+// up2Buf.z = UP2.z * K + up2Buf.z * (1 - K);
	411	+
	412	+ K = 1;
	413	+
	414	+ locationBuf.x = location.x * K + locationBuf.x * (1 - K);
	415	+ locationBuf.z = location.z * K + locationBuf.z * (1 - K);
	416	+ lookAtBuf.x = lookAt.x * K + lookAtBuf.x * (1 - K);
	417	+ lookAtBuf.z = lookAt.z * K + lookAtBuf.z * (1 - K);
	418	+ }
	419	+
344	420	cVector up2 = up;
345	421	cVector right2 = right;
346	422
347		- up2.x = UP.x;
348		- up2.y = UP.y;
349		- up2.z = UP.z;
350		- LA.vecSub(lookAt, location, away);
	423	+ up2.x = upBuf.x;
	424	+ up2.y = upBuf.y;
	425	+ up2.z = upBuf.z;
	426	+ LA.vecSub(lookAtBuf, locationBuf, away);
351	427	LA.vecNormalize(away);
352	428	LA.vecCross(away, up2, right2);
353	429	if (right2.length2() < 0.0001)
354	430	{
	431	+ //System.out.println("right2.length2() < 0.0001");
355	432	// UP failed
356	433	up2.x = UP2.x;
357	434	up2.y = UP2.y;
358	435	up2.z = UP2.z;
359		- LA.vecSub(lookAt, location, away);
360		- LA.vecNormalize(away);
361	436	LA.vecCross(away, up2, right2);
362	437	if (!(right2.length2() > 0))
363	438	{
	439	+ System.out.println("NO UP VECTOR: " + up2);
	440	+ System.out.println("lookAtBuf: " + lookAtBuf);
	441	+ System.out.println("locationBuf: " + locationBuf);
	442	+ System.exit(0);
	443	+
364	444	// old problem...
365	445	assert (right2.length2() <= 0 \|\| right2.length2() > 0); // weirdest thing ever
366	446	up2.x = UP.x = 0;
367	447	up2.y = UP.y = 1;
368	448	up2.z = UP.z = 0;
369		- LA.vecSub(lookAt, location, away);
370		- LA.vecNormalize(away);
371	449	LA.vecCross(away, up2, right2);
372	450	}
373	451	}
..	..	@@ -390,10 +468,10 @@
390	468	}
391	469
392	470	for (int i=0; i < 3; i++)
393		- fromScreen[3][i] = location.get(i);
	471	+ fromScreen[3][i] = locationBuf.get(i);
394	472
395	473	for (int i=0; i < 3; i++)
396		- temp[3][i] = -location.get(i);
	474	+ temp[3][i] = -locationBuf.get(i);
397	475
398	476	LA.matConcat(temp, toScreen, toScreen);
399	477
..	..	@@ -405,9 +483,16 @@
405	483	LA.matConcat(fromScreen, rotate, fromScreen);
406	484	//LA.matConcat(toScreen, rotate_1, toScreen);
407	485	}
	486	+
	487	+ if (CameraPane.IMAGEFLIP)
	488	+ {
	489	+ double[][] flip = { { -1,0,0,0 }, { 0,1,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
	490	+
	491	+ LA.matConcat(fromScreen, flip, fromScreen);
	492	+ }
	493	+
408	494	//if (this == CameraPane.lightCamera)
409	495	//CameraPane.lighttouched = true;
410		-
411	496	LA.matInvert(fromScreen, toScreen);
412	497	}
413	498
..	..	@@ -473,11 +558,20 @@
473	558	static final int viewFront = 2;
474	559	static final int viewSide = 3;
475	560	int viewCode;
	561	+
476	562	cVector location;
477	563	cVector lookAt;
	564	+
	565	+ transient cVector locationBuf;
	566	+ transient cVector lookAtBuf;
	567	+ transient cVector upBuf;
	568	+ //transient cVector up2Buf;
	569	+
478	570	cVector direction;
479		- double toScreen[][];
480		- double fromScreen[][];
	571	+
	572	+ double[][] toScreen;
	573	+ double[][] fromScreen;
	574	+
481	575	boolean perspective;
482	576	int hAspect = 0; // Free camera
483	577	int vAspect;