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

rename colliders -> colliders_

Browse Source
This commit is contained in:
aozhiwei 2020-05-30 14:56:05 +08:00
parent af51b71e66
commit 63d910e555
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/entity.cc
View File

@ -42,8 +42,8 @@ bool Entity::TestCollision(Room* room, Entity* b)
} }
OnPreCollision(room); OnPreCollision(room);
b->OnPreCollision(room); b->OnPreCollision(room);
for (auto& a_collider : colliders) { for (auto& a_collider : colliders_) {
for (auto& b_collider : b->colliders) { for (auto& b_collider : b->colliders_) {
if (a_collider->Intersect(b_collider)) { if (a_collider->Intersect(b_collider)) {
return true; return true;
} }
@ -59,7 +59,7 @@ bool Entity::TestCollision(Room* room,ColliderComponent* b)
} }
OnPreCollision(room); OnPreCollision(room);
b->owner->OnPreCollision(room); b->owner->OnPreCollision(room);
for (auto& a_collider : colliders) { for (auto& a_collider : colliders_) {
if (a_collider->Intersect(b)) { if (a_collider->Intersect(b)) {
return true; return true;
} }
@ -73,7 +73,7 @@ bool Entity::TestCollisionEx(Room* room, const a8::Vec2& aabb_pos, AabbCollider&
if (aabb_box.owner) { if (aabb_box.owner) {
aabb_box.owner->OnPreCollision(room); aabb_box.owner->OnPreCollision(room);
} }
for (auto& a_collider : colliders) { for (auto& a_collider : colliders_) {
if (a_collider->IntersectEx(aabb_pos, &aabb_box)) { if (a_collider->IntersectEx(aabb_pos, &aabb_box)) {
return true; return true;
} }
@ -83,11 +83,11 @@ bool Entity::TestCollisionEx(Room* room, const a8::Vec2& aabb_pos, AabbCollider&
void Entity::ClearColliders() void Entity::ClearColliders()
{ {
for (auto& itr : colliders) { for (auto& itr : colliders_) {
ColliderComponent* collider = itr; ColliderComponent* collider = itr;
DestoryCollider(collider); DestoryCollider(collider);
} }
colliders.clear(); colliders_.clear();
} }
void Entity::BroadcastFullState(Room* room) void Entity::BroadcastFullState(Room* room)
@ -120,7 +120,7 @@ void Entity::BroadcastDeleteState(Room* room)
void Entity::AddEntityCollider(ColliderComponent* collider) void Entity::AddEntityCollider(ColliderComponent* collider)
{ {
colliders.push_back(collider); colliders_.push_back(collider);
} }
bool Entity::IsPermanent() bool Entity::IsPermanent()

2
server/gameserver/entity.h
View File

@ -75,7 +75,7 @@ class Entity
} }
protected: protected:
std::list<ColliderComponent*> colliders; std::list<ColliderComponent*> colliders_;
private: private:
a8::Vec2 pos_; a8::Vec2 pos_;

2
server/gameserver/roomobstacle.cc
View File

@ -18,7 +18,7 @@ RoomObstacle::RoomObstacle():Obstacle()
RoomObstacle::~RoomObstacle() RoomObstacle::~RoomObstacle()
{ {
for (auto& itr : colliders) { for (auto& itr : colliders_) {
ColliderComponent* collider = itr; ColliderComponent* collider = itr;
#ifdef DEBUG #ifdef DEBUG
a8::UdpLog::Instance()->Debug("OnRemoveCollider %d %d %d", a8::UdpLog::Instance()->Debug("OnRemoveCollider %d %d %d",