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

Remove instancing

Browse Source
This commit is contained in:
Vincent Lejeune
2014-08-26 01:33:36 +02:00
parent 3cea173ee2
commit dfbae2ea07
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tracks/track.cpp
View File

@@ -743,7 +743,7 @@ void Track::convertTrackToBullet(scene::ISceneNode *node)
std::vector<core::matrix4> matrices;
STKInstancedSceneNode* instancing_node = dynamic_cast<STKInstancedSceneNode*>(node);
STKInstancedSceneNode* instancing_node = NULL;// dynamic_cast<STKInstancedSceneNode*>(node);
if (instancing_node != NULL)
{
int count = instancing_node->getInstanceCount();
@@ -1064,7 +1064,7 @@ bool Track::loadMainTrack(const XMLNode &root)
}
// Load instancing models (for the moment they are loaded the same way as LOD to simplify implementation)
const XMLNode *instancing_xml_node = root.getNode("instancing");
const XMLNode *instancing_xml_node = NULL;// root.getNode("instancing");
if (instancing_xml_node != NULL)
{
for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
@@ -1757,7 +1757,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
}
// Load instancing models (for the moment they are loaded the same way as LOD to simplify implementation)
const XMLNode *instancing_xml_node = root->getNode("instancing");
const XMLNode *instancing_xml_node = NULL;// root->getNode("instancing");
if (instancing_xml_node != NULL)
{
for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
@@ -2012,7 +2012,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
}
// Load instancing definitions
const XMLNode *instancing_xml_node = libroot->getNode("instancing");
const XMLNode *instancing_xml_node = NULL;// libroot->getNode("instancing");
if (instancing_xml_node != NULL)
{
for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)

2
src/tracks/track_object.cpp
View File

@@ -104,7 +104,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
xml_node.get("lod_instance", &lod_instance);
bool instancing = false;
xml_node.get("instancing", &instancing);
// xml_node.get("instancing", &instancing);
m_soccer_ball = false;
xml_node.get("soccer_ball", &m_soccer_ball);