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