~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -26,6 +26,575 @@
26	26	public class Mocap extends Object3D
27	27	{
28	28	static final long serialVersionUID = 7437391692559853707L;
	29	+
	30	+ void Fade()
	31	+ {
	32	+ if (currentbones == null \|\| CameraPane.fullreset)
	33	+ return;
	34	+
	35	+ cVector temp = new cVector();
	36	+
	37	+ int numframes = bvh.animation.getNumFrames();
	38	+
	39	+ int b;
	40	+ float[] data;
	41	+ Quat4d quatstart = new Quat4d();
	42	+ Quat4d quatend = new Quat4d();
	43	+ Quat4d quat = new Quat4d();
	44	+ Matrix4d mat4d = new Matrix4d();
	45	+ double[][] rot = new double[4][4];
	46	+ for (b=numbones; --b>=0;) // HIP ROTATION: 0;)
	47	+ {
	48	+ // int hipindex = get(0)._index;
	49	+
	50	+// assert(get(0).get(0)._isHip);
	51	+
	52	+ // if (b == hipindex)
	53	+ // continue;
	54	+
	55	+ data = bvh.animation.getBoneData(b);
	56	+
	57	+ int dof = 3; // data.length/numframes;
	58	+
	59	+ if (b == 0)
	60	+ {
	61	+ dof = 6;
	62	+ }
	63	+ // assert(dof == 3);
	64	+
	65	+ int boneframe3 = (b-1)*3; // dof;
	66	+
	67	+ // System.err.println("Bone #" + b + ": dof = " + dof);
	68	+ int fadein = 45; // 120;
	69	+
	70	+ // if (b == hipindex)
	71	+ // fadein *= 5;
	72	+
	73	+ if (fadein > numframes)
	74	+ fadein = 0; // numframes;
	75	+
	76	+ for (int fi=fadein; --fi>=0;)
	77	+ //for (int f=numframes; --f>=0;)
	78	+ {
	79	+ int f = fi + GetFirstFrame();
	80	+
	81	+ int f3 = f*dof;
	82	+
	83	+ float k = fi;
	84	+
	85	+ k /= fadein - 1;
	86	+
	87	+ if (Float.isNaN(k))
	88	+ k = 1; // 0/0
	89	+
	90	+ k = (float) (-Math.cos(k*Math.PI));
	91	+ k += 1;
	92	+ k /= 2;
	93	+
	94	+ int start = 3;
	95	+ int end = 0;
	96	+
	97	+ if (dof == 6)
	98	+ {
	99	+ start = 6;
	100	+ end = 3;
	101	+ }
	102	+
	103	+ if (b == 0)
	104	+ {
	105	+ for (int i=start; --i>=end;)
	106	+ {
	107	+ //data[f3 + i] += pos[i] - data[frame3 + i];
	108	+// data[f3 + i] = kdata[f3+i] + (1-k)
	109	+// currentbones[boneframe3 + i-end];
	110	+// data[f3 + i] = (float)CurveAngle(data[f3+i], currenthip[i], 1-k);
	111	+ }
	112	+
	113	+ // TODO: translation
	114	+
	115	+// _t1.setIdentity();
	116	+// _t2.setIdentity();
	117	+// _t2.rotZ(currentbones[boneframe3 + start-1-end]);
	118	+// _t1.mul(_t2);
	119	+// _t2.setIdentity();
	120	+// if (b == 0)
	121	+// {
	122	+// _t2.rotY(currentbones[boneframe3 + start-2-end]);
	123	+// _t1.mul(_t2);
	124	+// _t2.setIdentity();
	125	+// _t2.rotX(currentbones[boneframe3 + start-3-end]);
	126	+// }
	127	+// else
	128	+// {
	129	+// _t2.rotX(currentbones[boneframe3 + start-2-end]);
	130	+// _t1.mul(_t2);
	131	+// _t2.setIdentity();
	132	+// _t2.rotY(currentbones[boneframe3 + start-3-end]);
	133	+// }
	134	+// _t1.mul(_t2);
	135	+// _t2.setIdentity();
	136	+//
	137	+// _t1.get(mat4d);
	138	+//
	139	+// mat4d.get(quatstart);
	140	+//
	141	+// _t1.setIdentity();
	142	+// _t2.setIdentity();
	143	+// _t2.rotZ(data[f3 + start-1]);
	144	+// _t1.mul(_t2);
	145	+// _t2.setIdentity();
	146	+// if (b == 0)
	147	+// {
	148	+// _t2.rotY(data[f3 + start-2]);
	149	+// _t1.mul(_t2);
	150	+// _t2.setIdentity();
	151	+// _t2.rotX(data[f3 + start-3]);
	152	+// }
	153	+// else
	154	+// {
	155	+// _t2.rotX(data[f3 + start-2]);
	156	+// _t1.mul(_t2);
	157	+// _t2.setIdentity();
	158	+// _t2.rotY(data[f3 + start-3]);
	159	+// }
	160	+//
	161	+// _t1.mul(_t2);
	162	+// _t2.setIdentity();
	163	+//
	164	+// _t1.get(mat4d);
	165	+//
	166	+// mat4d.get(quatend);
	167	+//
	168	+// double dot = quatstart.x*quatend.x +
	169	+// quatstart.y*quatend.y +
	170	+// quatstart.z*quatend.z +
	171	+// quatstart.w*quatend.w
	172	+// ;
	173	+//
	174	+// if (dot < 0)
	175	+// {
	176	+// quatend.x *= -1;
	177	+// quatend.y *= -1;
	178	+// quatend.z *= -1;
	179	+// quatend.w *= -1;
	180	+// }
	181	+//
	182	+// // k = 1-k;
	183	+//
	184	+// quat.x = (1-k)quatstart.x + kquatend.x;
	185	+// quat.y = (1-k)quatstart.y + kquatend.y;
	186	+// quat.z = (1-k)quatstart.z + kquatend.z;
	187	+// quat.w = (1-k)quatstart.w + kquatend.w;
	188	+//
	189	+// quat.normalize();
	190	+//
	191	+// mat4d.set(quat);
	192	+//
	193	+// cJ3D.SetTransform(rot, mat4d);
	194	+//
	195	+// matrixToEulerXYZ(rot, temp);
	196	+//
	197	+// data[f3 + start-1] = -(float)temp.z;
	198	+//
	199	+// if (b == 0)
	200	+// {
	201	+// data[f3 + start-2] = -(float)temp.y;
	202	+// data[f3 + start-3] = -(float)temp.x;
	203	+// }
	204	+// else
	205	+// {
	206	+// data[f3 + start-2] = -(float)temp.x;
	207	+// data[f3 + start-3] = -(float)temp.y;
	208	+// }
	209	+ }
	210	+ else
	211	+ {
	212	+ for (int i=start; --i>=end;)
	213	+ {
	214	+ //data[f3 + i] += pos[i] - data[frame3 + i];
	215	+// data[f3 + i] = kdata[f3+i] + (1-k)
	216	+// currentbones[boneframe3 + i-end];
	217	+ data[f3 + i] = (float)CurveAngle(data[f3+i], currentbones[boneframe3 + i/-end/], 1-k);
	218	+ }
	219	+ }
	220	+ }
	221	+ }
	222	+ }
	223	+
	224	+ // Updates the toParent matrix to keep the same position and orientation
	225	+ // before resetting the mocap data.
	226	+ void SetGlobalTransform()
	227	+ {
	228	+ //SetCurrentBones(frame);
	229	+
	230	+ cVector temp = new cVector();
	231	+ cVector pos = new cVector();
	232	+ cVector poship = new cVector();
	233	+
	234	+ double angleY = 0;
	235	+ double angleYhip = 0;
	236	+
	237	+ Object3D hip = get(0);
	238	+
	239	+ if (hip.get(0).toParent == null)
	240	+ {
	241	+ hip.get(0).toParent = LA.newMatrix();
	242	+ hip.get(0).fromParent = LA.newMatrix();
	243	+ }
	244	+
	245	+ LA.matConcat(toParent, hip.get(0).toParent, matrix);
	246	+ poship.x = matrix[3][0];
	247	+ poship.y = matrix[3][1];
	248	+ poship.z = matrix[3][2];
	249	+
	250	+ temp.x = 1;
	251	+ temp.y = 0;
	252	+ temp.z = 0;
	253	+
	254	+ LA.xformDir(temp, matrix, temp);
	255	+
	256	+ angleYhip = Math.atan2(-temp.z, temp.x);
	257	+
	258	+ LA.matIdentity(toParent);
	259	+ LA.matYRotate(toParent, angleYhip);
	260	+ LA.matTranslate(toParent, poship.x, poship.y, poship.z);
	261	+
	262	+// LA.matConcat(toParent, hip.get(0).toParent, toParent);
	263	+
	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	+
	268	+ LA.matInvert(toParent, fromParent);
	269	+
	270	+ LA.matIdentity(hip.get(0).toParent);
	271	+ LA.matIdentity(hip.get(0).fromParent);
	272	+
	273	+// if (true)
	274	+// return;
	275	+
	276	+ // Updates hip.get(0).toParent
	277	+ setPose(hip, GetFirstFrame(), bvh.animation.getBoneData(hip._index));
	278	+
	279	+ // A = toParent; B = hip.get(0).toParent
	280	+ // A'*B = A
	281	+ // A' = A * B-1
	282	+
	283	+ poship.x = hip.get(0).toParent[3][0];
	284	+ poship.y = hip.get(0).toParent[3][1];
	285	+ poship.z = hip.get(0).toParent[3][2];
	286	+
	287	+ temp.x = 1;
	288	+ temp.y = 0;
	289	+ temp.z = 0;
	290	+
	291	+ LA.xformDir(temp, hip.get(0).toParent, temp);
	292	+
	293	+ angleYhip = Math.atan2(-temp.z, temp.x);
	294	+
	295	+ LA.matIdentity(matrix);
	296	+ LA.matYRotate(matrix, angleYhip);
	297	+ LA.matTranslate(matrix, poship.x, poship.y, poship.z);
	298	+
	299	+ //LA.matInvert(hip.get(0).toParent, matrix);
	300	+ LA.matInvert(matrix, matrix);
	301	+
	302	+ //LA.matIdentity(matrix);
	303	+ //LA.matTranslate(matrix, -poship.x, -poship.y, -poship.z);
	304	+
	305	+ LA.matConcat(toParent, matrix, toParent);
	306	+
	307	+
	308	+ LA.matConcat(toParent, hip.get(0).toParent, matrix);
	309	+ pos.x = hip.get(0).toParent[3][0];
	310	+ pos.y = hip.get(0).toParent[3][1];
	311	+ pos.z = hip.get(0).toParent[3][2];
	312	+ LA.xformPos(new cVector(), hip.get(0).toParent, pos);
	313	+ LA.xformPos(pos, toParent, pos);
	314	+
	315	+// temp.x = 1;
	316	+// temp.y = 0;
	317	+// temp.z = 0;
	318	+//
	319	+// LA.xformDir(temp, toParent, temp);
	320	+//
	321	+// angleY = Math.atan2(-temp.z, temp.x);
	322	+//
	323	+// LA.matIdentity(toParent);
	324	+// LA.matYRotate(toParent, angleY - angleYhip);
	325	+// LA.matTranslate(toParent, pos.x - poship.x, pos.y - poship.y, pos.z - poship.z);
	326	+
	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	+
	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	+
	335	+ poship.x = toParent[3][0];
	336	+ poship.y = toParent[3][1];
	337	+ poship.z = toParent[3][2];
	338	+
	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	+
	343	+ LA.matInvert(toParent, fromParent);
	344	+ }
	345	+
	346	+ void LoadData()
	347	+ {
	348	+ float[] thedata = bvh.animation.getBoneData(0);
	349	+
	350	+// thedata[0] = 0;
	351	+// thedata[1] = 0;
	352	+// thedata[2] = 0;
	353	+// thedata[3] = 0;
	354	+// thedata[4] = 0;
	355	+// thedata[5] = 0;
	356	+
	357	+ if (true)
	358	+ return;
	359	+
	360	+ for (int b=numbones; --b>=0;)
	361	+ //int b = 0;
	362	+ {
	363	+ thedata = bvh.animation.getBoneData(b);
	364	+
	365	+ int numframes = bvh.animation.getNumFrames();
	366	+
	367	+ int dof = 6; // thedata.length/numframes;
	368	+
	369	+ if (b > 0)
	370	+ dof = 3;
	371	+
	372	+ if (dof != thedata.length/numframes)
	373	+ {
	374	+ System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (thedata.length/numframes));
	375	+ dof = thedata.length/numframes;
	376	+ }
	377	+
	378	+ //for (int f=numframes; --f>=offset;)
	379	+ int firstframe = GetFirstFrame();
	380	+ for (int f=0; f<numframes-firstframe; f++)
	381	+ {
	382	+ int f3 = f*dof;
	383	+
	384	+ //for (int i=3/dof/; --i>=0;)
	385	+ for (int i=dof; --i>=0;)
	386	+ {
	387	+ //thedata[f3 + i] += thedata[i] - thedata[offset*dof + i];
	388	+ thedata[f3 + i] = thedata[f3 + firstframe*dof + i];
	389	+ }
	390	+ }
	391	+ }
	392	+ }
	393	+
	394	+ void ResetZero()
	395	+ {
	396	+ for (int b=numbones; --b>=0;)
	397	+ {
	398	+ float[] thedata = bvh.animation.getBoneData(b);
	399	+
	400	+ int numframes = bvh.animation.getNumFrames();
	401	+
	402	+ int dof = 6;
	403	+
	404	+ if (b > 0)
	405	+ dof = 3;
	406	+
	407	+ for (int i=dof; --i>=0;)
	408	+ {
	409	+ thedata[i] = 0;
	410	+ }
	411	+ }
	412	+ }
	413	+
	414	+ void SetCurrentBones(int frame)
	415	+ {
	416	+ if (frame == 0)
	417	+ {
	418	+ //frame = 1;
	419	+ }
	420	+
	421	+ if (currentbones == null)
	422	+ {
	423	+ currentbones = new double[(numbones-1)*3];
	424	+ currenthip = new double[6];
	425	+ }
	426	+
	427	+ for (int b=numbones; --b>=1;) // HIP ROTATION: 0;)
	428	+ //int b = 0;
	429	+ {
	430	+ float[] data = bvh.animation.getBoneData(b);
	431	+
	432	+ // int numframes = bvh.animation.getNumFrames();
	433	+
	434	+ int dof = 6; // data.length/numframes;
	435	+
	436	+ if (b > 0)
	437	+ dof = 3;
	438	+
	439	+ //assert(dof == 3);
	440	+
	441	+ // System.err.println("Bone #" + b + ": dof = " + dof);
	442	+ int theframe = // 1; // baseframe;
	443	+ frame;
	444	+
	445	+ int frame3 = theframe*dof;
	446	+ int bone3 = (b-1)*dof;
	447	+
	448	+ int start = 3;
	449	+ int end = 0;
	450	+
	451	+ if (dof == 6)
	452	+ {
	453	+ start = 6;
	454	+ //end = 3;
	455	+ }
	456	+
	457	+ for (int i=start; --i>=end;)
	458	+ {
	459	+ currentbones[bone3 + i/-end/] = data[frame3 + i];
	460	+ }
	461	+ }
	462	+
	463	+ float[] data = bvh.animation.getBoneData(0);
	464	+
	465	+ int dof = 6;
	466	+
	467	+ int theframe = frame;
	468	+
	469	+ int frame3 = theframe*dof;
	470	+
	471	+ int start = 6;
	472	+ int end = 0;
	473	+
	474	+ for (int i=start; --i>=end;)
	475	+ {
	476	+ currenthip[i] = data[frame3 + i];
	477	+ }
	478	+ }
	479	+
	480	+ static cVector centroid = new cVector();
	481	+ static cVector mocaporigin = new cVector();
	482	+
	483	+ void SetHipOrientation()
	484	+ {
	485	+ Object3D hip = get(0);
	486	+
	487	+ if (toParent == null)
	488	+ {
	489	+ toParent = LA.newMatrix();
	490	+ fromParent = LA.newMatrix();
	491	+ }
	492	+
	493	+ LA.matConcat(toParent, hip.get(0).toParent, matrix);
	494	+
	495	+ mocaporigin.x = matrix[3][0];
	496	+ mocaporigin.y = matrix[3][1];
	497	+ mocaporigin.z = matrix[3][2];
	498	+
	499	+ centroid.x = matrix[3][0];
	500	+ centroid.y = matrix[3][1];
	501	+ centroid.z = matrix[3][2];
	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;
	514	+
	515	+ cVector goal = GetGoal(centroid);
	516	+ if (goal != null)
	517	+ {
	518	+ System.err.println("GOAL change (" + this + "): " + goal + " (was " + goalposx + ", " + goalposz + ")");
	519	+
	520	+ goalposx = goal.x;
	521	+ goalposz = goal.z;
	522	+ targetdirx = targetdirz = 0;
	523	+ }
	524	+
	525	+ if (goalposx == 0 && goalposz == 0)
	526	+ {
	527	+ // No target
	528	+ if (ScriptNode.speaker != null)
	529	+ {
	530	+ Object3D sourcenode = GetFileRoot();
	531	+ Object3D speakernode = ScriptNode.speaker.GetFileRoot();
	532	+
	533	+ //System.err.println("speaker is " + speakernode + "; last was " + ScriptNode.lastspeaker);
	534	+
	535	+ Object3D speaker = ScriptNode.speaker;
	536	+
	537	+ if (speakernode == sourcenode)
	538	+ {
	539	+ if (ScriptNode.lastspeaker != null)
	540	+ {
	541	+ speakernode = ScriptNode.lastspeaker.GetFileRoot();
	542	+ speaker = ScriptNode.lastspeaker;
	543	+ }
	544	+ else
	545	+ return;
	546	+ }
	547	+
	548	+ cVector dst = new cVector();
	549	+
	550	+ boolean success = speakernode.getCentroid(dst); // , true);
	551	+
	552	+ if (!success)
	553	+ new Exception().printStackTrace();
	554	+
	555	+ //speakernode.parent.TransformToWorld(dst);
	556	+ //sourcenode.parent.TransformToLocal(dst);
	557	+ this.parent.TransformToLocal(dst);
	558	+
	559	+ goalposx = dst.x;
	560	+ goalposz = dst.z;
	561	+ }
	562	+ else
	563	+ return;
	564	+ }
	565	+
	566	+ cVector temp = new cVector();
	567	+
	568	+ temp.x = 1;
	569	+ temp.y = 0;
	570	+ temp.z = 0;
	571	+
	572	+ LA.xformDir(temp, matrix, temp);
	573	+
	574	+ double angleYhip = Math.atan2(-temp.z, temp.x);
	575	+
	576	+ double angleYtarget = Math.atan2(goalposx - centroid.x, goalposz - centroid.z);
	577	+
	578	+ LA.matIdentity(matrix);
	579	+ LA.matTranslate(matrix, -centroid.x, -centroid.y, -centroid.z);
	580	+ double angle = CurveAngle(0, angleYtarget - angleYhip, 0.1f);
	581	+ LA.matYRotate(matrix, angle);
	582	+ LA.matTranslate(matrix, centroid.x, centroid.y, centroid.z);
	583	+
	584	+ LA.matConcat(matrix, toParent, toParent);
	585	+
	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);
	595	+
	596	+ CheckForAction(centroid);
	597	+ }
29	598
30	599	void WriteTo(java.io.Writer writer) throws Exception
31	600	{
..	..	@@ -76,6 +645,24 @@
76	645	// transient // aout 2013
77	646	Object3D skeleton;
78	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	+
79	666	boolean smoothed;
80	667
81	668	//boolean touched;
..	..	@@ -99,11 +686,11 @@
99	686	double pinx;
100	687	double pinz;
101	688
102		- double targetx;
103		- double targetz;
	689	+ double targetdirx;
	690	+ double targetdirz;
104	691
105		- double goalx;
106		- double goalz;
	692	+ double goalposx = 0; // -20;
	693	+ double goalposz = 0; // -10;
107	694
108	695	boolean followpath;
109	696
..	..	@@ -174,7 +761,7 @@
174	761	scriptactions.clear();
175	762	}
176	763
177		- static double EPSACTION = 0.1; // 0.075; // 0.1;
	764	+ static double EPSACTION = 0.1; // 0.075; // 0.1;Came
178	765
179	766	void AddFromTo(cVector from, cVector to)
180	767	{
..	..	@@ -359,7 +946,7 @@
359	946	// //GetFileRoot();
360	947
361	948	// sept 2014: //
362		- GrafreeD.RENDERME = 3; // patch for Merge objects
	949	+ Grafreed.RENDERME = 3; // patch for Merge objects
363	950	float[] thedata = bvh.animation.getBoneData(0);
364	951
365	952	os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
..	..	@@ -460,6 +1047,8 @@
460	1047	testvect.set(from);
461	1048	testvect.sub(fromto.from);
462	1049
	1050	+ testvect.y = 0; // PATCH
	1051	+
463	1052	int factor = 1;
464	1053
465	1054	//if (CameraPane.FAST)
..	..	@@ -501,6 +1090,8 @@
501	1090
502	1091	testvect.set(from);
503	1092	testvect.sub(fromto.from);
	1093	+
	1094	+ testvect.y = 0; // PATCH
504	1095
505	1096	int factor = 1;
506	1097
..	..	@@ -705,7 +1296,7 @@
705	1296	// skip first node: translation
706	1297	// Object3D b = input.get(0);
707	1298
708		- setPose(input, f, data.getBoneData(input._index), false); //, null);
	1299	+ setPose(input, f, data.getBoneData(input._index)); //, false); //, null);
709	1300	}
710	1301
711	1302	//mocap.figure.Bone[] children = b.getChildren();
..	..	@@ -736,6 +1327,7 @@
736	1327
737	1328	void SetPosition(Object3D sourcenode, cVector floor, long floorid, cVector centroid)
738	1329	{
	1330	+ assert(false);
739	1331	//assert(CameraPane.drawMode == CameraPane.SHADOW);
740	1332
741	1333	Object3D transformnode = new Object3D();
..	..	@@ -921,7 +1513,7 @@
921	1513	//groundz += sourcenode.parent.toParent[3][2] - posz;
922	1514	}
923	1515
924		- boolean footcontact = CameraPane.FOOTCONTACT; // false;
	1516	+ boolean footcontact = false; // CameraPane.FOOTCONTACT; // false;
925	1517
926	1518	if (footcontact && ground != -123456)
927	1519	{
..	..	@@ -939,9 +1531,9 @@
939	1531	groundid = floorid;
940	1532
941	1533	// green
942		- CameraPane.debugpoint.toParent[3][0] = groundx;
943		- CameraPane.debugpoint.toParent[3][1] = floor.y;
944		- 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;
945	1537
946	1538	if (true) // slow && stepout && onein)
947	1539	{
..	..	@@ -952,7 +1544,7 @@
952	1544	// mywave = currentwave++;
953	1545	// }
954	1546	// sound
955		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	1547	+ cVector eye = Globals.theRenderer.EyeCamera().location;
956	1548
957	1549	// if (sourcenode.parent.parent != null)
958	1550	// sourcenode.parent.parent.TransformToWorld(floor, tmp);
..	..	@@ -997,9 +1589,9 @@
997	1589	//GraphreeD.
998	1590	wav.play(volume * usedvolume); //, mywave);
999	1591
1000		- lastsoundtime = CameraPane.framecount;
	1592	+ lastsoundtime = Globals.framecount;
1001	1593
1002		- GrafreeD.hassound = true;
	1594	+ Grafreed.hassound = true;
1003	1595	}
1004	1596	// else
1005	1597	// System.out.println("skipped");
..	..	@@ -1018,9 +1610,9 @@
1018	1610
1019	1611	// System.out.println("Allo " + sourcenode);
1020	1612	// purple
1021		- CameraPane.debugpoint2.toParent[3][0] = floor.x;// + posx;
1022		- CameraPane.debugpoint2.toParent[3][1] = ground; // floor.y;// + sourcenode.parent.toParent[3][1];
1023		- 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;
1024	1616
1025	1617
1026	1618	if (false) // dist2 > 0.1)
..	..	@@ -1086,9 +1678,9 @@
1086	1678	this.get(0).TransformToWorld(v0);
1087	1679
1088	1680	// cyan
1089		- CameraPane.debugpoint3.toParent[3][0] = v0.x;
1090		- CameraPane.debugpoint3.toParent[3][1] = ground;
1091		- 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;
1092	1684
1093	1685	LA.matConcat(sourcenode.toParent, transformnode.toParent, sourcenode.toParent);
1094	1686	LA.matInvert(sourcenode.toParent, sourcenode.fromParent);
..	..	@@ -1098,9 +1690,9 @@
1098	1690	this.get(0).TransformToWorld(v0);
1099	1691
1100	1692	// red
1101		- CameraPane.debugpoint4.toParent[3][0] = v0.x;
1102		- CameraPane.debugpoint4.toParent[3][1] = ground;
1103		- 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;
1104	1696	}
1105	1697	}
1106	1698
..	..	@@ -1140,11 +1732,11 @@
1140	1732
1141	1733	if (goal != null)
1142	1734	{
1143		- System.err.println("GOAL change (" + sourcenode + "): " + goal + " (was " + goalx + ", " + goalz + ")");
	1735	+ System.err.println("GOAL change (" + sourcenode + "): " + goal + " (was " + goalposx + ", " + goalposz + ")");
1144	1736	//sourcenode.parent.parent.Dump();
1145		- goalx = goal.x;
1146		- goalz = goal.z;
1147		- targetx = targetz = 0;
	1737	+ goalposx = goal.x;
	1738	+ goalposz = goal.z;
	1739	+ targetdirx = targetdirz = 0;
1148	1740
1149	1741	followpath = true;
1150	1742	}
..	..	@@ -1195,16 +1787,16 @@
1195	1787	// }
1196	1788	if (false) // !uselast)
1197	1789	{
1198		- CameraPane.debugpoint.toParent[3][0] = dst.x;
1199		- CameraPane.debugpoint.toParent[3][1] = dst.y;
1200		- 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;
1201	1793	}
1202	1794	}
1203	1795
1204		- if (goalx != 0 \|\| goalz != 0) // TODO
	1796	+ if (goalposx != 0 \|\| goalposz != 0) // TODO
1205	1797	{
1206	1798	// overwrite speaker orientation
1207		- dst.set(goalx,0,goalz);
	1799	+ dst.set(goalposx,0,goalposz);
1208	1800	if (sourcenode.parent != null) // july 2014
1209	1801	sourcenode.parent.
1210	1802	TransformToLocal(dst);
..	..	@@ -1220,6 +1812,7 @@
1220	1812	src.x = 0;
1221	1813	src.y = 0;
1222	1814	src.z = 0;
	1815	+ LA.xformPos(src, get(0).get(0).toParent, src);
1223	1816	LA.xformPos(src, get(0).toParent, src);
1224	1817	LA.xformPos(src, toParent, src);
1225	1818	// LA.xformPos(src, rotsourcenode.toParent, src);
..	..	@@ -1255,26 +1848,26 @@
1255	1848	// mars 2014
1256	1849	if (false) // goalx != 0 \|\| goalz != 0)
1257	1850	{
1258		- targetx = dst.x - src.x;
1259		- targetz = dst.z - src.z;
	1851	+ targetdirx = dst.x - src.x;
	1852	+ targetdirz = dst.z - src.z;
1260	1853
1261		- if (Math.abs(targetx) > 0.1 \|\| Math.abs(targetz) > 0.1)
	1854	+ if (Math.abs(targetdirx) > 0.1 \|\| Math.abs(targetdirz) > 0.1)
1262	1855	{
1263	1856	// far enough from goal. keep the goal position.
1264		- targetx = 0;
1265		- targetz = 0;
	1857	+ targetdirx = 0;
	1858	+ targetdirz = 0;
1266	1859	}
1267	1860	else
1268	1861	{
1269	1862	// too close to goal. switch to target direction instead.
1270		- goalx = 0;
1271		- goalz = 0;
	1863	+ goalposx = 0;
	1864	+ goalposz = 0;
1272	1865	}
1273	1866	}
1274	1867
1275	1868	//sourcenode.getCentroid(src, true);
1276	1869
1277		- if (speakernode == sourcenode && goalx == 0 && goalz == 0)
	1870	+ if (speakernode == sourcenode && goalposx == 0 && goalposz == 0)
1278	1871	{
1279	1872	if (ScriptNode.lastspeaker != null)
1280	1873	new Exception().printStackTrace();
..	..	@@ -1283,13 +1876,13 @@
1283	1876
1284	1877	// LA.xformPos(src, fromParent, src);
1285	1878
1286		- 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)
1287	1880	dst.sub(src);
1288	1881	else
1289	1882	// vector mode
1290	1883	{
1291		- dst.x = targetx;
1292		- dst.z = targetz;
	1884	+ dst.x = targetdirx;
	1885	+ dst.z = targetdirz;
1293	1886
1294	1887	// TEST TARGET
1295	1888	// dst.x = CameraPane.selectedpoint.toParent[3][0];
..	..	@@ -1563,6 +2156,7 @@
1563	2156	toParent = LA.newMatrix();
1564	2157	fromParent = LA.newMatrix();
1565	2158	}
	2159	+
1566	2160	LA.matConcat(toParent, rotsourcenode.toParent, toParent);
1567	2161	LA.matInvert(toParent, fromParent);
1568	2162
..	..	@@ -1698,7 +2292,7 @@
1698	2292	}
1699	2293
1700	2294	if (!smoothed)
1701		- for (int i=4; --i>=0;)
	2295	+ for (int i=10; --i>=0;)
1702	2296	SmoothAnimData(); // much reduces shakiness
1703	2297
1704	2298	smoothed = true;
..	..	@@ -1736,9 +2330,16 @@
1736	2330	toVector.x = LA.cos(to);
1737	2331	toVector.y = LA.sin(to);
1738	2332
	2333	+ double fromA = Math.atan2(fromVector.y, fromVector.x);
	2334	+ double toA = Math.atan2(toVector.y, toVector.x);
	2335	+
1739	2336	Vector2d currentVector = Slerp(fromVector, toVector, step);
1740	2337
1741		- 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;
1742	2343	}
1743	2344
1744	2345	public static Vector2d Slerp(Vector2d from, Vector2d to, double step)
..	..	@@ -1780,12 +2381,28 @@
1780	2381	if (!live) // aout 2013
1781	2382	return;
1782	2383
1783		- cVector centroid = new cVector();
1784		- cVector floor = new cVector();
1785		-
1786		- Object3D sourcenode = GetFileRoot();
	2384	+ //bvh.skeleton.setPose(f, bvh.animation.getBoneData(bvh.skeleton.getIndex()), null);
	2385	+ try
	2386	+ {
	2387	+ SetPose(GetSkeleton(), bvh.animation, f);
	2388	+ SetCurrentBones(frame);
	2389	+ }
	2390	+ catch (Exception e)
	2391	+ {
	2392	+ e.printStackTrace();
	2393	+ }
1787	2394
1788		- boolean success; // = sourcenode.getCentroid(centroid);
	2395	+ SetHipOrientation();
	2396	+
	2397	+ if (true)
	2398	+ return;
	2399	+
	2400	+ cVector centroid = new cVector();
	2401	+ cVector floor = new cVector();
	2402	+
	2403	+ Object3D sourcenode = GetFileRoot();
	2404	+
	2405	+ boolean success; // = sourcenode.getCentroid(centroid);
1789	2406	// if (!success)
1790	2407	// {
1791	2408	// //assert(success);
..	..	@@ -1793,16 +2410,6 @@
1793	2410	// System.out.println("No centroid for " + sourcenode);
1794	2411	// }
1795	2412
1796		- //bvh.skeleton.setPose(f, bvh.animation.getBoneData(bvh.skeleton.getIndex()), null);
1797		- try
1798		- {
1799		- SetPose(GetSkeleton(), bvh.animation, f);
1800		- }
1801		- catch (Exception e)
1802		- {
1803		- e.printStackTrace();
1804		- }
1805		-
1806	2413	if (sourcenode.parent == null && sourcenode.fileparent == null)
1807	2414	{
1808	2415	// No GFD
..	..	@@ -2050,7 +2657,7 @@
2050	2657	* @param frame
2051	2658	* Frame number
2052	2659	*/
2053		- public void setPose(Object3D bone, int frame, float[] data, boolean fade) //, Point3d offsetTrans)
	2660	+ public void setPose(Object3D bone, int frame, float[] data) //, boolean fade) //, Point3d offsetTrans)
2054	2661	{
2055	2662	if (!live) // aout 2013
2056	2663	return;
..	..	@@ -2058,6 +2665,33 @@
2058	2665	cVector temp = new cVector();
2059	2666	cVector temp0 = new cVector();
2060	2667	double pos[] = new double[3];
	2668	+ double angleY = 0;
	2669	+ double sinY = 0;
	2670	+ double cosY = 0;
	2671	+
	2672	+ if (false) // bone._isRoot && firsttimeafterload && frame > 0)
	2673	+ {
	2674	+ bone.get(0).GlobalTransformInv();
	2675	+
	2676	+ temp.x = bone.get(0).globalTransform[3][0];
	2677	+ temp.y = bone.get(0).globalTransform[3][1];
	2678	+ temp.z = bone.get(0).globalTransform[3][2];
	2679	+
	2680	+ pos[0] = temp.x;
	2681	+ pos[1] = temp.y;
	2682	+ pos[2] = temp.z;
	2683	+
	2684	+ temp.x = 1;
	2685	+ temp.y = 0;
	2686	+ temp.z = 0;
	2687	+
	2688	+ LA.xformDir(temp, bone.get(0).globalTransform, temp);
	2689	+
	2690	+ sinY = temp.z;
	2691	+ cosY = temp.x;
	2692	+
	2693	+ angleY = Math.atan2(-sinY, cosY);
	2694	+ }
2061	2695
2062	2696	// Object3D obj = get(0);
2063	2697	// Object3D gp = this.parent;
..	..	@@ -2189,13 +2823,14 @@
2189	2823	if (//frame > 0 &&
2190	2824	!bone.skipmocap &&
2191	2825	!bone.name.contains("head") &&
	2826	+ !bone.name.contains("Head") // &&
2192	2827	// !bone.name.contains("rFoot") &&
2193	2828	// !bone.name.contains("lFoot") &&
2194		- !bone.name.contains("Pinky") &&
2195		- !bone.name.contains("Ring") &&
2196		- !bone.name.contains("Mid") &&
2197		- !bone.name.contains("Index") &&
2198		- !bone.name.contains("Thumb")
	2829	+// !bone.name.contains("Pinky") &&
	2830	+// !bone.name.contains("Ring") &&
	2831	+// !bone.name.contains("Mid") &&
	2832	+// !bone.name.contains("Index") &&
	2833	+// !bone.name.contains("Thumb")
2199	2834	)
2200	2835	{
2201	2836	//_rotTG.setTransform(_t1);
..	..	@@ -2228,15 +2863,17 @@
2228	2863	// CROWD
2229	2864	//cJ3D.GetTranslation(bone, _trans0);
2230	2865	//_trans.add(_trans0);
2231		- _transTF.setIdentity();
	2866	+ //_transTF.setIdentity();
	2867	+ _transTF.set(_t1);
2232	2868	_transTF.setTranslation(_trans);
2233	2869	// System.err.println("Translate: " + _transTF);
2234	2870	//_transTG.setTransform(_transTF);
2235		- cJ3D.ResetTransform(bone, _transTF, true); // translation node
	2871	+ cJ3D.ResetTransform(bone.get(0), _transTF, true); // translation node
	2872	+ //cJ3D.ResetTransform(bone, _transTF, true); // translation node
2236	2873	}
2237	2874	}
2238	2875
2239		- if (bone._isRoot && firsttimeafterload && frame > 0)
	2876	+ if (false) // bone._isRoot && firsttimeafterload && frame > 0)
2240	2877	{
2241	2878	assert(bone == get(0));
2242	2879
..	..	@@ -2252,17 +2889,17 @@
2252	2889	// LA.matConcat(originmatrixinv, tempmatrixinv, fromParent); // ABC * (B'*C')^-1
2253	2890	//
2254	2891
2255		- Invariants();
2256		- bone.Invariants();
2257		- bone.get(0).Invariants();
2258		- // if (origin == null)
2259		- // origin = null;
2260		- origin.Invariants();
2261		- origin0.Invariants();
	2892	+ Invariants();
	2893	+ bone.Invariants();
	2894	+ bone.get(0).Invariants();
	2895	+ // if (origin == null)
	2896	+ // origin = null;
	2897	+ origin.Invariants();
	2898	+ origin0.Invariants();
2262	2899
2263		-
2264		- LA.matConcat(bone.get(0).fromParent, bone.fromParent, tempmatrix); // B' * C'
2265		- LA.matConcat(origin.toParent, tempmatrix, toParent);
	2900	+
	2901	+//?? LA.matConcat(bone.get(0).fromParent, bone.fromParent, tempmatrix); // B' * C'
	2902	+//?? LA.matConcat(origin.toParent, tempmatrix, toParent);
2266	2903
2267	2904	// matrixToEulerXYZ(toParent, temp);
2268	2905	// matrixToEulerXYZ(bone.get(0).toParent, temp);
..	..	@@ -2296,7 +2933,7 @@
2296	2933	//
2297	2934	// mat4d.get(quat);
2298	2935
2299		- if (true) // hip correction
	2936	+ if (false) // hip correction
2300	2937	{
2301	2938	_t2.setIdentity();
2302	2939
..	..	@@ -2337,13 +2974,13 @@
2337	2974	//????? LA.matConcat(bone.get(0).toParent, bone.toParent, tempmatrix); // B' * C'
2338	2975	// LA.matConcat(origin.fromParent, tempmatrix, fromParent);
2339	2976
2340		- LA.matInvert(toParent, fromParent);
	2977	+//?? LA.matInvert(toParent, fromParent);
2341	2978
2342		- Invariants();
2343		- bone.Invariants();
2344		- bone.get(0).Invariants();
2345		- origin.Invariants();
2346		- origin0.Invariants();
	2979	+ Invariants();
	2980	+ bone.Invariants();
	2981	+ bone.get(0).Invariants();
	2982	+ origin.Invariants();
	2983	+ origin0.Invariants();
2347	2984
2348	2985	// LA.matInvert(fromParent, tempmatrix);
2349	2986	//
..	..	@@ -2364,33 +3001,39 @@
2364	3001	// temp.x = data[0];
2365	3002	// temp.y = data[1];
2366	3003	// temp.z = data[2];
2367		- LA.xformPos(temp, origin0.toParent, temp0);
	3004	+ LA.xformPos(temp, origin0.toParent, temp0); // NU
2368	3005
2369		-// bone.GlobalTransformInv();
2370		-
2371		- temp0.x = bone.globalTransform[3][0];
2372		- temp0.y = bone.globalTransform[3][1];
2373		- temp0.z = bone.globalTransform[3][2];
2374		-
	3006	+// bone.get(0).GlobalTransformInv();
	3007	+//
	3008	+// temp0.x = bone.get(0).globalTransform[3][0];
	3009	+// temp0.y = bone.get(0).globalTransform[3][1];
	3010	+// temp0.z = bone.get(0).globalTransform[3][2];
	3011	+//
2375	3012	// MEGA TEST // june 2014: necessary for precision? otherwise comment works
2376		-fromParent[3][0] = 0;
2377		-fromParent[3][1] = 0;
2378		-fromParent[3][2] = 0;
2379		-LA.matInvert(fromParent, toParent);
	3013	+//fromParent[3][0] = 0;
	3014	+//fromParent[3][1] = 0;
	3015	+//fromParent[3][2] = 0;
	3016	+//LA.matInvert(fromParent, toParent);
2380	3017
2381		- LA.xformPos(temp0, fromParent, temp);
	3018	+ LA.xformPos(temp0, fromParent, temp); // NU
2382	3019	//LA.xformPos(temp, bone.fromParent, temp);
2383	3020	// float[] data;
2384	3021
2385		- pos[0] = temp.x;
2386		- pos[1] = temp.y;
2387		- pos[2] = temp.z;
	3022	+// pos[0] = temp.x;
	3023	+// pos[1] = temp.y;
	3024	+// pos[2] = temp.z;
	3025	+//
	3026	+// temp.x = 1;
	3027	+// temp.y = 0;
	3028	+// temp.z = 0;
	3029	+//
	3030	+// LA.xformDir(temp, bone.get(0).globalTransform, temp);
2388	3031
2389	3032	// CameraPane.selectedpoint.toParent[3][0] = temp0.x;
2390	3033	// CameraPane.selectedpoint.toParent[3][1] = temp0.y;
2391	3034	// CameraPane.selectedpoint.toParent[3][2] = temp0.z;
2392	3035
2393		- int numframes = bvh.animation.getNumFrames();
	3036	+ int numframes = bvh.animation.getNumFrames();
2394	3037
2395	3038	int b = 0;
2396	3039	{
..	..	@@ -2398,12 +3041,12 @@
2398	3041
2399	3042	int dof = 6; /// data.length/numframes;
2400	3043
2401		- // july 2014
2402		- if (dof != data.length/numframes)
2403		- {
2404		- System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (data.length/numframes));
2405		- dof = data.length/numframes;
2406		- }
	3044	+ // july 2014
	3045	+ if (dof != data.length/numframes)
	3046	+ {
	3047	+ System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (data.length/numframes));
	3048	+ dof = data.length/numframes;
	3049	+ }
2407	3050
2408	3051
2409	3052	int theframe = 0; // baseframe;
..	..	@@ -2455,17 +3098,26 @@
2455	3098	// }
2456	3099	// }
2457	3100
2458		- data[f3 + i] += pos[i] - data[frame3 + i];
	3101	+ data[f3 + i] += /pos[i]/ - data[frame3 + i];
2459	3102
2460	3103	// if (f < 3)
2461	3104	// {
2462	3105	// System.out.print(data[f3 + i] + " ");
2463	3106	// }
2464	3107	}
2465		-// if (f < 3)
2466		-// {
2467		-// System.out.println();
2468		-// }
	3108	+
	3109	+ double t1 = data[f3 + 0];
	3110	+ double t2 = data[f3 + 2];
	3111	+
	3112	+ data[f3 + 0] = (float)(cosYt1 - sinYt2);
	3113	+ data[f3 + 2] = (float)(sinYt1 + cosYt2);
	3114	+
	3115	+ for (int i=3/dof/; --i>=0;)
	3116	+ {
	3117	+ data[f3 + i] += pos[i];
	3118	+ }
	3119	+
	3120	+ data[f3 + 4] += angleY - data[frame3 + 4];
2469	3121	}
2470	3122	}
2471	3123
..	..	@@ -2479,186 +3131,17 @@
2479	3131	// temp.y = data[1];
2480	3132	// temp.z = data[2];
2481	3133
2482		- if (fade && currentbones != null && !CameraPane.fullreset)
2483		- {
2484		- Quat4d quatstart = new Quat4d();
2485		- Quat4d quatend = new Quat4d();
2486		- Quat4d quat = new Quat4d();
2487		- Matrix4d mat4d = new Matrix4d();
2488		- double[][] rot = new double[4][4];
2489		-
2490		- for (b=numbones; --b>=1;) // HIP ROTATION: 0;)
2491		- {
2492		- int hipindex = get(0)._index;
2493		-
2494		-// assert(get(0).get(0)._isHip);
2495		-
2496		- // if (b == hipindex)
2497		- // continue;
2498		-
2499		- data = bvh.animation.getBoneData(b);
2500		-
2501		- int dof = 3; // data.length/numframes;
2502		-
2503		- // assert(dof == 3);
2504		-
2505		- int boneframe3 = b*3; // dof;
2506		-
2507		- // System.err.println("Bone #" + b + ": dof = " + dof);
2508		- int fadein = 45; // 120;
2509		-
2510		- // if (b == hipindex)
2511		- // fadein *= 5;
2512		-
2513		- if (fadein > numframes)
2514		- fadein = 0; // numframes;
2515		-
2516		- for (int fi=fadein; --fi>=0;)
2517		- //for (int f=numframes; --f>=0;)
2518		- {
2519		- int f = fi + GetFirstFrame();
2520		-
2521		- int f3 = f*dof;
2522		-
2523		- float k = fi;
2524		-
2525		- k /= fadein - 1;
2526		-
2527		- if (Float.isNaN(k))
2528		- k = 1; // 0/0
2529		-
2530		- k = (float) (-Math.cos(k*Math.PI));
2531		- k += 1;
2532		- k /= 2;
2533		-
2534		- int start = 3;
2535		- int end = 0;
2536		-
2537		- if (dof == 6)
2538		- {
2539		- start = 6;
2540		- end = 3;
2541		- }
2542		-
2543		- if (b == 0)
2544		- {
2545		- _t1.setIdentity();
2546		- _t2.setIdentity();
2547		- _t2.rotZ(currentbones[boneframe3 + start-1-end]);
2548		- _t1.mul(_t2);
2549		- _t2.setIdentity();
2550		- if (b == 0)
2551		- {
2552		- _t2.rotY(currentbones[boneframe3 + start-2-end]);
2553		- _t1.mul(_t2);
2554		- _t2.setIdentity();
2555		- _t2.rotX(currentbones[boneframe3 + start-3-end]);
2556		- }
2557		- else
2558		- {
2559		- _t2.rotX(currentbones[boneframe3 + start-2-end]);
2560		- _t1.mul(_t2);
2561		- _t2.setIdentity();
2562		- _t2.rotY(currentbones[boneframe3 + start-3-end]);
2563		- }
2564		- _t1.mul(_t2);
2565		- _t2.setIdentity();
2566		-
2567		- _t1.get(mat4d);
2568		-
2569		- mat4d.get(quatstart);
2570		-
2571		- _t1.setIdentity();
2572		- _t2.setIdentity();
2573		- _t2.rotZ(data[f3 + start-1]);
2574		- _t1.mul(_t2);
2575		- _t2.setIdentity();
2576		- if (b == 0)
2577		- {
2578		- _t2.rotY(data[f3 + start-2]);
2579		- _t1.mul(_t2);
2580		- _t2.setIdentity();
2581		- _t2.rotX(data[f3 + start-3]);
2582		- }
2583		- else
2584		- {
2585		- _t2.rotX(data[f3 + start-2]);
2586		- _t1.mul(_t2);
2587		- _t2.setIdentity();
2588		- _t2.rotY(data[f3 + start-3]);
2589		- }
2590		-
2591		- _t1.mul(_t2);
2592		- _t2.setIdentity();
2593		-
2594		- _t1.get(mat4d);
2595		-
2596		- mat4d.get(quatend);
2597		-
2598		- double dot = quatstart.x*quatend.x +
2599		- quatstart.y*quatend.y +
2600		- quatstart.z*quatend.z +
2601		- quatstart.w*quatend.w
2602		- ;
2603		-
2604		- if (dot < 0)
2605		- {
2606		- quatend.x *= -1;
2607		- quatend.y *= -1;
2608		- quatend.z *= -1;
2609		- quatend.w *= -1;
2610		- }
2611		-
2612		- // k = 1-k;
2613		-
2614		- quat.x = (1-k)quatstart.x + kquatend.x;
2615		- quat.y = (1-k)quatstart.y + kquatend.y;
2616		- quat.z = (1-k)quatstart.z + kquatend.z;
2617		- quat.w = (1-k)quatstart.w + kquatend.w;
2618		-
2619		- quat.normalize();
2620		-
2621		- mat4d.set(quat);
2622		-
2623		- cJ3D.SetTransform(rot, mat4d);
2624		-
2625		- matrixToEulerXYZ(rot, temp);
2626		-
2627		- data[f3 + start-1] = -(float)temp.z;
2628		-
2629		- if (b == 0)
2630		- {
2631		- data[f3 + start-2] = -(float)temp.y;
2632		- data[f3 + start-3] = -(float)temp.x;
2633		- }
2634		- else
2635		- {
2636		- data[f3 + start-2] = -(float)temp.x;
2637		- data[f3 + start-3] = -(float)temp.y;
2638		- }
2639		- }
2640		- else
2641		- {
2642		- for (int i=start; --i>=end;)
2643		- {
2644		- //data[f3 + i] += pos[i] - data[frame3 + i];
2645		- // data[f3 + i] = kdata[f3+i] + (1-k)
2646		- // currentbones[boneframe3 + i-end];
2647		- data[f3 + i] = (float)CurveAngle(data[f3+i], currentbones[boneframe3 + i-end], 1-k);
2648		- }
2649		- }
2650		-
2651		- }
2652		- }
2653		-
2654		- }
	3134	+// if (fade && currentbones != null && !CameraPane.fullreset)
	3135	+// {
	3136	+// Fade();
	3137	+// }
2655	3138	}
2656		-
	3139	+
2657	3140	if (false) // doesn't change anything bone._isRoot)
2658	3141	{
2659	3142	// Reset orientation
2660	3143	_t2.setIdentity();
2661		-
	3144	+
2662	3145	double tx = bone.toParent[3][0];
2663	3146	double ty = bone.toParent[3][1];
2664	3147	double tz = bone.toParent[3][2];
..	..	@@ -2667,9 +3150,9 @@
2667	3150	temp.y = 0;
2668	3151	temp.z = 0;
2669	3152	LA.xformDir(temp, bone.toParent, temp);
2670		-
	3153	+
2671	3154	double angle = Math.atan2(-temp.z, temp.x);
2672		-
	3155	+
2673	3156	_t2.rotY(angle);
2674	3157	// _t1.setIdentity();
2675	3158	// _t1.rotX(temp.x);
..	..	@@ -2682,56 +3165,21 @@
2682	3165	// _t1.setIdentity();
2683	3166	// _t1.rotZ(temp.z);
2684	3167	// _t2.mul(_t1);
2685		-
	3168	+
2686	3169	cJ3D.ResetTransform(bone, _t2, false);
2687		-
	3170	+
2688	3171	bone.toParent[3][0] = tx;
2689	3172	bone.toParent[3][1] = ty;
2690	3173	bone.toParent[3][2] = tz;
2691	3174	}
2692	3175	}
2693	3176
2694		- if (currentbones == null)
2695		- currentbones = new double[numbones*3];
2696		-
2697		- for (int b=numbones; --b>=1;) // 0;)
2698		- //int b = 0;
2699		- {
2700		- data = bvh.animation.getBoneData(b);
2701		-
2702		- int numframes = bvh.animation.getNumFrames();
2703		-
2704		- int dof = 6; // data.length/numframes;
2705		-
2706		- if (b > 0)
2707		- dof = 3;
2708		-
2709		- //assert(dof == 3);
2710		-
2711		- // System.err.println("Bone #" + b + ": dof = " + dof);
2712		- int theframe = // 1; // baseframe;
2713		- frame;
2714		-
2715		- int frame3 = theframe*dof;
2716		- int bone3 = b*3; // dof;
2717		-
2718		- int start = 3;
2719		- int end = 0;
2720		-
2721		- if (dof == 6)
2722		- {
2723		- start = 6;
2724		- end = 3;
2725		- }
2726		- for (int i=start; --i>=end;)
2727		- {
2728		- currentbones[bone3 + i-end] = data[frame3 + i];
2729		- }
2730		- }
	3177	+ // SetCurrentBones(frame);
2731	3178	}
2732	3179	}
2733	3180
2734		- static int offset = 1; // 5; // 10; // 5; // 100; // skip initial "T"
	3181	+ // skip initial "T"
	3182	+ static int offset = 1; // 5; // 10; // 5; // 100;
2735	3183
2736	3184	void ReadBVH()
2737	3185	{
..	..	@@ -2760,14 +3208,14 @@
2760	3208
2761	3209	void Reset()
2762	3210	{
2763		- if (fullname != null)
2764		- ReadBVH();
	3211	+// if (fullname != null)
	3212	+// ReadBVH();
2765	3213
2766	3214	Object3D hip = get(0);
2767	3215
2768	3216	// assert(obj.name.equals("hip"));
2769	3217
2770		- Object3D rot = hip.get(0);
	3218	+ //Object3D rot = hip.get(0);
2771	3219
2772	3220	// assert(obj.name == null); // .equals("hip#"));
2773	3221
..	..	@@ -2777,8 +3225,8 @@
2777	3225	hip.fromParent = LA.newMatrix();
2778	3226	}
2779	3227
2780		- hip.toParent[3][0] = hip.toParent[3][1] = hip.toParent[3][2] = 0;
2781		- hip.fromParent[3][0] = hip.fromParent[3][1] = hip.fromParent[3][2] = 0;
	3228	+ //hip.toParent[3][0] = hip.toParent[3][1] = hip.toParent[3][2] = 0;
	3229	+ //hip.fromParent[3][0] = hip.fromParent[3][1] = hip.fromParent[3][2] = 0;
2782	3230
2783	3231	if (toParent == null)
2784	3232	{
..	..	@@ -2790,26 +3238,29 @@
2790	3238	LA.matIdentity(fromParent);
2791	3239	// LA.matIdentity(hip.toParent);
2792	3240	// LA.matIdentity(hip.fromParent);
2793		- if (rot.toParent == null)
2794		- {
2795		- // june 2014
2796		- rot.toParent = LA.newMatrix();
2797		- rot.fromParent = LA.newMatrix();
2798		- }
2799		- LA.matIdentity(rot.toParent);
2800		- LA.matIdentity(rot.fromParent);
	3241	+// if (rot.toParent == null)
	3242	+// {
	3243	+// // june 2014
	3244	+// rot.toParent = LA.newMatrix();
	3245	+// rot.fromParent = LA.newMatrix();
	3246	+// }
	3247	+// LA.matIdentity(rot.toParent);
	3248	+// LA.matIdentity(rot.fromParent);
2801	3249
2802	3250	// july 2014
2803		- goalx = goalz = 0;
2804		- targetx = targetz = 0;
	3251	+// goalx = goalz = 0;
	3252	+ targetdirx = targetdirz = 0;
2805	3253
2806		- SetPositionDelta(true, true, true, false);
	3254	+ //SetPositionDelta(true, true, true, false);
	3255	+// LoadData();
	3256	+// Rewind();
2807	3257
2808	3258	baseframe = frame = 0; // T pose. No offset.
2809	3259
2810	3260	// aout 2013 endframe = 0; // june 2013
2811	3261
2812		- setPose(frame);
	3262	+ ResetZero();
	3263	+ //setPose(frame);
2813	3264	}
2814	3265
2815	3266	static int mocapsupport = 0;
..	..	@@ -2827,12 +3278,13 @@
2827	3278
2828	3279	int step = 1;
2829	3280
	3281	+ // patch for running hare
2830	3282	if (speedup) // fev 2014
2831	3283	step *= 2; // 4;
2832	3284	if (rewind) // mars 2014
2833	3285	step *= 4;
2834	3286
2835		- if (CameraPane.FAST) // && !CameraPane.HOLD)
	3287	+ //if (CameraPane.FAST) // && !CameraPane.HOLD)
2836	3288	step *= CameraPane.STEP;
2837	3289
2838	3290	//System.err.println("Step Mocap frame # " + frame);
..	..	@@ -2840,7 +3292,7 @@
2840	3292	baseframe += step;
2841	3293
2842	3294	//frame = baseframe;
2843		- frame += step;
	3295	+ //frame += step;
2844	3296
2845	3297	// if (frame != baseframe)
2846	3298	// {
..	..	@@ -2864,7 +3316,7 @@
2864	3316	"; fullname = " + fullname);
2865	3317
2866	3318	//int delta = frame - baseframe;
2867		- if (CameraPane.CROWD)
	3319	+ if (Globals.CROWD)
2868	3320	{
2869	3321	baseframe = GetFirstFrame(); // 0 initial point
2870	3322	}
..	..	@@ -2873,29 +3325,53 @@
2873	3325	// SetPositionDelta(false, true, false); // ?? false);
2874	3326	{
2875	3327	if (support == null)
2876		- ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
2877		- else
2878	3328	{
2879		- try
	3329	+ if (bvh == null && new File(fullname).exists())
	3330	+ ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
	3331	+ else
2880	3332	{
2881		- bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
2882		-
2883		- SetPositionDelta(false, true, true, true);
2884		- }
2885		- catch (Exception e)
2886		- {
2887		- e.printStackTrace();
2888		- ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
	3333	+ SetGlobalTransform();
	3334	+ Rewind();
	3335	+ Fade();
2889	3336	}
2890	3337	}
	3338	+ else
	3339	+ {
	3340	+// try
	3341	+// {
	3342	+ bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
	3343	+
	3344	+ // SetPositionDelta(false, true, true, true);
	3345	+ LoadData();
	3346	+ Rewind();
	3347	+ Fade();
	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	+// }
	3362	+ }
2891	3363	}
	3364	+
	3365	+ frame = GetFirstFrame();
2892	3366	}
	3367	+ else
	3368	+ frame += step;
2893	3369
2894	3370	//SetPositionDelta(false);
2895	3371
2896		- if (frame >= bvh.animation.getNumFrames())
2897		- //baseframe =
2898		- frame = GetFirstFrame(); // 0; // offset; // initial point
	3372	+// if (frame >= bvh.animation.getNumFrames())
	3373	+// //baseframe =
	3374	+// frame = GetFirstFrame(); // 0; // offset; // initial point
2899	3375
2900	3376	//System.err.println("frame = " + frame);
2901	3377	if (lastframe != 0)
..	..	@@ -3064,6 +3540,7 @@
3064	3540	// filters out bad input data
3065	3541	void FilterAnimData()
3066	3542	{
	3543	+ new Exception().printStackTrace();
3067	3544	System.exit(0);
3068	3545
3069	3546	float[] data; // = bvh.animation.getBoneData(0);
..	..	@@ -3193,6 +3670,8 @@
3193	3670	//static
3194	3671	transient
3195	3672	double[] currentbones;
	3673	+ double[] currenthip;
	3674	+
3196	3675	transient boolean inbetween;
3197	3676
3198	3677	void SetPositionDelta(boolean reset, boolean rewind, boolean load, boolean fade)
..	..	@@ -3203,38 +3682,9 @@
3203	3682	//assert(dim == numframes*6);
3204	3683
3205	3684	if (load)
3206		- for (int b=numbones; --b>=0;)
3207		- //int b = 0;
3208		- {
3209		- float[] thedata = bvh.animation.getBoneData(b);
3210		-
3211		- int numframes = bvh.animation.getNumFrames();
3212		-
3213		- int dof = 6; // thedata.length/numframes;
3214		-
3215		- if (b > 0)
3216		- dof = 3;
3217		-
3218		- if (dof != thedata.length/numframes)
3219		- {
3220		- System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (thedata.length/numframes));
3221		- dof = thedata.length/numframes;
3222		- }
3223		-
3224		- //for (int f=numframes; --f>=offset;)
3225		- int firstframe = GetFirstFrame();
3226		- for (int f=0; f<numframes-firstframe; f++)
3227		- {
3228		- int f3 = f*dof;
3229		-
3230		- //for (int i=3/dof/; --i>=0;)
3231		- for (int i=dof; --i>=0;)
3232		- {
3233		- //thedata[f3 + i] += thedata[i] - thedata[offset*dof + i];
3234		- thedata[f3 + i] = thedata[f3 + firstframe*dof + i];
3235		- }
3236		- }
3237		- }
	3685	+ {
	3686	+ LoadData();
	3687	+ }
3238	3688
3239	3689	// assert(thedata[0] == 0);
3240	3690	// assert(thedata[1] == 0);
..	..	@@ -3244,11 +3694,11 @@
3244	3694	// assert(thedata[7] == 0);
3245	3695	// assert(thedata[8] == 0);
3246	3696
3247		- Object3D obj = get(0);
	3697	+ Object3D hip = get(0);
3248	3698
3249	3699	// assert(obj.name.equals("hip"));
3250	3700
3251		- Object3D rot = obj.get(0);
	3701	+ Object3D rot = hip.get(0);
3252	3702
3253	3703	// if (toParent == null)
3254	3704	// {
..	..	@@ -3260,7 +3710,7 @@
3260	3710	// // assert(obj.name == null); // .equals("hip#"));
3261	3711
3262	3712	Invariants();
3263		- obj.Invariants();
	3713	+ hip.Invariants();
3264	3714	rot.Invariants();
3265	3715
3266	3716	if (origin == null)
..	..	@@ -3281,16 +3731,16 @@
3281	3731	fromParent = LA.newMatrix();
3282	3732	}
3283	3733
3284		- if (obj.toParent == null) // june 2014
	3734	+ if (hip.toParent == null) // june 2014
3285	3735	{
3286		- obj.toParent = LA.newMatrix();
3287		- obj.fromParent = LA.newMatrix();
	3736	+ hip.toParent = LA.newMatrix();
	3737	+ hip.fromParent = LA.newMatrix();
3288	3738	}
3289	3739
3290		- LA.matConcat(toParent, obj.toParent, origin0.toParent); // AB
	3740	+ LA.matConcat(toParent, hip.toParent, origin0.toParent); // AB
3291	3741	Object3D gp = this.parent;
3292	3742	this.parent = null;
3293		- obj.GlobalTransformInv();
	3743	+ hip.GlobalTransformInv();
3294	3744	this.parent = gp;
3295	3745
3296	3746	if (rot.toParent == null)
..	..	@@ -3313,41 +3763,41 @@
3313	3763	LA.matInvert(origin.toParent, origin.fromParent);
3314	3764
3315	3765	Invariants();
3316		- obj.Invariants();
	3766	+ hip.Invariants();
3317	3767	rot.Invariants();
3318	3768	origin.Invariants();
3319	3769	origin0.Invariants();
3320	3770
3321		- firsttimeafterload = true;
	3771	+ firsttimeafterload = false; // true;
3322	3772
3323	3773	if (rewind)
3324	3774	Rewind();
3325	3775
3326		- setPose(obj, frame, bvh.animation.getBoneData(obj._index), fade);
	3776	+ setPose(hip, frame, bvh.animation.getBoneData(hip._index)); //, fade);
3327	3777
3328		- if (true)
3329		- return;
	3778	+ if (true)
	3779	+ return;
3330	3780
3331	3781	double pos[] = new double[6];
3332	3782
3333	3783	if (!reset)
3334	3784	{
3335		- assert(obj.tx == obj.toParent[3][0]);
3336		- assert(obj.ty == obj.toParent[3][1]);
3337		- assert(obj.tz == obj.toParent[3][2]);
	3785	+ assert(hip.tx == hip.toParent[3][0]);
	3786	+ assert(hip.ty == hip.toParent[3][1]);
	3787	+ assert(hip.tz == hip.toParent[3][2]);
3338	3788
3339		- pos[0] = obj.tx; // obj.toParent[3][0];
3340		- pos[1] = obj.ty; // obj.toParent[3][1];
3341		- pos[2] = obj.tz; // obj.toParent[3][2];
3342		- pos[3] = obj.rz;
3343		- pos[4] = obj.ry;
3344		- pos[5] = obj.rx;
	3789	+ pos[0] = hip.tx; // obj.toParent[3][0];
	3790	+ pos[1] = hip.ty; // obj.toParent[3][1];
	3791	+ pos[2] = hip.tz; // obj.toParent[3][2];
	3792	+ pos[3] = hip.rz;
	3793	+ pos[4] = hip.ry;
	3794	+ pos[5] = hip.rx;
3345	3795	}
3346	3796
3347	3797	cVector temp = new cVector();
3348		- temp.x = obj.globalTransform[3][0];
3349		- temp.y = obj.globalTransform[3][1];
3350		- temp.z = obj.globalTransform[3][2];
	3798	+ temp.x = hip.globalTransform[3][0];
	3799	+ temp.y = hip.globalTransform[3][1];
	3800	+ temp.z = hip.globalTransform[3][2];
3351	3801	// LA.xformPos(temp, origin0.toParent, temp);
3352	3802	// System.err.println("POS0 = " + temp.x + ", " + temp.y + ", " + temp.z + ";");
3353	3803
..	..	@@ -3431,7 +3881,7 @@
3431	3881	}
3432	3882
3433	3883	// Rewind();
3434		- setPose(obj, frame, bvh.animation.getBoneData(obj._index), true);
	3884	+ setPose(hip, frame, bvh.animation.getBoneData(hip._index)); // , true);
3435	3885	}
3436	3886
3437	3887	void Rewind()
..	..	@@ -3448,7 +3898,7 @@
3448	3898
3449	3899	transient boolean restarted; // CROWD issue?
3450	3900
3451		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	3901	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
3452	3902	{
3453	3903	//System.err.println("drawSelf Mocap frame # " + frame);
3454	3904	//System.err.println("drawSelf Mocap baseframe # " + baseframe);
..	..	@@ -3465,17 +3915,22 @@
3465	3915	// if (firstframe)
3466	3916	// return;
3467	3917
3468		- if (!restarted && /display.restartframe &&/
3469		- 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))
3470	3920	{
3471	3921	//display.restartframe = false;
3472	3922	restarted = true;
	3923	+ //System.err.println("restarted = true");
3473	3924	Step();
3474	3925	}
3475	3926	else
3476	3927	{
3477		- if (display.isLIVE() && live && display.drawMode != display.SHADOW)
	3928	+ //System.err.println("restarted");
	3929	+ if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
	3930	+ {
3478	3931	restarted = false;
	3932	+ //System.err.println("restarted = false");
	3933	+ }
3479	3934	}
3480	3935
3481	3936	super.drawSelf(display, root, selected, blocked);