README.md

@@ -26,7 +26,6 @@ Build dependencies:
 
 - bash
 - a C++ 20 compiler
-- GLFW with headers
 
 Setup dependencies:
 

scripts/build.sh

@@ -63,7 +63,7 @@ COMPILE_COMMANDS=(
     "$CXX_WITH_FLAGS src/tools/arraydump.cpp -I./include -Lbin/lib -l:file.so -l:cli.so -o bin/tools/arraydump"
     "$CXX_WITH_FLAGS src/tools/baseconvert.cpp -I./include -Lbin/lib -l:cli.so -o bin/tools/baseconvert"
     "$CXX_WITH_FLAGS -pthread src/tools/hexnet.cpp -I./include -Lbin/lib -l:cli.so -l:libsockpp.so -o bin/tools/hexnet"
-    "$CXX_WITH_FLAGS src/fossvg.cpp -I./include -Lbin/lib -l:cli.so -lglfw -o bin/fossvg"
+    "$CXX_WITH_FLAGS src/fossvg.cpp -I./include -Lbin/lib -l:cli.so -o bin/fossvg"
     "$CXX_WITH_FLAGS src/fossvgd.cpp -I./include -Lbin/lib -l:cli.so -o bin/fossvgd"
 )
 for command in ${!COMPILE_COMMANDS[@]}; do

scripts/clean.sh

@@ -25,7 +25,6 @@ remove .endianness
 remove resources/check_endianness
 create_directory ./bin
 create_directory ./bin/lib
-create_directory ./bin/lib/net
 create_directory ./include
 
 ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so bin/lib/

src/fossvg.cpp

@@ -18,10 +18,6 @@
 
 #include <iostream>
 #include <vector>
-#include <cstdint>
-#include <string>
-
-#include <GLFW/glfw3.h>
 
 #include "./lib/cli.hpp"
 
@@ -29,27 +25,6 @@
 #define EXIT_RUNTIME 1
 #define EXIT_USAGE   2
 
-//TODO: check the TODO above glfwInit() in void main()
-// #### Callbacks ##############################################################
-void cursorPositionCallback(GLFWwindow* window, double x, double y) {
-}
-
-void keyCallback(GLFWwindow* window, int32_t key, int32_t scancode, int32_t action, int32_t mods) {
-}
-
-void textInputCallback(GLFWwindow* window, uint32_t codepoint) {
-}
-
-void cursorEnterLeaveCallback(GLFWwindow* window, int32_t entered) {
-}
-
-void mouseButtonCallback(GLFWwindow* window, int32_t button, int32_t action, int32_t mods) {
-}
-
-void scrollCallback(GLFWwindow* window, double x, double y) {
-}
-// #### End Callbacks ##########################################################
-
 int main(int argc, char* argv[]) {
     std::vector<CLI::Flag> flags;
     flags.push_back(CLI::Flag('h', "help",        "print help and exit"));
@@ -88,50 +63,5 @@ int main(int argc, char* argv[]) {
         return EXIT_USAGE;
     }
 
-
-    // TODO: Find a better place for this
-    // Ideally, the window management and rendering portion of FOSS-VG should
-    // live in a library so it can be easily reloaded/restarted for things like
-    // switching from/to fullscreen. For now, I am going to put it here because
-    // I want to get it going before making it pretty.
-    {
-        if (!glfwInit()) {
-            return EXIT_RUNTIME;
-        }
-
-        //TODO: allow to set startup window size using CLI options
-        uint32_t windowWidth  = 1366;
-        uint32_t windowHeight = 768;
-        //TODO: add a version macro
-        // (for example Git commit hash passed on the compiler command line)
-        std::string windowTitle = "FOSS-VG";
-
-        // Apparently, this also allows to set things like whether the window is full-screen
-        GLFWwindow* window = glfwCreateWindow(windowWidth, windowHeight, windowTitle.c_str(), nullptr, nullptr);
-
-        if (window == nullptr) {
-            return EXIT_RUNTIME;
-        }
-
-        // What dis do? It was in a tutorial.
-        glfwMakeContextCurrent(window);
-
-        glfwSetCursorPosCallback(window, cursorPositionCallback);
-        glfwSetKeyCallback(window, keyCallback);
-        glfwSetCharCallback(window, textInputCallback);
-        glfwSetCursorEnterCallback(window, cursorEnterLeaveCallback);
-        glfwSetMouseButtonCallback(window, mouseButtonCallback);
-        glfwSetScrollCallback(window, scrollCallback);
-
-        while (!glfwWindowShouldClose(window)) {
-
-            glfwSwapBuffers(window);
-
-            glfwPollEvents();
-        }
-
-        glfwTerminate();
-    }
-
     return EXIT_SUCCESS;
 }

src/lib/file.hpp

@@ -16,8 +16,6 @@
 // version 3 along with this program.
 // If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
 
-#pragma once
-
 #include <cstdint>
 #include <string>
 #include <fstream>

src/lib/javacompat.hpp

@@ -13,8 +13,6 @@
 //version 3 along with this program.
 //If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
 
-#pragma once
-
 #include <tinyutf8/tinyutf8.h>
 #include <string>
 #include "error.hpp"

src/lib/net/conversion/position.hpp

@@ -16,8 +16,6 @@
 // version 3 along with this program.
 // If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
 
-#pragma once
-
 #include <cstdint>
 #include <vector>
 

src/lib/net/conversion/varint.hpp

@@ -16,8 +16,6 @@
 // version 3 along with this program.
 // If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
 
-#pragma once
-
 #include <cstdint>
 #include <vector>
 

src/lib/net/packet.hpp

@@ -16,8 +16,6 @@
 // version 3 along with this program.
 // If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
 
-#pragma once
-
 #include <vector>
 #include <cstdint>