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

Bugfix and better error handling in ArenaGraph

Browse Source
This commit is contained in:
Benau 2016-09-16 12:21:38 +08:00
parent 20e85aa781
commit a0005d57e9
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tracks/arena_graph.cpp
View File

@ -121,6 +121,7 @@ void ArenaGraph::loadNavmesh(const std::string &navmesh)
all_vertices.push_back(p);
}
}
if (xml_node->getName() == "faces")
{
for (unsigned int i = 0; i < xml_node->getNumNodes(); i++)
@ -128,8 +129,8 @@ void ArenaGraph::loadNavmesh(const std::string &navmesh)
const XMLNode *xml_node_node = xml_node->getNode(i);
if (xml_node_node->getName() != "face")
{
Log::error("NavMesh", "Unsupported type '%s' found in '%s'"
" - ignored.",
Log::error("ArenaGraph", "Unsupported type '%s'"
" found in '%s' - ignored.",
xml_node_node->getName().c_str(), navmesh.c_str());
continue;
}
@ -139,7 +140,11 @@ void ArenaGraph::loadNavmesh(const std::string &navmesh)
std::vector<int> adjacent_quad_index;
xml_node_node->get("indices", &quad_index);
xml_node_node->get("adjacents", &adjacent_quad_index);
assert(quad_index.size() == 4);
if (quad_index.size() != 4)
{
Log::error("ArenaGraph", "A Node in navmesh is not made"
" of quad, will only use the first 4 vertices");
}
createQuad(all_vertices[quad_index[0]],
all_vertices[quad_index[1]], all_vertices[quad_index[2]],

20
src/tracks/graph.cpp
View File

@ -430,17 +430,19 @@ void Graph::createQuad(const Vec3 &p0, const Vec3 &p1, const Vec3 &p2,
ai_ignore);
}
}
Log::debug("Graph", "2d node created, normal: %f, %f, %f",
normal.x(), normal.y(), normal.z());
if (is_arena)
{
q = new ArenaNode(p0, p1, p2, p3, normal, node_index);
}
else
{
q = new Node2D(p0, p1, p2, p3, normal, node_index, invisible,
ai_ignore);
Log::debug("Graph", "2d node created, normal: %f, %f, %f",
normal.x(), normal.y(), normal.z());
if (is_arena)
{
q = new ArenaNode(p0, p1, p2, p3, normal, node_index);
}
else
{
q = new Node2D(p0, p1, p2, p3, normal, node_index, invisible,
ai_ignore);
}
}
m_all_nodes.push_back(q);