reorder files, in preparation for Bullet 3 -> Bullet 2 merge

Demos3/Wavefront/objLoader.cpp

@@ -0,0 +1,46 @@
+#include "objLoader.h"
+#include "obj_parser.h"
+
+
+int objLoader::load(char *filename)
+{
+	int no_error = 1;
+	no_error = parse_obj_scene(&data, filename);
+	if(no_error)
+	{
+		this->vertexCount = data.vertex_count;
+		this->normalCount = data.vertex_normal_count;
+		this->textureCount = data.vertex_texture_count;
+
+		this->faceCount = data.face_count;
+		this->sphereCount = data.sphere_count;
+		this->planeCount = data.plane_count;
+
+		this->lightPointCount = data.light_point_count;
+		this->lightDiscCount = data.light_disc_count;
+		this->lightQuadCount = data.light_quad_count;
+
+		this->materialCount = data.material_count;
+
+		this->vertexList = data.vertex_list;
+		this->normalList = data.vertex_normal_list;
+		this->textureList = data.vertex_texture_list;
+
+		this->faceList = data.face_list;
+		this->sphereList = data.sphere_list;
+		this->planeList = data.plane_list;
+
+		this->lightPointList = data.light_point_list;
+		this->lightDiscList = data.light_disc_list;
+		this->lightQuadList = data.light_quad_list;
+
+		this->objectList = data.object_list;
+		this->objectCount = data.object_count;
+
+		this->materialList = data.material_list;
+
+		this->camera = data.camera;
+	}
+
+	return no_error;
+}