VEGA v0.0.2

Aermoss · Feb 24, 2024 · bbb5194 · bbb5194
1 parent 5d91fb2
commit bbb5194
Show file tree

Hide file tree

Showing 130 changed files with 175,238 additions and 27,598 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.vscode
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Yusuf Rençber
+Copyright (c) 2024 Yusuf Rençber
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -1,12 +1,25 @@
 cc = g++
-cflags = -lopengl32 -lglfw3 -lgdi32 -static -static-libgcc -static-libstdc++
-src_files = src/*.cpp src/stb/*.cpp src/glad/*.c
-include_dirs = -Iinclude
-lib_dirs = -Llib -Llib/GLFW
-output_file = bin/main
-
-default:
-	xcopy shaders bin\shaders /E /H /C /I /Y
-	xcopy res bin\res /E /H /C /I /Y
-	$(cc) -o $(output_file) $(src_files) $(include_dirs) $(lib_dirs) $(cflags)
-	$(output_file)
+binaryDir := ./bin
+objectDir := ./bin/obj
+sourceDir := ./src
+includeDirs := ./include ./include/imgui
+libDirs := ./lib
+executable := $(binaryDir)/main.exe
+vendors := $(patsubst $(sourceDir)/vendor/%,%,$(wildcard $(sourceDir)/vendor/*))
+sources := $(wildcard $(sourceDir)/*.cpp) $(foreach vendor,$(vendors),$(wildcard $(sourceDir)/vendor/$(vendor)/*.cpp))
+objects := $(patsubst $(sourceDir)/%.cpp,$(objectDir)/%.o,$(sources)) $(foreach vendor,$(vendors),$(wildcard $(objectDir)/vendor/$(vendor)/*.o))
+flags = -lopengl32 -lglfw3 -lgdi32 -static -static-libgcc -static-libstdc++
+
+all: $(objectDir) $(executable) run
+
+$(executable): $(objects) | $(binaryDir)
+	$(cc) $^ -o $@ $(foreach dir,$(includeDirs),-I$(dir)) $(foreach dir,$(libDirs),-L$(dir)) $(flags)
+
+$(objectDir)/%.o: $(sourceDir)/%.cpp | $(objectDir)
+	$(cc) -c $< -o $@ $(foreach dir,$(includeDirs),-I$(dir))
+
+$(objectDir):
+	mkdir bin && cd bin && mkdir obj && cd obj && mkdir vendor && cd vendor && $(foreach dir,$(vendors),mkdir $(dir) &&) cd ../../..
+
+run: $(executable)
+	$<
diff --git a/README.md b/README.md
@@ -2,20 +2,58 @@
 A simple 3D game engine written in C++ using OpenGL.
 
 # Examples
-## Creating a window
+## Creating a window.
 ```c++
-#include "vega.hpp"
+#include <vega/vega.hpp>
 
 int main(int argc, const char* argv[]) {
-    vega::VEGAWindow window(1200, 600, "VEGA Window", "res/icon/icon.png", vega::VEGAColor(0.0f, 0.0f, 0.0f), false, false, true, true);
+    vega::VEGAWindow window(1200, 600, "VEGA Window");
 
-    while (!window.should_close()) {
-        window.handle_events();
-        window.clear_color();
-        window.check_errors();
-        window.swap_buffers();
+    while (!window.shouldClose()) {
+        window.pollEvents();
+        window.clear();
+        window.checkErrors();
+        window.swapBuffers();
     }
-
+
+    window.destroy();
     return 0;
 }
 ```
+
+## Rendering a model.
+```c++
+#include <vega/vega.hpp>
+
+int main(int argc, const char* argv[]) {
+    vega::VEGAWindow window(1200, 600, "VEGA Window");
+
+    vega::VEGAShader shader(
+        vega::VEGAReadFile("shaders/default.vert"),
+        vega::VEGAReadFile("shaders/default.frag")
+    );
+
+    vega::VEGACamera camera(&window, 45.0f, 0.1f, 1000.0f);
+    vega::VEGAModel model("res/models/crow/scene.gltf");
+    
+    shader.use();
+    glUniform4fv(shader.getUniformLocation("lightColor"), 1, (float*) glm::value_ptr(glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)));
+    glUniform3fv(shader.getUniformLocation("lightPosition"), 1, (float*) glm::value_ptr(glm::vec3(0.5f, 0.5f, 0.5f)));
+    glUniform1f(shader.getUniformLocation("ambient"), ambient);
+    shader.unuse();
+
+    while (!window.shouldClose()) {
+        window.pollEvents();
+        camera.processInputs();
+        window.clear();
+        model.render(&shader, &camera);
+        window.checkErrors();
+        window.swapBuffers();
+    }
+
+    model.destroy();
+    shader.destroy();
+    window.destroy();
+    return 0;
+}
+```
diff --git a/bin/main.exe b/bin/main.exe
diff --git a/bin/obj/camera.o b/bin/obj/camera.o
diff --git a/bin/obj/file.o b/bin/obj/file.o
diff --git a/bin/obj/indexBuffer.o b/bin/obj/indexBuffer.o
diff --git a/bin/obj/input.o b/bin/obj/input.o
diff --git a/bin/obj/main.o b/bin/obj/main.o
diff --git a/bin/obj/mesh.o b/bin/obj/mesh.o
diff --git a/bin/obj/model.o b/bin/obj/model.o
diff --git a/bin/obj/shader.o b/bin/obj/shader.o
diff --git a/bin/obj/texture.o b/bin/obj/texture.o
diff --git a/bin/obj/transform.o b/bin/obj/transform.o
diff --git a/bin/obj/vendor/glad/glad.o b/bin/obj/vendor/glad/glad.o
diff --git a/bin/obj/vendor/imgui/imgui.o b/bin/obj/vendor/imgui/imgui.o
diff --git a/bin/obj/vendor/imgui/imgui_demo.o b/bin/obj/vendor/imgui/imgui_demo.o
diff --git a/bin/obj/vendor/imgui/imgui_draw.o b/bin/obj/vendor/imgui/imgui_draw.o
diff --git a/bin/obj/vendor/imgui/imgui_impl_glfw.o b/bin/obj/vendor/imgui/imgui_impl_glfw.o
diff --git a/bin/obj/vendor/imgui/imgui_impl_opengl3.o b/bin/obj/vendor/imgui/imgui_impl_opengl3.o
diff --git a/bin/obj/vendor/imgui/imgui_tables.o b/bin/obj/vendor/imgui/imgui_tables.o
diff --git a/bin/obj/vendor/imgui/imgui_widgets.o b/bin/obj/vendor/imgui/imgui_widgets.o
diff --git a/bin/obj/vendor/stb/stb.o b/bin/obj/vendor/stb/stb.o
diff --git a/bin/obj/vertexArray.o b/bin/obj/vertexArray.o
diff --git a/bin/obj/vertexBuffer.o b/bin/obj/vertexBuffer.o
diff --git a/bin/obj/window.o b/bin/obj/window.o
diff --git a/bin/res/icon/icon.png b/bin/res/icon/icon.png
diff --git a/bin/res/models/bunny/baseColor.png b/bin/res/models/bunny/baseColor.png
diff --git a/bin/res/models/bunny/metallicRoughness.png b/bin/res/models/bunny/metallicRoughness.png
diff --git a/bin/res/models/bunny/scene.bin b/bin/res/models/bunny/scene.bin
diff --git a/bin/res/models/bunny/scene.gltf b/bin/res/models/bunny/scene.gltf
diff --git a/bin/res/models/crow/diffuse.png b/bin/res/models/crow/diffuse.png
diff --git a/bin/res/models/crow/scene.bin b/bin/res/models/crow/scene.bin