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

Simplify calculation of transform

Browse Source
This commit is contained in:
Benau 2016-10-26 09:08:10 +08:00
parent a38c8f0c19
commit cc3ff7cf9f
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/graphics/stk_text_billboard.cpp
View File

@ -50,16 +50,28 @@ STKTextBillboard::STKTextBillboard(core::stringw text, FontWithFace* font,
void STKTextBillboard::updateAbsolutePosition() void STKTextBillboard::updateAbsolutePosition()
{ {
// Make billboard always face the camera
scene::ICameraSceneNode* curr_cam =
irr_driver->getSceneManager()->getActiveCamera();
if (!curr_cam) return;
core::quaternion q(curr_cam->getViewMatrix());
q.W = -q.W;
if (Parent) if (Parent)
{ {
// Override to not use the parent's rotation // Override to not use the parent's rotation
AbsoluteTransformation = getRelativeTransformation();
core::vector3df wc = RelativeTranslation; core::vector3df wc = RelativeTranslation;
Parent->getAbsoluteTransformation().transformVect(wc); Parent->getAbsoluteTransformation().transformVect(wc);
AbsoluteTransformation.setTranslation(wc); AbsoluteTransformation.setTranslation(wc);
q.getMatrix(AbsoluteTransformation, wc);
} }
else else
AbsoluteTransformation = getRelativeTransformation(); {
q.getMatrix(AbsoluteTransformation, RelativeTranslation);
}
core::matrix4 m;
m.setScale(RelativeScale);
AbsoluteTransformation *= m;
} }
scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, FontWithFace* font) scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, FontWithFace* font)
@ -173,22 +185,6 @@ scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, FontWithFace* fo
return Mesh; return Mesh;
} }
void STKTextBillboard::updateNoGL()
{
scene::ICameraSceneNode* curr_cam =irr_driver->getSceneManager()->getActiveCamera();
btMatrix3x3 m;
m.setFromOpenGLSubMatrix(curr_cam->getViewMatrix().pointer());
btQuaternion q;
m.getRotation(q);
q.setW(-q.getW());
Vec3 hpr;
hpr.setHPR(q);
this->setRotation(hpr.toIrrHPR());
updateAbsolutePosition();
STKMeshSceneNode::updateNoGL();
}
void STKTextBillboard::collectChar(video::ITexture* texture, void STKTextBillboard::collectChar(video::ITexture* texture,
const core::rect<float>& destRect, const core::rect<float>& destRect,
const core::rect<s32>& sourceRect, const core::rect<s32>& sourceRect,

2
src/graphics/stk_text_billboard.hpp
View File

@ -74,8 +74,6 @@ public:
const irr::core::vector3df& position, const irr::core::vector3df& position,
const irr::core::vector3df& size); const irr::core::vector3df& size);
virtual void updateNoGL() OVERRIDE;
virtual scene::ESCENE_NODE_TYPE getType() const OVERRIDE virtual scene::ESCENE_NODE_TYPE getType() const OVERRIDE
{ {
return scene::ESNT_TEXT; return scene::ESNT_TEXT;