fix issue with duplicate keys across elements

ddiakopoulos · ddiakopoulos · commit b3aa975b0c59 · 2015-09-26T12:32:19.000-07:00
diff --git a/source/example.cpp b/source/example.cpp
@@ -62,11 +62,11 @@ void write_ply_example(const std::string & filename)
     
     verts = {1.f, 2.f, 3.f, 4.f, 5.f, 6.f};
     norms = {10.f, 20.f, 30.f, 40.f, 50.f, 60.f};
-    colors = {100, 200, 100, 200, 100, 200, 100, 200};
+    colors = {100, 200, 100, 200, 166, 255, 166, 255};
     
     faces = { 0, 5, 3, 2, 1, 0};
     uvCoords = { .50f, .55f, .60f, .65f, .70f, .75f, .125f, .225f, .325f, .425f, .525f, .625f};
-    colors = {105, 205, 105, 205, 150, 250, 150, 250};
+    faceColors = {105, 205, 105, 205, 150, 250, 150, 250};
     
     std::ofstream outputFile(filename);
     std::ostringstream outputStream;
diff --git a/source/tinyply.cpp b/source/tinyply.cpp
@@ -139,7 +139,7 @@ void PlyFile::write_binary_internal(std::ostringstream & os)
         {
             for (auto & p : e.properties)
             {
-                auto & cursor = userDataTable[p.name];
+                auto & cursor = userDataTable[make_key(e.name, p.name)];
                 if (p.isList)
                 {
                     uint8_t listSize[4] = {0, 0, 0, 0};
@@ -170,7 +170,7 @@ void PlyFile::write_ascii_internal(std::ostringstream & os)
         {
             for (auto & p : e.properties)
             {
-                auto & cursor = userDataTable[p.name];
+                auto & cursor = userDataTable[make_key(e.name, p.name)];
                 if (p.isList)
                 {
                     os << p.listCount << " ";
@@ -238,7 +238,7 @@ void PlyFile::parse_data_binary(std::istream & is, const std::vector<uint8_t> &
 				bool foundPropetyListSize = false;
 				for (const auto & property : element.properties)
 				{
-					if (const auto & cursor = userDataTable[property.name])
+					if (const auto & cursor = userDataTable[make_key(element.name, property.name)])
 					{
 						int expectedListMultiplier = skip_property(localOffset, property, srcBuffer);
 						if (expectedListMultiplier)
@@ -253,8 +253,8 @@ void PlyFile::parse_data_binary(std::istream & is, const std::vector<uint8_t> &
 				if (foundPropetyListSize)
 					break;
 			}
-		}
-	};
+
+		}	};
 
 	find_property_list_size();
 
@@ -266,7 +266,7 @@ void PlyFile::parse_data_binary(std::istream & is, const std::vector<uint8_t> &
             {
                 for (auto & property : element.properties)
                 {
-                    if (auto & cursor = userDataTable[property.name])
+                    if (auto & cursor = userDataTable[make_key(element.name, property.name)])
                     {
                         if (property.isList)
                         {
@@ -305,7 +305,7 @@ void PlyFile::parse_data_ascii(std::istream & is, const std::vector<uint8_t> & b
             {
                 for (auto & property : element.properties)
                 {
-                    if (auto & cursor = userDataTable[property.name])
+                    if (auto & cursor = userDataTable[make_key(element.name, property.name)])
                     {
                         if (property.isList)
                         {
diff --git a/source/tinyply.h b/source/tinyply.h
@@ -19,7 +19,7 @@
 
 namespace tinyply
 {
-
+    
 static inline uint16_t swap_16(uint16_t value)
 {
     return (uint16_t)((value >> 8) | (value << 8));
@@ -79,6 +79,11 @@ class PlyProperty
     int listCount = 0;
     std::string name;
 };
+    
+inline std::string make_key(const std::string & a, const std::string & b)
+{
+    return (a + "-" + b);
+}
 
 template<typename T>
 void ply_cast(void * dest, const uint8_t * src)
@@ -326,7 +331,7 @@ class PlyFile
             if (int instanceCount = instance_counter(key))
             {
                 instanceCounts.push_back(instanceCount);
-                auto result = userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(key, cursor));
+                auto result = userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(make_key(elementKey, key), cursor));
                 if (result.second == false)
                     throw std::runtime_error("property has already been requested: " + key);
             }
@@ -363,7 +368,7 @@ class PlyFile
             {
                 PlyProperty::Type t = property_type_for_type(source);
                 PlyProperty newProp = (listType == PlyProperty::Type::INVALID) ? PlyProperty(t, key) : PlyProperty(listType, t, key, listCount);
-                userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(key, cursor));
+                userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(make_key(e.name, key), cursor));
                 e.properties.push_back(newProp);
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void PlyFile::write_binary_internal(std::ostringstream & os)`
`139`	`139`	`{`
`140`	`140`	`for (auto & p : e.properties)`
`141`	`141`	`{`
`142`		`- auto & cursor = userDataTable[p.name];`
	`142`	`+ auto & cursor = userDataTable[make_key(e.name, p.name)];`
`143`	`143`	`if (p.isList)`
`144`	`144`	`{`
`145`	`145`	`uint8_t listSize[4] = {0, 0, 0, 0};`
`@@ -170,7 +170,7 @@ void PlyFile::write_ascii_internal(std::ostringstream & os)`
`170`	`170`	`{`
`171`	`171`	`for (auto & p : e.properties)`
`172`	`172`	`{`
`173`		`- auto & cursor = userDataTable[p.name];`
	`173`	`+ auto & cursor = userDataTable[make_key(e.name, p.name)];`
`174`	`174`	`if (p.isList)`
`175`	`175`	`{`
`176`	`176`	`os << p.listCount << " ";`
`@@ -238,7 +238,7 @@ void PlyFile::parse_data_binary(std::istream & is, const std::vector<uint8_t> &`
`238`	`238`	`bool foundPropetyListSize = false;`
`239`	`239`	`for (const auto & property : element.properties)`
`240`	`240`	`{`
`241`		`- if (const auto & cursor = userDataTable[property.name])`
	`241`	`+ if (const auto & cursor = userDataTable[make_key(element.name, property.name)])`
`242`	`242`	`{`
`243`	`243`	`int expectedListMultiplier = skip_property(localOffset, property, srcBuffer);`
`244`	`244`	`if (expectedListMultiplier)`
`@@ -253,8 +253,8 @@ void PlyFile::parse_data_binary(std::istream & is, const std::vector<uint8_t> &`
`253`	`253`	`if (foundPropetyListSize)`
`254`	`254`	`break;`
`255`	`255`	`}`
`256`		`- }`
`257`		`- };`
	`256`	`+`
	`257`	`+ } };`
`258`	`258`
`259`	`259`	`find_property_list_size();`
`260`	`260`
`@@ -266,7 +266,7 @@ void PlyFile::parse_data_binary(std::istream & is, const std::vector<uint8_t> &`
`266`	`266`	`{`
`267`	`267`	`for (auto & property : element.properties)`
`268`	`268`	`{`
`269`		`- if (auto & cursor = userDataTable[property.name])`
	`269`	`+ if (auto & cursor = userDataTable[make_key(element.name, property.name)])`
`270`	`270`	`{`
`271`	`271`	`if (property.isList)`
`272`	`272`	`{`
`@@ -305,7 +305,7 @@ void PlyFile::parse_data_ascii(std::istream & is, const std::vector<uint8_t> & b`
`305`	`305`	`{`
`306`	`306`	`for (auto & property : element.properties)`
`307`	`307`	`{`
`308`		`- if (auto & cursor = userDataTable[property.name])`
	`308`	`+ if (auto & cursor = userDataTable[make_key(element.name, property.name)])`
`309`	`309`	`{`
`310`	`310`	`if (property.isList)`
`311`	`311`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`namespace tinyply`
`21`	`21`	`{`
`22`		`-`
	`22`	`+`
`23`	`23`	`static inline uint16_t swap_16(uint16_t value)`
`24`	`24`	`{`
`25`	`25`	`return (uint16_t)((value >> 8) \| (value << 8));`
`@@ -79,6 +79,11 @@ class PlyProperty`
`79`	`79`	`int listCount = 0;`
`80`	`80`	`std::string name;`
`81`	`81`	`};`
	`82`	`+`
	`83`	`+inline std::string make_key(const std::string & a, const std::string & b)`
	`84`	`+{`
	`85`	`+ return (a + "-" + b);`
	`86`	`+}`
`82`	`87`
`83`	`88`	`template<typename T>`
`84`	`89`	`void ply_cast(void * dest, const uint8_t * src)`
`@@ -326,7 +331,7 @@ class PlyFile`
`326`	`331`	`if (int instanceCount = instance_counter(key))`
`327`	`332`	`{`
`328`	`333`	`instanceCounts.push_back(instanceCount);`
`329`		`- auto result = userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(key, cursor));`
	`334`	`+ auto result = userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(make_key(elementKey, key), cursor));`
`330`	`335`	`if (result.second == false)`
`331`	`336`	`throw std::runtime_error("property has already been requested: " + key);`
`332`	`337`	`}`
`@@ -363,7 +368,7 @@ class PlyFile`
`363`	`368`	`{`
`364`	`369`	`PlyProperty::Type t = property_type_for_type(source);`
`365`	`370`	`PlyProperty newProp = (listType == PlyProperty::Type::INVALID) ? PlyProperty(t, key) : PlyProperty(listType, t, key, listCount);`
`366`		`- userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(key, cursor));`
	`371`	`+ userDataTable.insert(std::pair<std::string, std::shared_ptr<DataCursor>>(make_key(e.name, key), cursor));`
`367`	`372`	`e.properties.push_back(newProp);`
`368`	`373`	`}`
`369`	`374`	`};`