X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fmain.cc;h=9720723ffbbc40dbfd9eb314af4dc349201d6b07;hb=a8a7d557cf22c2bf16eb333d33a6c7c68f532482;hp=ef26c3c4eaa117b91fbd0535952679dd6858e15b;hpb=96407860f68887a2a4911c99095f54198da97549;p=hair

diff --git a/src/main.cc b/src/main.cc
index ef26c3c..9720723 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -10,8 +10,9 @@
 
 #include "mesh.h"
 #include "hair.h"
+#include "object.h"
 
-#define MAX_NUM_SPAWNS 4
+#define MAX_NUM_SPAWNS 800
 #define THRESH 0.5
 
 static bool init();
@@ -24,14 +25,19 @@ static void mouse(int bn, int st, int x, int y);
 static void motion(int x, int y);
 static void idle();
 
+static unsigned int gen_grad_tex(int sz, const Vec3 &c0, const Vec3 &c1);
+
 static std::vector<Mesh*> meshes;
 static Mesh *mesh_head;
 static Hair hair;
 
+static unsigned int grad_tex;
+
 static int win_width, win_height;
 static float cam_theta, cam_phi = 25, cam_dist = 8;
 static float head_rz, head_rx; /* rot angles x, z axis */
 static Mat4 head_xform;
+//static CollSphere coll_sphere; /* sphere used for collision detection */
 
 int main(int argc, char **argv)
 {
@@ -64,9 +70,11 @@ static bool init()
 {
 	glewInit();
 
+	grad_tex = gen_grad_tex(32, Vec3(0, 0, 1), Vec3(0, 1, 0));
+
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
-	glEnable(GL_COLOR_MATERIAL);
+//	glEnable(GL_COLOR_MATERIAL);
 
 	glEnable(GL_LIGHTING);
 	glEnable(GL_LIGHT0);
@@ -103,11 +111,16 @@ static bool init()
 		return false;
 	}
 
+//	coll_sphere.radius = 1.0;
+//	coll_sphere.center = Vec3(0, 0.6, 0.53);
+
 	if(!hair.init(mesh_head, MAX_NUM_SPAWNS, THRESH)) {
 		fprintf(stderr, "Failed to initialize hair\n");
 		return false;
 	}
 
+//	hair.add_collider(&coll_sphere);
+
 	return true;
 }
 
@@ -120,6 +133,11 @@ static void cleanup()
 
 static void display()
 {
+	static unsigned long prev_time;
+	unsigned long msec = glutGet(GLUT_ELAPSED_TIME);
+	float dt = (float)(msec - prev_time) / 1000.0;
+	prev_time = msec;
+
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	head_xform = Mat4::identity;
@@ -131,15 +149,81 @@ static void display()
 	glTranslatef(0, 0, -cam_dist);
 	glRotatef(cam_phi, 1, 0, 0);
 	glRotatef(cam_theta, 0, 1, 0);
-
+	/* multiplying with the head rot matrix */
+	glPushMatrix();
 	glMultMatrixf(head_xform[0]);
-
+/*
+	glPushAttrib(GL_LINE_BIT);
+	glLineWidth(1);
+	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+*/
 	for(size_t i=0; i<meshes.size(); i++) {
 		meshes[i]->draw();
 	}
+/*
+	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+	glPopAttrib();
+*/
 
+	glPopMatrix();
+
+	hair.set_transform(head_xform);
+	hair.update(dt);
 	hair.draw();
 
+/*
+	glPushAttrib(GL_ENABLE_BIT);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_LIGHTING);
+	glBegin(GL_POINTS);
+	for (int i=0; i<500; i++) {
+		Vec3 p;
+		p.x = (float)rand() / RAND_MAX * 8 - 4;
+		p.y = (float)rand() / RAND_MAX * 4;
+		p.z = 0;
+
+		Vec3 tmp = inverse(head_xform) * p;
+		if(coll_sphere.contains(tmp)) {
+			glColor3f(1, 0, 0);
+		}
+		else glColor3f(0, 1, 0);
+
+		glVertex3f(p.x, p.y, p.z);
+	}
+	glEnd();
+	glPopAttrib();
+*/
+	float plane[4] = {
+		0, 0, 0.5 / 350, 0.5 
+	};
+
+	glPushMatrix();
+	glRotatef(90, 1, 0, 0);
+
+	glPushAttrib(GL_ENABLE_BIT);
+	glDisable(GL_LIGHTING);
+	glEnable(GL_TEXTURE_1D);
+	glBindTexture(GL_TEXTURE_1D, grad_tex);
+	glFrontFace(GL_CW);
+	glEnable(GL_TEXTURE_GEN_S);
+	glTexGenfv(GL_S, GL_OBJECT_PLANE, plane);
+	glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+	glColor3f(1, 1, 1);
+
+	glDepthMask(0);
+
+	glutSolidSphere(350, 16, 8);
+	glDisable(GL_TEXTURE_1D);
+
+	glColor3f(0.2, 0.2, 0.2);
+	glutWireSphere(350, 32, 16);
+
+	glDepthMask(1);
+	glFrontFace(GL_CCW);
+	glPopAttrib();
+
+	glPopMatrix();
+
 	glutSwapBuffers();
 	assert(glGetError() == GL_NO_ERROR);
 }
@@ -210,7 +294,7 @@ static void motion(int x, int y)
 			if(head_rx > 45) head_rx = 45;
 
 			if(head_rz < -90) head_rz = -90;
-			if(head_rz > 90) head_rx = 90;
+			if(head_rz > 90) head_rz = 30;
 		}
 	}
 	else {
@@ -232,3 +316,29 @@ static void idle()
 {
 	glutPostRedisplay();
 }
+
+static unsigned int gen_grad_tex(int sz, const Vec3 &c0, const Vec3 &c1)
+{
+	unsigned char *pixels = new unsigned char[sz * 3];
+	for(int i=0; i<sz; i++) {
+		float t = (float)i / (float)(sz - 1);
+		Vec3 color = c0 + (c1 - c0) * t;
+		pixels[i * 3] = color.x * 255;
+		pixels[i * 3 + 1] = color.y * 255;
+		pixels[i * 3 + 2] = color.z * 255;
+	}
+
+	unsigned int tex;
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_1D, tex);
+
+	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+
+	glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, sz, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
+
+	delete [] pixels;
+
+	return tex;
+}