~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -261,9 +261,9 @@
261	261
262	262	// LA.matConcat(toParent, hip.get(0).toParent, toParent);
263	263
264		- CameraPane.debugpoint.toParent[3][0] = poship.x;
265		- CameraPane.debugpoint.toParent[3][1] = poship.y;
266		- CameraPane.debugpoint.toParent[3][2] = poship.z;
	264	+ CameraPane.debugpointG.toParent[3][0] = poship.x;
	265	+ CameraPane.debugpointG.toParent[3][1] = poship.y;
	266	+ CameraPane.debugpointG.toParent[3][2] = poship.z;
267	267
268	268	LA.matInvert(toParent, fromParent);
269	269
..	..	@@ -324,21 +324,21 @@
324	324	// LA.matYRotate(toParent, angleY - angleYhip);
325	325	// LA.matTranslate(toParent, pos.x - poship.x, pos.y - poship.y, pos.z - poship.z);
326	326
327		- CameraPane.debugpoint2.toParent[3][0] = pos.x;
328		- CameraPane.debugpoint2.toParent[3][1] = pos.y;
329		- CameraPane.debugpoint2.toParent[3][2] = pos.z;
	327	+ CameraPane.debugpointP.toParent[3][0] = pos.x;
	328	+ CameraPane.debugpointP.toParent[3][1] = pos.y;
	329	+ CameraPane.debugpointP.toParent[3][2] = pos.z;
330	330
331		- CameraPane.debugpoint3.toParent[3][0] = poship.x;
332		- CameraPane.debugpoint3.toParent[3][1] = poship.y;
333		- CameraPane.debugpoint3.toParent[3][2] = poship.z;
	331	+ CameraPane.debugpointC.toParent[3][0] = poship.x;
	332	+ CameraPane.debugpointC.toParent[3][1] = poship.y;
	333	+ CameraPane.debugpointC.toParent[3][2] = poship.z;
334	334
335	335	poship.x = toParent[3][0];
336	336	poship.y = toParent[3][1];
337	337	poship.z = toParent[3][2];
338	338
339		- CameraPane.debugpoint4.toParent[3][0] = poship.x;
340		- CameraPane.debugpoint4.toParent[3][1] = poship.y;
341		- CameraPane.debugpoint4.toParent[3][2] = poship.z;
	339	+ CameraPane.debugpointR.toParent[3][0] = poship.x;
	340	+ CameraPane.debugpointR.toParent[3][1] = poship.y;
	341	+ CameraPane.debugpointR.toParent[3][2] = poship.z;
342	342
343	343	LA.matInvert(toParent, fromParent);
344	344	}
..	..	@@ -477,29 +477,52 @@
477	477	}
478	478	}
479	479
	480	+ static cVector centroid = new cVector();
	481	+ static cVector mocaporigin = new cVector();
	482	+
480	483	void SetHipOrientation()
481	484	{
482	485	Object3D hip = get(0);
483	486
	487	+ if (toParent == null)
	488	+ {
	489	+ toParent = LA.newMatrix();
	490	+ fromParent = LA.newMatrix();
	491	+ }
	492	+
484	493	LA.matConcat(toParent, hip.get(0).toParent, matrix);
485	494
486		- cVector centroid = new cVector();
	495	+ mocaporigin.x = matrix[3][0];
	496	+ mocaporigin.y = matrix[3][1];
	497	+ mocaporigin.z = matrix[3][2];
	498	+
487	499	centroid.x = matrix[3][0];
488	500	centroid.y = matrix[3][1];
489	501	centroid.z = matrix[3][2];
490		- this.getCentroid(centroid, true);
	502	+// this.getCentroid(centroid, true);
	503	+
	504	+ CameraPane.CreateSelectedPoint();
	505	+ CameraPane.debugpointG.name = "";
	506	+ CameraPane.debugpointG.toParent[3][0] = mocaporigin.x;
	507	+ CameraPane.debugpointG.toParent[3][1] = mocaporigin.y;
	508	+ CameraPane.debugpointG.toParent[3][2] = mocaporigin.z;
	509	+
	510	+ CameraPane.debugpointP.name = "";
	511	+ CameraPane.debugpointP.toParent[3][0] = centroid.x;
	512	+ CameraPane.debugpointP.toParent[3][1] = centroid.y;
	513	+ CameraPane.debugpointP.toParent[3][2] = centroid.z;
491	514
492	515	cVector goal = GetGoal(centroid);
493	516	if (goal != null)
494	517	{
495		- System.err.println("GOAL change (" + this + "): " + goal + " (was " + goalx + ", " + goalz + ")");
	518	+ System.err.println("GOAL change (" + this + "): " + goal + " (was " + goalposx + ", " + goalposz + ")");
496	519
497		- goalx = goal.x;
498		- goalz = goal.z;
499		- targetx = targetz = 0;
	520	+ goalposx = goal.x;
	521	+ goalposz = goal.z;
	522	+ targetdirx = targetdirz = 0;
500	523	}
501	524
502		- if (goalx == 0 && goalz == 0)
	525	+ if (goalposx == 0 && goalposz == 0)
503	526	{
504	527	// No target
505	528	if (ScriptNode.speaker != null)
..	..	@@ -533,8 +556,8 @@
533	556	//sourcenode.parent.TransformToLocal(dst);
534	557	this.parent.TransformToLocal(dst);
535	558
536		- goalx = dst.x;
537		- goalz = dst.z;
	559	+ goalposx = dst.x;
	560	+ goalposz = dst.z;
538	561	}
539	562	else
540	563	return;
..	..	@@ -550,17 +573,25 @@
550	573
551	574	double angleYhip = Math.atan2(-temp.z, temp.x);
552	575
553		- double angleYtarget = Math.atan2(goalx - centroid.x, goalz - centroid.z);
	576	+ double angleYtarget = Math.atan2(goalposx - centroid.x, goalposz - centroid.z);
554	577
555	578	LA.matIdentity(matrix);
556	579	LA.matTranslate(matrix, -centroid.x, -centroid.y, -centroid.z);
557		- double angle = CurveAngle(0, angleYtarget - angleYhip, 1); // 0.1f);
	580	+ double angle = CurveAngle(0, angleYtarget - angleYhip, 0.1f);
558	581	LA.matYRotate(matrix, angle);
559	582	LA.matTranslate(matrix, centroid.x, centroid.y, centroid.z);
560	583
561	584	LA.matConcat(matrix, toParent, toParent);
562	585
563	586	LA.matInvert(toParent, fromParent);
	587	+
	588	+ LA.matConcat(toParent, hip.get(0).toParent, matrix);
	589	+
	590	+ centroid.x = matrix[3][0];
	591	+ centroid.y = matrix[3][1];
	592	+ centroid.z = matrix[3][2];
	593	+
	594	+ double dist = LA.distance(centroid, mocaporigin);
564	595
565	596	CheckForAction(centroid);
566	597	}
..	..	@@ -614,6 +645,24 @@
614	645	// transient // aout 2013
615	646	Object3D skeleton;
616	647
	648	+ void ExtractBigData(Object3D o)
	649	+ {
	650	+ super.ExtractBigData(o);
	651	+
	652	+ o.bvh = this.bvh;
	653	+ o.skeleton = this.skeleton;
	654	+ this.bvh = null;
	655	+ this.skeleton = null;
	656	+ }
	657	+
	658	+ void RestoreBigData(Object3D o)
	659	+ {
	660	+ super.RestoreBigData(o);
	661	+
	662	+ this.bvh = o.bvh;
	663	+ this.skeleton = o.skeleton;
	664	+ }
	665	+
617	666	boolean smoothed;
618	667
619	668	//boolean touched;
..	..	@@ -637,11 +686,11 @@
637	686	double pinx;
638	687	double pinz;
639	688
640		- double targetx;
641		- double targetz;
	689	+ double targetdirx;
	690	+ double targetdirz;
642	691
643		- double goalx = -20;
644		- double goalz = -10;
	692	+ double goalposx = 0; // -20;
	693	+ double goalposz = 0; // -10;
645	694
646	695	boolean followpath;
647	696
..	..	@@ -712,7 +761,7 @@
712	761	scriptactions.clear();
713	762	}
714	763
715		- static double EPSACTION = 0.1; // 0.075; // 0.1;
	764	+ static double EPSACTION = 0.1; // 0.075; // 0.1;Came
716	765
717	766	void AddFromTo(cVector from, cVector to)
718	767	{
..	..	@@ -897,7 +946,7 @@
897	946	// //GetFileRoot();
898	947
899	948	// sept 2014: //
900		- GrafreeD.RENDERME = 3; // patch for Merge objects
	949	+ Grafreed.RENDERME = 3; // patch for Merge objects
901	950	float[] thedata = bvh.animation.getBoneData(0);
902	951
903	952	os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
..	..	@@ -1278,6 +1327,7 @@
1278	1327
1279	1328	void SetPosition(Object3D sourcenode, cVector floor, long floorid, cVector centroid)
1280	1329	{
	1330	+ assert(false);
1281	1331	//assert(CameraPane.drawMode == CameraPane.SHADOW);
1282	1332
1283	1333	Object3D transformnode = new Object3D();
..	..	@@ -1481,9 +1531,9 @@
1481	1531	groundid = floorid;
1482	1532
1483	1533	// green
1484		- CameraPane.debugpoint.toParent[3][0] = groundx;
1485		- CameraPane.debugpoint.toParent[3][1] = floor.y;
1486		- CameraPane.debugpoint.toParent[3][2] = groundz;
	1534	+ CameraPane.debugpointG.toParent[3][0] = groundx;
	1535	+ CameraPane.debugpointG.toParent[3][1] = floor.y;
	1536	+ CameraPane.debugpointG.toParent[3][2] = groundz;
1487	1537
1488	1538	if (true) // slow && stepout && onein)
1489	1539	{
..	..	@@ -1494,7 +1544,7 @@
1494	1544	// mywave = currentwave++;
1495	1545	// }
1496	1546	// sound
1497		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	1547	+ cVector eye = Globals.theRenderer.EyeCamera().location;
1498	1548
1499	1549	// if (sourcenode.parent.parent != null)
1500	1550	// sourcenode.parent.parent.TransformToWorld(floor, tmp);
..	..	@@ -1539,9 +1589,9 @@
1539	1589	//GraphreeD.
1540	1590	wav.play(volume * usedvolume); //, mywave);
1541	1591
1542		- lastsoundtime = CameraPane.framecount;
	1592	+ lastsoundtime = Globals.framecount;
1543	1593
1544		- GrafreeD.hassound = true;
	1594	+ Grafreed.hassound = true;
1545	1595	}
1546	1596	// else
1547	1597	// System.out.println("skipped");
..	..	@@ -1560,9 +1610,9 @@
1560	1610
1561	1611	// System.out.println("Allo " + sourcenode);
1562	1612	// purple
1563		- CameraPane.debugpoint2.toParent[3][0] = floor.x;// + posx;
1564		- CameraPane.debugpoint2.toParent[3][1] = ground; // floor.y;// + sourcenode.parent.toParent[3][1];
1565		- CameraPane.debugpoint2.toParent[3][2] = floor.z;// + posz;
	1613	+ CameraPane.debugpointP.toParent[3][0] = floor.x;// + posx;
	1614	+ CameraPane.debugpointP.toParent[3][1] = ground; // floor.y;// + sourcenode.parent.toParent[3][1];
	1615	+ CameraPane.debugpointP.toParent[3][2] = floor.z;// + posz;
1566	1616
1567	1617
1568	1618	if (false) // dist2 > 0.1)
..	..	@@ -1628,9 +1678,9 @@
1628	1678	this.get(0).TransformToWorld(v0);
1629	1679
1630	1680	// cyan
1631		- CameraPane.debugpoint3.toParent[3][0] = v0.x;
1632		- CameraPane.debugpoint3.toParent[3][1] = ground;
1633		- CameraPane.debugpoint3.toParent[3][2] = v0.z;
	1681	+ CameraPane.debugpointC.toParent[3][0] = v0.x;
	1682	+ CameraPane.debugpointC.toParent[3][1] = ground;
	1683	+ CameraPane.debugpointC.toParent[3][2] = v0.z;
1634	1684
1635	1685	LA.matConcat(sourcenode.toParent, transformnode.toParent, sourcenode.toParent);
1636	1686	LA.matInvert(sourcenode.toParent, sourcenode.fromParent);
..	..	@@ -1640,9 +1690,9 @@
1640	1690	this.get(0).TransformToWorld(v0);
1641	1691
1642	1692	// red
1643		- CameraPane.debugpoint4.toParent[3][0] = v0.x;
1644		- CameraPane.debugpoint4.toParent[3][1] = ground;
1645		- CameraPane.debugpoint4.toParent[3][2] = v0.z;
	1693	+ CameraPane.debugpointR.toParent[3][0] = v0.x;
	1694	+ CameraPane.debugpointR.toParent[3][1] = ground;
	1695	+ CameraPane.debugpointR.toParent[3][2] = v0.z;
1646	1696	}
1647	1697	}
1648	1698
..	..	@@ -1682,11 +1732,11 @@
1682	1732
1683	1733	if (goal != null)
1684	1734	{
1685		- System.err.println("GOAL change (" + sourcenode + "): " + goal + " (was " + goalx + ", " + goalz + ")");
	1735	+ System.err.println("GOAL change (" + sourcenode + "): " + goal + " (was " + goalposx + ", " + goalposz + ")");
1686	1736	//sourcenode.parent.parent.Dump();
1687		- goalx = goal.x;
1688		- goalz = goal.z;
1689		- targetx = targetz = 0;
	1737	+ goalposx = goal.x;
	1738	+ goalposz = goal.z;
	1739	+ targetdirx = targetdirz = 0;
1690	1740
1691	1741	followpath = true;
1692	1742	}
..	..	@@ -1737,16 +1787,16 @@
1737	1787	// }
1738	1788	if (false) // !uselast)
1739	1789	{
1740		- CameraPane.debugpoint.toParent[3][0] = dst.x;
1741		- CameraPane.debugpoint.toParent[3][1] = dst.y;
1742		- CameraPane.debugpoint.toParent[3][2] = dst.z;
	1790	+ CameraPane.debugpointG.toParent[3][0] = dst.x;
	1791	+ CameraPane.debugpointG.toParent[3][1] = dst.y;
	1792	+ CameraPane.debugpointG.toParent[3][2] = dst.z;
1743	1793	}
1744	1794	}
1745	1795
1746		- if (goalx != 0 \|\| goalz != 0) // TODO
	1796	+ if (goalposx != 0 \|\| goalposz != 0) // TODO
1747	1797	{
1748	1798	// overwrite speaker orientation
1749		- dst.set(goalx,0,goalz);
	1799	+ dst.set(goalposx,0,goalposz);
1750	1800	if (sourcenode.parent != null) // july 2014
1751	1801	sourcenode.parent.
1752	1802	TransformToLocal(dst);
..	..	@@ -1798,26 +1848,26 @@
1798	1848	// mars 2014
1799	1849	if (false) // goalx != 0 \|\| goalz != 0)
1800	1850	{
1801		- targetx = dst.x - src.x;
1802		- targetz = dst.z - src.z;
	1851	+ targetdirx = dst.x - src.x;
	1852	+ targetdirz = dst.z - src.z;
1803	1853
1804		- if (Math.abs(targetx) > 0.1 \|\| Math.abs(targetz) > 0.1)
	1854	+ if (Math.abs(targetdirx) > 0.1 \|\| Math.abs(targetdirz) > 0.1)
1805	1855	{
1806	1856	// far enough from goal. keep the goal position.
1807		- targetx = 0;
1808		- targetz = 0;
	1857	+ targetdirx = 0;
	1858	+ targetdirz = 0;
1809	1859	}
1810	1860	else
1811	1861	{
1812	1862	// too close to goal. switch to target direction instead.
1813		- goalx = 0;
1814		- goalz = 0;
	1863	+ goalposx = 0;
	1864	+ goalposz = 0;
1815	1865	}
1816	1866	}
1817	1867
1818	1868	//sourcenode.getCentroid(src, true);
1819	1869
1820		- if (speakernode == sourcenode && goalx == 0 && goalz == 0)
	1870	+ if (speakernode == sourcenode && goalposx == 0 && goalposz == 0)
1821	1871	{
1822	1872	if (ScriptNode.lastspeaker != null)
1823	1873	new Exception().printStackTrace();
..	..	@@ -1826,13 +1876,13 @@
1826	1876
1827	1877	// LA.xformPos(src, fromParent, src);
1828	1878
1829		- if ((ScriptNode.speaker != null && CameraPane.SPEAKERMOCAP \|\| goalx != 0 \|\| goalz != 0) && targetx == 0 && targetz == 0)
	1879	+ if ((ScriptNode.speaker != null && CameraPane.SPEAKERMOCAP \|\| goalposx != 0 \|\| goalposz != 0) && targetdirx == 0 && targetdirz == 0)
1830	1880	dst.sub(src);
1831	1881	else
1832	1882	// vector mode
1833	1883	{
1834		- dst.x = targetx;
1835		- dst.z = targetz;
	1884	+ dst.x = targetdirx;
	1885	+ dst.z = targetdirz;
1836	1886
1837	1887	// TEST TARGET
1838	1888	// dst.x = CameraPane.selectedpoint.toParent[3][0];
..	..	@@ -2242,7 +2292,7 @@
2242	2292	}
2243	2293
2244	2294	if (!smoothed)
2245		- for (int i=0; --i>=0;)
	2295	+ for (int i=10; --i>=0;)
2246	2296	SmoothAnimData(); // much reduces shakiness
2247	2297
2248	2298	smoothed = true;
..	..	@@ -2280,9 +2330,16 @@
2280	2330	toVector.x = LA.cos(to);
2281	2331	toVector.y = LA.sin(to);
2282	2332
	2333	+ double fromA = Math.atan2(fromVector.y, fromVector.x);
	2334	+ double toA = Math.atan2(toVector.y, toVector.x);
	2335	+
2283	2336	Vector2d currentVector = Slerp(fromVector, toVector, step);
2284	2337
2285		- return Math.atan2(currentVector.y, currentVector.x);
	2338	+ double angle = Math.atan2(currentVector.y, currentVector.x);
	2339	+
	2340	+ double angle2 = (1-step) * fromA + step * toA;
	2341	+
	2342	+ return angle;
2286	2343	}
2287	2344
2288	2345	public static Vector2d Slerp(Vector2d from, Vector2d to, double step)
..	..	@@ -2765,7 +2822,8 @@
2765	2822	//if (bone._rotationEnabled)
2766	2823	if (//frame > 0 &&
2767	2824	!bone.skipmocap &&
2768		- !bone.name.contains("head") // &&
	2825	+ !bone.name.contains("head") &&
	2826	+ !bone.name.contains("Head") // &&
2769	2827	// !bone.name.contains("rFoot") &&
2770	2828	// !bone.name.contains("lFoot") &&
2771	2829	// !bone.name.contains("Pinky") &&
..	..	@@ -3191,7 +3249,7 @@
3191	3249
3192	3250	// july 2014
3193	3251	// goalx = goalz = 0;
3194		- targetx = targetz = 0;
	3252	+ targetdirx = targetdirz = 0;
3195	3253
3196	3254	//SetPositionDelta(true, true, true, false);
3197	3255	// LoadData();
..	..	@@ -3201,8 +3259,8 @@
3201	3259
3202	3260	// aout 2013 endframe = 0; // june 2013
3203	3261
3204		- //ResetZero();
3205		- setPose(frame);
	3262	+ ResetZero();
	3263	+ //setPose(frame);
3206	3264	}
3207	3265
3208	3266	static int mocapsupport = 0;
..	..	@@ -3220,12 +3278,13 @@
3220	3278
3221	3279	int step = 1;
3222	3280
	3281	+ // patch for running hare
3223	3282	if (speedup) // fev 2014
3224	3283	step *= 2; // 4;
3225	3284	if (rewind) // mars 2014
3226	3285	step *= 4;
3227	3286
3228		- if (CameraPane.FAST) // && !CameraPane.HOLD)
	3287	+ //if (CameraPane.FAST) // && !CameraPane.HOLD)
3229	3288	step *= CameraPane.STEP;
3230	3289
3231	3290	//System.err.println("Step Mocap frame # " + frame);
..	..	@@ -3257,7 +3316,7 @@
3257	3316	"; fullname = " + fullname);
3258	3317
3259	3318	//int delta = frame - baseframe;
3260		- if (CameraPane.CROWD)
	3319	+ if (Globals.CROWD)
3261	3320	{
3262	3321	baseframe = GetFirstFrame(); // 0 initial point
3263	3322	}
..	..	@@ -3266,23 +3325,40 @@
3266	3325	// SetPositionDelta(false, true, false); // ?? false);
3267	3326	{
3268	3327	if (support == null)
3269		- ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
	3328	+ {
	3329	+ if (bvh == null && new File(fullname).exists())
	3330	+ ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
	3331	+ else
	3332	+ {
	3333	+ SetGlobalTransform();
	3334	+ Rewind();
	3335	+ Fade();
	3336	+ }
	3337	+ }
3270	3338	else
3271	3339	{
3272		- try
3273		- {
	3340	+// try
	3341	+// {
3274	3342	bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
3275	3343
3276	3344	// SetPositionDelta(false, true, true, true);
3277	3345	LoadData();
3278	3346	Rewind();
3279	3347	Fade();
3280		- }
3281		- catch (Exception e)
3282		- {
3283		- e.printStackTrace();
3284		- ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3285		- }
	3348	+// }
	3349	+// catch (Exception e)
	3350	+// {
	3351	+// System.err.println("An error occured while loading data. Use fallback by loading the file.");
	3352	+// //e.printStackTrace();
	3353	+// try
	3354	+// {
	3355	+// ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
	3356	+// }
	3357	+// catch (Exception e2)
	3358	+// {
	3359	+// System.err.println("Motion file not found: " + fullname);
	3360	+// }
	3361	+// }
3286	3362	}
3287	3363	}
3288	3364
..	..	@@ -3464,6 +3540,7 @@
3464	3540	// filters out bad input data
3465	3541	void FilterAnimData()
3466	3542	{
	3543	+ new Exception().printStackTrace();
3467	3544	System.exit(0);
3468	3545
3469	3546	float[] data; // = bvh.animation.getBoneData(0);
..	..	@@ -3821,7 +3898,7 @@
3821	3898
3822	3899	transient boolean restarted; // CROWD issue?
3823	3900
3824		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	3901	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
3825	3902	{
3826	3903	//System.err.println("drawSelf Mocap frame # " + frame);
3827	3904	//System.err.println("drawSelf Mocap baseframe # " + baseframe);
..	..	@@ -3838,17 +3915,22 @@
3838	3915	// if (firstframe)
3839	3916	// return;
3840	3917
3841		- if (!restarted && /display.restartframe &&/
3842		- display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
	3918	+ if (//!restarted && /display.restartframe &&/
	3919	+ Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE))
3843	3920	{
3844	3921	//display.restartframe = false;
3845	3922	restarted = true;
	3923	+ //System.err.println("restarted = true");
3846	3924	Step();
3847	3925	}
3848	3926	else
3849	3927	{
3850		- if (display.isLIVE() && live && display.drawMode != display.SHADOW)
	3928	+ //System.err.println("restarted");
	3929	+ if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
	3930	+ {
3851	3931	restarted = false;
	3932	+ //System.err.println("restarted = false");
	3933	+ }
3852	3934	}
3853	3935
3854	3936	super.drawSelf(display, root, selected, blocked);