X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=tools%2Fropesim%2Fsrc%2Fmain.c;h=3c616f67f8f9ece4379dfb682e6586f89fc9dcde;hp=2ccd69575f2e5f5f427669c02ec6a978b1dcdfe5;hb=1ae209a77434dcdf7266d2cf95d3f20c0de7a0e9;hpb=c4e738daa32d1949f2d5c6fc62237760fb8aac68

diff --git a/tools/ropesim/src/main.c b/tools/ropesim/src/main.c
index 2ccd695..3c616f6 100644
--- a/tools/ropesim/src/main.c
+++ b/tools/ropesim/src/main.c
@@ -31,7 +31,7 @@ cgm_vec3 gmove;
 /*cgm_quat grot = {0, 0, 0, 1};*/
 float grot_theta, grot_phi;
 float ginner_xform[16], gouter_xform[16];
-cgm_vec3 ganchor[4];
+cgm_vec3 ganchor[4], manchor[4];
 
 cgm_vec3 dbgvec[4];
 
@@ -64,11 +64,11 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-#define ROPE_MASSES			4
+#define ROPE_MASSES			5
 #define ROPE_SPRINGS		(ROPE_MASSES - 1)
-#define ROPE_LEN			1.0f
+#define ROPE_LEN			0.6f
 #define ROPE_MASSES_MASS	0.1f
-#define ROPE_K				0.5f
+#define ROPE_K				80.0f
 
 int init(void)
 {
@@ -114,14 +114,21 @@ int init(void)
 		ganchor[i].y = (float)((i & 2) - 1) * 1.5f;
 		ganchor[i].z = 0;
 
+		manchor[i] = ganchor[i];
+		cgm_vscale(manchor + i, 0.32);
+
+
+
+		manchor[i].y += 0.15;
+
 		/* create a rope hanging from the anchor point */
 		if(!(rope = rsim_alloc_rope(ROPE_MASSES, ROPE_SPRINGS))) {
 			fprintf(stderr, "failed to allocate rope\n");
 			return -1;
 		}
 		for(j=0; j<ROPE_MASSES; j++) {
-			rope->masses[j].p = ganchor[i];
-			rope->masses[j].p.y = ganchor[i].y - j * ROPE_LEN / ROPE_SPRINGS;
+			float t = (float)j / (float)(ROPE_MASSES - 1.0f);
+			cgm_vlerp(&rope->masses[j].p, ganchor + i, manchor + i, t);
 			rope->masses[j].m = 0.1f;
 
 			if(j < ROPE_SPRINGS) {
@@ -132,6 +139,7 @@ int init(void)
 			}
 		}
 		rsim_freeze_rope_mass(rope, rope->masses);	/* freeze first mass */
+		rsim_freeze_rope_mass(rope, rope->masses + j - 1);	/* freeze last mass */
 
 		if(!ropes_tail) {
 			rsim.ropes = ropes_tail = rope;
@@ -180,6 +188,8 @@ void update(long tmsec, float dt)
 
 		dbgvec[i] = apt0;
 		rope->masses[0].p = apt0;
+
+		rope = rope->next;
 	}
 
 	rsim_step(&rsim, dt);
@@ -245,10 +255,19 @@ void display(void)
 	glPushAttrib(GL_ENABLE_BIT);
 	glDisable(GL_LIGHTING);
 	glLineWidth(2);
+	glPointSize(5);
 
 	rope = rsim.ropes;
 	while(rope) {
 		glBegin(GL_LINE_STRIP);
+		glColor3f(0.2, 1, 0.2);
+		for(i=0; i<rope->num_masses; i++) {
+			glVertex3f(rope->masses[i].p.x, rope->masses[i].p.y, rope->masses[i].p.z);
+		}
+		glEnd();
+
+		glBegin(GL_POINTS);
+		glColor3f(1, 0.2, 0.2);
 		for(i=0; i<rope->num_masses; i++) {
 			glVertex3f(rope->masses[i].p.x, rope->masses[i].p.y, rope->masses[i].p.z);
 		}