From 870a796f395f6b249633fd5651499ecd091c99c3 Mon Sep 17 00:00:00 2001 From: kearwood Date: Thu, 7 Jul 2022 23:20:01 -0700 Subject: [PATCH] Removed Kraken Engine Specific GL code from Hydra. Removed krhelpers.cpp, as it only contained GL code which is no longer used. --- CMakeLists.txt | 1 - src/krhelpers.cpp | 74 ----------------------------------------------- src/krhelpers.h | 24 --------------- 3 files changed, 99 deletions(-) delete mode 100644 src/krhelpers.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 8858779..49b2bd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ set(PUBLIC_HEADERS set(SRCS src/aabb.cpp src/hitinfo.cpp - src/krhelpers.cpp src/matrix2.cpp src/matrix2x3.cpp src/matrix4.cpp diff --git a/src/krhelpers.cpp b/src/krhelpers.cpp deleted file mode 100644 index 33efb12..0000000 --- a/src/krhelpers.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// -// krhelpers.cpp -// Kraken Engine / Hydra -// -// Copyright 2022 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. -// - -#include "krhelpers.h" - -#if defined(KRAKEN_USE_OPENGL) - -#if defined(DEBUG) || defined(_DEBUG) -#define GLDEBUG(x) \ -x; \ -{ \ -GLenum e; \ -while( (e=glGetError()) != GL_NO_ERROR) \ -{ \ -fprintf(stderr, "Error at line number %d, in file %s. glGetError() returned %i for call %s\n",__LINE__, __FILE__, e, #x ); \ -} \ -} -#else -#define GLDEBUG(x) x; -#endif - -namespace kraken { - -void SetUniform(GLint location, const Vector2 &v) -{ - if (location != -1) GLDEBUG(glUniform2f(location, v.x, v.y)); -} - -void SetUniform(GLint location, const Vector3 &v) -{ - if (location != -1) GLDEBUG(glUniform3f(location, v.x, v.y, v.z)); -} - -void SetUniform(GLint location, const Vector4 &v) -{ - if (location != -1) GLDEBUG(glUniform4f(location, v.x, v.y, v.z, v.w)); -} - -void SetUniform(GLint location, const Matrix4 &v) -{ - if (location != -1) GLDEBUG(glUniformMatrix4fv(location, 1, GL_FALSE, v.c)); -} - -} // namespace kraken - -#endif // defined(KRAKEN_USE_OPENGL) \ No newline at end of file diff --git a/src/krhelpers.h b/src/krhelpers.h index 0aac325..214a94f 100644 --- a/src/krhelpers.h +++ b/src/krhelpers.h @@ -31,21 +31,6 @@ #pragma once -#if defined(KRAKEN_USE_OPENGL) - -#if defined(_WIN32) || defined(_WIN64) -#include -#elif defined(__linux__) || defined(__unix__) || defined(__posix__) -#include -#include -#include -#elif defined(__APPLE__) -#include -#include -#endif - -#endif // defined(KRAKEN_USE_OPENGL) - #include "../include/hydra.h" #define KRMIN(x,y) ((x) < (y) ? (x) : (y)) @@ -55,12 +40,3 @@ float const PI = 3.141592653589793f; float const D2R = PI * 2 / 360; - -#if defined(KRAKEN_USE_OPENGL) -namespace kraken { - void SetUniform(GLint location, const Vector2 &v); - void SetUniform(GLint location, const Vector3 &v); - void SetUniform(GLint location, const Vector4 &v); - void SetUniform(GLint location, const Matrix4 &v); -} // namespace kraken -#endif // defined(KRAKEN_USE_OPENGL)