From: <hik...@us...> - 2012-08-08 06:58:01
|
Revision: 11487 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=11487&view=rev Author: hikerstk Date: 2012-08-08 06:57:55 +0000 (Wed, 08 Aug 2012) Log Message: ----------- Renamed GraphNode::getIndex to getQuadIndex. Modified Paths: -------------- main/trunk/src/tracks/graph_node.hpp main/trunk/src/tracks/quad_graph.cpp main/trunk/src/tracks/quad_graph.hpp main/trunk/src/tracks/quad_set.cpp Modified: main/trunk/src/tracks/graph_node.hpp =================================================================== --- main/trunk/src/tracks/graph_node.hpp 2012-08-07 23:31:35 UTC (rev 11486) +++ main/trunk/src/tracks/graph_node.hpp 2012-08-08 06:57:55 UTC (rev 11487) @@ -151,8 +151,7 @@ int getPredecessor(unsigned int i) const {return m_predecessor_nodes[i]; } // ------------------------------------------------------------------------ /** Returns the quad_index in the quad_set of this node. */ - int getIndex() const { return m_quad_index; } - + int getQuadIndex() const { return m_quad_index; } // ------------------------------------------------------------------------ /** Returns the quad of this graph node. */ const Quad& getQuad() const {return QuadSet::get()->getQuad(m_quad_index);} Modified: main/trunk/src/tracks/quad_graph.cpp =================================================================== --- main/trunk/src/tracks/quad_graph.cpp 2012-08-07 23:31:35 UTC (rev 11486) +++ main/trunk/src/tracks/quad_graph.cpp 2012-08-08 06:57:55 UTC (rev 11487) @@ -605,7 +605,7 @@ if(current_distance<new_distance) { float delta = new_distance - current_distance; - updateDistancesForAllSuccessors(gn->getIndex(), delta); + updateDistancesForAllSuccessors(gn->getQuadIndex(), delta); } return; } @@ -622,7 +622,7 @@ if(gn_next->getDistanceFromStart()==0) continue; - computeDistanceFromStart(gn_next->getIndex(), + computeDistanceFromStart(gn_next->getQuadIndex(), new_distance + gn->getDistanceToSuccessor(i)); } // for i } // computeDistanceFromStart Modified: main/trunk/src/tracks/quad_graph.hpp =================================================================== --- main/trunk/src/tracks/quad_graph.hpp 2012-08-07 23:31:35 UTC (rev 11486) +++ main/trunk/src/tracks/quad_graph.hpp 2012-08-08 06:57:55 UTC (rev 11487) @@ -174,7 +174,7 @@ // ---------------------------------------------------------------------- /** Returns the quad that belongs to a graph node. */ const Quad& getQuadOfNode(unsigned int j) const - { return QuadSet::get()->getQuad(m_all_nodes[j]->getIndex()); } + { return QuadSet::get()->getQuad(m_all_nodes[j]->getQuadIndex()); } // ---------------------------------------------------------------------- /** Returns the quad that belongs to a graph node. */ GraphNode& getNode(unsigned int j) const{ return *m_all_nodes[j]; } Modified: main/trunk/src/tracks/quad_set.cpp =================================================================== --- main/trunk/src/tracks/quad_set.cpp 2012-08-07 23:31:35 UTC (rev 11486) +++ main/trunk/src/tracks/quad_set.cpp 2012-08-08 06:57:55 UTC (rev 11487) @@ -74,7 +74,7 @@ } // getPoint // ----------------------------------------------------------------------------- -/** Loads the set of all quads from the speciified filename. +/** Loads the set of all quads from the specified filename. * \param filename The absolute filename to load the quad file from. */ void QuadSet::init(const std::string &filename) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |