NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commented non-functional features.

This commit is contained in:
Robin Engman 2013-11-20 13:48:54 +01:00
parent b8d0a106b3
commit da6eda2a8c
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Code/OysterPhysics3D/Box.cpp
View File

@ -31,10 +31,10 @@ bool Box::Intersects( const ICollideable *target ) const
case Type_ray: return Utility::Intersect( *this, *(Ray*)target, ((Ray*)target)->collisionDistance ); case Type_ray: return Utility::Intersect( *this, *(Ray*)target, ((Ray*)target)->collisionDistance );
case Type_sphere: return Utility::Intersect( *this, *(Sphere*)target ); case Type_sphere: return Utility::Intersect( *this, *(Sphere*)target );
case Type_plane: return Utility::Intersect( *this, *(Plane*)target ); case Type_plane: return Utility::Intersect( *this, *(Plane*)target );
case Type_triangle: return false; // TODO: : // case Type_triangle: return false; // TODO: :
case Type_box_axis_aligned: return Utility::Intersect( *this, *(BoxAxisAligned*)target ); case Type_box_axis_aligned: return Utility::Intersect( *this, *(BoxAxisAligned*)target );
case Type_box: return Utility::Intersect( *this, *(Box*)target ); case Type_box: return Utility::Intersect( *this, *(Box*)target );
case Type_frustrum: return false; // TODO: : // case Type_frustrum: return false; // TODO: :
default: return false; default: return false;
} }
} }
@ -44,11 +44,11 @@ bool Box::Contains( const ICollideable *target ) const
switch( target->type ) switch( target->type )
{ {
case Type_point: return Utility::Intersect( *this, *(Point*)target ); case Type_point: return Utility::Intersect( *this, *(Point*)target );
case Type_sphere: return false; // TODO: // case Type_sphere: return false; // TODO:
case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return false; // TODO: // case Type_box_axis_aligned: return false; // TODO:
case Type_box: return false; // TODO: // case Type_box: return false; // TODO:
case Type_frustrum: return false; // TODO: // case Type_frustrum: return false; // TODO:
default: return false; default: return false;
} }
} }

18
Code/OysterPhysics3D/BoxAxisAligned.cpp
View File

@ -33,10 +33,10 @@ bool BoxAxisAligned::Intersects( const ICollideable *target ) const
case Type_ray: return Utility::Intersect( *this, *(Ray*)target, ((Ray*)target)->collisionDistance ); case Type_ray: return Utility::Intersect( *this, *(Ray*)target, ((Ray*)target)->collisionDistance );
case Type_sphere: return Utility::Intersect( *this, *(Sphere*)target ); case Type_sphere: return Utility::Intersect( *this, *(Sphere*)target );
case Type_plane: return Utility::Intersect( *this, *(Plane*)target ); case Type_plane: return Utility::Intersect( *this, *(Plane*)target );
case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return Utility::Intersect( *this, *(BoxAxisAligned*)target ); case Type_box_axis_aligned: return Utility::Intersect( *this, *(BoxAxisAligned*)target );
case Type_box: return false; // TODO: // case Type_box: return false; // TODO:
case Type_frustrum: return false; // TODO: // case Type_frustrum: return false; // TODO:
default: return false; default: return false;
} }
} }
@ -45,12 +45,12 @@ bool BoxAxisAligned::Contains( const ICollideable *target ) const
{ {
switch( target->type ) switch( target->type )
{ {
case Type_point: return false; // TODO: // case Type_point: return false; // TODO:
case Type_sphere: return false; // TODO: // case Type_sphere: return false; // TODO:
case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return false; // TODO: // case Type_box_axis_aligned: return false; // TODO:
case Type_box: return false; // TODO: // case Type_box: return false; // TODO:
case Type_frustrum: return false; // TODO: // case Type_frustrum: return false; // TODO:
default: return false; default: return false;
} }
} }

20
Code/OysterPhysics3D/Frustrum.cpp
View File

@ -200,11 +200,11 @@ bool Frustrum::Intersects( const ICollideable *target ) const
case Type_ray: return Utility::Intersect( *this, *(Ray*)target, ((Ray*)target)->collisionDistance ); case Type_ray: return Utility::Intersect( *this, *(Ray*)target, ((Ray*)target)->collisionDistance );
case Type_sphere: return Utility::Intersect( *this, *(Sphere*)target ); case Type_sphere: return Utility::Intersect( *this, *(Sphere*)target );
case Type_plane: return Utility::Intersect( *this, *(Plane*)target ); case Type_plane: return Utility::Intersect( *this, *(Plane*)target );
case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return Utility::Intersect( *this, *(BoxAxisAligned*)target ); case Type_box_axis_aligned: return Utility::Intersect( *this, *(BoxAxisAligned*)target );
case Type_box: return Utility::Intersect( *this, *(Box*)target ); case Type_box: return Utility::Intersect( *this, *(Box*)target );
case Type_frustrum: return Utility::Intersect( *this, *(Frustrum*)target ); case Type_frustrum: return Utility::Intersect( *this, *(Frustrum*)target );
case Type_line: return false; // TODO: // case Type_line: return false; // TODO:
default: return false; default: return false;
} }
} }
@ -214,14 +214,14 @@ bool Frustrum::Contains( const ICollideable *target ) const
switch( target->type ) switch( target->type )
{ {
case Type_point: return Utility::Intersect( *this, *(Point*)target ); case Type_point: return Utility::Intersect( *this, *(Point*)target );
case Type_ray: return false; // TODO: // case Type_ray: return false; // TODO:
case Type_sphere: return false; // TODO: // case Type_sphere: return false; // TODO:
case Type_plane: return false; // TODO: // case Type_plane: return false; // TODO:
case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return false; // TODO: // case Type_box_axis_aligned: return false; // TODO:
case Type_box: return false; // TODO: // case Type_box: return false; // TODO:
case Type_frustrum: return false; // TODO: // case Type_frustrum: return false; // TODO:
case Type_line: return false; // TODO: // case Type_line: return false; // TODO:
default: return false; default: return false;
} }
} }

2
Code/OysterPhysics3D/ICollideable.h
View File

@ -21,7 +21,7 @@ namespace Oyster { namespace Collision3D /// Contains a collection of 3D shapes
Type_ray, Type_ray,
Type_sphere, Type_sphere,
Type_plane, Type_plane,
Type_triangle, // Type_triangle,
Type_box_axis_aligned, Type_box_axis_aligned,
Type_box, Type_box,
Type_frustrum, Type_frustrum,