X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fblob_exhibit.cc;h=58522d9303997fa74eab8e3ad94d1ea305b62644;hp=3d133961159302e12c92e7a344b348dbc3bac9cd;hb=64b09a921ac6c46f8a7ff6e25c9aef3452cdc6b8;hpb=b75b6703809abf0dc02f2e557ba73e9efbefa4d1

diff --git a/src/blob_exhibit.cc b/src/blob_exhibit.cc
index 3d13396..58522d9 100644
--- a/src/blob_exhibit.cc
+++ b/src/blob_exhibit.cc
@@ -49,10 +49,11 @@ bool BlobExhibit::init()
 	}
 	msurf_set_threshold(priv->msurf, 8);
 	msurf_set_inside(priv->msurf, MSURF_GREATER);
-	msurf_set_bounds(priv->msurf, -3.5, 3.5, -3.5, 3.5, -3.5, 3.5);
+	msurf_set_bounds(priv->msurf, -3.5, -3.5, -3.5, 3.5, 3.5, 3.5);
 	msurf_enable(priv->msurf, MSURF_NORMALIZE);
 
 	priv->tex = texman.get_texture("data/sphmap.jpg");
+
 	return true;
 }
 
@@ -91,11 +92,10 @@ void BlobExhibit::update(float dt)
 
 	float max_energy = 0.0f;
 
-//#pragma omp parallel for
+#pragma omp parallel for
 	for(int i=0; i<zres; i++) {
 		float z = zmin + i * zstep;
 		float *voxptr = msurf_slice(priv->msurf, i);
-		if(!voxptr) break;
 
 		for(int j=0; j<yres; j++) {
 			float y = ymin + j * ystep;
@@ -141,25 +141,24 @@ void BlobExhibit::draw() const
 	glLoadIdentity();
 	glScalef(1, -1, 1);
 
-	glFrontFace(GL_CW);
-
-
 	int nverts = msurf_vertex_count(priv->msurf);
 	float *varr = msurf_vertices(priv->msurf);
 	float *narr = msurf_normals(priv->msurf);
 
-	glBegin(GL_TRIANGLES);
 	glColor3f(1, 1, 1);
-	for(int i=0; i<nverts; i++) {
-		glNormal3f(narr[0], narr[1], narr[2]);
-		glVertex3f(varr[0], varr[1], varr[2]);
-		varr += 3;
-		narr += 3;
-	}
-	glEnd();
 
-	glFrontFace(GL_CCW);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
+	glVertexPointer(3, GL_FLOAT, 0, varr);
+	glNormalPointer(GL_FLOAT, 0, narr);
+
+	glDrawArrays(GL_TRIANGLES, 0, nverts);
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
 
+	/*
 	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_LIGHTING);
 
@@ -177,6 +176,7 @@ void BlobExhibit::draw() const
 		narr += 3;
 	}
 	glEnd();
+	*/
 
 	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);