Ticket #243: static-prop.patch

source/collada/PMDConvert.cpp

@@ -71 +71 @@
         return FMVector3(1.0f, 0.0f, 0.0f);
 }
 
+static void AddStaticPropPoints(std::vector<PropPoint> &propPoints, FCDSceneNode* node)
+{
+    if (node->GetName().find("prop-") == 0)
+    {
+        // Strip off the "prop-" from the name
+        std::string propPointName (node->GetName().substr(5));
+
+        Log(LOG_INFO, "Adding prop point %s", propPointName.c_str());
+
+        // Get translation and orientation of local transform
+
+        FMMatrix44 localTransform = node->CalculateWorldTransform();
+
+        HMatrix matrix;
+        memcpy(matrix, localTransform.Transposed().m, sizeof(matrix));
+
+        AffineParts parts;
+        decomp_affine(matrix, &parts);
+
+        // Add prop point to list
+
+        PropPoint p = {
+            propPointName,
+            { parts.t.x, parts.t.y, parts.t.z },
+            { parts.q.x, parts.q.y, parts.q.z, parts.q.w },
+            0xff
+        };
+        propPoints.push_back(p);
+    }
+
+    for (size_t i = 0; i < node->GetChildrenCount(); ++i)
+        AddStaticPropPoints(propPoints, node->GetChild(i));
+}
+
 class PMDConvert
 {
 public:
@@ -123 +157 @@
             std::vector<PropPoint> propPoints;
             AddDefaultPropPoints(propPoints);
 
+            AddStaticPropPoints(propPoints, converter.GetInstance().GetParent());
+
             WritePMD(output, indicesCombined, indicesCombinedCount, dataPosition, dataNormal, dataTexcoord, vertexCount, boneWeights, boneTransforms, propPoints);
         }
         else if (converter.GetInstance().GetType() == FCDEntityInstance::CONTROLLER)