kraken_engine/hydra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge github.com:KrakenEngine/hydra

Browse Source
This commit is contained in:
Kearwood Kip Gilbert
2018-04-23 11:22:20 -07:00
parent a31d510360 00bb9b6689
commit fe16af07f1
28 changed files with 305 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -3,12 +3,12 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
project(kraken-math) project(hydra)
set(PUBLIC_HEADERS set(PUBLIC_HEADERS
include/aabb.h include/aabb.h
include/hitinfo.h include/hitinfo.h
include/kraken-math.h include/hydra.h
include/matrix2.h include/matrix2.h
include/matrix2x3.h include/matrix2x3.h
include/matrix4.h include/matrix4.h
@@ -37,4 +37,4 @@ set(SRCS
src/vector2i.cpp src/vector2i.cpp
) )
add_library(krakenmath STATIC ${SRCS} ${PUBLIC_HEADERS}) add_library(hydra STATIC ${SRCS} ${PUBLIC_HEADERS})

2
include/aabb.h
View File

@@ -1,6 +1,6 @@
// //
// KRAABB.h // KRAABB.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/hitinfo.h
View File

@@ -1,6 +1,6 @@
// //
// hitinfo.h // hitinfo.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

9
include/kraken-math.h → include/hydra.h
View File

@@ -1,5 +1,6 @@
// //
// Kraken // hydra.h
// Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -28,8 +29,8 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#ifndef KRAKEN_H #ifndef KRAKEN_HYDRA_H
#define KRAKEN_H #define KRAKEN_HYDRA_H
#include "scalar.h" #include "scalar.h"
#include "vector2.h" #include "vector2.h"
@@ -44,4 +45,4 @@
#include "triangle3.h" #include "triangle3.h"
#include "hitinfo.h" #include "hitinfo.h"
#endif // KRAKEN_H #endif // KRAKEN_HYDRA_H

2
include/matrix2.h
View File

@@ -1,6 +1,6 @@
// //
// Matrix2.h // Matrix2.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/matrix2x3.h
View File

@@ -1,6 +1,6 @@
// //
// Matrix2x3.h // Matrix2x3.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/matrix4.h
View File

@@ -1,6 +1,6 @@
// //
// Matrix4.h // Matrix4.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/quaternion.h
View File

@@ -1,6 +1,6 @@
// //
// Quaternion.h // Quaternion.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/scalar.h
View File

@@ -1,6 +1,6 @@
// //
// KRFloat.h // KRFloat.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/triangle3.h
View File

@@ -1,6 +1,6 @@
// //
// KRTriangle.h // KRTriangle.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/vector2.h
View File

@@ -1,6 +1,6 @@
// //
// vector2.h // vector2.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/vector2i.h
View File

@@ -1,6 +1,6 @@
// //
// vector2i.h // vector2i.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/vector3.h
View File

@@ -1,6 +1,6 @@
// //
// Vector3.h // Vector3.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
include/vector4.h
View File

@@ -1,6 +1,6 @@
// //
// Vector4.h // Vector4.h
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

4
src/aabb.cpp
View File

@@ -1,6 +1,6 @@
// //
// aabb.cpp // aabb.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include "assert.h" #include "assert.h"
#include "krhelpers.h" #include "krhelpers.h"

4
src/hitinfo.cpp
View File

@@ -1,6 +1,6 @@
// //
// hitinfo.cpp // hitinfo.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
namespace kraken { namespace kraken {

2
src/krhelpers.cpp
View File

@@ -1,6 +1,6 @@
// //
// krhelpers.cpp // krhelpers.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //

2
src/krhelpers.h
View File

@@ -16,7 +16,7 @@
#endif // defined(KRAKEN_USE_OPENGL) #endif // defined(KRAKEN_USE_OPENGL)
#include "../include/kraken-math.h" #include "../include/hydra.h"
#define KRMIN(x,y) ((x) < (y) ? (x) : (y)) #define KRMIN(x,y) ((x) < (y) ? (x) : (y))
#define KRMAX(x,y) ((x) > (y) ? (x) : (y)) #define KRMAX(x,y) ((x) > (y) ? (x) : (y))

4
src/matrix2.cpp
View File

@@ -1,6 +1,6 @@
// //
// matrix2.cpp // matrix2.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include <string.h> #include <string.h>

4
src/matrix2x3.cpp
View File

@@ -1,6 +1,6 @@
// //
// matrix23.cpp // matrix23.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include <string.h> #include <string.h>

4
src/matrix4.cpp
View File

@@ -1,6 +1,6 @@
// //
// matrix4.cpp // matrix4.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include <string.h> #include <string.h>

4
src/quaternion.cpp
View File

@@ -1,6 +1,6 @@
// //
// quaternion.cpp // quaternion.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include "krhelpers.h" #include "krhelpers.h"

4
src/scalar.cpp
View File

@@ -1,6 +1,6 @@
// //
// scalar.cpp // scalar.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
namespace kraken { namespace kraken {

4
src/triangle3.cpp
View File

@@ -1,6 +1,6 @@
// //
// KRTriangle.cpp // KRTriangle.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
using namespace kraken; using namespace kraken;

4
src/vector2.cpp
View File

@@ -1,6 +1,6 @@
// //
// Vector2.cpp // Vector2.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include "krhelpers.h" #include "krhelpers.h"
namespace kraken { namespace kraken {

4
src/vector2i.cpp
View File

@@ -1,6 +1,6 @@
// //
// Vector2i.cpp // Vector2i.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include "krhelpers.h" #include "krhelpers.h"
namespace kraken { namespace kraken {

4
src/vector3.cpp
View File

@@ -1,6 +1,6 @@
// //
// Vector3.cpp // Vector3.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include "krhelpers.h" #include "krhelpers.h"
namespace kraken { namespace kraken {

4
src/vector4.cpp
View File

@@ -1,6 +1,6 @@
// //
// Vector4.cpp // Vector4.cpp
// Kraken // Kraken Engine / Hydra
// //
// Copyright 2018 Kearwood Gilbert. All rights reserved. // Copyright 2018 Kearwood Gilbert. All rights reserved.
// //
@@ -29,7 +29,7 @@
// or implied, of Kearwood Gilbert. // or implied, of Kearwood Gilbert.
// //
#include "../include/kraken-math.h" #include "../include/hydra.h"
#include "krhelpers.h" #include "krhelpers.h"
namespace kraken { namespace kraken {