extend Wavefront obj loader to recognize objects (for compound shape creation)

add reproduction of a bug in compound versus concave trimesh

demo/ObjLoader/objLoader.cpp

@@ -34,6 +34,9 @@ int objLoader::load(char *filename)
 		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;

demo/ObjLoader/objLoader.h

@@ -26,6 +26,7 @@ public:
 	obj_light_quad **lightQuadList;
 	obj_light_disc **lightDiscList;
 	
+	obj_object** objectList;
 	obj_material **materialList;
 	
 	int vertexCount;
@@ -40,6 +41,7 @@ public:
 	int lightQuadCount;
 	int lightDiscCount;
 
+	int objectCount;
 	int materialCount;
 
 	obj_camera *camera;

demo/ObjLoader/obj_parser.cpp

@@ -89,6 +89,18 @@ int obj_parse_vertex_index(int *vertex_index, int *texture_index, int *normal_in
 	return vertex_count;
 }
 
+
+obj_object* obj_parse_object(obj_growable_scene_data *scene)
+{
+	obj_object* obj= (obj_object*)malloc(sizeof(obj_object));
+	obj->vertex_offset = scene->vertex_list.item_count;
+	obj->face_offset = scene->face_list.item_count;
+	// get the name
+	strncpy(obj->name, strtok(NULL, " \t"), OBJECT_NAME_SIZE);
+	return obj;
+}
+
+
 obj_face* obj_parse_face(obj_growable_scene_data *scene)
 {
 	int vertex_count;
@@ -417,7 +429,11 @@ int obj_parse_obj_file(obj_growable_scene_data *growable_data, char *filename)
 		}
 		
 		else if( strequal(current_token, "o") ) //object name
-		{ }
+		{ 
+			obj_object* obj = obj_parse_object(growable_data);
+			list_add_item(&growable_data->object_list, obj, NULL);
+
+		}
 		else if( strequal(current_token, "s") ) //smoothing
 		{ }
 		else if( strequal(current_token, "g") ) // group
@@ -450,6 +466,8 @@ void obj_init_temp_storage(obj_growable_scene_data *growable_data)
 	list_make(&growable_data->light_quad_list, 10, 1);
 	list_make(&growable_data->light_disc_list, 10, 1);
 	
+	list_make(&growable_data->object_list,10,1);
+
 	list_make(&growable_data->material_list, 10, 1);	
 	
 	growable_data->camera = NULL;
@@ -469,6 +487,7 @@ void obj_free_temp_storage(obj_growable_scene_data *growable_data)
 	obj_free_half_list(&growable_data->light_quad_list);
 	obj_free_half_list(&growable_data->light_disc_list);
 	
+	obj_free_half_list(&growable_data->object_list);
 	obj_free_half_list(&growable_data->material_list);
 }
 
@@ -506,6 +525,11 @@ void delete_obj_data(obj_scene_data *data_out)
 		free(data_out->light_quad_list[i]);
 	free(data_out->light_quad_list);
 
+	for(i=0; i<data_out->object_count; i++)
+		free(data_out->object_list[i]);
+	free(data_out->object_list);
+
+
 	for(i=0; i<data_out->material_count; i++)
 		free(data_out->material_list[i]);
 	free(data_out->material_list);
@@ -541,6 +565,9 @@ void obj_copy_to_out_storage(obj_scene_data *data_out, obj_growable_scene_data *
 	data_out->light_disc_list = (obj_light_disc**)growable_data->light_disc_list.items;
 	data_out->light_quad_list = (obj_light_quad**)growable_data->light_quad_list.items;
 	
+	data_out->object_list = (obj_object**)growable_data->object_list.items;
+	data_out->object_count = growable_data->object_list.item_count;
+
 	data_out->material_list = (obj_material**)growable_data->material_list.items;
 	
 	data_out->camera = growable_data->camera;

demo/ObjLoader/obj_parser.h

@@ -5,9 +5,13 @@
 
 #define OBJ_FILENAME_LENGTH 500
 #define MATERIAL_NAME_SIZE 255
+#define OBJECT_NAME_SIZE 255
+
 #define OBJ_LINE_SIZE 500
 #define MAX_VERTEX_COUNT 4 //can only handle quads or triangles
 
+
+
 typedef struct obj_face
 {
 	int vertex_index[MAX_VERTEX_COUNT];
@@ -81,6 +85,13 @@ typedef struct obj_light_quad
 	int material_index;
 };
 
+typedef struct obj_object
+{
+	int vertex_offset;
+	int face_offset;
+	char name[OBJECT_NAME_SIZE];
+};
+
 typedef struct obj_growable_scene_data
 {
 //	vector extreme_dimensions[2];
@@ -100,6 +111,8 @@ typedef struct obj_growable_scene_data
 	list light_disc_list;
 	
 	list material_list;
+
+	list object_list;
 	
 	obj_camera *camera;
 };
@@ -120,6 +133,9 @@ typedef struct obj_scene_data
 	
 	obj_material **material_list;
 	
+	obj_object** object_list;
+	int object_count;
+
 	int vertex_count;
 	int vertex_normal_count;
 	int vertex_texture_count;