ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow exact shape to be used with tangents mesh

Browse Source
This commit is contained in:
Benau 2017-11-05 00:55:26 +08:00
parent 628bc7ce50
commit 8ba0fd3569
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/physics/physical_object.cpp
View File

@ -386,7 +386,8 @@ void PhysicalObject::init(const PhysicalObject::Settings& settings)
scene::IMeshBuffer *mb = mesh->getMeshBuffer(i); scene::IMeshBuffer *mb = mesh->getMeshBuffer(i);
// FIXME: take translation/rotation into account // FIXME: take translation/rotation into account
if (mb->getVertexType() != video::EVT_STANDARD && if (mb->getVertexType() != video::EVT_STANDARD &&
mb->getVertexType() != video::EVT_2TCOORDS) mb->getVertexType() != video::EVT_2TCOORDS &&
mb->getVertexType() != video::EVT_TANGENTS)
{ {
Log::warn("PhysicalObject", Log::warn("PhysicalObject",
"createPhysicsBody: Ignoring type '%d'!", "createPhysicsBody: Ignoring type '%d'!",
@ -439,9 +440,7 @@ void PhysicalObject::init(const PhysicalObject::Settings& settings)
material ); material );
} // for j } // for j
} }
else else if (mb->getVertexType() == video::EVT_2TCOORDS)
{
if (mb->getVertexType() == video::EVT_2TCOORDS)
{ {
irr::video::S3DVertex2TCoords* mbVertices = irr::video::S3DVertex2TCoords* mbVertices =
(video::S3DVertex2TCoords*)mb->getVertices(); (video::S3DVertex2TCoords*)mb->getVertices();
@ -460,8 +459,26 @@ void PhysicalObject::init(const PhysicalObject::Settings& settings)
normals[1], normals[2], normals[1], normals[2],
material ); material );
} // for j } // for j
} }
else if (mb->getVertexType() == video::EVT_TANGENTS)
{
irr::video::S3DVertexTangents* mbVertices =
(video::S3DVertexTangents*)mb->getVertices();
for(unsigned int j=0; j<mb->getIndexCount(); j+=3)
{
for(unsigned int k=0; k<3; k++)
{
int indx=mbIndices[j+k];
core::vector3df v = mbVertices[indx].Pos;
//mat.transformVect(v);
vertices[k]=v;
normals[k]=mbVertices[indx].Normal;
} // for k
triangle_mesh->addTriangle(vertices[0], vertices[1],
vertices[2], normals[0],
normals[1], normals[2],
material );
} // for j
} }
} // for i<getMeshBufferCount } // for i<getMeshBufferCount