Start text rendering refactor, fix Windows linking

Author: palaceswitcher

CMakeLists.txt

@@ -1,15 +1,15 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.31)
 project(AlchemyPlusPlus)
 
 # Create an option to switch between a system sdl library and a vendored sdl library
 option(MYGAME_VENDORED "Use vendored libraries" OFF)
 
-#build settings
+# Build settings
 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
+  set(CMAKE_BUILD_TYPE Debug)
 endif()
-#set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+set(CMAKE_DEBUG_POSTFIX d)
+#set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 if(MYGAME_VENDORED)
     add_subdirectory(vendored/sdl EXCLUDE_FROM_ALL)
@@ -21,8 +21,10 @@ else()
     find_package(SDL2 REQUIRED CONFIG COMPONENTS SDL2main)
 endif()
 
+# Find dependencies
 find_package(SDL2_image REQUIRED)
 find_package(SDL2_ttf REQUIRED)
+find_package(GLEW REQUIRED)
 include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})
 
 # Create your game executable target as usual
@@ -40,19 +42,20 @@ add_executable(AlchemyPlusPlus src/main.cpp) #Main file
 
 if(WIN32)
     target_link_options(AlchemyPlusPlus PRIVATE "-mwindows") #Disable console pop-up
-    target_link_options(AlchemyPlusPlus PRIVATE -static gcc stdc++ winpthread -dynamic) #Statically link libraries
+    target_link_options(AlchemyPlusPlus PRIVATE -static) #Statically link non-SDL libraries
 endif(WIN32)
 
 # SDL2::SDL2main may or may not be available. It is e.g. required by Windows GUI applications
 if(TARGET SDL2::SDL2main)
     # It has an implicit dependency on SDL2 functions, so it MUST be added before SDL2::SDL2 (or SDL2::SDL2-static)
     target_link_libraries(AlchemyPlusPlus SDL2::SDL2main)
 endif()
-target_link_libraries (AlchemyPlusPlus JSON)
-target_link_libraries (AlchemyPlusPlus GFX)
-target_link_libraries (AlchemyPlusPlus Game)
-target_link_libraries (AlchemyPlusPlus Misc)
-target_link_libraries (AlchemyPlusPlus Menu)
+target_link_libraries(AlchemyPlusPlus GLEW::GLEW)
+target_link_libraries(AlchemyPlusPlus JSON)
+target_link_libraries(AlchemyPlusPlus GFX)
+target_link_libraries(AlchemyPlusPlus Game)
+target_link_libraries(AlchemyPlusPlus Misc)
+target_link_libraries(AlchemyPlusPlus Menu)
 
 # Link to the actual SDL2 library. SDL2::SDL2 is the shared SDL library, SDL2::SDL2-static is the static SDL libarary.
 target_link_libraries(AlchemyPlusPlus SDL2::SDL2 SDL2_image::SDL2_image)

src/main.cpp

@@ -2,6 +2,8 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_ttf.h>
+#define GLEW_STATIC
+#include <GL/glew.h>
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,16 +23,17 @@ typedef std::chrono::high_resolution_clock Clock;
 
 int main(int argc, char* argv[])
 {
-	std::vector<std::string> elemsUnlocked = {"air", "earth", "fire", "water"};
-	elem::JSONInit(); //Initialize JSON
+	SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl"); //Always use OpenGL
+	SDL_GLContext glContext;
+	SDL_Event e;
 
 	// SDL Init
 	if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
 		fprintf(stderr, "SDL_Init Error: %s\n", SDL_GetError());
 		return EXIT_FAILURE;
 	}
 	// Initialize window
-	SDL_Window* win = SDL_CreateWindow("Alchemy++ alpha v0.1.2", 64, 64, 800, 600, SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE);
+	SDL_Window* win = SDL_CreateWindow("Alchemy++ alpha v0.1.2", 64, 64, 800, 600, SDL_WINDOW_SHOWN|SDL_WINDOW_OPENGL|SDL_WINDOW_RESIZABLE);
 	if (win == NULL) {
 		fprintf(stderr, "SDL_CreateWindow Error: %s\n", SDL_GetError());
 		return EXIT_FAILURE;
@@ -40,6 +43,7 @@ int main(int argc, char* argv[])
 			printf("SDL_image could not initialize! SDL_image Error: %s\n", IMG_GetError());
 		}
 	}
+	glContext = SDL_GL_CreateContext(win);
 
 	SDL_Renderer* ren = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED|SDL_RENDERER_PRESENTVSYNC);
 	if (ren == NULL) {
@@ -65,9 +69,11 @@ int main(int argc, char* argv[])
 	FC_Font* font = FC_CreateFont();
 	FC_LoadFont(font, ren, "gamedata/default/font/Droid-Sans.ttf", 12, FC_MakeColor(255,255,255,255), TTF_STYLE_NORMAL);
 
+	elem::JSONInit(); //Initialize JSON
 	Text::loadAll("en-us"); //Load game text
 
 	// Game loop init
+	std::vector<std::string> elemsUnlocked = {"air", "earth", "fire", "water"};
 	std::vector<std::unique_ptr<DraggableElement>> draggables; //List of draggable elements on screen
 	std::vector<std::string> elementsUnlocked; //Every element the user has unlocked
 
@@ -91,7 +97,6 @@ int main(int argc, char* argv[])
 		auto startTick = Clock::now();
 
 		//deltaTime = endTick-startTick;
-		SDL_Event e; //Event variable
 
 		while (SDL_PollEvent(&e)) {
 			switch (e.type) {
@@ -232,6 +237,7 @@ int main(int argc, char* argv[])
 		deltaTime = std::chrono::duration_cast<std::chrono::microseconds>(endTick - startTick).count() / 1000.0; //Get the time the frame took in ms
 	}
 
+	SDL_GL_DeleteContext(glContext);
 	SDL_DestroyTexture(tex);
 	SDL_DestroyRenderer(ren);
 	SDL_DestroyWindow(win);