Moved typedef'd integers into PlyVox namespace instead of std.
This commit is contained in:
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#define __PolyVox_Vector_H__
|
||||
|
||||
#pragma region Headers
|
||||
#include "PolyVoxCStdInt.h"
|
||||
#include "PolyVoxForwardDeclarations.h"
|
||||
|
||||
#include <iostream>
|
||||
#pragma endregion
|
||||
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
namespace PolyVox
|
||||
{
|
||||
///Represents a vector in space.
|
||||
template <std::uint32_t Size, typename Type>
|
||||
template <uint32 Size, typename Type>
|
||||
class Vector
|
||||
{
|
||||
public:
|
||||
@@ -66,7 +66,7 @@ namespace PolyVox
|
||||
Vector<Size,Type>& operator/=(const Type& rhs) throw();
|
||||
|
||||
///Element Access
|
||||
Type getElement(std::uint32_t index) const throw();
|
||||
Type getElement(uint32 index) const throw();
|
||||
///Get the x component of the vector.
|
||||
Type getX(void) const throw();
|
||||
///Get the y component of the vector.
|
||||
@@ -77,7 +77,7 @@ namespace PolyVox
|
||||
Type getW(void) const throw();
|
||||
|
||||
///Element Access
|
||||
void setElement(std::uint32_t index, Type tValue) throw();
|
||||
void setElement(uint32 index, Type tValue) throw();
|
||||
///Set the x component of the vector.
|
||||
void setX(Type tX) throw();
|
||||
///Set the y component of the vector.
|
||||
@@ -107,19 +107,19 @@ namespace PolyVox
|
||||
|
||||
//Non-member overloaded operators.
|
||||
///Addition operator.
|
||||
template <std::uint32_t Size,typename Type>
|
||||
template <uint32 Size,typename Type>
|
||||
Vector<Size,Type> operator+(const Vector<Size,Type>& lhs, const Vector<Size,Type>& rhs) throw();
|
||||
///Subtraction operator.
|
||||
template <std::uint32_t Size,typename Type>
|
||||
template <uint32 Size,typename Type>
|
||||
Vector<Size,Type> operator-(const Vector<Size,Type>& lhs, const Vector<Size,Type>& rhs) throw();
|
||||
///Multiplication operator.
|
||||
template <std::uint32_t Size,typename Type>
|
||||
template <uint32 Size,typename Type>
|
||||
Vector<Size,Type> operator*(const Vector<Size,Type>& lhs, const Type& rhs) throw();
|
||||
///Division operator.
|
||||
template <std::uint32_t Size,typename Type>
|
||||
template <uint32 Size,typename Type>
|
||||
Vector<Size,Type> operator/(const Vector<Size,Type>& lhs, const Type& rhs) throw();
|
||||
///Stream insertion operator.
|
||||
template <std::uint32_t Size, typename Type>
|
||||
template <uint32 Size, typename Type>
|
||||
std::ostream& operator<<(std::ostream& os, const Vector<Size,Type>& vector) throw();
|
||||
|
||||
//Some handy typedefs
|
||||
@@ -128,17 +128,17 @@ namespace PolyVox
|
||||
///A 3D Vector of doubles.
|
||||
typedef Vector<3,double> Vector3DDouble;
|
||||
///A 3D Vector of signed 8-bit values.
|
||||
typedef Vector<3,std::int8_t> Vector3DInt8;
|
||||
typedef Vector<3,int8> Vector3DInt8;
|
||||
///A 3D Vector of unsigned 8-bit values.
|
||||
typedef Vector<3,std::uint8_t> Vector3DUint8;
|
||||
typedef Vector<3,uint8> Vector3DUint8;
|
||||
///A 3D Vector of signed 16-bit values.
|
||||
typedef Vector<3,std::int16_t> Vector3DInt16;
|
||||
typedef Vector<3,int16> Vector3DInt16;
|
||||
///A 3D Vector of unsigned 16-bit values.
|
||||
typedef Vector<3,std::uint16_t> Vector3DUint16;
|
||||
typedef Vector<3,uint16> Vector3DUint16;
|
||||
///A 3D Vector of signed 32-bit values.
|
||||
typedef Vector<3,std::int32_t> Vector3DInt32;
|
||||
typedef Vector<3,int32> Vector3DInt32;
|
||||
///A 3D Vector of unsigned 32-bit values.
|
||||
typedef Vector<3,std::uint32_t> Vector3DUint32;
|
||||
typedef Vector<3,uint32> Vector3DUint32;
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user