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-11-04 08:54:52 +08:00
commit 46bb061f2b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/mapcollider.cc
View File

@ -90,7 +90,7 @@ namespace mc
switch (collider_union_xobj->At("type")->AsXValue().GetInt()) { switch (collider_union_xobj->At("type")->AsXValue().GetInt()) {
case kBoxCollider: case kBoxCollider:
{ {
std::shared_ptr<Collider> c = std::make_shared<BoxCollider>(); auto c = std::make_shared<BoxCollider>();
c->type = kBoxCollider; c->type = kBoxCollider;
c->Read(collider_union_xobj->At("box")); c->Read(collider_union_xobj->At("box"));
colliders.push_back(c); colliders.push_back(c);
@ -98,7 +98,7 @@ namespace mc
break; break;
case kMeshCollider: case kMeshCollider:
{ {
std::shared_ptr<Collider> c = std::make_shared<MeshCollider>(); auto c = std::make_shared<MeshCollider>();
c->type = kMeshCollider; c->type = kMeshCollider;
c->Read(collider_union_xobj->At("mesh")); c->Read(collider_union_xobj->At("mesh"));
colliders.push_back(c); colliders.push_back(c);
@ -115,7 +115,7 @@ namespace mc
{ {
auto childs_arr = xobj->At("childs"); auto childs_arr = xobj->At("childs");
for (int i = 0; i < childs_arr->Size(); ++i) { for (int i = 0; i < childs_arr->Size(); ++i) {
std::shared_ptr<ColliderNode> node = std::make_shared<ColliderNode>(); auto node = std::make_shared<ColliderNode>();
node->parent = this; node->parent = this;
node->Read(childs_arr->At(i)); node->Read(childs_arr->At(i));
if (childs.find(node->name) != childs.end()) { if (childs.find(node->name) != childs.end()) {

2
server/gameserver/mapinstance.cc
View File

@ -930,7 +930,7 @@ void MapInstance::LoadHouse()
}//end for i }//end for i
} else if (c->type == mc::kBoxCollider) { } else if (c->type == mc::kBoxCollider) {
mc::BoxCollider* box_collider = (mc::BoxCollider*)c.get(); mc::BoxCollider* box_collider = (mc::BoxCollider*)c.get();
#if 0 #if 0
if (node->name == "Wall2_1 (18)") { if (node->name == "Wall2_1 (18)") {
printf("node->name %s %f,%f,%f %f,%f,%f\n", printf("node->name %s %f,%f,%f %f,%f,%f\n",
node->name.c_str(), node->name.c_str(),

2
server/gameserver/mt/Map.h
View File

@ -36,7 +36,7 @@ namespace mt
std::vector<std::shared_ptr<WorldObject>> _world_objects; std::vector<std::shared_ptr<WorldObject>> _world_objects;
std::shared_ptr<MapCollider> collider_info; std::shared_ptr<MapCollider> collider_info;
std::map<int, std::vector<std::shared_ptr<WorldObject>>> _group_world_objects; std::map<int, std::vector<std::shared_ptr<WorldObject>>> _group_world_objects;
MapCollider* collider_info = nullptr; std::shared_ptr<MapCollider> collider_info = nullptr;
std::vector<std::tuple<std::shared_ptr<WorldObject>, int>> moba_born_points; std::vector<std::tuple<std::shared_ptr<WorldObject>, int>> moba_born_points;
std::vector<std::vector<std::tuple<std::shared_ptr<WorldObject>, int>>> moba_path_points; std::vector<std::vector<std::tuple<std::shared_ptr<WorldObject>, int>>> moba_path_points;

6
server/gameserver/mt/MapCollider.cc
View File

@ -49,7 +49,7 @@ namespace mt
auto xobj_nodes = xobj_root.At("nodes"); auto xobj_nodes = xobj_root.At("nodes");
for (int i = 0; i < xobj_nodes->Size(); ++i) { for (int i = 0; i < xobj_nodes->Size(); ++i) {
auto xobj_node = xobj_nodes->At(i); auto xobj_node = xobj_nodes->At(i);
std::shared_ptr<mc::ColliderNode> node = std::make_shared<mc::ColliderNode>(); auto node = std::make_shared<mc::ColliderNode>();
node->Read(xobj_node); node->Read(xobj_node);
if (nodes_.find(node->name) != nodes_.end()) { if (nodes_.find(node->name) != nodes_.end()) {
abort(); abort();
@ -82,13 +82,13 @@ namespace mt
abort(); abort();
} }
const std::string terrain_name = "_terrain_"; const std::string terrain_name = "_terrain_";
std::shared_ptr<mc::ColliderNode> node = std::make_shared<mc::ColliderNode>(); auto node = std::make_shared<mc::ColliderNode>();
node->name = terrain_name; node->name = terrain_name;
if (nodes_.find(node->name) != nodes_.end()) { if (nodes_.find(node->name) != nodes_.end()) {
abort(); abort();
} }
{ {
std::shared_ptr<mc::MeshCollider> mesh = std::make_shared<mc::MeshCollider>(); auto mesh = std::make_shared<mc::MeshCollider>();
mesh->type = mc::kMeshCollider; mesh->type = mc::kMeshCollider;
mesh->ca_type = mc::kCA_Surface; mesh->ca_type = mc::kCA_Surface;
mesh->mesh.vertices.reserve(verts_pb.vectors().size()); mesh->mesh.vertices.reserve(verts_pb.vectors().size());