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

Simplified physics track mesh handling.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8515 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-05-04 21:41:32 +00:00
parent 9c127322f2
commit 5e61e050a8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tracks/track.cpp
View File

@ -69,8 +69,8 @@ Track::Track(std::string filename)
m_designer = ""; m_designer = "";
m_screenshot = ""; m_screenshot = "";
m_version = 0; m_version = 0;
m_track_mesh = new TriangleMesh(); m_track_mesh = NULL;
m_gfx_effect_mesh = new TriangleMesh(); m_gfx_effect_mesh = NULL;
m_all_nodes.clear(); m_all_nodes.clear();
m_all_cached_meshes.clear(); m_all_cached_meshes.clear();
m_is_arena = false; m_is_arena = false;
@ -147,10 +147,10 @@ void Track::cleanup()
irr_driver->removeNode(m_sun); irr_driver->removeNode(m_sun);
delete m_track_mesh; delete m_track_mesh;
m_track_mesh = new TriangleMesh(); m_track_mesh = NULL;
delete m_gfx_effect_mesh; delete m_gfx_effect_mesh;
m_gfx_effect_mesh = new TriangleMesh(); m_gfx_effect_mesh = NULL;
// The m_all_cached_mesh contains each mesh loaded from a file, which // The m_all_cached_mesh contains each mesh loaded from a file, which
@ -562,6 +562,10 @@ bool PairCompare(const std::pair<int, std::string>& i, const std::pair<int, std:
*/ */
bool Track::loadMainTrack(const XMLNode &root) bool Track::loadMainTrack(const XMLNode &root)
{ {
assert(m_track_mesh==NULL);
assert(m_gfx_effect_mesh==NULL);
m_track_mesh = new TriangleMesh();
m_gfx_effect_mesh = new TriangleMesh();
const XMLNode *track_node= root.getNode("track"); const XMLNode *track_node= root.getNode("track");
std::string model_name; std::string model_name;
track_node->get("model", &model_name); track_node->get("model", &model_name);