Add shader rendering (#79)

Author: dbierek

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0141 NEW)
 set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<CONFIG:Debug>,EditAndContinue,ProgramDatabase>" CACHE STRING "MSVC debug information format")
 project(
         NavKit
-        VERSION 2.9.0
+        VERSION 2.10.0
         DESCRIPTION "An app to create NAVP and AIRG files for use with Hitman: World of Assassination"
         LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)
@@ -20,8 +20,10 @@ find_package(OpenSSL CONFIG REQUIRED)
 find_package(PNG REQUIRED)
 find_package(SDL2 CONFIG REQUIRED)
 find_package(ZLIB REQUIRED)
+find_package(assimp CONFIG REQUIRED)
 find_package(httplib CONFIG REQUIRED)
 find_package(cpptrace CONFIG REQUIRED)
+find_package(glm CONFIG REQUIRED)
 find_package(nfd CONFIG REQUIRED)
 find_package(recastnavigation CONFIG REQUIRED)
 find_package(simdjson CONFIG REQUIRED)
@@ -41,9 +43,11 @@ endif ()
 set(THIRD_PARTY_DLL_PATHS
         "$<TARGET_FILE:GLEW::glew>"
         "$<TARGET_FILE:SDL2::SDL2>"
+        "$<TARGET_FILE:assimp::assimp>"
         "$<TARGET_FILE:cpptrace::cpptrace>"
         "$<TARGET_FILE:freetype>"
         "$<TARGET_FILE:ftgl>"
+        "$<TARGET_FILE:glm::glm>"
         "$<TARGET_FILE:nfd::nfd>"
         "$<TARGET_FILE:simdjson::simdjson>"
         "$<TARGET_FILE:unofficial::brotli::brotlicommon>"
@@ -85,7 +89,7 @@ if(BUILD_INSTALLER)
                     RUNTIME DESTINATION .
             )
             install(FILES
-                    $<TARGET_FILE:glacier2obj>
+                    $<TARGET_FILE:navkit-rpkg-lib>
                     $<TARGET_FILE:NavWeakness>
                     $<TARGET_FILE:ResourceLib_HM3>
                     DESTINATION .

extern/vcpkg

@@ -1,3 +1,3 @@
 #define NavKit_VERSION_MAJOR "2"
-#define NavKit_VERSION_MINOR "9"
+#define NavKit_VERSION_MINOR "10"
 #define NavKit_VERSION_PATCH "0"

include/NavKit/NavKitConfig.h

@@ -5,7 +5,11 @@
 #include <vector>
 #define WIN32_LEAN_AND_MEAN
 #include <map>
+#include <GL/glew.h>
+#include <glm/vec3.hpp>
+#include <glm/vec4.hpp>
 #include <windows.h>
+#include "../model/ReasoningGrid.h"
 
 struct Vec3;
 struct ResourceConverter;
@@ -16,12 +20,23 @@ enum CellColorDataSource {
     OFF, AIRG_BITMAP, VISION_DATA, LAYER
 };
 
+struct AirgVertex {
+    glm::vec3 pos;
+    glm::vec3 normal;
+    glm::vec4 color;
+};
 class Airg {
 public:
     explicit Airg();
 
     ~Airg();
 
+    static GLuint airgLineVAO;
+
+    static GLuint airgTriVBO;
+
+    static GLuint airgTriVAO;
+
     static Airg &getInstance() {
         static Airg instance;
         return instance;
@@ -51,8 +66,10 @@ class Airg {
 
     void finalizeSave();
 
-    void build();
+    int visibilityDataSize(ReasoningGrid* reasoningGrid, int waypointIndex);
 
+    void build();
+    static void addWaypointGeometry(std::vector<AirgVertex>& triVerts, std::vector<AirgVertex>& lineVerts, const Waypoint& waypoint, bool selected, const glm::vec4& color, bool forceFan = false);
     void renderLayerIndices(int waypointIndex) const;
 
     void renderCellBitmaps(int waypointIndex, bool selected);
@@ -112,6 +129,22 @@ class Airg {
     static std::map<std::string, std::string> airgHashIoiStringMap;
 
 private:
+    static GLuint airgLineVBO;
+
+    static int airgTriCount;
+
+    static int airgLineCount;
+
+    static bool airgDirty;
+
+    static GLuint airgHitTestVAO;
+
+    static GLuint airgHitTestVBO;
+
+    static int airgHitTestCount;
+
+    static bool airgHitTestDirty;
+
     static INT_PTR CALLBACK AirgDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
     static char *openSaveAirgFileDialog(char *lastAirgFolder);

include/NavKit/module/Airg.h

@@ -4,6 +4,7 @@
 #include <vector>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <GL/glew.h>
 
 #include "../model/ZPathfinding.h"
 
@@ -25,8 +26,36 @@ class Navp {
 
     ~Navp();
 
+    static int navMeshTriCount;
+
+    static GLuint hitTestVBO;
+
+    static GLuint hitTestVAO;
+
+    static GLuint navMeshLineVBO;
+
+    static GLuint navMeshLineVAO;
+
+    static GLuint navMeshTriVBO;
+
+    static GLuint navMeshTriVAO;
+
     static HWND hNavpDialog;
 
+    static int navMeshLineCount;
+
+    static int hitTestTriCount;
+
+    static bool navMeshDirty;
+
+    static bool hitTestDirty;
+
+    static int lastSelectedArea;
+
+    static void updateNavMeshBuffers(const NavPower::NavMesh* navMesh, int selectedIndex);
+
+    static void updateHitTestBuffers(const NavPower::NavMesh* navMesh);
+
     void renderPfSeedPoints() const;
     void renderPfSeedPointsForHitTest() const;
 

include/NavKit/module/Navp.h

@@ -6,7 +6,10 @@
 #include <vector>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <GL/glew.h>
 
+#include "../../include/NavKit/render/Model.h"
+#include "../../include/NavKit/render/Shader.h"
 enum MeshType {
     ALOC,
     PRIM
@@ -20,6 +23,10 @@ enum SceneMeshBuildType {
 class Obj {
     explicit Obj();
 
+    static GLuint tileTextureId;
+
+    static void loadTileTexture();
+
     static void updateObjDialogControls(HWND hDlg);
 
 public:
@@ -58,6 +65,7 @@ class Obj {
     bool primLods[8];
     bool blendFileBuilt;
     static HWND hObjDialog;
+    Model model;
 
     static char *openSetBlenderFileDialog(const char *lastBlenderFile);
 
@@ -79,7 +87,9 @@ class Obj {
 
     void finalizeObjBuild();
 
-    static void renderObj();
+    void renderObj() const;
+
+    void renderObjUsingRecast();
 
     static char *openLoadObjFileDialog();
 

include/NavKit/module/Obj.h

@@ -3,7 +3,10 @@
 #include <SDL_syswm.h>
 #include "../../NavWeakness/Vec3.h"
 #include "../util/Math.h"
-class FTPixmapFont;
+#include "../render/Shader.h"
+#include <glm/mat4x4.hpp>
+
+class FTPolygonFont;
 
 typedef double GLdouble;
 typedef int GLint;
@@ -33,6 +36,8 @@ class Renderer {
 
     void handleMoved();
 
+    void initShaders();
+
     static Renderer &getInstance() {
         static Renderer instance;
         return instance;
@@ -70,7 +75,7 @@ class Renderer {
     unsigned int framebuffer;
     unsigned int color_rb;
     unsigned int depth_rb;
-    FTPixmapFont *font;
+    FTPolygonFont* font;
     int width;
     int height;
     float frameRate;
@@ -82,8 +87,11 @@ class Renderer {
     GLdouble projectionMatrix[16];
     GLdouble modelviewMatrix[16];
     GLint viewport[4];
+    Shader shader;
 
     SDL_Window *window;
+    glm::mat4 projection;
+    glm::mat4 view;
     static HWND hwnd;
     Uint32 prevFrameTime;
 };

include/NavKit/module/Renderer.h

@@ -0,0 +1,35 @@
+#pragma once
+#include <string>
+#include <vector>
+#include <assimp/types.h>
+#include <glm/vec2.hpp>
+#include <glm/vec3.hpp>
+
+#include "Shader.h"
+
+struct Vertex {
+    glm::vec3 Position;
+    glm::vec3 Normal;
+    glm::vec2 TexCoords;
+};
+
+struct Texture {
+    unsigned int id;
+    std::string type;
+    aiString path;
+};
+class Mesh {
+public:
+    std::vector<Vertex> vertices;
+    std::vector<unsigned int> indices;
+    std::vector<Texture> textures;
+    unsigned int VAO, VBO, EBO;
+    glm::vec3 aabbMin;
+    glm::vec3 aabbMax;
+
+    Mesh(const std::vector<Vertex>& vertices, const std::vector<unsigned int>& indices, const std::vector<Texture>& textures);
+
+    void draw(Shader& shader) const;
+
+    void setupMesh();
+};

include/NavKit/render/Mesh.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "Mesh.h"
+#include <future>
+#include <assimp/scene.h>
+
+struct SortContext {
+    std::vector<unsigned int> drawOrder;
+    std::future<std::vector<unsigned int>> sortFuture;
+};
+
+class Model {
+public:
+    std::vector<Mesh> meshes;
+    void initGL();
+
+    static std::map<const Model*, SortContext> sortContexts;
+
+    static Mesh processBatchedMeshes(const std::vector<aiMesh*>& batch);
+
+    void loadModelData(std::string const& path);
+
+    void draw(Shader& shader, const glm::mat4& viewProj) const;
+};

include/NavKit/render/Model.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <string>
+#include <sstream>
+#include <glm/fwd.hpp>
+
+class Shader {
+public:
+    unsigned int ID;
+
+    Shader();
+
+    void loadShaders(const char* vertexPath, const char* fragmentPath);
+
+    void use() const;
+
+    void setBool(const std::string& name, bool value) const;
+
+    void setInt(const std::string& name, int value) const;
+
+    void setFloat(const std::string& name, float value) const;
+
+    void setVec4(const std::string& name, const glm::vec4& value) const;
+
+    void setMat3(const std::string& name, const glm::mat3& mat) const;
+
+    void setMat4(const std::string& name, const glm::mat4& mat) const;
+};