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

Zipper are now converted into buller objects. This means that a zipper should

Browse Source 
be flat now and not slightly raised anymore. This fixes bug 3114770.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-11-22 01:22:49 +00:00
parent d1238b58f4
commit b1b57be476
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tracks/track.cpp
View File

@ -67,7 +67,6 @@ Track::Track(std::string filename)
m_screenshot = "";
m_version = 0;
m_track_mesh = new TriangleMesh();
m_non_collision_mesh = new TriangleMesh();
m_all_nodes.clear();
m_all_meshes.clear();
m_is_arena = false;
@ -89,7 +88,6 @@ Track::~Track()
if(m_check_manager) delete m_check_manager;
if(m_mini_map) irr_driver->removeTexture(m_mini_map);
delete m_track_mesh;
delete m_non_collision_mesh;
} // ~Track
//-----------------------------------------------------------------------------
@ -153,8 +151,6 @@ void Track::cleanup()
irr_driver->removeNode(m_sun);
delete m_non_collision_mesh;
m_non_collision_mesh = new TriangleMesh();
delete m_track_mesh;
m_track_mesh = new TriangleMesh();
@ -342,11 +338,6 @@ void Track::createPhysicsModel(unsigned int main_track_count)
fprintf(stderr, "ERROR: m_track_mesh == NULL, cannot createPhysicsModel\n");
return;
}
if (m_non_collision_mesh == NULL)
{
fprintf(stderr, "ERROR: m_track_mesh == NULL, cannot createPhysicsModel\n");
return;
}
m_track_mesh->removeBody();
for(unsigned int i=main_track_count; i<m_all_nodes.size(); i++)
@ -354,7 +345,6 @@ void Track::createPhysicsModel(unsigned int main_track_count)
convertTrackToBullet(m_all_nodes[i]);
}
m_track_mesh->createBody();
m_non_collision_mesh->createBody(btCollisionObject::CF_NO_CONTACT_RESPONSE);
} // createPhysicsModel
@ -428,10 +418,6 @@ void Track::convertTrackToBullet(scene::ISceneNode *node)
{
std::string image = std::string(core::stringc(t->getName()).c_str());
material=material_manager->getMaterial(StringUtils::getBasename(image));
// Zipper are converted to non-collision mesh, since otherwise
// the road becomes 'bumpy' if the meshes are not 100% correctly
// aligned.
if(material->isZipper()) tmesh = m_non_collision_mesh;
// Materials to be ignored are not converted into bullet meshes.
if(material->isIgnore()) continue;
}

1
src/tracks/track.hpp
View File

@ -70,7 +70,6 @@ private:
std::vector<scene::IMesh*> m_all_meshes;
scene::ILightSceneNode *m_sun;
TriangleMesh* m_track_mesh;
TriangleMesh* m_non_collision_mesh;
/** Minimum coordinates of this track. */
Vec3 m_aabb_min;
/** Maximum coordinates of this track. */