/s/KRVector2/Vector2/
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <functional> // for hash<>
|
||||
|
||||
#include "KRVector2.h"
|
||||
#include "Vector2.h"
|
||||
#include "KRVector3.h"
|
||||
|
||||
namespace kraken {
|
||||
|
||||
@@ -1,116 +0,0 @@
|
||||
//
|
||||
// KRVector2.h
|
||||
// Kraken
|
||||
//
|
||||
// Copyright 2017 Kearwood Gilbert. All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other materials
|
||||
// provided with the distribution.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR
|
||||
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
// The views and conclusions contained in the software and documentation are those of the
|
||||
// authors and should not be interpreted as representing official policies, either expressed
|
||||
// or implied, of Kearwood Gilbert.
|
||||
//
|
||||
|
||||
#ifndef KRVECTOR2
|
||||
#define KRVECTOR2
|
||||
|
||||
#include <functional> // for hash<>
|
||||
|
||||
namespace kraken {
|
||||
|
||||
class KRVector2 {
|
||||
|
||||
public:
|
||||
union {
|
||||
struct {
|
||||
float x, y;
|
||||
};
|
||||
float c[2];
|
||||
};
|
||||
|
||||
KRVector2();
|
||||
KRVector2(float X, float Y);
|
||||
KRVector2(float v);
|
||||
KRVector2(float *v);
|
||||
KRVector2(const KRVector2 &v);
|
||||
~KRVector2();
|
||||
|
||||
// KRVector2 swizzle getters
|
||||
KRVector2 yx() const;
|
||||
|
||||
// KRVector2 swizzle setters
|
||||
void yx(const KRVector2 &v);
|
||||
|
||||
KRVector2& operator =(const KRVector2& b);
|
||||
KRVector2 operator +(const KRVector2& b) const;
|
||||
KRVector2 operator -(const KRVector2& b) const;
|
||||
KRVector2 operator +() const;
|
||||
KRVector2 operator -() const;
|
||||
KRVector2 operator *(const float v) const;
|
||||
KRVector2 operator /(const float v) const;
|
||||
|
||||
KRVector2& operator +=(const KRVector2& b);
|
||||
KRVector2& operator -=(const KRVector2& b);
|
||||
KRVector2& operator *=(const float v);
|
||||
KRVector2& operator /=(const float v);
|
||||
|
||||
// Comparison operators are implemented to allow insertion into sorted containers such as std::set
|
||||
bool operator >(const KRVector2& b) const;
|
||||
bool operator <(const KRVector2& b) const;
|
||||
|
||||
bool operator ==(const KRVector2& b) const;
|
||||
bool operator !=(const KRVector2& b) const;
|
||||
|
||||
float& operator[](unsigned i);
|
||||
float operator[](unsigned i) const;
|
||||
|
||||
float sqrMagnitude() const;
|
||||
float magnitude() const;
|
||||
|
||||
void normalize();
|
||||
static KRVector2 Normalize(const KRVector2 &v);
|
||||
|
||||
static float Cross(const KRVector2 &v1, const KRVector2 &v2);
|
||||
|
||||
static float Dot(const KRVector2 &v1, const KRVector2 &v2);
|
||||
static KRVector2 Min();
|
||||
static KRVector2 Max();
|
||||
static KRVector2 Zero();
|
||||
static KRVector2 One();
|
||||
};
|
||||
|
||||
} // namespace kraken
|
||||
|
||||
namespace std {
|
||||
template<>
|
||||
struct hash<kraken::KRVector2> {
|
||||
public:
|
||||
size_t operator()(const kraken::KRVector2 &s) const
|
||||
{
|
||||
size_t h1 = hash<float>()(s.x);
|
||||
size_t h2 = hash<float>()(s.y);
|
||||
return h1 ^ (h2 << 1);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#endif // KRVECTOR2_H
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
// or implied, of Kearwood Gilbert.
|
||||
//
|
||||
|
||||
#ifndef KRVECTOR3_H
|
||||
#define KRVECTOR3_H
|
||||
#ifndef KRAKEN_VECTOR3_H
|
||||
#define KRAKEN_VECTOR3_H
|
||||
|
||||
#include <functional> // for hash<>
|
||||
|
||||
@@ -57,24 +57,24 @@ public:
|
||||
KRVector3(const KRVector4 &v);
|
||||
~KRVector3();
|
||||
|
||||
// KRVector2 swizzle getters
|
||||
KRVector2 xx() const;
|
||||
KRVector2 xy() const;
|
||||
KRVector2 xz() const;
|
||||
KRVector2 yx() const;
|
||||
KRVector2 yy() const;
|
||||
KRVector2 yz() const;
|
||||
KRVector2 zx() const;
|
||||
KRVector2 zy() const;
|
||||
KRVector2 zz() const;
|
||||
// Vector2 swizzle getters
|
||||
Vector2 xx() const;
|
||||
Vector2 xy() const;
|
||||
Vector2 xz() const;
|
||||
Vector2 yx() const;
|
||||
Vector2 yy() const;
|
||||
Vector2 yz() const;
|
||||
Vector2 zx() const;
|
||||
Vector2 zy() const;
|
||||
Vector2 zz() const;
|
||||
|
||||
// KRVector2 swizzle setters
|
||||
void xy(const KRVector2 &v);
|
||||
void xz(const KRVector2 &v);
|
||||
void yx(const KRVector2 &v);
|
||||
void yz(const KRVector2 &v);
|
||||
void zx(const KRVector2 &v);
|
||||
void zy(const KRVector2 &v);
|
||||
// Vector2 swizzle setters
|
||||
void xy(const Vector2 &v);
|
||||
void xz(const Vector2 &v);
|
||||
void yx(const Vector2 &v);
|
||||
void yz(const Vector2 &v);
|
||||
void zx(const Vector2 &v);
|
||||
void zy(const Vector2 &v);
|
||||
|
||||
KRVector3& operator =(const KRVector3& b);
|
||||
KRVector3& operator =(const KRVector4& b);
|
||||
@@ -142,4 +142,4 @@ namespace std {
|
||||
};
|
||||
}
|
||||
|
||||
#endif // KRVECTOR3_H
|
||||
#endif // KRAKEN_VECTOR3_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define KRAKEN_H
|
||||
|
||||
#include "KRFloat.h"
|
||||
#include "KRVector2.h"
|
||||
#include "vector2.h"
|
||||
#include "KRVector3.h"
|
||||
#include "KRVector4.h"
|
||||
#include "KRMat4.h"
|
||||
|
||||
Reference in New Issue
Block a user