From da6eda2a8c78959b0afe6de4fd95f952c1b99c6c Mon Sep 17 00:00:00 2001 From: Robin Engman Date: Wed, 20 Nov 2013 13:48:54 +0100 Subject: [PATCH] Commented non-functional features. --- Code/OysterPhysics3D/Box.cpp | 14 +++++++------- Code/OysterPhysics3D/BoxAxisAligned.cpp | 18 +++++++++--------- Code/OysterPhysics3D/Frustrum.cpp | 20 ++++++++++---------- Code/OysterPhysics3D/ICollideable.h | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Code/OysterPhysics3D/Box.cpp b/Code/OysterPhysics3D/Box.cpp index a20b8195..ed42ba76 100644 --- a/Code/OysterPhysics3D/Box.cpp +++ b/Code/OysterPhysics3D/Box.cpp @@ -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_sphere: return Utility::Intersect( *this, *(Sphere*)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: return Utility::Intersect( *this, *(Box*)target ); - case Type_frustrum: return false; // TODO: : + // case Type_frustrum: return false; // TODO: : default: return false; } } @@ -44,11 +44,11 @@ bool Box::Contains( const ICollideable *target ) const switch( target->type ) { case Type_point: return Utility::Intersect( *this, *(Point*)target ); - case Type_sphere: return false; // TODO: - case Type_triangle: return false; // TODO: - case Type_box_axis_aligned: return false; // TODO: - case Type_box: return false; // TODO: - case Type_frustrum: return false; // TODO: + // case Type_sphere: return false; // TODO: + // case Type_triangle: return false; // TODO: + // case Type_box_axis_aligned: return false; // TODO: + // case Type_box: return false; // TODO: + // case Type_frustrum: return false; // TODO: default: return false; } } \ No newline at end of file diff --git a/Code/OysterPhysics3D/BoxAxisAligned.cpp b/Code/OysterPhysics3D/BoxAxisAligned.cpp index c782ed25..04bc53f1 100644 --- a/Code/OysterPhysics3D/BoxAxisAligned.cpp +++ b/Code/OysterPhysics3D/BoxAxisAligned.cpp @@ -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_sphere: return Utility::Intersect( *this, *(Sphere*)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: return false; // TODO: - case Type_frustrum: return false; // TODO: + // case Type_box: return false; // TODO: + // case Type_frustrum: return false; // TODO: default: return false; } } @@ -45,12 +45,12 @@ bool BoxAxisAligned::Contains( const ICollideable *target ) const { switch( target->type ) { - case Type_point: return false; // TODO: - case Type_sphere: return false; // TODO: - case Type_triangle: return false; // TODO: - case Type_box_axis_aligned: return false; // TODO: - case Type_box: return false; // TODO: - case Type_frustrum: return false; // TODO: + // case Type_point: return false; // TODO: + // case Type_sphere: return false; // TODO: + // case Type_triangle: return false; // TODO: + // case Type_box_axis_aligned: return false; // TODO: + // case Type_box: return false; // TODO: + // case Type_frustrum: return false; // TODO: default: return false; } } \ No newline at end of file diff --git a/Code/OysterPhysics3D/Frustrum.cpp b/Code/OysterPhysics3D/Frustrum.cpp index e4da0ce9..9e45f579 100644 --- a/Code/OysterPhysics3D/Frustrum.cpp +++ b/Code/OysterPhysics3D/Frustrum.cpp @@ -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_sphere: return Utility::Intersect( *this, *(Sphere*)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: return Utility::Intersect( *this, *(Box*)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; } } @@ -214,14 +214,14 @@ bool Frustrum::Contains( const ICollideable *target ) const switch( target->type ) { case Type_point: return Utility::Intersect( *this, *(Point*)target ); - case Type_ray: return false; // TODO: - case Type_sphere: return false; // TODO: - case Type_plane: return false; // TODO: - case Type_triangle: return false; // TODO: - case Type_box_axis_aligned: return false; // TODO: - case Type_box: return false; // TODO: - case Type_frustrum: return false; // TODO: - case Type_line: return false; // TODO: + // case Type_ray: return false; // TODO: + // case Type_sphere: return false; // TODO: + // case Type_plane: return false; // TODO: + // case Type_triangle: return false; // TODO: + // case Type_box_axis_aligned: return false; // TODO: + // case Type_box: return false; // TODO: + // case Type_frustrum: return false; // TODO: + // case Type_line: return false; // TODO: default: return false; } } \ No newline at end of file diff --git a/Code/OysterPhysics3D/ICollideable.h b/Code/OysterPhysics3D/ICollideable.h index aa6c7891..4b620506 100644 --- a/Code/OysterPhysics3D/ICollideable.h +++ b/Code/OysterPhysics3D/ICollideable.h @@ -21,7 +21,7 @@ namespace Oyster { namespace Collision3D /// Contains a collection of 3D shapes Type_ray, Type_sphere, Type_plane, - Type_triangle, + // Type_triangle, Type_box_axis_aligned, Type_box, Type_frustrum,