Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Support prop_ prefix in Collada files, as well as prop-

Browse Source 
This was SVN commit r8616.
This commit is contained in:
Ykkrosh 2010-11-15 02:18:49 +00:00
parent 816c810791
commit 6a74b798ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/collada/PMDConvert.cpp
View File

@ -73,7 +73,7 @@ static FMVector3 FMVector3_Normalize(const FMVector3& vec)
static void AddStaticPropPoints(std::vector<PropPoint> &propPoints, FCDSceneNode* node) static void AddStaticPropPoints(std::vector<PropPoint> &propPoints, FCDSceneNode* node)
{ {
if (node->GetName().find("prop-") == 0) if (node->GetName().find("prop-") == 0 || node->GetName().find("prop_") == 0)
{ {
// Strip off the "prop-" from the name // Strip off the "prop-" from the name
std::string propPointName (node->GetName().substr(5)); std::string propPointName (node->GetName().substr(5));
@ -297,7 +297,7 @@ public:
// Construct the list of prop points. // Construct the list of prop points.
// Currently takes all objects that are directly attached to a // Currently takes all objects that are directly attached to a
// standard bone, and whose name begins with "prop-". // standard bone, and whose name begins with "prop-" or "prop_".
std::vector<PropPoint> propPoints; std::vector<PropPoint> propPoints;
AddDefaultPropPoints(propPoints); AddDefaultPropPoints(propPoints);
@ -317,7 +317,7 @@ public:
for (size_t j = 0; j < joint->GetChildrenCount(); ++j) for (size_t j = 0; j < joint->GetChildrenCount(); ++j)
{ {
FCDSceneNode* child = joint->GetChild(j); FCDSceneNode* child = joint->GetChild(j);
if (child->GetName().find("prop-") != 0) if (child->GetName().find("prop-") != 0 && child->GetName().find("prop_") != 0)
{ {
// doesn't begin with "prop-", so skip it // doesn't begin with "prop-", so skip it
continue; continue;