ISSUE #391 keeping track of parent bim id for easier debugging

3drepo · Nov 27, 2020 · 95d25b3 · 95d25b3
1 parent 4a3a63a
commit 95d25b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bouncer/src/repo/manipulator/modelconvertor/import/repo_model_import_3drepo.cpp b/bouncer/src/repo/manipulator/modelconvertor/import/repo_model_import_3drepo.cpp
@@ -193,6 +193,7 @@ void RepoModelImport::parseTexture(
 
 
 RepoModelImport::mesh_data_t RepoModelImport::createMeshRecord(
+	int parentBimId,
 	const ptree &mesh,
 	const std::string &parentName,
 	const repo::lib::RepoUUID &parentID,
@@ -325,7 +326,7 @@ RepoModelImport::mesh_data_t RepoModelImport::createMeshRecord(
 		matParents[materialID].push_back(sharedID);
 	}
 
-	mesh_data_t result = { vertices, normals, faces, boundingBox, parentID, sharedID };
+	mesh_data_t result = { parentBimId, vertices, normals, uvChannels, faces, boundingBox, parentID, sharedID };
 	return result;
 }
 
@@ -378,7 +379,7 @@ void RepoModelImport::createObject(const ptree& tree)
 
 		if (props->first == REPO_IMPORT_GEOMETRY)
 		{
-			auto mesh = createMeshRecord(props->second, transName, transID, trans_matrix_map.back());
+			auto mesh = createMeshRecord(myID, props->second, transName, transID, trans_matrix_map.back());
 			metaParentIDs.push_back(mesh.sharedID);
 			meshEntries.push_back(mesh);
 		}

diff --git a/bouncer/src/repo/manipulator/modelconvertor/import/repo_model_import_3drepo.h b/bouncer/src/repo/manipulator/modelconvertor/import/repo_model_import_3drepo.h
@@ -88,6 +88,7 @@ namespace repo {
 
 				struct mesh_data_t 
 				{
+					int parentBimId;
 					std::vector<repo::lib::RepoVector3D64> rawVertices;
 					std::vector<repo::lib::RepoVector3D> normals;
 					std::vector<std::vector<repo::lib::RepoVector2D>> uvChannels;
@@ -100,7 +101,7 @@ namespace repo {
 				void parseMaterial(const boost::property_tree::ptree& pt);
 				void parseTexture(const boost::property_tree::ptree& textureTree, char * dataBuffer);
 				repo::core::model::MetadataNode*  createMetadataNode(const boost::property_tree::ptree &metadata, const std::string &parentName, const repo::lib::RepoUUID &parentID);
-				mesh_data_t createMeshRecord(const boost::property_tree::ptree &geometry, const std::string &parentName, const repo::lib::RepoUUID &parentID, const repo::lib::RepoMatrix &trans);
+				mesh_data_t createMeshRecord(int parentBimId, const boost::property_tree::ptree &geometry, const std::string &parentName, const repo::lib::RepoUUID &parentID, const repo::lib::RepoMatrix &trans);
 
 				/**
 				 * @brief Creates a property tree from the current