From 4f14c5662eb48551970b8a13efdd697afd27e701 Mon Sep 17 00:00:00 2001 From: Dander7BD Date: Sun, 10 Nov 2013 13:34:35 +0100 Subject: [PATCH] Frustrum::Split & Frustrum::WriteToByte edited Their paramlists did not follow coding practice standard. Now corrected. Old versions still available as inline methods and is marked DEPRECATED. --- OysterPhysics3D/Collision/Frustrum.cpp | 4 ++-- OysterPhysics3D/Collision/Frustrum.h | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/OysterPhysics3D/Collision/Frustrum.cpp b/OysterPhysics3D/Collision/Frustrum.cpp index 71e4b1cb..5c7a6664 100644 --- a/OysterPhysics3D/Collision/Frustrum.cpp +++ b/OysterPhysics3D/Collision/Frustrum.cpp @@ -101,7 +101,7 @@ Frustrum & Frustrum::operator = ( const Float4x4 &vp ) return *this; } -void Frustrum::Split( Frustrum target[], unsigned int numX, unsigned int numY, unsigned int numZ ) const +void Frustrum::Split( unsigned int numX, unsigned int numY, unsigned int numZ, Frustrum target[] ) const { float incrementX = 1.0f / numX, incrementY = 1.0f / numY, @@ -174,7 +174,7 @@ void Frustrum::Split( Frustrum target[], unsigned int numX, unsigned int numY, u } } -void Frustrum::WriteToByte( unsigned char targetMem[], unsigned int &nextIndex ) const +void Frustrum::WriteToByte( unsigned int &nextIndex, unsigned char targetMem[] ) const { Float *fMem = (Float*)&targetMem[nextIndex]; for( int p = 0; p < 6; ++p ) diff --git a/OysterPhysics3D/Collision/Frustrum.h b/OysterPhysics3D/Collision/Frustrum.h index 5f41ba06..03688154 100644 --- a/OysterPhysics3D/Collision/Frustrum.h +++ b/OysterPhysics3D/Collision/Frustrum.h @@ -31,13 +31,24 @@ namespace Oyster { namespace Collision3D Frustrum & operator = ( const Frustrum &frustrum ); Frustrum & operator = ( const ::Oyster::Math::Float4x4 &viewProjection ); - void Split( Frustrum targetList[], unsigned int numX, unsigned int numY = 1U, unsigned int numZ = 1u ) const; - void WriteToByte( unsigned char targetMem[], unsigned int &nextIndex ) const; + void Split( unsigned int numX, unsigned int numY, unsigned int numZ, Frustrum targetList[] ) const; + void WriteToByte( unsigned int &nextIndex, unsigned char targetMem[] ) const; + + void Split( Frustrum targetList[], unsigned int numX, unsigned int numY = 1U, unsigned int numZ = 1u ) const; /// DEPRECATED + void WriteToByte( unsigned char targetMem[], unsigned int &nextIndex ) const; /// DEPRECATED virtual ::Utility::Memory::UniquePointer Clone( ) const; bool Intersects( const ICollideable *target ) const; bool Contains( const ICollideable *target ) const; }; + + // INLINE IMPLEMENTATIONS /////////////////////////////////////// + + inline void Frustrum::Split( Frustrum targetList[], unsigned int numX, unsigned int numY, unsigned int numZ ) const /// DEPRECATED + { this->Split( numX, numY, numZ, targetList ); } + + inline void Frustrum::WriteToByte( unsigned char targetMem[], unsigned int &nextIndex ) const /// DEPRECATED + { this->WriteToByte( nextIndex, targetMem ); } } } #endif \ No newline at end of file