server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-03-30 20:17:42 +08:00
parent 69816694cd
commit 8bd3fa65a0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/mapinstance.cc
View File

@ -814,13 +814,18 @@ void MapInstance::LoadHouse()
} }
} }
{ {
int box_tri_arr[6][3] = { int box_tri_arr[8][3] = {
{0, 1, 2}, {0, 1, 2},
{0, 2, 3}, {0, 2, 3},
{0, 1, 2}, {0, 1, 2},
{0, 1, 2}, {0, 1, 2},
{0, 1, 2}, {0, 1, 2},
{0, 1, 2} {0, 1, 2},
{0, 1, 2},
{0, 1, 2}
}; };
//求三角形min_y max_y //求三角形min_y max_y
things_.reserve(1024 * 10); things_.reserve(1024 * 10);
@ -858,7 +863,6 @@ void MapInstance::LoadHouse()
map_service_->AddTriangle(&tri); map_service_->AddTriangle(&tri);
}//end for i }//end for i
} else if (c->type == mc::kBoxCollider) { } else if (c->type == mc::kBoxCollider) {
#if 0
mc::BoxCollider* box_collider = (mc::BoxCollider*)c; mc::BoxCollider* box_collider = (mc::BoxCollider*)c;
std::vector<glm::vec3> new_points; std::vector<glm::vec3> new_points;
mc::RotateBounds(box_collider->center, mc::RotateBounds(box_collider->center,
@ -866,11 +870,10 @@ void MapInstance::LoadHouse()
node->transform.local_rotation, node->transform.local_rotation,
new_points new_points
); );
box_collider->triangles.reserve(2 * 6); box_collider->triangles.reserve(2 * 8);
auto& tri = a8::FastAppend(box_collider->triangles); auto& tri = a8::FastAppend(box_collider->triangles);
tri.node = node; tri.node = node;
map_service_->AddTriangle(&tri); map_service_->AddTriangle(&tri);
#endif
}//endif }//endif
}//end forc }//end forc
things_.push_back(node); things_.push_back(node);