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

Fixes build error left out of c1a3b8f171. Refs #1497

Browse Source 
This was SVN commit r12205.
This commit is contained in:
historic_bruno 2012-07-27 05:26:37 +00:00
parent 4a1483231f
commit c6a0d0b6f3
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/collada/PMDConvert.cpp
View File

@ -159,13 +159,6 @@ public:
FCDGeometrySourceList texcoordSources;
polys->GetParent()->FindSourcesByType(FUDaeGeometryInput::TEXCOORD, texcoordSources);
std::vector<float*> dataTexcoords;
for (size_t i = 0; i < texcoordSources.size(); ++i)
{
dataTexcoords.push_back(texcoordSources[i]->GetData());
assert(texcoordSources[i]->GetDataCount() == vertexCount*2);
}
float* dataPosition = sourcePosition->GetData();
float* dataNormal = sourceNormal ->GetData();
@ -173,6 +166,13 @@ public:
assert(sourcePosition->GetDataCount() == vertexCount*3);
assert(sourceNormal ->GetDataCount() == vertexCount*3);
std::vector<float*> dataTexcoords;
for (size_t i = 0; i < texcoordSources.size(); ++i)
{
dataTexcoords.push_back(texcoordSources[i]->GetData());
assert(texcoordSources[i]->GetDataCount() == vertexCount*2);
}
// Transform mesh coordinate system to game coordinates
// (doesn't modify prop points)
@ -433,13 +433,6 @@ public:
FCDGeometrySourceList texcoordSources;
polys->GetParent()->FindSourcesByType(FUDaeGeometryInput::TEXCOORD, texcoordSources);
std::vector<float*> dataTexcoords;
for (size_t i = 0; i < texcoordSources.size(); ++i)
{
dataTexcoords.push_back(texcoordSources[i]->GetData());
assert(texcoordSources[i]->GetDataCount() == vertexCount*2);
}
float* dataPosition = sourcePosition->GetData();
float* dataNormal = sourceNormal ->GetData();
@ -447,6 +440,13 @@ public:
assert(sourcePosition->GetDataCount() == vertexCount*3);
assert(sourceNormal ->GetDataCount() == vertexCount*3);
std::vector<float*> dataTexcoords;
for (size_t i = 0; i < texcoordSources.size(); ++i)
{
dataTexcoords.push_back(texcoordSources[i]->GetData());
assert(texcoordSources[i]->GetDataCount() == vertexCount*2);
}
// Transform model coordinate system to game coordinates
TransformSkinnedModel(dataPosition, dataNormal, vertexCount, boneTransforms, propPoints,