v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed the windows build

pull/3042/head
iamAdrianIusca 2020-04-24 00:16:38 +03:00
parent 5b7e9ccb5f
commit d527939881
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
code/Common/SkeletonMeshBuilder.cpp
View File

@ -136,31 +136,31 @@ void SkeletonMeshBuilder::CreateGeometry( const aiNode* pNode)
aiVector3D ownpos( pNode->mTransformation.a4, pNode->mTransformation.b4, pNode->mTransformation.c4); aiVector3D ownpos( pNode->mTransformation.a4, pNode->mTransformation.b4, pNode->mTransformation.c4);
ai_real sizeEstimate = ownpos.Length() * ai_real( 0.18 ); ai_real sizeEstimate = ownpos.Length() * ai_real( 0.18 );
mVertices.emplace_back( -sizeEstimate, 0.0, 0.0); mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( 0.0, sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, -sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
mVertices.emplace_back( 0.0, sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
mVertices.emplace_back( sizeEstimate, 0.0, 0.0); mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, -sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
mVertices.emplace_back( sizeEstimate, 0.0, 0.0); mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( 0.0, -sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, -sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
mVertices.emplace_back( 0.0, -sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
mVertices.emplace_back( -sizeEstimate, 0.0, 0.0); mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, -sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
mVertices.emplace_back( -sizeEstimate, 0.0, 0.0); mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
mVertices.emplace_back( 0.0, sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
mVertices.emplace_back( 0.0, sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
mVertices.emplace_back( sizeEstimate, 0.0, 0.0); mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( sizeEstimate, 0.0, 0.0); mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
mVertices.emplace_back( 0.0, -sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
mVertices.emplace_back( 0.0, -sizeEstimate, 0.0); mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
mVertices.emplace_back( 0.0, 0.0, sizeEstimate); mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
mVertices.emplace_back( -sizeEstimate, 0.0, 0.0); mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
mFaces.emplace_back( vertexStartIndex + 0, vertexStartIndex + 1, vertexStartIndex + 2); mFaces.emplace_back( vertexStartIndex + 0, vertexStartIndex + 1, vertexStartIndex + 2);
mFaces.emplace_back( vertexStartIndex + 3, vertexStartIndex + 4, vertexStartIndex + 5); mFaces.emplace_back( vertexStartIndex + 3, vertexStartIndex + 4, vertexStartIndex + 5);

10
code/Common/StandardShapes.cpp
View File

@ -447,14 +447,14 @@ void StandardShapes::MakeCone(ai_real height,ai_real radius1,
// generate the end 'cap' // generate the end 'cap'
positions.emplace_back(s * radius2, halfHeight, t * radius2 ); positions.emplace_back(s * radius2, halfHeight, t * radius2 );
positions.emplace_back(s2 * radius2, halfHeight, t2 * radius2 ); positions.emplace_back(s2 * radius2, halfHeight, t2 * radius2 );
positions.emplace_back(0.0, halfHeight, 0.0); positions.emplace_back(ai_real(0.0), halfHeight, ai_real(0.0));
if (radius1) if (radius1)
{ {
// generate the other end 'cap' // generate the other end 'cap'
positions.emplace_back(s * radius1, -halfHeight, t * radius1 ); positions.emplace_back(s * radius1, -halfHeight, t * radius1 );
positions.emplace_back(s2 * radius1, -halfHeight, t2 * radius1 ); positions.emplace_back(s2 * radius1, -halfHeight, t2 * radius1 );
positions.emplace_back(0.0, -halfHeight, 0.0); positions.emplace_back(ai_real(0.0), -halfHeight, ai_real(0.0));
} }
} }
@ -493,14 +493,14 @@ void StandardShapes::MakeCircle(ai_real radius, unsigned int tess,
for (ai_real angle = 0.0; angle < angle_max; ) for (ai_real angle = 0.0; angle < angle_max; )
{ {
positions.emplace_back(s * radius,0.0,t * radius); positions.emplace_back(s * radius,ai_real(0.0),t * radius);
angle += angle_delta; angle += angle_delta;
s = std::cos(angle); s = std::cos(angle);
t = std::sin(angle); t = std::sin(angle);
positions.emplace_back(s * radius,0.0,t * radius); positions.emplace_back(s * radius,ai_real(0.0),t * radius);
positions.emplace_back(0.0,0.0,0.0); positions.emplace_back(ai_real(0.0),ai_real(0.0),ai_real(0.0));
} }
} }