1
This commit is contained in:
parent
57decc7d0d
commit
04fa411adf
@ -814,6 +814,7 @@ void MapInstance::LoadHouse()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
//求三角形min_y max_y
|
||||||
things_.reserve(1024 * 10);
|
things_.reserve(1024 * 10);
|
||||||
auto cb =
|
auto cb =
|
||||||
[this] (mc::ColliderNode* node)
|
[this] (mc::ColliderNode* node)
|
||||||
@ -835,7 +836,8 @@ void MapInstance::LoadHouse()
|
|||||||
tri.min_y = tri.vert0.y;
|
tri.min_y = tri.vert0.y;
|
||||||
tri.max_y = tri.vert0.y;
|
tri.max_y = tri.vert0.y;
|
||||||
for (int ii = 1; ii < 3; ++ii) {
|
for (int ii = 1; ii < 3; ++ii) {
|
||||||
float y = mesh_collider->mesh.vertices[i + ii].y;
|
int vp = mesh_collider->mesh.raw_triangles[i + ii];
|
||||||
|
float y = mesh_collider->mesh.vertices.at(vp).y;
|
||||||
if (y < tri.min_y) {
|
if (y < tri.min_y) {
|
||||||
tri.min_y = y;
|
tri.min_y = y;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,6 @@ namespace mt
|
|||||||
|
|
||||||
void MapCollider::Load(const std::string& filename)
|
void MapCollider::Load(const std::string& filename)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
a8::XObject xobj_root;
|
a8::XObject xobj_root;
|
||||||
xobj_root.ReadFromFile(MetaMgr::Instance()->GetResDir() + filename);
|
xobj_root.ReadFromFile(MetaMgr::Instance()->GetResDir() + filename);
|
||||||
auto xobj_nodes = xobj_root.At("nodes");
|
auto xobj_nodes = xobj_root.At("nodes");
|
||||||
@ -50,7 +49,6 @@ namespace mt
|
|||||||
}
|
}
|
||||||
nodes_[node->name] = node;
|
nodes_[node->name] = node;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mc::ColliderNode* MapCollider::GetNode(const std::string& name)
|
mc::ColliderNode* MapCollider::GetNode(const std::string& name)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user