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 2022-08-07 15:57:03 +08:00
parent d094241db1
commit 9783bd2c44
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/gameserver/collider.cc
View File

@ -74,6 +74,12 @@ bool ColliderComponent::Intersect(ColliderComponent* b)
case CT_Arc: case CT_Arc:
{ {
ArcCollider* b_arc = (ArcCollider*)b; ArcCollider* b_arc = (ArcCollider*)b;
#if 0
return a8::IntersectAabbArc(a_aabb->owner->GetPos() + a_aabb->_min,
a_aabb->owner->GetPos() + a_aabb->_max,
b_arc->owner->GetPos(),
b_arc->width);
#endif
} }
break; break;
} }
@ -104,6 +110,17 @@ bool ColliderComponent::Intersect(ColliderComponent* b)
b_circle->rad); b_circle->rad);
} }
break; break;
case CT_Arc:
{
ArcCollider* b_arc = (ArcCollider*)b;
#if 0
return a8::IntersectCircleArc(a_circle->owner->GetPos(),
a_circle->rad,
b_arc->owner->GetPos(),
b_arc->width);
#endif
}
break;
} }
} }
break; break;

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit cc57f69109cae63a1cfda69df474ffc328c012cc Subproject commit ab36720b8e2b61fd70cc288d3708f88a94d1ca6b