Removed most references to OpenGL.

Unarelith · Oct 29, 2023 · 00fa948 · 00fa948
1 parent 870ef40
commit 00fa948
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 20 deletions.
diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt
@@ -35,7 +35,6 @@ if (NOT MSVC)
 	target_compile_options(${PROJECT_NAME} PRIVATE ${CLANG_FLAGS})
 endif ()
 
-target_compile_options(${PROJECT_NAME} PRIVATE -DGLM_FORCE_RADIANS)
 target_compile_options(${PROJECT_NAME} PRIVATE -D_USE_MATH_DEFINES)
 target_compile_options(${PROJECT_NAME} PRIVATE -DSOL_CHECK_ARGUMENTS -DSOL_PRINT_ERRORS=0)
 

diff --git a/source/client/core/Vertex.hpp b/source/client/core/Vertex.hpp
@@ -27,15 +27,13 @@
 #ifndef VERTEX_HPP_
 #define VERTEX_HPP_
 
-#include <gk/gl/OpenGL.hpp>
-
 struct Vertex {
-	GLfloat coord3d[4]      = {0, 0, 0, 1};
-	GLfloat texCoord[2]     = {-1, -1};
-	GLfloat color[4]        = {0, 0, 0, 1};
-	GLfloat normal[3]       = {0, 0, 0};
-	GLfloat lightValue[2]   = {-1, -1};
-	GLfloat ambientOcclusion = 4;
+	float coord3d[4]       = {0, 0, 0, 1};
+	float texCoord[2]      = {-1, -1};
+	float color[4]         = {0, 0, 0, 1};
+	float normal[3]        = {0, 0, 0};
+	float lightValue[2]    = {-1, -1};
+	float ambientOcclusion = 4;
 };
 
 #endif // VERTEX_HPP_
diff --git a/source/client/graphics/ChunkRenderer.cpp b/source/client/graphics/ChunkRenderer.cpp
@@ -80,7 +80,7 @@ static bool fullyOutside(const glm::vec3 &v1, const glm::vec3 &v2, const glm::ve
 void ChunkRenderer::draw(RenderTarget &target, RenderStates states, const ChunkMap &chunks, Camera &camera, const Sky *currentSky) const {
 	// Changing the values sent to the GPU to double precision is suicidal,
 	// performance wise, if possible at all. Therefore we want to keep the
-	// GL rendering numbers in single precision format. But that introduces
+	// BGFX rendering numbers in single precision format. But that introduces
 	// an issue at larger coordinates, because the precision of floats
 	// quickly degrades as the numbers grow, with a random wobbling being
 	// very noticeable at e.g. coordinates >= 65536 or so, and the waving

diff --git a/source/client/graphics/TextureAtlas.cpp b/source/client/graphics/TextureAtlas.cpp
@@ -26,7 +26,6 @@
  */
 #include <gk/core/Exception.hpp>
 #include <gk/core/Filesystem.hpp>
-#include <gk/gl/OpenGL.hpp>
 
 #include "Registry.hpp"
 #include "TextureAtlas.hpp"

diff --git a/source/client/hud/BlockCursor.cpp b/source/client/hud/BlockCursor.cpp
@@ -287,10 +287,10 @@ void BlockCursor::updateAnimationVertexBuffer(const BlockState &blockState, u8f
 	Vertex vertices[nFaces][nVertsPerFace];
 	updateVBOCoords(vertices, blockState, -2, orientation);
 
-	GLfloat color[4] = {1, 1, 1, 0.5};
+	float color[4] = {1, 1, 1, 0.5};
 	for (u8f f = 0; f < nFaces; ++f)
 		for (u8f v = 0; v < nVertsPerFace; ++v)
-			memcpy(&vertices[f][v].color, &color[0], 4 * sizeof(GLfloat));
+			memcpy(&vertices[f][v].color, &color[0], 4 * sizeof(float));
 
 	if (animationPos != -1) {
 		glm::vec4 blockTexCoords{0.1f * (float)animationPos, 0.0f, 0.1f + 0.1f * (float)animationPos, 1.0f};

diff --git a/source/client/states/GameState.cpp b/source/client/states/GameState.cpp
@@ -33,7 +33,6 @@
 #include <gk/core/input/GamePad.hpp>
 #include <gk/core/Exception.hpp>
 #include <gk/core/GameClock.hpp>
-#include <gk/gl/OpenGL.hpp>
 #include <gk/resource/ResourceHandler.hpp>
 
 #include "ApplicationStateStack.hpp"

diff --git a/source/client/states/TitleScreenState.cpp b/source/client/states/TitleScreenState.cpp
@@ -38,8 +38,6 @@
 #include "ServerApplication.hpp" // For ServerOnlineEvent
 
 TitleScreenState::TitleScreenState(u16 port) : m_port(port) {
-	glClearColor(0.0, 0.0, 0.0, 1.0);
-
 	m_menuWidget.setScale(Config::guiScale, Config::guiScale);
 
 	m_menuWidget.addButton("Singleplayer", [this] (TextButton &) {

diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
@@ -42,7 +42,6 @@ if (NOT MSVC)
 	target_compile_options(${PROJECT_NAME} PRIVATE ${CLANG_FLAGS})
 endif ()
 
-target_compile_options(${PROJECT_NAME} PRIVATE -DGLM_FORCE_RADIANS)
 target_compile_options(${PROJECT_NAME} PRIVATE -D_USE_MATH_DEFINES)
 target_compile_options(${PROJECT_NAME} PRIVATE -DSOL_CHECK_ARGUMENTS -DSOL_PRINT_ERRORS=0)
 
@@ -60,7 +59,6 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
 	gamekit
 	zlib
 	EnTT
-	${OPENGL_LIBRARIES}
 	${UNIX_LIBS}
 )
 
diff --git a/source/server/CMakeLists.txt b/source/server/CMakeLists.txt
@@ -46,11 +46,9 @@ if (NOT MSVC)
 	target_compile_options(${PROJECT_NAME} PRIVATE ${CLANG_FLAGS})
 endif ()
 
-target_compile_options(${PROJECT_NAME}_lib PRIVATE -DGLM_FORCE_RADIANS)
 target_compile_options(${PROJECT_NAME}_lib PRIVATE -D_USE_MATH_DEFINES)
 target_compile_options(${PROJECT_NAME}_lib PRIVATE -DSOL_CHECK_ARGUMENTS -DSOL_PRINT_ERRORS=0)
 
-target_compile_options(${PROJECT_NAME} PRIVATE -DGLM_FORCE_RADIANS)
 target_compile_options(${PROJECT_NAME} PRIVATE -D_USE_MATH_DEFINES)
 target_compile_options(${PROJECT_NAME} PRIVATE -DSOL_CHECK_ARGUMENTS -DSOL_PRINT_ERRORS=0)