Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some work on fcollada import

Browse Source
This commit is contained in:
ejcoumans
2006-05-27 01:24:08 +00:00
parent 718faabe59
commit 7392431860
7 changed files with 22 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Extras/FCollada/FCDocument/FCDPhysicsShape.cpp
View File

@@ -167,15 +167,18 @@ FUStatus FCDPhysicsShape::LoadFromXML(xmlNode* physicsShapeNode)
else
{
FCDTransform* transform = FCDTFactory::CreateTransform(GetDocument(), NULL, child);
if (transform != NULL && (transform->GetType() != FCDTransform::TRANSLATION
|| transform->GetType() != FCDTransform::ROTATION || transform->GetType() != FCDTransform::SCALE))
if (transform)
{
SAFE_DELETE(transform);
}
else
{
transforms.push_back(transform);
status.AppendStatus(transform->LoadFromXML(child));
if (transform != NULL && (transform->GetType() != FCDTransform::TRANSLATION
|| transform->GetType() != FCDTransform::ROTATION || transform->GetType() != FCDTransform::SCALE))
{
SAFE_DELETE(transform);
}
else
{
transforms.push_back(transform);
status.AppendStatus(transform->LoadFromXML(child));
}
}
}
}

2
Extras/FCollada/FMath/FMArray.h
View File

@@ -36,7 +36,7 @@ public:
/** Copy constructor.
@param copy The dynamically-sized array to copy the values from. */
vector(const std::vector& copy) : std::vector<T>(copy) {}
vector(const std::vector<T>& copy) : std::vector<T>(copy) {}
/** Constructor: Builds a dynamically-sized array from a constant-sized array.
@param values A constant-sized array of floating-point values.

2
Extras/FCollada/FUtils/FUFileManager.cpp
View File

@@ -237,7 +237,7 @@ fstring FUFileManager::MakeFilePathAbsolute(const fstring& _filePath)
if (filePath.size() < 2 || (filePath[1] != ':' && filePath[1] != '|'))
{
filePath.insert(0, '/');
filePath.insert(0, "/");//'/');
}
}

2
Extras/FCollada/FUtils/FUUniqueStringMap.h
View File

@@ -50,7 +50,7 @@ void FUUniqueStringMapT<Builder>::AddUniqueString(typename Builder::String& want
{
// Attempt to generate a new string by appending an increasing counter.
uint32 counter = 2;
static const maxCounter = 256;
static const int maxCounter = 256;
Builder buffer;
buffer.reserve(wantedStr.length() + 5);
do