WIP organization of library

This commit is contained in:
Kearwood Kip Gilbert
2017-07-29 01:07:21 -07:00
parent 3ca57d56ee
commit 18b74bcbe4
47 changed files with 292 additions and 309 deletions

View File

@@ -16,6 +16,8 @@
#include "KRVector2.h"
#include "KRVector3.h"
namespace kraken {
class KRMat4;
class KRAABB {
@@ -58,14 +60,16 @@ public:
KRVector3 nearestPoint(const KRVector3 & v) const;
};
} // namespace kraken
namespace std {
template<>
struct hash<KRAABB> {
struct hash<kraken::KRAABB> {
public:
size_t operator()(const KRAABB &s) const
size_t operator()(const kraken::KRAABB &s) const
{
size_t h1 = hash<KRVector3>()(s.min);
size_t h2 = hash<KRVector3>()(s.max);
size_t h1 = hash<kraken::KRVector3>()(s.min);
size_t h2 = hash<kraken::KRVector3>()(s.max);
return h1 ^ ( h2 << 1 );
}
};

View File

@@ -32,8 +32,10 @@
#ifndef KRFLOAT_H
#define KRFLOAT_H
namespace KRFloat {
namespace kraken {
float SmoothStep(float a, float b, float t);
};
}; // namespace kraken
#endif /* defined(KRFLOAT_H) */

View File

@@ -36,6 +36,8 @@
#ifndef KRMAT4_H
#define KRMAT4_H
namespace kraken {
typedef enum {
X_AXIS,
Y_AXIS,
@@ -108,4 +110,6 @@ class KRMat4 {
static KRMat4 Scaling(const KRVector3 &v);
};
} // namespace kraken
#endif // KRMAT4_H

View File

@@ -0,0 +1,90 @@
//
// KRQuaternion.h
// KREngine
//
// Copyright 2012 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 KRQUATERNION_H
#define KRQUATERNION_H
#include "KRVector3.h"
namespace kraken {
class KRQuaternion {
public:
KRQuaternion();
KRQuaternion(float w, float x, float y, float z);
KRQuaternion(const KRQuaternion& p);
KRQuaternion(const KRVector3 &euler);
KRQuaternion(const KRVector3 &from_vector, const KRVector3 &to_vector);
~KRQuaternion();
KRQuaternion& operator =( const KRQuaternion& p );
KRQuaternion operator +(const KRQuaternion &v) const;
KRQuaternion operator -(const KRQuaternion &v) const;
KRQuaternion operator +() const;
KRQuaternion operator -() const;
KRQuaternion operator *(const KRQuaternion &v);
KRQuaternion operator *(float num) const;
KRQuaternion operator /(float num) const;
KRQuaternion& operator +=(const KRQuaternion& v);
KRQuaternion& operator -=(const KRQuaternion& v);
KRQuaternion& operator *=(const KRQuaternion& v);
KRQuaternion& operator *=(const float& v);
KRQuaternion& operator /=(const float& v);
friend bool operator ==(KRQuaternion &v1, KRQuaternion &v2);
friend bool operator !=(KRQuaternion &v1, KRQuaternion &v2);
float& operator [](unsigned i);
float operator [](unsigned i) const;
void setEulerXYZ(const KRVector3 &euler);
void setEulerZYX(const KRVector3 &euler);
KRVector3 eulerXYZ() const;
KRMat4 rotationMatrix() const;
void normalize();
static KRQuaternion Normalize(const KRQuaternion &v1);
void conjugate();
static KRQuaternion Conjugate(const KRQuaternion &v1);
static KRQuaternion FromAngleAxis(const KRVector3 &axis, float angle);
static KRQuaternion Lerp(const KRQuaternion &a, const KRQuaternion &b, float t);
static KRQuaternion Slerp(const KRQuaternion &a, const KRQuaternion &b, float t);
static float Dot(const KRQuaternion &v1, const KRQuaternion &v2);
private:
float m_val[4];
};
} // namespace kraken
#endif // KRQUATERNION_H

View File

@@ -34,6 +34,8 @@
#include "KRVector3.h"
namespace kraken {
class KRTriangle3
{
public:
@@ -58,4 +60,6 @@ public:
KRVector3 closestPointOnTriangle(const KRVector3 &p) const;
};
} // namespace kraken
#endif // KRTRIANGLE3_H

View File

@@ -34,6 +34,8 @@
#include <functional> // for hash<>
namespace kraken {
class KRVector2 {
public:
@@ -95,18 +97,20 @@ public:
static KRVector2 One();
};
} // namespace kraken
namespace std {
template<>
struct hash<KRVector2> {
public:
size_t operator()(const KRVector2 &s) const
{
size_t h1 = hash<float>()(s.x);
size_t h2 = hash<float>()(s.y);
return h1 ^ ( h2 << 1 );
}
};
};
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
#endif

View File

@@ -34,8 +34,9 @@
#include <functional> // for hash<>
class KRVector2;
class KRVector4;
#include "KRVector4.h"
namespace kraken {
class KRVector3 {
@@ -125,18 +126,20 @@ public:
static void OrthoNormalize(KRVector3 &normal, KRVector3 &tangent); // Gram-Schmidt Orthonormalization
};
} // namespace kraken
namespace std {
template<>
struct hash<KRVector3> {
public:
size_t operator()(const KRVector3 &s) const
{
size_t h1 = hash<float>()(s.x);
size_t h2 = hash<float>()(s.y);
size_t h3 = hash<float>()(s.z);
return h1 ^ ( h2 << 1 ) ^ (h3 << 2);
}
};
};
template<>
struct hash<kraken::KRVector3> {
public:
size_t operator()(const kraken::KRVector3 &s) const
{
size_t h1 = hash<float>()(s.x);
size_t h2 = hash<float>()(s.y);
size_t h3 = hash<float>()(s.z);
return h1 ^ (h2 << 1) ^ (h3 << 2);
}
};
}
#endif // KRVECTOR3_H

View File

@@ -34,6 +34,8 @@
#include <functional> // for hash<>
namespace kraken {
class KRVector3;
class KRVector4 {
@@ -100,4 +102,21 @@ public:
static void OrthoNormalize(KRVector4 &normal, KRVector4 &tangent); // Gram-Schmidt Orthonormalization
};
} // namespace kraken
namespace std {
template<>
struct hash<kraken::KRVector4> {
public:
size_t operator()(const kraken::KRVector4 &s) const
{
size_t h1 = hash<float>()(s.x);
size_t h2 = hash<float>()(s.y);
size_t h3 = hash<float>()(s.z);
size_t h4 = hash<float>()(s.w);
return h1 ^ (h2 << 1) ^ (h3 << 2) ^ (h4 << 3);
}
};
}
#endif // KRVECTOR4_H

View File

@@ -6,6 +6,7 @@
#include "KRVector3.h"
#include "KRVector4.h"
#include "KRMat4.h"
#include "KRQuaternion.h"
#include "KRAABB.h"
#include "KRTriangle3.h"