From b204de7a8e3972fb94b72c688563e533ef8da7c5 Mon Sep 17 00:00:00 2001 From: Marianne Gagnon Date: Fri, 14 Nov 2014 18:26:48 -0500 Subject: [PATCH] Ignore billboard text nodes in physics, fixes #1666 --- src/graphics/stk_text_billboard.hpp | 5 +++++ src/tracks/track.cpp | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/graphics/stk_text_billboard.hpp b/src/graphics/stk_text_billboard.hpp index 937834280..9f3d80925 100644 --- a/src/graphics/stk_text_billboard.hpp +++ b/src/graphics/stk_text_billboard.hpp @@ -58,6 +58,11 @@ public: virtual void updateNoGL() OVERRIDE; + virtual scene::ESCENE_NODE_TYPE getType() const OVERRIDE + { + return scene::ESNT_TEXT; + } + virtual void collectChar(irr::video::ITexture* texture, const irr::core::rect& destRect, const irr::core::rect& sourceRect, diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 3e7abe921..b1e53c3b7 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -736,6 +736,9 @@ void Track::createPhysicsModel(unsigned int main_track_count) */ void Track::convertTrackToBullet(scene::ISceneNode *node) { + if (node->getType() == scene::ESNT_TEXT) + return; + if (node->getType() == scene::ESNT_LOD_NODE) { node = ((LODNode*)node)->getFirstNode();