~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -26,6 +26,544 @@
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.debugpoint.toParent[3][0] = poship.x;
	265	+ CameraPane.debugpoint.toParent[3][1] = poship.y;
	266	+ CameraPane.debugpoint.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.debugpoint2.toParent[3][0] = pos.x;
	328	+ CameraPane.debugpoint2.toParent[3][1] = pos.y;
	329	+ CameraPane.debugpoint2.toParent[3][2] = pos.z;
	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;
	334	+
	335	+ poship.x = toParent[3][0];
	336	+ poship.y = toParent[3][1];
	337	+ poship.z = toParent[3][2];
	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;
	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	+ void SetHipOrientation()
	481	+ {
	482	+ Object3D hip = get(0);
	483	+
	484	+ LA.matConcat(toParent, hip.get(0).toParent, matrix);
	485	+
	486	+ cVector centroid = new cVector();
	487	+ centroid.x = matrix[3][0];
	488	+ centroid.y = matrix[3][1];
	489	+ centroid.z = matrix[3][2];
	490	+ this.getCentroid(centroid, true);
	491	+
	492	+ cVector goal = GetGoal(centroid);
	493	+ if (goal != null)
	494	+ {
	495	+ System.err.println("GOAL change (" + this + "): " + goal + " (was " + goalx + ", " + goalz + ")");
	496	+
	497	+ goalx = goal.x;
	498	+ goalz = goal.z;
	499	+ targetx = targetz = 0;
	500	+ }
	501	+
	502	+ if (goalx == 0 && goalz == 0)
	503	+ {
	504	+ // No target
	505	+ if (ScriptNode.speaker != null)
	506	+ {
	507	+ Object3D sourcenode = GetFileRoot();
	508	+ Object3D speakernode = ScriptNode.speaker.GetFileRoot();
	509	+
	510	+ //System.err.println("speaker is " + speakernode + "; last was " + ScriptNode.lastspeaker);
	511	+
	512	+ Object3D speaker = ScriptNode.speaker;
	513	+
	514	+ if (speakernode == sourcenode)
	515	+ {
	516	+ if (ScriptNode.lastspeaker != null)
	517	+ {
	518	+ speakernode = ScriptNode.lastspeaker.GetFileRoot();
	519	+ speaker = ScriptNode.lastspeaker;
	520	+ }
	521	+ else
	522	+ return;
	523	+ }
	524	+
	525	+ cVector dst = new cVector();
	526	+
	527	+ boolean success = speakernode.getCentroid(dst); // , true);
	528	+
	529	+ if (!success)
	530	+ new Exception().printStackTrace();
	531	+
	532	+ //speakernode.parent.TransformToWorld(dst);
	533	+ //sourcenode.parent.TransformToLocal(dst);
	534	+ this.parent.TransformToLocal(dst);
	535	+
	536	+ goalx = dst.x;
	537	+ goalz = dst.z;
	538	+ }
	539	+ else
	540	+ return;
	541	+ }
	542	+
	543	+ cVector temp = new cVector();
	544	+
	545	+ temp.x = 1;
	546	+ temp.y = 0;
	547	+ temp.z = 0;
	548	+
	549	+ LA.xformDir(temp, matrix, temp);
	550	+
	551	+ double angleYhip = Math.atan2(-temp.z, temp.x);
	552	+
	553	+ double angleYtarget = Math.atan2(goalx - centroid.x, goalz - centroid.z);
	554	+
	555	+ LA.matIdentity(matrix);
	556	+ LA.matTranslate(matrix, -centroid.x, -centroid.y, -centroid.z);
	557	+ double angle = CurveAngle(0, angleYtarget - angleYhip, 1); // 0.1f);
	558	+ LA.matYRotate(matrix, angle);
	559	+ LA.matTranslate(matrix, centroid.x, centroid.y, centroid.z);
	560	+
	561	+ LA.matConcat(matrix, toParent, toParent);
	562	+
	563	+ LA.matInvert(toParent, fromParent);
	564	+
	565	+ CheckForAction(centroid);
	566	+ }
29	567
30	568	void WriteTo(java.io.Writer writer) throws Exception
31	569	{
..	..	@@ -102,8 +640,8 @@
102	640	double targetx;
103	641	double targetz;
104	642
105		- double goalx;
106		- double goalz;
	643	+ double goalx = -20;
	644	+ double goalz = -10;
107	645
108	646	boolean followpath;
109	647
..	..	@@ -359,7 +897,7 @@
359	897	// //GetFileRoot();
360	898
361	899	// sept 2014: //
362		- GraphreeD.RENDERME = 3; // patch for Merge objects
	900	+ GrafreeD.RENDERME = 3; // patch for Merge objects
363	901	float[] thedata = bvh.animation.getBoneData(0);
364	902
365	903	os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
..	..	@@ -460,6 +998,8 @@
460	998	testvect.set(from);
461	999	testvect.sub(fromto.from);
462	1000
	1001	+ testvect.y = 0; // PATCH
	1002	+
463	1003	int factor = 1;
464	1004
465	1005	//if (CameraPane.FAST)
..	..	@@ -501,6 +1041,8 @@
501	1041
502	1042	testvect.set(from);
503	1043	testvect.sub(fromto.from);
	1044	+
	1045	+ testvect.y = 0; // PATCH
504	1046
505	1047	int factor = 1;
506	1048
..	..	@@ -705,7 +1247,7 @@
705	1247	// skip first node: translation
706	1248	// Object3D b = input.get(0);
707	1249
708		- setPose(input, f, data.getBoneData(input._index), false); //, null);
	1250	+ setPose(input, f, data.getBoneData(input._index)); //, false); //, null);
709	1251	}
710	1252
711	1253	//mocap.figure.Bone[] children = b.getChildren();
..	..	@@ -754,7 +1296,7 @@
754	1296	//long
755	1297	// june 2014 floorid = sourcenode.getFloor(floor); // , sourcenode.parent);
756	1298
757		- CameraPane.debugpoints[0].name = "Floor = " + floorid;
	1299	+ CameraPane.debugpoints[0].name = ""; // "Floor = " + 0; // floorid;
758	1300	CameraPane.debugpoints[0].toParent[3][0] = floor.x;
759	1301	CameraPane.debugpoints[0].toParent[3][1] = floor.y;
760	1302	CameraPane.debugpoints[0].toParent[3][2] = floor.z;
..	..	@@ -770,7 +1312,7 @@
770	1312
771	1313	this.count--; // currently drawing itself
772	1314
773		- CameraPane.debugpoints[7].name = "Centroid = " + groundid; // centroid;
	1315	+ CameraPane.debugpoints[7].name = ""; // Centroid = " + 0; // groundid; // centroid;
774	1316	CameraPane.debugpoints[7].toParent[3][0] = centroid.x;
775	1317	CameraPane.debugpoints[7].toParent[3][1] = centroid.y;
776	1318	CameraPane.debugpoints[7].toParent[3][2] = centroid.z;
..	..	@@ -795,7 +1337,7 @@
795	1337
796	1338	// jan 2014 sourcenode.parent.TransformToWorld(tmp);
797	1339
798		- CameraPane.debugpoints[1].name = "C+";
	1340	+ CameraPane.debugpoints[1].name = ""; // "C+";
799	1341	CameraPane.debugpoints[1].toParent[3][0] = tmp.x;
800	1342	CameraPane.debugpoints[1].toParent[3][1] = tmp.y;
801	1343	CameraPane.debugpoints[1].toParent[3][2] = tmp.z;
..	..	@@ -814,7 +1356,7 @@
814	1356	tmp.z = pinz;
815	1357	}
816	1358
817		- CameraPane.debugpoints[2].name = "Pin";
	1359	+ CameraPane.debugpoints[2].name = ""; // "Pin";
818	1360	CameraPane.debugpoints[2].toParent[3][0] = tmp.x;
819	1361	CameraPane.debugpoints[2].toParent[3][1] = tmp.y;
820	1362	CameraPane.debugpoints[2].toParent[3][2] = tmp.z;
..	..	@@ -822,7 +1364,7 @@
822	1364	//if (sourcenode.parent.parent != null)
823	1365	// jan 2014 sourcenode.parent.TransformToLocal(tmp); //, tmp);
824	1366
825		- CameraPane.debugpoints[3].name = "C-";
	1367	+ CameraPane.debugpoints[3].name = ""; // "C-";
826	1368	CameraPane.debugpoints[3].toParent[3][0] = tmp.x;
827	1369	CameraPane.debugpoints[3].toParent[3][1] = tmp.y;
828	1370	CameraPane.debugpoints[3].toParent[3][2] = tmp.z;
..	..	@@ -895,14 +1437,14 @@
895	1437	// if (sourcenode.parent.parent != null)
896	1438	// sourcenode.parent.parent.TransformToWorld(floor); //, floor);
897	1439
898		- CameraPane.debugpoints[5].name = "F++";
	1440	+ CameraPane.debugpoints[5].name = ""; // "F++";
899	1441	CameraPane.debugpoints[5].toParent[3][0] = floor.x;
900	1442	CameraPane.debugpoints[5].toParent[3][1] = floor.y;
901	1443	CameraPane.debugpoints[5].toParent[3][2] = floor.z;
902	1444
903	1445	floor.y = tempg;
904	1446
905		- CameraPane.debugpoints[6].name = "F+-";
	1447	+ CameraPane.debugpoints[6].name = ""; // "F+-";
906	1448	CameraPane.debugpoints[6].toParent[3][0] = floor.x;
907	1449	CameraPane.debugpoints[6].toParent[3][1] = floor.y;
908	1450	CameraPane.debugpoints[6].toParent[3][2] = floor.z;
..	..	@@ -921,7 +1463,7 @@
921	1463	//groundz += sourcenode.parent.toParent[3][2] - posz;
922	1464	}
923	1465
924		- boolean footcontact = CameraPane.FOOTCONTACT; // false;
	1466	+ boolean footcontact = false; // CameraPane.FOOTCONTACT; // false;
925	1467
926	1468	if (footcontact && ground != -123456)
927	1469	{
..	..	@@ -938,6 +1480,7 @@
938	1480
939	1481	groundid = floorid;
940	1482
	1483	+ // green
941	1484	CameraPane.debugpoint.toParent[3][0] = groundx;
942	1485	CameraPane.debugpoint.toParent[3][1] = floor.y;
943	1486	CameraPane.debugpoint.toParent[3][2] = groundz;
..	..	@@ -998,7 +1541,7 @@
998	1541
999	1542	lastsoundtime = CameraPane.framecount;
1000	1543
1001		- GraphreeD.hassound = true;
	1544	+ GrafreeD.hassound = true;
1002	1545	}
1003	1546	// else
1004	1547	// System.out.println("skipped");
..	..	@@ -1016,6 +1559,7 @@
1016	1559	// floor.z += posz;
1017	1560
1018	1561	// System.out.println("Allo " + sourcenode);
	1562	+ // purple
1019	1563	CameraPane.debugpoint2.toParent[3][0] = floor.x;// + posx;
1020	1564	CameraPane.debugpoint2.toParent[3][1] = ground; // floor.y;// + sourcenode.parent.toParent[3][1];
1021	1565	CameraPane.debugpoint2.toParent[3][2] = floor.z;// + posz;
..	..	@@ -1052,7 +1596,7 @@
1052	1596	v0.z = groundz - floor.z;
1053	1597
1054	1598	double distance = Math.sqrt(v0.dot(v0));
1055		- double maxdist = 0.004;
	1599	+ double maxdist = 0.04;
1056	1600
1057	1601	if (distance > maxdist)
1058	1602	{
..	..	@@ -1078,8 +1622,27 @@
1078	1622	sourcenode.toParent = LA.newMatrix();
1079	1623	sourcenode.fromParent = LA.newMatrix();
1080	1624	}
	1625	+
	1626	+ v0.x = v0.z = 0;
	1627	+
	1628	+ this.get(0).TransformToWorld(v0);
	1629	+
	1630	+ // cyan
	1631	+ CameraPane.debugpoint3.toParent[3][0] = v0.x;
	1632	+ CameraPane.debugpoint3.toParent[3][1] = ground;
	1633	+ CameraPane.debugpoint3.toParent[3][2] = v0.z;
	1634	+
1081	1635	LA.matConcat(sourcenode.toParent, transformnode.toParent, sourcenode.toParent);
1082	1636	LA.matInvert(sourcenode.toParent, sourcenode.fromParent);
	1637	+
	1638	+ v0.x = v0.z = 0;
	1639	+
	1640	+ this.get(0).TransformToWorld(v0);
	1641	+
	1642	+ // red
	1643	+ CameraPane.debugpoint4.toParent[3][0] = v0.x;
	1644	+ CameraPane.debugpoint4.toParent[3][1] = ground;
	1645	+ CameraPane.debugpoint4.toParent[3][2] = v0.z;
1083	1646	}
1084	1647	}
1085	1648
..	..	@@ -1199,6 +1762,7 @@
1199	1762	src.x = 0;
1200	1763	src.y = 0;
1201	1764	src.z = 0;
	1765	+ LA.xformPos(src, get(0).get(0).toParent, src);
1202	1766	LA.xformPos(src, get(0).toParent, src);
1203	1767	LA.xformPos(src, toParent, src);
1204	1768	// LA.xformPos(src, rotsourcenode.toParent, src);
..	..	@@ -1318,7 +1882,7 @@
1318	1882
1319	1883	rotsourcenode.TransformToWorld(test);
1320	1884
1321		- CameraPane.debugpoints[4].name = "ROT = "; // + test;
	1885	+ CameraPane.debugpoints[4].name = ""; // "ROT = "; // + test;
1322	1886	CameraPane.debugpoints[4].toParent[3][0] = test.x;
1323	1887	CameraPane.debugpoints[4].toParent[3][1] = test.y;
1324	1888	CameraPane.debugpoints[4].toParent[3][2] = test.z;
..	..	@@ -1542,6 +2106,7 @@
1542	2106	toParent = LA.newMatrix();
1543	2107	fromParent = LA.newMatrix();
1544	2108	}
	2109	+
1545	2110	LA.matConcat(toParent, rotsourcenode.toParent, toParent);
1546	2111	LA.matInvert(toParent, fromParent);
1547	2112
..	..	@@ -1677,7 +2242,7 @@
1677	2242	}
1678	2243
1679	2244	if (!smoothed)
1680		- for (int i=4; --i>=0;)
	2245	+ for (int i=0; --i>=0;)
1681	2246	SmoothAnimData(); // much reduces shakiness
1682	2247
1683	2248	smoothed = true;
..	..	@@ -1759,12 +2324,28 @@
1759	2324	if (!live) // aout 2013
1760	2325	return;
1761	2326
1762		- cVector centroid = new cVector();
1763		- cVector floor = new cVector();
1764		-
1765		- Object3D sourcenode = GetFileRoot();
	2327	+ //bvh.skeleton.setPose(f, bvh.animation.getBoneData(bvh.skeleton.getIndex()), null);
	2328	+ try
	2329	+ {
	2330	+ SetPose(GetSkeleton(), bvh.animation, f);
	2331	+ SetCurrentBones(frame);
	2332	+ }
	2333	+ catch (Exception e)
	2334	+ {
	2335	+ e.printStackTrace();
	2336	+ }
1766	2337
1767		- boolean success; // = sourcenode.getCentroid(centroid);
	2338	+ SetHipOrientation();
	2339	+
	2340	+ if (true)
	2341	+ return;
	2342	+
	2343	+ cVector centroid = new cVector();
	2344	+ cVector floor = new cVector();
	2345	+
	2346	+ Object3D sourcenode = GetFileRoot();
	2347	+
	2348	+ boolean success; // = sourcenode.getCentroid(centroid);
1768	2349	// if (!success)
1769	2350	// {
1770	2351	// //assert(success);
..	..	@@ -1772,16 +2353,6 @@
1772	2353	// System.out.println("No centroid for " + sourcenode);
1773	2354	// }
1774	2355
1775		- //bvh.skeleton.setPose(f, bvh.animation.getBoneData(bvh.skeleton.getIndex()), null);
1776		- try
1777		- {
1778		- SetPose(GetSkeleton(), bvh.animation, f);
1779		- }
1780		- catch (Exception e)
1781		- {
1782		- e.printStackTrace();
1783		- }
1784		-
1785	2356	if (sourcenode.parent == null && sourcenode.fileparent == null)
1786	2357	{
1787	2358	// No GFD
..	..	@@ -1835,7 +2406,7 @@
1835	2406	{
1836	2407	SetRotation(sourcenode, new cVector(floor), new cVector(centroid));
1837	2408	}
1838		-
	2409	+
1839	2410	if (setposition)
1840	2411	{
1841	2412	if (floorobject != null)
..	..	@@ -2029,7 +2600,7 @@
2029	2600	* @param frame
2030	2601	* Frame number
2031	2602	*/
2032		- public void setPose(Object3D bone, int frame, float[] data, boolean fade) //, Point3d offsetTrans)
	2603	+ public void setPose(Object3D bone, int frame, float[] data) //, boolean fade) //, Point3d offsetTrans)
2033	2604	{
2034	2605	if (!live) // aout 2013
2035	2606	return;
..	..	@@ -2037,6 +2608,33 @@
2037	2608	cVector temp = new cVector();
2038	2609	cVector temp0 = new cVector();
2039	2610	double pos[] = new double[3];
	2611	+ double angleY = 0;
	2612	+ double sinY = 0;
	2613	+ double cosY = 0;
	2614	+
	2615	+ if (false) // bone._isRoot && firsttimeafterload && frame > 0)
	2616	+ {
	2617	+ bone.get(0).GlobalTransformInv();
	2618	+
	2619	+ temp.x = bone.get(0).globalTransform[3][0];
	2620	+ temp.y = bone.get(0).globalTransform[3][1];
	2621	+ temp.z = bone.get(0).globalTransform[3][2];
	2622	+
	2623	+ pos[0] = temp.x;
	2624	+ pos[1] = temp.y;
	2625	+ pos[2] = temp.z;
	2626	+
	2627	+ temp.x = 1;
	2628	+ temp.y = 0;
	2629	+ temp.z = 0;
	2630	+
	2631	+ LA.xformDir(temp, bone.get(0).globalTransform, temp);
	2632	+
	2633	+ sinY = temp.z;
	2634	+ cosY = temp.x;
	2635	+
	2636	+ angleY = Math.atan2(-sinY, cosY);
	2637	+ }
2040	2638
2041	2639	// Object3D obj = get(0);
2042	2640	// Object3D gp = this.parent;
..	..	@@ -2167,14 +2765,14 @@
2167	2765	//if (bone._rotationEnabled)
2168	2766	if (//frame > 0 &&
2169	2767	!bone.skipmocap &&
2170		- !bone.name.contains("head") &&
	2768	+ !bone.name.contains("head") // &&
2171	2769	// !bone.name.contains("rFoot") &&
2172	2770	// !bone.name.contains("lFoot") &&
2173		- !bone.name.contains("Pinky") &&
2174		- !bone.name.contains("Ring") &&
2175		- !bone.name.contains("Mid") &&
2176		- !bone.name.contains("Index") &&
2177		- !bone.name.contains("Thumb")
	2771	+// !bone.name.contains("Pinky") &&
	2772	+// !bone.name.contains("Ring") &&
	2773	+// !bone.name.contains("Mid") &&
	2774	+// !bone.name.contains("Index") &&
	2775	+// !bone.name.contains("Thumb")
2178	2776	)
2179	2777	{
2180	2778	//_rotTG.setTransform(_t1);
..	..	@@ -2207,15 +2805,17 @@
2207	2805	// CROWD
2208	2806	//cJ3D.GetTranslation(bone, _trans0);
2209	2807	//_trans.add(_trans0);
2210		- _transTF.setIdentity();
	2808	+ //_transTF.setIdentity();
	2809	+ _transTF.set(_t1);
2211	2810	_transTF.setTranslation(_trans);
2212	2811	// System.err.println("Translate: " + _transTF);
2213	2812	//_transTG.setTransform(_transTF);
2214		- cJ3D.ResetTransform(bone, _transTF, true); // translation node
	2813	+ cJ3D.ResetTransform(bone.get(0), _transTF, true); // translation node
	2814	+ //cJ3D.ResetTransform(bone, _transTF, true); // translation node
2215	2815	}
2216	2816	}
2217	2817
2218		- if (bone._isRoot && firsttimeafterload && frame > 0)
	2818	+ if (false) // bone._isRoot && firsttimeafterload && frame > 0)
2219	2819	{
2220	2820	assert(bone == get(0));
2221	2821
..	..	@@ -2231,17 +2831,17 @@
2231	2831	// LA.matConcat(originmatrixinv, tempmatrixinv, fromParent); // ABC * (B'*C')^-1
2232	2832	//
2233	2833
2234		- Invariants();
2235		- bone.Invariants();
2236		- bone.get(0).Invariants();
2237		- // if (origin == null)
2238		- // origin = null;
2239		- origin.Invariants();
2240		- origin0.Invariants();
	2834	+ Invariants();
	2835	+ bone.Invariants();
	2836	+ bone.get(0).Invariants();
	2837	+ // if (origin == null)
	2838	+ // origin = null;
	2839	+ origin.Invariants();
	2840	+ origin0.Invariants();
2241	2841
2242		-
2243		- LA.matConcat(bone.get(0).fromParent, bone.fromParent, tempmatrix); // B' * C'
2244		- LA.matConcat(origin.toParent, tempmatrix, toParent);
	2842	+
	2843	+//?? LA.matConcat(bone.get(0).fromParent, bone.fromParent, tempmatrix); // B' * C'
	2844	+//?? LA.matConcat(origin.toParent, tempmatrix, toParent);
2245	2845
2246	2846	// matrixToEulerXYZ(toParent, temp);
2247	2847	// matrixToEulerXYZ(bone.get(0).toParent, temp);
..	..	@@ -2275,7 +2875,7 @@
2275	2875	//
2276	2876	// mat4d.get(quat);
2277	2877
2278		- if (true) // hip correction
	2878	+ if (false) // hip correction
2279	2879	{
2280	2880	_t2.setIdentity();
2281	2881
..	..	@@ -2316,13 +2916,13 @@
2316	2916	//????? LA.matConcat(bone.get(0).toParent, bone.toParent, tempmatrix); // B' * C'
2317	2917	// LA.matConcat(origin.fromParent, tempmatrix, fromParent);
2318	2918
2319		- LA.matInvert(toParent, fromParent);
	2919	+//?? LA.matInvert(toParent, fromParent);
2320	2920
2321		- Invariants();
2322		- bone.Invariants();
2323		- bone.get(0).Invariants();
2324		- origin.Invariants();
2325		- origin0.Invariants();
	2921	+ Invariants();
	2922	+ bone.Invariants();
	2923	+ bone.get(0).Invariants();
	2924	+ origin.Invariants();
	2925	+ origin0.Invariants();
2326	2926
2327	2927	// LA.matInvert(fromParent, tempmatrix);
2328	2928	//
..	..	@@ -2343,33 +2943,39 @@
2343	2943	// temp.x = data[0];
2344	2944	// temp.y = data[1];
2345	2945	// temp.z = data[2];
2346		- LA.xformPos(temp, origin0.toParent, temp0);
	2946	+ LA.xformPos(temp, origin0.toParent, temp0); // NU
2347	2947
2348		-// bone.GlobalTransformInv();
2349		-
2350		- temp0.x = bone.globalTransform[3][0];
2351		- temp0.y = bone.globalTransform[3][1];
2352		- temp0.z = bone.globalTransform[3][2];
2353		-
	2948	+// bone.get(0).GlobalTransformInv();
	2949	+//
	2950	+// temp0.x = bone.get(0).globalTransform[3][0];
	2951	+// temp0.y = bone.get(0).globalTransform[3][1];
	2952	+// temp0.z = bone.get(0).globalTransform[3][2];
	2953	+//
2354	2954	// MEGA TEST // june 2014: necessary for precision? otherwise comment works
2355		-fromParent[3][0] = 0;
2356		-fromParent[3][1] = 0;
2357		-fromParent[3][2] = 0;
2358		-LA.matInvert(fromParent, toParent);
	2955	+//fromParent[3][0] = 0;
	2956	+//fromParent[3][1] = 0;
	2957	+//fromParent[3][2] = 0;
	2958	+//LA.matInvert(fromParent, toParent);
2359	2959
2360		- LA.xformPos(temp0, fromParent, temp);
	2960	+ LA.xformPos(temp0, fromParent, temp); // NU
2361	2961	//LA.xformPos(temp, bone.fromParent, temp);
2362	2962	// float[] data;
2363	2963
2364		- pos[0] = temp.x;
2365		- pos[1] = temp.y;
2366		- pos[2] = temp.z;
	2964	+// pos[0] = temp.x;
	2965	+// pos[1] = temp.y;
	2966	+// pos[2] = temp.z;
	2967	+//
	2968	+// temp.x = 1;
	2969	+// temp.y = 0;
	2970	+// temp.z = 0;
	2971	+//
	2972	+// LA.xformDir(temp, bone.get(0).globalTransform, temp);
2367	2973
2368	2974	// CameraPane.selectedpoint.toParent[3][0] = temp0.x;
2369	2975	// CameraPane.selectedpoint.toParent[3][1] = temp0.y;
2370	2976	// CameraPane.selectedpoint.toParent[3][2] = temp0.z;
2371	2977
2372		- int numframes = bvh.animation.getNumFrames();
	2978	+ int numframes = bvh.animation.getNumFrames();
2373	2979
2374	2980	int b = 0;
2375	2981	{
..	..	@@ -2377,12 +2983,12 @@
2377	2983
2378	2984	int dof = 6; /// data.length/numframes;
2379	2985
2380		- // july 2014
2381		- if (dof != data.length/numframes)
2382		- {
2383		- System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (data.length/numframes));
2384		- dof = data.length/numframes;
2385		- }
	2986	+ // july 2014
	2987	+ if (dof != data.length/numframes)
	2988	+ {
	2989	+ System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (data.length/numframes));
	2990	+ dof = data.length/numframes;
	2991	+ }
2386	2992
2387	2993
2388	2994	int theframe = 0; // baseframe;
..	..	@@ -2434,17 +3040,26 @@
2434	3040	// }
2435	3041	// }
2436	3042
2437		- data[f3 + i] += pos[i] - data[frame3 + i];
	3043	+ data[f3 + i] += /pos[i]/ - data[frame3 + i];
2438	3044
2439	3045	// if (f < 3)
2440	3046	// {
2441	3047	// System.out.print(data[f3 + i] + " ");
2442	3048	// }
2443	3049	}
2444		-// if (f < 3)
2445		-// {
2446		-// System.out.println();
2447		-// }
	3050	+
	3051	+ double t1 = data[f3 + 0];
	3052	+ double t2 = data[f3 + 2];
	3053	+
	3054	+ data[f3 + 0] = (float)(cosYt1 - sinYt2);
	3055	+ data[f3 + 2] = (float)(sinYt1 + cosYt2);
	3056	+
	3057	+ for (int i=3/dof/; --i>=0;)
	3058	+ {
	3059	+ data[f3 + i] += pos[i];
	3060	+ }
	3061	+
	3062	+ data[f3 + 4] += angleY - data[frame3 + 4];
2448	3063	}
2449	3064	}
2450	3065
..	..	@@ -2458,186 +3073,17 @@
2458	3073	// temp.y = data[1];
2459	3074	// temp.z = data[2];
2460	3075
2461		- if (fade && currentbones != null && !CameraPane.fullreset)
2462		- {
2463		- Quat4d quatstart = new Quat4d();
2464		- Quat4d quatend = new Quat4d();
2465		- Quat4d quat = new Quat4d();
2466		- Matrix4d mat4d = new Matrix4d();
2467		- double[][] rot = new double[4][4];
2468		-
2469		- for (b=numbones; --b>=1;) // HIP ROTATION: 0;)
2470		- {
2471		- int hipindex = get(0)._index;
2472		-
2473		-// assert(get(0).get(0)._isHip);
2474		-
2475		- // if (b == hipindex)
2476		- // continue;
2477		-
2478		- data = bvh.animation.getBoneData(b);
2479		-
2480		- int dof = 3; // data.length/numframes;
2481		-
2482		- // assert(dof == 3);
2483		-
2484		- int boneframe3 = b*3; // dof;
2485		-
2486		- // System.err.println("Bone #" + b + ": dof = " + dof);
2487		- int fadein = 45; // 120;
2488		-
2489		- // if (b == hipindex)
2490		- // fadein *= 5;
2491		-
2492		- if (fadein > numframes)
2493		- fadein = 0; // numframes;
2494		-
2495		- for (int fi=fadein; --fi>=0;)
2496		- //for (int f=numframes; --f>=0;)
2497		- {
2498		- int f = fi + GetFirstFrame();
2499		-
2500		- int f3 = f*dof;
2501		-
2502		- float k = fi;
2503		-
2504		- k /= fadein - 1;
2505		-
2506		- if (Float.isNaN(k))
2507		- k = 1; // 0/0
2508		-
2509		- k = (float) (-Math.cos(k*Math.PI));
2510		- k += 1;
2511		- k /= 2;
2512		-
2513		- int start = 3;
2514		- int end = 0;
2515		-
2516		- if (dof == 6)
2517		- {
2518		- start = 6;
2519		- end = 3;
2520		- }
2521		-
2522		- if (b == 0)
2523		- {
2524		- _t1.setIdentity();
2525		- _t2.setIdentity();
2526		- _t2.rotZ(currentbones[boneframe3 + start-1-end]);
2527		- _t1.mul(_t2);
2528		- _t2.setIdentity();
2529		- if (b == 0)
2530		- {
2531		- _t2.rotY(currentbones[boneframe3 + start-2-end]);
2532		- _t1.mul(_t2);
2533		- _t2.setIdentity();
2534		- _t2.rotX(currentbones[boneframe3 + start-3-end]);
2535		- }
2536		- else
2537		- {
2538		- _t2.rotX(currentbones[boneframe3 + start-2-end]);
2539		- _t1.mul(_t2);
2540		- _t2.setIdentity();
2541		- _t2.rotY(currentbones[boneframe3 + start-3-end]);
2542		- }
2543		- _t1.mul(_t2);
2544		- _t2.setIdentity();
2545		-
2546		- _t1.get(mat4d);
2547		-
2548		- mat4d.get(quatstart);
2549		-
2550		- _t1.setIdentity();
2551		- _t2.setIdentity();
2552		- _t2.rotZ(data[f3 + start-1]);
2553		- _t1.mul(_t2);
2554		- _t2.setIdentity();
2555		- if (b == 0)
2556		- {
2557		- _t2.rotY(data[f3 + start-2]);
2558		- _t1.mul(_t2);
2559		- _t2.setIdentity();
2560		- _t2.rotX(data[f3 + start-3]);
2561		- }
2562		- else
2563		- {
2564		- _t2.rotX(data[f3 + start-2]);
2565		- _t1.mul(_t2);
2566		- _t2.setIdentity();
2567		- _t2.rotY(data[f3 + start-3]);
2568		- }
2569		-
2570		- _t1.mul(_t2);
2571		- _t2.setIdentity();
2572		-
2573		- _t1.get(mat4d);
2574		-
2575		- mat4d.get(quatend);
2576		-
2577		- double dot = quatstart.x*quatend.x +
2578		- quatstart.y*quatend.y +
2579		- quatstart.z*quatend.z +
2580		- quatstart.w*quatend.w
2581		- ;
2582		-
2583		- if (dot < 0)
2584		- {
2585		- quatend.x *= -1;
2586		- quatend.y *= -1;
2587		- quatend.z *= -1;
2588		- quatend.w *= -1;
2589		- }
2590		-
2591		- // k = 1-k;
2592		-
2593		- quat.x = (1-k)quatstart.x + kquatend.x;
2594		- quat.y = (1-k)quatstart.y + kquatend.y;
2595		- quat.z = (1-k)quatstart.z + kquatend.z;
2596		- quat.w = (1-k)quatstart.w + kquatend.w;
2597		-
2598		- quat.normalize();
2599		-
2600		- mat4d.set(quat);
2601		-
2602		- cJ3D.SetTransform(rot, mat4d);
2603		-
2604		- matrixToEulerXYZ(rot, temp);
2605		-
2606		- data[f3 + start-1] = -(float)temp.z;
2607		-
2608		- if (b == 0)
2609		- {
2610		- data[f3 + start-2] = -(float)temp.y;
2611		- data[f3 + start-3] = -(float)temp.x;
2612		- }
2613		- else
2614		- {
2615		- data[f3 + start-2] = -(float)temp.x;
2616		- data[f3 + start-3] = -(float)temp.y;
2617		- }
2618		- }
2619		- else
2620		- {
2621		- for (int i=start; --i>=end;)
2622		- {
2623		- //data[f3 + i] += pos[i] - data[frame3 + i];
2624		- // data[f3 + i] = kdata[f3+i] + (1-k)
2625		- // currentbones[boneframe3 + i-end];
2626		- data[f3 + i] = (float)CurveAngle(data[f3+i], currentbones[boneframe3 + i-end], 1-k);
2627		- }
2628		- }
2629		-
2630		- }
2631		- }
2632		-
2633		- }
	3076	+// if (fade && currentbones != null && !CameraPane.fullreset)
	3077	+// {
	3078	+// Fade();
	3079	+// }
2634	3080	}
2635		-
	3081	+
2636	3082	if (false) // doesn't change anything bone._isRoot)
2637	3083	{
2638	3084	// Reset orientation
2639	3085	_t2.setIdentity();
2640		-
	3086	+
2641	3087	double tx = bone.toParent[3][0];
2642	3088	double ty = bone.toParent[3][1];
2643	3089	double tz = bone.toParent[3][2];
..	..	@@ -2646,9 +3092,9 @@
2646	3092	temp.y = 0;
2647	3093	temp.z = 0;
2648	3094	LA.xformDir(temp, bone.toParent, temp);
2649		-
	3095	+
2650	3096	double angle = Math.atan2(-temp.z, temp.x);
2651		-
	3097	+
2652	3098	_t2.rotY(angle);
2653	3099	// _t1.setIdentity();
2654	3100	// _t1.rotX(temp.x);
..	..	@@ -2661,56 +3107,21 @@
2661	3107	// _t1.setIdentity();
2662	3108	// _t1.rotZ(temp.z);
2663	3109	// _t2.mul(_t1);
2664		-
	3110	+
2665	3111	cJ3D.ResetTransform(bone, _t2, false);
2666		-
	3112	+
2667	3113	bone.toParent[3][0] = tx;
2668	3114	bone.toParent[3][1] = ty;
2669	3115	bone.toParent[3][2] = tz;
2670	3116	}
2671	3117	}
2672	3118
2673		- if (currentbones == null)
2674		- currentbones = new double[numbones*3];
2675		-
2676		- for (int b=numbones; --b>=1;) // 0;)
2677		- //int b = 0;
2678		- {
2679		- data = bvh.animation.getBoneData(b);
2680		-
2681		- int numframes = bvh.animation.getNumFrames();
2682		-
2683		- int dof = 6; // data.length/numframes;
2684		-
2685		- if (b > 0)
2686		- dof = 3;
2687		-
2688		- //assert(dof == 3);
2689		-
2690		- // System.err.println("Bone #" + b + ": dof = " + dof);
2691		- int theframe = // 1; // baseframe;
2692		- frame;
2693		-
2694		- int frame3 = theframe*dof;
2695		- int bone3 = b*3; // dof;
2696		-
2697		- int start = 3;
2698		- int end = 0;
2699		-
2700		- if (dof == 6)
2701		- {
2702		- start = 6;
2703		- end = 3;
2704		- }
2705		- for (int i=start; --i>=end;)
2706		- {
2707		- currentbones[bone3 + i-end] = data[frame3 + i];
2708		- }
2709		- }
	3119	+ // SetCurrentBones(frame);
2710	3120	}
2711	3121	}
2712	3122
2713		- static int offset = 1; // 5; // 10; // 5; // 100; // skip initial "T"
	3123	+ // skip initial "T"
	3124	+ static int offset = 1; // 5; // 10; // 5; // 100;
2714	3125
2715	3126	void ReadBVH()
2716	3127	{
..	..	@@ -2739,14 +3150,14 @@
2739	3150
2740	3151	void Reset()
2741	3152	{
2742		- if (fullname != null)
2743		- ReadBVH();
	3153	+// if (fullname != null)
	3154	+// ReadBVH();
2744	3155
2745	3156	Object3D hip = get(0);
2746	3157
2747	3158	// assert(obj.name.equals("hip"));
2748	3159
2749		- Object3D rot = hip.get(0);
	3160	+ //Object3D rot = hip.get(0);
2750	3161
2751	3162	// assert(obj.name == null); // .equals("hip#"));
2752	3163
..	..	@@ -2756,8 +3167,8 @@
2756	3167	hip.fromParent = LA.newMatrix();
2757	3168	}
2758	3169
2759		- hip.toParent[3][0] = hip.toParent[3][1] = hip.toParent[3][2] = 0;
2760		- hip.fromParent[3][0] = hip.fromParent[3][1] = hip.fromParent[3][2] = 0;
	3170	+ //hip.toParent[3][0] = hip.toParent[3][1] = hip.toParent[3][2] = 0;
	3171	+ //hip.fromParent[3][0] = hip.fromParent[3][1] = hip.fromParent[3][2] = 0;
2761	3172
2762	3173	if (toParent == null)
2763	3174	{
..	..	@@ -2769,25 +3180,28 @@
2769	3180	LA.matIdentity(fromParent);
2770	3181	// LA.matIdentity(hip.toParent);
2771	3182	// LA.matIdentity(hip.fromParent);
2772		- if (rot.toParent == null)
2773		- {
2774		- // june 2014
2775		- rot.toParent = LA.newMatrix();
2776		- rot.fromParent = LA.newMatrix();
2777		- }
2778		- LA.matIdentity(rot.toParent);
2779		- LA.matIdentity(rot.fromParent);
	3183	+// if (rot.toParent == null)
	3184	+// {
	3185	+// // june 2014
	3186	+// rot.toParent = LA.newMatrix();
	3187	+// rot.fromParent = LA.newMatrix();
	3188	+// }
	3189	+// LA.matIdentity(rot.toParent);
	3190	+// LA.matIdentity(rot.fromParent);
2780	3191
2781	3192	// july 2014
2782		- goalx = goalz = 0;
	3193	+// goalx = goalz = 0;
2783	3194	targetx = targetz = 0;
2784	3195
2785		- SetPositionDelta(true, true, true, false);
	3196	+ //SetPositionDelta(true, true, true, false);
	3197	+// LoadData();
	3198	+// Rewind();
2786	3199
2787	3200	baseframe = frame = 0; // T pose. No offset.
2788	3201
2789	3202	// aout 2013 endframe = 0; // june 2013
2790	3203
	3204	+ //ResetZero();
2791	3205	setPose(frame);
2792	3206	}
2793	3207
..	..	@@ -2819,7 +3233,7 @@
2819	3233	baseframe += step;
2820	3234
2821	3235	//frame = baseframe;
2822		- frame += step;
	3236	+ //frame += step;
2823	3237
2824	3238	// if (frame != baseframe)
2825	3239	// {
..	..	@@ -2833,6 +3247,7 @@
2833	3247	if (lastframetest == 0)
2834	3248	lastframetest = bvh.animation.getNumFrames();
2835	3249
	3250	+ // WARNING: RESET DESTROYS EVERYTHING
2836	3251	if (baseframe >= lastframetest) // july 2013 // - GetFirstFrame())
2837	3252	{
2838	3253	System.out.println("MOCAP reset: " + this.GetFileRoot() +
..	..	@@ -2858,7 +3273,10 @@
2858	3273	{
2859	3274	bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
2860	3275
2861		- SetPositionDelta(false, true, true, true);
	3276	+ // SetPositionDelta(false, true, true, true);
	3277	+ LoadData();
	3278	+ Rewind();
	3279	+ Fade();
2862	3280	}
2863	3281	catch (Exception e)
2864	3282	{
..	..	@@ -2867,13 +3285,17 @@
2867	3285	}
2868	3286	}
2869	3287	}
	3288	+
	3289	+ frame = GetFirstFrame();
2870	3290	}
	3291	+ else
	3292	+ frame += step;
2871	3293
2872	3294	//SetPositionDelta(false);
2873	3295
2874		- if (frame >= bvh.animation.getNumFrames())
2875		- //baseframe =
2876		- frame = GetFirstFrame(); // 0; // offset; // initial point
	3296	+// if (frame >= bvh.animation.getNumFrames())
	3297	+// //baseframe =
	3298	+// frame = GetFirstFrame(); // 0; // offset; // initial point
2877	3299
2878	3300	//System.err.println("frame = " + frame);
2879	3301	if (lastframe != 0)
..	..	@@ -3171,6 +3593,8 @@
3171	3593	//static
3172	3594	transient
3173	3595	double[] currentbones;
	3596	+ double[] currenthip;
	3597	+
3174	3598	transient boolean inbetween;
3175	3599
3176	3600	void SetPositionDelta(boolean reset, boolean rewind, boolean load, boolean fade)
..	..	@@ -3181,38 +3605,9 @@
3181	3605	//assert(dim == numframes*6);
3182	3606
3183	3607	if (load)
3184		- for (int b=numbones; --b>=0;)
3185		- //int b = 0;
3186		- {
3187		- float[] thedata = bvh.animation.getBoneData(b);
3188		-
3189		- int numframes = bvh.animation.getNumFrames();
3190		-
3191		- int dof = 6; // thedata.length/numframes;
3192		-
3193		- if (b > 0)
3194		- dof = 3;
3195		-
3196		- if (dof != thedata.length/numframes)
3197		- {
3198		- System.err.println("Bone #" + b + ": dof = " + dof + " ---> " + (thedata.length/numframes));
3199		- dof = thedata.length/numframes;
3200		- }
3201		-
3202		- //for (int f=numframes; --f>=offset;)
3203		- int firstframe = GetFirstFrame();
3204		- for (int f=0; f<numframes-firstframe; f++)
3205		- {
3206		- int f3 = f*dof;
3207		-
3208		- //for (int i=3/dof/; --i>=0;)
3209		- for (int i=dof; --i>=0;)
3210		- {
3211		- //thedata[f3 + i] += thedata[i] - thedata[offset*dof + i];
3212		- thedata[f3 + i] = thedata[f3 + firstframe*dof + i];
3213		- }
3214		- }
3215		- }
	3608	+ {
	3609	+ LoadData();
	3610	+ }
3216	3611
3217	3612	// assert(thedata[0] == 0);
3218	3613	// assert(thedata[1] == 0);
..	..	@@ -3222,11 +3617,11 @@
3222	3617	// assert(thedata[7] == 0);
3223	3618	// assert(thedata[8] == 0);
3224	3619
3225		- Object3D obj = get(0);
	3620	+ Object3D hip = get(0);
3226	3621
3227	3622	// assert(obj.name.equals("hip"));
3228	3623
3229		- Object3D rot = obj.get(0);
	3624	+ Object3D rot = hip.get(0);
3230	3625
3231	3626	// if (toParent == null)
3232	3627	// {
..	..	@@ -3238,7 +3633,7 @@
3238	3633	// // assert(obj.name == null); // .equals("hip#"));
3239	3634
3240	3635	Invariants();
3241		- obj.Invariants();
	3636	+ hip.Invariants();
3242	3637	rot.Invariants();
3243	3638
3244	3639	if (origin == null)
..	..	@@ -3259,16 +3654,16 @@
3259	3654	fromParent = LA.newMatrix();
3260	3655	}
3261	3656
3262		- if (obj.toParent == null) // june 2014
	3657	+ if (hip.toParent == null) // june 2014
3263	3658	{
3264		- obj.toParent = LA.newMatrix();
3265		- obj.fromParent = LA.newMatrix();
	3659	+ hip.toParent = LA.newMatrix();
	3660	+ hip.fromParent = LA.newMatrix();
3266	3661	}
3267	3662
3268		- LA.matConcat(toParent, obj.toParent, origin0.toParent); // AB
	3663	+ LA.matConcat(toParent, hip.toParent, origin0.toParent); // AB
3269	3664	Object3D gp = this.parent;
3270	3665	this.parent = null;
3271		- obj.GlobalTransformInv();
	3666	+ hip.GlobalTransformInv();
3272	3667	this.parent = gp;
3273	3668
3274	3669	if (rot.toParent == null)
..	..	@@ -3291,41 +3686,41 @@
3291	3686	LA.matInvert(origin.toParent, origin.fromParent);
3292	3687
3293	3688	Invariants();
3294		- obj.Invariants();
	3689	+ hip.Invariants();
3295	3690	rot.Invariants();
3296	3691	origin.Invariants();
3297	3692	origin0.Invariants();
3298	3693
3299		- firsttimeafterload = true;
	3694	+ firsttimeafterload = false; // true;
3300	3695
3301	3696	if (rewind)
3302	3697	Rewind();
3303	3698
3304		- setPose(obj, frame, bvh.animation.getBoneData(obj._index), fade);
	3699	+ setPose(hip, frame, bvh.animation.getBoneData(hip._index)); //, fade);
3305	3700
3306		- if (true)
3307		- return;
	3701	+ if (true)
	3702	+ return;
3308	3703
3309	3704	double pos[] = new double[6];
3310	3705
3311	3706	if (!reset)
3312	3707	{
3313		- assert(obj.tx == obj.toParent[3][0]);
3314		- assert(obj.ty == obj.toParent[3][1]);
3315		- assert(obj.tz == obj.toParent[3][2]);
	3708	+ assert(hip.tx == hip.toParent[3][0]);
	3709	+ assert(hip.ty == hip.toParent[3][1]);
	3710	+ assert(hip.tz == hip.toParent[3][2]);
3316	3711
3317		- pos[0] = obj.tx; // obj.toParent[3][0];
3318		- pos[1] = obj.ty; // obj.toParent[3][1];
3319		- pos[2] = obj.tz; // obj.toParent[3][2];
3320		- pos[3] = obj.rz;
3321		- pos[4] = obj.ry;
3322		- pos[5] = obj.rx;
	3712	+ pos[0] = hip.tx; // obj.toParent[3][0];
	3713	+ pos[1] = hip.ty; // obj.toParent[3][1];
	3714	+ pos[2] = hip.tz; // obj.toParent[3][2];
	3715	+ pos[3] = hip.rz;
	3716	+ pos[4] = hip.ry;
	3717	+ pos[5] = hip.rx;
3323	3718	}
3324	3719
3325	3720	cVector temp = new cVector();
3326		- temp.x = obj.globalTransform[3][0];
3327		- temp.y = obj.globalTransform[3][1];
3328		- temp.z = obj.globalTransform[3][2];
	3721	+ temp.x = hip.globalTransform[3][0];
	3722	+ temp.y = hip.globalTransform[3][1];
	3723	+ temp.z = hip.globalTransform[3][2];
3329	3724	// LA.xformPos(temp, origin0.toParent, temp);
3330	3725	// System.err.println("POS0 = " + temp.x + ", " + temp.y + ", " + temp.z + ";");
3331	3726
..	..	@@ -3409,7 +3804,7 @@
3409	3804	}
3410	3805
3411	3806	// Rewind();
3412		- setPose(obj, frame, bvh.animation.getBoneData(obj._index), true);
	3807	+ setPose(hip, frame, bvh.animation.getBoneData(hip._index)); // , true);
3413	3808	}
3414	3809
3415	3810	void Rewind()