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

Some compile error fixes

This commit is contained in:
Dander7BD 2013-12-16 10:03:29 +01:00
parent 61e1d20748
commit a3ced24fea
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Code/OysterPhysics3D/ICollideable.h
View File

@ -6,6 +6,7 @@
#ifndef OYSTER_COLLISION_3D_ICOLLIDEABLE_H #ifndef OYSTER_COLLISION_3D_ICOLLIDEABLE_H
#define OYSTER_COLLISION_3D_ICOLLIDEABLE_H #define OYSTER_COLLISION_3D_ICOLLIDEABLE_H
#include "OysterMath.h"
#include "Utilities.h" #include "Utilities.h"
namespace Oyster { namespace Collision3D //! Contains a collection of 3D shapes and intercollission algorithms. namespace Oyster { namespace Collision3D //! Contains a collection of 3D shapes and intercollission algorithms.

4
Code/OysterPhysics3D/Plane.cpp
View File

@ -60,8 +60,8 @@ bool Plane::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &worl
case Type_sphere: return Utility::Intersect( *this, *(Sphere*)&target, worldPointOfContact ); case Type_sphere: return Utility::Intersect( *this, *(Sphere*)&target, worldPointOfContact );
case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact ); case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact );
// case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact ); case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
case Type_box: return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact ); case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
case Type_frustrum: return false; // TODO: case Type_frustrum: return false; // TODO:
default: worldPointOfContact = NULL; default: worldPointOfContact = NULL;
return false; return false;

4
Code/OysterPhysics3D/Point.cpp
View File

@ -58,8 +58,8 @@ bool Point::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &worl
case Type_sphere: return Utility::Intersect( *(Sphere*)&target, *this, worldPointOfContact ); case Type_sphere: return Utility::Intersect( *(Sphere*)&target, *this, worldPointOfContact );
case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact ); case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact );
// case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact ); case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
case Type_box: return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact ); case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
case Type_frustrum: return false; // TODO: case Type_frustrum: return false; // TODO:
default: worldPointOfContact = NULL; default: worldPointOfContact = NULL;
return false; return false;

4
Code/OysterPhysics3D/Ray.cpp
View File

@ -67,8 +67,8 @@ bool Ray::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &worldP
case Type_sphere: return Utility::Intersect( *(Sphere*)&target, *this, this->collisionDistance, worldPointOfContact ); case Type_sphere: return Utility::Intersect( *(Sphere*)&target, *this, this->collisionDistance, worldPointOfContact );
case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, this->collisionDistance, worldPointOfContact ); case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, this->collisionDistance, worldPointOfContact );
// case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, this->collisionDistance, worldPointOfContact ); case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, this->collisionDistance, worldPointOfContact );
case Type_box: return Utility::Intersect( *(Box*)&target, *this, this->collisionDistance, worldPointOfContact ); case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, this->collisionDistance, worldPointOfContact );
case Type_frustrum: return false; // TODO: case Type_frustrum: return false; // TODO:
default: worldPointOfContact = NULL; default: worldPointOfContact = NULL;
return false; return false;

1
Code/OysterPhysics3D/Ray.h
View File

@ -10,7 +10,6 @@
#ifndef OYSTER_COLLISION_3D_RAY_H #ifndef OYSTER_COLLISION_3D_RAY_H
#define OYSTER_COLLISION_3D_RAY_H #define OYSTER_COLLISION_3D_RAY_H
#include "OysterMath.h"
#include "ICollideable.h" #include "ICollideable.h"
namespace Oyster { namespace Collision3D namespace Oyster { namespace Collision3D

4
Code/OysterPhysics3D/Sphere.cpp
View File

@ -55,8 +55,8 @@ bool Sphere::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &wor
case Type_sphere: return Utility::Intersect( *this, *(Sphere*)&target, worldPointOfContact ); case Type_sphere: return Utility::Intersect( *this, *(Sphere*)&target, worldPointOfContact );
case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact ); case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact );
// case Type_triangle: return false; // TODO: // case Type_triangle: return false; // TODO:
case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact ); case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
case Type_box: return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact ); case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
case Type_frustrum: return false; // TODO: case Type_frustrum: return false; // TODO:
default: worldPointOfContact = Float3::null; default: worldPointOfContact = Float3::null;
return false; return false;

1
Code/OysterPhysics3D/Universe.h
View File

@ -7,6 +7,7 @@
#define OYSTER_COLLISION_3D_UNIVERSE_H #define OYSTER_COLLISION_3D_UNIVERSE_H
#include "ICollideable.h" #include "ICollideable.h"
#include "OysterMath.h"
namespace Oyster { namespace Collision3D namespace Oyster { namespace Collision3D
{ {