Add configurable graphics presets

CMakeLists.txt

@@ -52,7 +52,8 @@ add_executable(Graph
     src/dofpass.cpp
     src/imguipass.cpp
     src/skypass.cpp
-    src/shadowpass.cpp)
+    src/shadowpass.cpp
+    src/config.cpp)
 target_compile_options(Graph
     PUBLIC
     -fno-exceptions
@@ -90,4 +91,5 @@ add_data(Graph
     data/test.cim
     data/bokeh.png
     data/scene.obj
-    data/tile.jpg)
+    data/tile.jpg
+    data/graphics_presets.cfg)

data/graphics_presets.cfg

@@ -0,0 +1,8 @@
+[Low]
+shadowResolution=128
+
+[Medium]
+shadowResolution=256
+
+[High]
+shadowResolution=512

include/config.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+class Config {
+public:
+    bool load(const char* from);
+    void save(const char* to);
+
+    void set(const char* category, const char* key, const std::string& value);
+    std::string get(const char* category, const char* key);
+
+private:
+    std::map<std::string, std::map<std::string, std::string>> categories;
+};

include/renderer.h

@@ -68,6 +68,10 @@ struct RenderTarget {
     VkDescriptorSet* dofSets = nullptr;
 };
 
+struct GraphicsConfig {
+    int shadowResolution;
+};
+
 class World;
 class Mesh;
 class Camera;
@@ -75,7 +79,7 @@ class Material;
 
 class Renderer {
 public:
-    Renderer();
+    Renderer(GraphicsConfig config);
     ~Renderer();
 
     void render(World& world, Camera& camera, RenderTarget* target);
@@ -97,6 +101,10 @@ public:
     void fillMaterialBuffers(Material* material);
     void destroyMaterialBuffers(Material* material);
 
+    GraphicsConfig getConfig() const {
+        return config_;
+    }
+
     VkInstance getInstance() const {
         return instance_;
     }
@@ -144,6 +152,8 @@ private:
     void createDescriptorPool();
     void createMaterialSetLayout();
 
+    GraphicsConfig config_;
+
     VkInstance instance_ = nullptr;
 
 #ifdef DEBUG

shaders/mesh.frag

@@ -37,7 +37,7 @@ float filterPCF(vec4 sc) {
     const float scale = 1.5;
     const float dx = scale * 1.0 / float(texDim.x);
     const float dy = scale * 1.0 / float(texDim.y);
-    const int range = 2;
+    const int range = 1;
 
     float shadowFactor = 0.0;
     int count = 0;

src/config.cpp

@@ -0,0 +1,53 @@
+#include "config.h"
+
+#include <fstream>
+#include <iostream>
+
+bool Config::load(const char* from) {
+    std::ifstream file(from);
+    if(!file)
+        return false;
+
+    std::string line, currentCategory;
+    while(std::getline(file, line)) {
+        //category
+        if(line[0] == '[')
+            currentCategory = line.substr(1, line.length() - 2);
+
+        //key/value
+        if(line.find('=') != std::string::npos) {
+            std::string key, value;
+            key = line.substr(0, line.find('='));
+            value = line.substr(line.find('=') + 1, line.length());
+
+            categories[currentCategory][key] = value;
+        }
+    }
+
+    return true;
+}
+
+void Config::save(const char* to) {
+    std::ofstream file(to);
+    if(!file)
+        return;
+
+    std::string currentCategory;
+    for(auto itr : categories) {
+        file << "[" << itr.first << "]\n";
+
+        for(auto itr2 : itr.second) {
+            file << itr2.first << "=" << itr2.second << "\n";
+        }
+
+        file << "\n";
+    }
+}
+
+void Config::set(const char* category, const char* key, const std::string& value) {
+    categories[category][key] = value;
+}
+
+std::string Config::get(const char* category, const char* key) {
+    return categories[category][key];
+}

src/main.cpp

@@ -17,6 +17,7 @@
 #include "camera.h"
 #include "cinematic.h"
 #include "material.h"
+#include "config.h"
 
 SDL_Window* window = nullptr;
 Renderer* renderer = nullptr;
@@ -40,6 +41,8 @@ int windowY = SDL_WINDOWPOS_CENTERED;
 int windowWidth = 640;
 int windowHeight = 480;
 int windowFullscreen = 0;
+std::string currentGraphicsPreset = "Medium";
+GraphicsConfig graphicsConfig;
 
 int toInt(const std::string &str) {
     std::stringstream ss(str);
@@ -51,51 +54,42 @@ int toInt(const std::string &str) {
     return num;
 }
 
-void readConfig() {
+void loadGraphicsConfig() {
-    std::ifstream file("config.txt");
+    Config config;
-    if(!file)
+    if(!config.load("data/graphics_presets.cfg"))
         return;
 
-    std::string line;
+    graphicsConfig.shadowResolution = toInt(config.get(currentGraphicsPreset.c_str(), "shadowResolution"));
-    while(std::getline(file, line)) {
+}
-        if(line.find('=') != std::string::npos) {
-            std::string key, value;
-            key = line.substr(0, line.find('='));
-            value = line.substr(line.find('=') + 1, line.length());
 
-            if(key == "x") {
+void readConfig() {
-                windowX = toInt(value);
+    Config config;
-            } else if(key == "y") {
+    if(!config.load("user.cfg"))
-                windowY = toInt(value);
+        return;
-            } else if(key == "width") {
+
-                windowWidth = toInt(value);
+    windowX = toInt(config.get("Window", "x"));
-            } else if(key == "height") {
+    windowY = toInt(config.get("Window", "y"));
-                windowHeight = toInt(value);
+    windowWidth = toInt(config.get("Window", "width"));
-            } else if(key == "fullscreen") {
+    windowHeight = toInt(config.get("Window", "height"));
-                windowFullscreen = toInt(value);
+    windowFullscreen = toInt(config.get("Window", "fullscreen"));
-            }
+
-        }
+    currentGraphicsPreset = config.get("Graphics", "preset");
-    }
+
+    loadGraphicsConfig();
 }
 
 void writeConfig() {
-    std::ofstream file("config.txt");
+    Config config;
-    if(!file)
-        return;
 
-    int x, y;
+    config.set("Window", "x", std::to_string(windowX));
-    SDL_GetWindowPosition(window, &x, &y);
+    config.set("Window", "y", std::to_string(windowY));
+    config.set("Window", "width", std::to_string(windowWidth));
+    config.set("Window", "height", std::to_string(windowHeight));
+    config.set("Window", "fullscreen", std::to_string(windowFullscreen));
 
-    file << "x=" << x << "\n";
+    config.set("Graphics", "preset", currentGraphicsPreset);
-    file << "y=" << y << "\n";
 
-    int w, h;
+    config.save("user.cfg");
-    SDL_GetWindowSize(window, &w, &h);
-
-    file << "width=" << w << "\n";
-    file << "height=" << h << "\n";
-
-    file << "fullscreen=" << windowFullscreen << "\n";
 }
 
 Mesh* loadMesh(const char* path) {
@@ -228,7 +222,7 @@ int main(int argc, char* argv[]) {
 
     ImGui::StyleColorsDark();
 
-    renderer = new Renderer();
+    renderer = new Renderer(graphicsConfig);
 
     VkSurfaceKHR surface = nullptr;
     SDL_Vulkan_CreateSurface(window, renderer->getInstance(), &surface);

src/renderer.cpp

@@ -14,7 +14,7 @@
 #include "camera.h"
 #include "material.h"
 
-Renderer::Renderer() {
+Renderer::Renderer(GraphicsConfig config) : config_(config) {
     createInstance();
 #ifdef DEBUG
     if(enableDebug)

src/shadowpass.cpp

@@ -29,15 +29,15 @@ ShadowPass::~ShadowPass() {
 
 void ShadowPass::render(VkCommandBuffer commandBuffer, World& world) {
     VkViewport viewport = {};
-    viewport.width = 512;
+    viewport.width = renderer_.getConfig().shadowResolution;
-    viewport.height = 512;
+    viewport.height = renderer_.getConfig().shadowResolution;
     viewport.maxDepth = 1.0f;
 
     vkCmdSetViewport(commandBuffer, 0, 1, &viewport);
 
     VkRect2D scissor = {};
-    scissor.extent.width = 512;
+    scissor.extent.width = renderer_.getConfig().shadowResolution;
-    scissor.extent.height = 512;
+    scissor.extent.height = renderer_.getConfig().shadowResolution;
 
     vkCmdSetScissor(commandBuffer, 0, 1, &scissor);
 
@@ -48,8 +48,8 @@ void ShadowPass::render(VkCommandBuffer commandBuffer, World& world) {
     renderPassBeginInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
     renderPassBeginInfo.framebuffer = shadowFramebuffer_;
     renderPassBeginInfo.renderPass = renderPass_;
-    renderPassBeginInfo.renderArea.extent.width = 512;
+    renderPassBeginInfo.renderArea.extent.width = renderer_.getConfig().shadowResolution;
-    renderPassBeginInfo.renderArea.extent.height = 512;
+    renderPassBeginInfo.renderArea.extent.height = renderer_.getConfig().shadowResolution;
     renderPassBeginInfo.clearValueCount = 1;
     renderPassBeginInfo.pClearValues = &clearColor;
 
@@ -113,8 +113,8 @@ void ShadowPass::createFramebuffer() {
     imageCreateInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
     imageCreateInfo.imageType = VK_IMAGE_TYPE_2D;
     imageCreateInfo.format = VK_FORMAT_D32_SFLOAT;
-    imageCreateInfo.extent.width = 512;
+    imageCreateInfo.extent.width = renderer_.getConfig().shadowResolution;
-    imageCreateInfo.extent.height = 512;
+    imageCreateInfo.extent.height = renderer_.getConfig().shadowResolution;
     imageCreateInfo.extent.depth = 1;
     imageCreateInfo.mipLevels = 1;
     imageCreateInfo.arrayLayers = 1;
@@ -151,8 +151,8 @@ void ShadowPass::createFramebuffer() {
     framebufferInfo.renderPass = renderPass_;
     framebufferInfo.attachmentCount = 1;
     framebufferInfo.pAttachments = &shadowImageView_;
-    framebufferInfo.width = 512;
+    framebufferInfo.width = renderer_.getConfig().shadowResolution;
-    framebufferInfo.height = 512;
+    framebufferInfo.height = renderer_.getConfig().shadowResolution;
     framebufferInfo.layers = 1;
 
     vkCreateFramebuffer(renderer_.getDevice(), &framebufferInfo, nullptr, &shadowFramebuffer_);