config mappings

Author: collinalexbell

config.yaml

@@ -1,3 +1,5 @@
 database_file: './db/matrix.db'
 #menu_program: 'rofi -show drun'
 menu_program: dmenu_run
+key_mappings:
+  screenshot: "p"

include/Config.h

@@ -3,7 +3,9 @@
 #include "fkYAML/node.hpp"
 #include <memory>
 
-class Config
+std::vector<std::string> split_path(const std::string& path);
+
+  class Config
 {
 private:
   fkyaml::node config;
@@ -13,15 +15,18 @@ class Config
   static std::shared_ptr<Config> _singleton;
   Config();
 
-  template <typename T>
-  T get(std::string key)
+  template<typename T>
+  T get(const std::string& key_path)
   {
-    return config[key.c_str()].get_value<std::string>();
-  }
+    auto parts = split_path(key_path);
+    fkyaml::node* current = &config;
 
-  template <typename T>
-  T get(const char* key)
-  {
-    return config[key].get_value<std::string>();
+    for (size_t i = 0; i < parts.size() - 1; ++i) {
+      current = &(*current)[parts[i]];
+    }
+
+    return (*current)[parts.back()].get_value<T>();
   }
+
+  std::vector<std::string> get_keys(const std::string& key_path);
 };

include/ControlMappings.h

@@ -0,0 +1,12 @@
+#include <unordered_map>
+#include <string>
+#include <GLFW/glfw3.h>
+
+// Map for direct key mappings (e.g., "W" -> GLFW_KEY_W)
+class ControlMappings {
+  static std::unordered_map<std::string, int> keyMap;
+  std::unordered_map<std::string, int> functionMap;
+ public:
+  ControlMappings();
+  int getKey(std::string function);
+};

include/controls.h

@@ -9,6 +9,7 @@
 #include "app.h"
 #include "world.h"
 #include "WindowManager/WindowManager.h"
+#include "ControlMappings.h"
 
 struct DeferedAction
 {
@@ -18,6 +19,7 @@ struct DeferedAction
 
 class Controls
 {
+  ControlMappings controlMappings;
   shared_ptr<blocks::TexturePack> texturePack;
   shared_ptr<WindowManager::WindowManager> wm;
   float windowFlop = 0.25;

makefile

@@ -15,7 +15,7 @@ INCLUDES        = -Iinclude -I/usr/local/include -Iinclude/imgui -Itracy/public
 LOADER_FLAGS = -march=native -funroll-loops
 SQLITE_SOURCES = $(wildcard src/sqlite/*.cpp)
 SQLITE_OBJECTS = $(patsubst src/sqlite/%.cpp, build/%.o, $(SQLITE_SOURCES))
-ALL_OBJECTS = build/Config.o build/systems/Player.o build/MultiPlayer/Server.o build/MultiPlayer/Client.o build/MultiPlayer/Gui.o build/screen.o build/systems/Light.o build/components/Light.o  build/systems/Boot.o build/components/Bootable.o build/IndexPool.o build/WindowManager/Space.o build/systems/Move.o build/systems/ApplyTranslation.o build/systems/Derivative.o build/systems/Update.o build/systems/Intersections.o build/systems/Scripts.o build/components/Scriptable.o build/components/Parent.o build/components/RotateMovement.o build/components/Lock.o build/components/Key.o build/systems/KeyAndLock.o build/systems/Door.o build/systems/ApplyRotation.o build/persister.o build/engineGui.o build/entity.o build/renderer.o build/shader.o build/texture.o build/world.o build/camera.o build/api.o build/controls.o build/app.o build/WindowManager/WindowManager.o build/logger.o build/engine.o build/cube.o build/chunk.o build/mesher.o build/loader.o build/utility.o build/blocks.o build/dynamicObject.o build/assets.o build/model.o build/mesh.o build/imgui/imgui.o build/imgui/imgui_draw.o build/imgui/imgui_impl_opengl3.o build/imgui/imgui_widgets.o build/imgui/imgui_demo.o build/imgui/imgui_impl_glfw.o build/imgui/imgui_tables.o build/enkimi.o build/miniz.o src/api.pb.cc src/glad.c src/glad_glx.c $(SQLITE_OBJECTS) tracy/public/TracyClient.cpp
+ALL_OBJECTS = build/ControlMappings.o build/Config.o build/systems/Player.o build/MultiPlayer/Server.o build/MultiPlayer/Client.o build/MultiPlayer/Gui.o build/screen.o build/systems/Light.o build/components/Light.o  build/systems/Boot.o build/components/Bootable.o build/IndexPool.o build/WindowManager/Space.o build/systems/Move.o build/systems/ApplyTranslation.o build/systems/Derivative.o build/systems/Update.o build/systems/Intersections.o build/systems/Scripts.o build/components/Scriptable.o build/components/Parent.o build/components/RotateMovement.o build/components/Lock.o build/components/Key.o build/systems/KeyAndLock.o build/systems/Door.o build/systems/ApplyRotation.o build/persister.o build/engineGui.o build/entity.o build/renderer.o build/shader.o build/texture.o build/world.o build/camera.o build/api.o build/controls.o build/app.o build/WindowManager/WindowManager.o build/logger.o build/engine.o build/cube.o build/chunk.o build/mesher.o build/loader.o build/utility.o build/blocks.o build/dynamicObject.o build/assets.o build/model.o build/mesh.o build/imgui/imgui.o build/imgui/imgui_draw.o build/imgui/imgui_impl_opengl3.o build/imgui/imgui_widgets.o build/imgui/imgui_demo.o build/imgui/imgui_impl_glfw.o build/imgui/imgui_tables.o build/enkimi.o build/miniz.o src/api.pb.cc src/glad.c src/glad_glx.c $(SQLITE_OBJECTS) tracy/public/TracyClient.cpp
 
 LIBS = -lzmq -lX11 -lXcomposite -lXtst -lXext -lXfixes -lprotobuf -lspdlog -lfmt -Llib $(shell pkg-config --libs glfw3) -lGL -lpthread -lassimp -lsqlite3 $(shell pkg-config --libs protobuf)
 
@@ -72,9 +72,14 @@ build/camera.o: src/camera.cpp include/camera.h
 build/api.o: src/api.cpp include/api.h include/world.h include/logger.h include/protos/api.pb.h
 	g++  -std=c++20 $(FLAGS) -o build/api.o -c src/api.cpp $(INCLUDES)
 
-build/controls.o: src/controls.cpp include/controls.h include/camera.h include/WindowManager/WindowManager.h include/world.h
+build/controls.o: src/controls.cpp include/controls.h include/camera.h include/WindowManager/WindowManager.h include/world.h include/ControlMappings.h
 	g++  -std=c++20 $(FLAGS) -o build/controls.o -c src/controls.cpp $(INCLUDES)
 
+build/ControlMappings.o: src/ControlMappings.cpp include/ControlMappings.h include/Config.h
+	g++  -std=c++20 $(FLAGS) -o build/ControlMappings.o -c src/ControlMappings.cpp $(INCLUDES)
+
+
+
 build/app.o: src/app.cpp include/app.h include/screen.h
 	g++  -std=c++20 $(FLAGS) -o build/app.o -c src/app.cpp $(INCLUDES) -Wno-narrowing
 
@@ -123,7 +128,7 @@ build/model.o: src/model.cpp include/model.h include/mesh.h
 build/mesh.o: src/mesh.cpp include/mesh.h
 	g++ -std=c++20 $(FLAGS) -o build/mesh.o -c src/mesh.cpp $(INCLUDES)
 
-build/entity.o: src/entity.cpp include/entity.h
+build/entity.o: src/entity.cpp include/entity.h include/Config.h
 	g++ -std=c++20 $(FLAGS) -o build/entity.o -c src/entity.cpp $(INCLUDES)
 
 build/engineGui.o: src/engineGui.cpp include/engineGui.h include/components/RotateMovement.h include/model.h include/systems/Update.h include/components/Bootable.h include/components/Light.h include/engine.h

src/Config.cpp

@@ -1,5 +1,6 @@
 #include "Config.h"
 #include <fstream>
+#include <map>
 
 Config::Config()
 {
@@ -17,3 +18,41 @@ Config::singleton()
   }
   return _singleton;
 }
+
+std::vector<std::string>
+split_path(const std::string& path)
+{
+  std::vector<std::string> parts;
+  size_t start = 0, end;
+
+  while ((end = path.find('.', start)) != std::string::npos) {
+    parts.push_back(path.substr(start, end - start));
+    start = end + 1;
+  }
+  parts.push_back(path.substr(start));
+  return parts;
+}
+
+std::vector<std::string>
+Config::get_keys(const std::string& key_path)
+{
+  std::vector<std::string> keys;
+  auto parts = split_path(key_path);
+  fkyaml::node* current = &config;
+
+  // Navigate to the requested node
+  for (const auto& part : parts) {
+    current = &(*current)[part];
+  }
+
+  if(current->is_mapping()) {
+  auto keyPairs = current->get_value<std::map<std::string, std::string>>();
+
+    // Collect all keys in the node
+    for (const auto& pair : keyPairs) {
+        keys.push_back(pair.first);
+    }
+  }
+
+  return keys;
+}

src/ControlMappings.cpp

@@ -0,0 +1,31 @@
+#include "ControlMappings.h"
+#include "Config.h"
+#include <iostream>
+
+std::unordered_map<std::string, int> ControlMappings::keyMap = {
+  { "w", GLFW_KEY_W },
+  { "a", GLFW_KEY_A },
+  { "s", GLFW_KEY_S },
+  { "d", GLFW_KEY_D },
+  { "p", GLFW_KEY_P}
+};
+
+ControlMappings::ControlMappings() {
+  auto config = Config::singleton();
+  auto mappingKeys = Config::singleton()->get_keys("key_mappings");
+  //std::cout << "key_mappings" << mappingKeys[0] << std::endl;
+  for(auto it = mappingKeys.begin(); it != mappingKeys.end(); it++) {
+    auto fullPath = "key_mappings." + *it;
+    auto key = config->get<std::string>(fullPath);
+    if(keyMap.contains(key)) {
+      functionMap[*it] = keyMap[key];
+    }
+  }
+}
+
+int ControlMappings::getKey(std::string fnName) {
+  if(functionMap.contains(fnName)) {
+    return functionMap[fnName];
+  }
+  return -1;
+}

src/controls.cpp

@@ -168,7 +168,8 @@ Controls::handleSave(GLFWwindow* window)
 void
 Controls::handleScreenshot(GLFWwindow* window)
 {
-  bool shouldCapture = glfwGetKey(window, GLFW_KEY_P) == GLFW_PRESS;
+  int screenshotKey = controlMappings.getKey("screenshot");
+  bool shouldCapture = glfwGetKey(window, screenshotKey) == GLFW_PRESS;
   if (shouldCapture && debounce(lastKeyPressTime)) {
     renderer->screenshot();
   }