Removes unused collor array support, disable bullet in sys/sys.h

1 files changed, 5 insertions, 8 deletions

diff --git a/src/model/vertexarray.h b/src/model/vertexarray.h
index 8312789..4277442 100644
--- a/src/model/vertexarray.h
+++ b/src/model/vertexarray.h
@@ -7,13 +7,13 @@
 #ifndef __INCLUDED_MODEL_VERTEXARRAY_H__
 #define __INCLUDED_MODEL_VERTEXARRAY_H__
 
-#include "math/color.h"
 #include "math/vector3f.h"
 
 namespace model
 {
 
-const int SPHERESEGMENTS=65;
+// number of segments in a sphere circle, must be uneven
+const int SPHERESEGMENTS = 65;
 
 /// global vertex array
 /** a VertexArray acts like a stack of model vertices, it has no knowledge of what it is holding
@@ -27,20 +27,18 @@ public:
 	
 	void clear();
 	
-	size_t add_vertex(math::Vector3f const &v, math::Vector3f const &n, math::Color const &color, float tex_x=0.0f, float tex_y=0.0f);
+	size_t add_vertex(math::Vector3f const &v, math::Vector3f const &n, float tex_x=0.0f, float tex_y=0.0f);
 	
 	inline float *vertex()
 	{
 		return vertex_vertex;
 	}
-	inline float *color()
-	{
-		return vertex_color;
-	}
+
 	inline float *normal()
 	{
 		return vertex_normal;
 	}
+
 	inline float *texture()
 	{
 		return vertex_texture;
@@ -71,7 +69,6 @@ public:
 private:
 	/// model vertices
 	float *vertex_vertex;
-	float *vertex_color;
 	float *vertex_normal;
 	float *vertex_texture;