diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index fe4e45a..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "C_Cpp.errorSquiggles": "disabled", - "files.associations": { - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "cctype": "cpp", - "chrono": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "compare": "cpp", - "concepts": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "set": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "initializer_list": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "new": "cpp", - "numbers": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp" - } -} \ No newline at end of file diff --git a/assets/viking_room.obj b/assets/viking_room.obj old mode 100644 new mode 100755 diff --git a/assets/viking_room.png b/assets/viking_room.png old mode 100644 new mode 100755 diff --git a/events/event.cpp b/events/event.cpp old mode 100644 new mode 100755 diff --git a/events/event.h b/events/event.h old mode 100644 new mode 100755 index d2007de..c35462b --- a/events/event.h +++ b/events/event.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" enum class EventType { None = 0, @@ -17,4 +17,4 @@ class Event { virtual EventType getType() const = 0; -}; \ No newline at end of file +}; diff --git a/events/eventHandler.cpp b/events/eventHandler.cpp old mode 100644 new mode 100755 diff --git a/events/eventHandler.h b/events/eventHandler.h old mode 100644 new mode 100755 index 8206d69..f15b3f5 --- a/events/eventHandler.h +++ b/events/eventHandler.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "event.h" @@ -11,4 +11,4 @@ class EventHandler { EventHandler(); bool handleEvent(const Event*, Layer*); -}; \ No newline at end of file +}; diff --git a/events/keyEvent.cpp b/events/keyEvent.cpp old mode 100644 new mode 100755 diff --git a/events/keyEvent.h b/events/keyEvent.h old mode 100644 new mode 100755 index 3e50a02..98453e4 --- a/events/keyEvent.h +++ b/events/keyEvent.h @@ -1,4 +1,4 @@ -#include "terminal.h" +#include "engine.h" #include "event.h" class KeyEvent : public Event { @@ -25,4 +25,4 @@ class KeyTypedEvent : public Event { inline int getWindowID() const { return windowID; } inline const char* getText() const { return text.c_str(); } EventType getType() const { return EventType::KeyTyped; } -}; \ No newline at end of file +}; diff --git a/events/mouseEvent.cpp b/events/mouseEvent.cpp old mode 100644 new mode 100755 diff --git a/events/mouseEvent.h b/events/mouseEvent.h old mode 100644 new mode 100755 index caa1579..9a2ac57 --- a/events/mouseEvent.h +++ b/events/mouseEvent.h @@ -1,4 +1,4 @@ -#include "terminal.h" +#include "engine.h" #include "event.h" class MouseButtonEvent : public Event { @@ -30,4 +30,4 @@ class MouseScrolledEvent : public Event { inline int getX() const { return x; } inline int getY() const { return y; } EventType getType() const { return EventType::MouseScrolled; } -}; \ No newline at end of file +}; diff --git a/events/windowEvent.cpp b/events/windowEvent.cpp old mode 100644 new mode 100755 diff --git a/events/windowEvent.h b/events/windowEvent.h old mode 100644 new mode 100755 index 86431ba..25da4b0 --- a/events/windowEvent.h +++ b/events/windowEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "event.h" @@ -24,4 +24,4 @@ class WindowEvent : public Event { } return EventType::None; } -}; \ No newline at end of file +}; diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index 8daf2d6..653193a --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Build Project Terminal"; + description = "Build Project Engine"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; @@ -22,7 +22,7 @@ packages.${system}.default = pkgs.stdenv.mkDerivation { - name = "Terminal"; + name = "Engine"; inherit system; @@ -109,7 +109,7 @@ shaders = pkgs.stdenv.mkDerivation { - name = "Terminal"; + name = "Engine"; inherit system; diff --git a/imgui.ini b/imgui.ini old mode 100644 new mode 100755 diff --git a/layers/baseLayer.cpp b/layers/baseLayer.cpp old mode 100644 new mode 100755 diff --git a/layers/baseLayer.h b/layers/baseLayer.h old mode 100644 new mode 100755 index 133e584..3197760 --- a/layers/baseLayer.h +++ b/layers/baseLayer.h @@ -1,5 +1,5 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "layer.h" #include "eventHandler.h" @@ -29,4 +29,4 @@ class BaseLayer : public Layer { virtual bool onWindowFocusLost(const WindowEvent*); virtual bool onWindowMoved(const WindowEvent*); virtual bool onWindowResize(const WindowEvent*); -}; \ No newline at end of file +}; diff --git a/layers/layer.cpp b/layers/layer.cpp old mode 100644 new mode 100755 diff --git a/layers/layer.h b/layers/layer.h old mode 100644 new mode 100755 index a8e423d..f805d3e --- a/layers/layer.h +++ b/layers/layer.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "event.h" @@ -32,4 +32,4 @@ class Layer { virtual bool onWindowClose(const WindowEvent* event) = 0; virtual bool onWindowMoved(const WindowEvent* event) = 0; -}; \ No newline at end of file +}; diff --git a/layers/layerstack.cpp b/layers/layerstack.cpp old mode 100644 new mode 100755 diff --git a/layers/layerstack.h b/layers/layerstack.h old mode 100644 new mode 100755 index a73bef3..8688fb3 --- a/layers/layerstack.h +++ b/layers/layerstack.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "layer.h" @@ -29,4 +29,4 @@ class LayerStack { std::vector layers; std::vector::iterator insert; bool eventHandled; -}; \ No newline at end of file +}; diff --git a/layers/overlay.cpp b/layers/overlay.cpp old mode 100644 new mode 100755 diff --git a/layers/overlay.h b/layers/overlay.h old mode 100644 new mode 100755 index 8634ba1..902ce68 --- a/layers/overlay.h +++ b/layers/overlay.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "layer.h" @@ -206,4 +206,4 @@ static void ImGui_ImplSDL2_UpdateKeyModifiers(SDL_Keymod sdl_key_mods) io.AddKeyEvent(ImGuiMod_Shift, (sdl_key_mods & KMOD_SHIFT) != 0); io.AddKeyEvent(ImGuiMod_Alt, (sdl_key_mods & KMOD_ALT) != 0); io.AddKeyEvent(ImGuiMod_Super, (sdl_key_mods & KMOD_GUI) != 0); -} \ No newline at end of file +} diff --git a/renderer/openglRenderer.cpp b/renderer/openglRenderer.cpp old mode 100644 new mode 100755 diff --git a/renderer/openglRenderer.h b/renderer/openglRenderer.h old mode 100644 new mode 100755 diff --git a/renderer/renderer.h b/renderer/renderer.h old mode 100644 new mode 100755 diff --git a/renderer/vulkanRenderer.cpp b/renderer/vulkanRenderer.cpp old mode 100644 new mode 100755 diff --git a/renderer/vulkanRenderer.h b/renderer/vulkanRenderer.h old mode 100644 new mode 100755 index 706eb7a..8eb51fb --- a/renderer/vulkanRenderer.h +++ b/renderer/vulkanRenderer.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "sdl2Window.h" @@ -293,4 +293,4 @@ class Renderer { void check_vk_result(); -}; \ No newline at end of file +}; diff --git a/shaders/s.frag b/shaders/s.frag old mode 100644 new mode 100755 diff --git a/shaders/s.vert b/shaders/s.vert old mode 100644 new mode 100755 diff --git a/src/application.cpp b/src/application.cpp old mode 100644 new mode 100755 diff --git a/src/application.h b/src/application.h old mode 100644 new mode 100755 index 9eca43e..0ed1c72 --- a/src/application.h +++ b/src/application.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "sdl2Window.h" #include "vulkanRenderer.h" @@ -46,4 +46,4 @@ class App { LayerStack lStack; -}; \ No newline at end of file +}; diff --git a/src/terminal.cpp b/src/terminal.cpp deleted file mode 100644 index da361bb..0000000 --- a/src/terminal.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "application.h" - -int main() { - - App app; - - app.run(); - -} diff --git a/src/terminal.h b/src/terminal.h deleted file mode 100644 index 8b68260..0000000 --- a/src/terminal.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - - -//macros -#ifdef SHDR_PATH -#define STRINGIZE(x) #x -#define STRINGIZE_VALUE_OF(x) STRINGIZE(x) -#endif - - -#include -#include // printf, fprintf -#include // abort - -#include -#include -#include -#include // Necessary for uint32_t -#include // Necessary for std::numeric_limits -#include // Necessary for std::clamp -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - - -#include - -#include -#include -#include - - - -#include "imgui.h" -#include "imconfig.h" -#include "imgui_internal.h" -#include "imgui_impl_sdl2.h" -#include "imgui_impl_vulkan.h" - - - -//Forward declarations -class App; -class MouseButtonEvent; -class MouseMovedEvent; -class MouseScrolledEvent; -class KeyEvent; -class KeyTypedEvent; -class WindowEvent; -class Layer; - - - diff --git a/window/glfwWindow.cpp b/window/glfwWindow.cpp old mode 100644 new mode 100755 diff --git a/window/glfwWindow.h b/window/glfwWindow.h old mode 100644 new mode 100755 diff --git a/window/sdl2Window.cpp b/window/sdl2Window.cpp old mode 100644 new mode 100755 diff --git a/window/sdl2Window.h b/window/sdl2Window.h old mode 100644 new mode 100755 diff --git a/window/window.cpp b/window/window.cpp old mode 100644 new mode 100755 diff --git a/window/window.h b/window/window.h old mode 100644 new mode 100755 index dd2d0d9..dc7e6ec --- a/window/window.h +++ b/window/window.h @@ -1,6 +1,6 @@ #pragma once -#include "terminal.h" +#include "engine.h" #include "event.h" #include "mouseEvent.h" @@ -39,4 +39,4 @@ class Window { SDL_Event event; bool error = false; -}; \ No newline at end of file +};