plot vertex shader and graphing;

NateSeymour · Nov 24, 2024 · c082d1b · c082d1b
1 parent 2607de4
commit c082d1b
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 45 deletions.
diff --git a/src/calculator/renderer/VulkanWindow.h b/src/calculator/renderer/VulkanWindow.h
@@ -38,26 +38,28 @@ namespace ui
             {
                 QPointF current_position = ev->position();
 
-                this->scene->camera.center.x += (float)(current_position.x() - this->last_mouse_pos_.x());
-                this->scene->camera.center.y += (float)(current_position.y() - this->last_mouse_pos_.y());
+                float dx = current_position.x() - this->last_mouse_pos_.x();
+                float dy = current_position.y() - this->last_mouse_pos_.y();
+
+                this->scene->camera.TranslatePixel({dx, dy});
 
                 this->last_mouse_pos_ = current_position;
             }
         }
 
         void wheelEvent(QWheelEvent *ev) override
         {
-            this->scene->camera.resolution += (float)ev->angleDelta().y();
+            // this->scene->camera.resolution += (float)ev->angleDelta().y();
         }
 
         void resizeEvent(QResizeEvent *ev) override
         {
-            this->scene->camera.dpi_scalar = (float)this->devicePixelRatio();
+            this->scene->camera.SetDPI((float)this->devicePixelRatio());
 
-            this->scene->camera.window = {
+            this->scene->camera.SetWindowSize({
                     ev->size().width(),
                     ev->size().height(),
-            };
+            });
         }
 
     public:

diff --git a/src/calculator/resource/shaders/grid.frag b/src/calculator/resource/shaders/grid.frag
@@ -1,9 +1,10 @@
 #version 450
 
 layout (binding = 0) uniform Camera {
-    float resolution;
-    float dpi_scalar;
-    vec2 center;
+    float dpi;
+    float fov;
+
+    vec2 location;
     vec2 window;
 
     mat4 model;
@@ -26,7 +27,9 @@ bool centerline(vec2 st, float width) {
 }
 
 void main() {
-    vec2 st = ((gl_FragCoord.xy - ((camera.window * camera.dpi_scalar) / 2) - (camera.center.xy * camera.dpi_scalar)) / camera.resolution);
+    // ((gl_FragCoord.xy - ((camera.window * camera.dpi_scalar) / 2) - (camera.center.xy * camera.dpi_scalar)) / camera.resolution);
+    vec4 ndc = vec4((gl_FragCoord.xy + camera.window * camera.dpi / 2) / (camera.window * camera.dpi), 0.0, 1.0);
+    vec2 st = (inverse(camera.projection) * ndc).xy;
     vec4 color = vec4(1.0, 1.0, 1.0, 1.0);
 
     if (centerline(st, 0.2)) {

diff --git a/src/calculator/resource/shaders/plot.vert b/src/calculator/resource/shaders/plot.vert
@@ -1,11 +1,23 @@
 #version 450
 
+layout (binding = 0) uniform Camera {
+    float dpi;
+    float fov;
+
+    vec2 location;
+    vec2 window;
+
+    mat4 model;
+    mat4 view;
+    mat4 projection;
+} camera;
+
 layout (location = 0) in vec2 in_position;
 layout (location = 1) in vec4 in_color;
 
 layout (location = 0) out vec4 out_color;
 
 void main() {
-    gl_Position = vec4(in_position, 0.0, 1.0);
+    gl_Position = camera.projection * camera.view * camera.model * vec4(in_position, 0.0, 1.0);
     out_color = in_color;
 }
diff --git a/src/compiler/Compiler.h b/src/compiler/Compiler.h
@@ -81,13 +81,6 @@ namespace unlogic
 
             for (auto library: this->default_libraries_)
             {
-                // Create dylib
-                auto dylib = jit->createJITDylib(library->name);
-                if (auto e = dylib.takeError())
-                {
-                    throw std::runtime_error(llvm::toString(std::move(e)));
-                }
-
                 // Generate symbol map
                 llvm::orc::SymbolMap library_symbols;
                 for (auto symbol: library->symbols)
@@ -97,18 +90,15 @@ namespace unlogic
                             symbol->symbol,
                     });
 
-                    symbol->PopulateScope(*ctx.get(), *module, program_scope);
+                    symbol->Define(*ctx.get(), *module);
                 }
 
                 // Add symbol map
-                auto std_sym_def = dylib->define(llvm::orc::absoluteSymbols(library_symbols));
+                auto std_sym_def = main.define(llvm::orc::absoluteSymbols(library_symbols));
                 if (std_sym_def)
                 {
                     throw std::runtime_error(llvm::toString(std::move(std_sym_def)));
                 }
-
-                // Add lib
-                main.addToLinkOrder(*dylib);
             }
 
             // Parse program

diff --git a/src/compiler/Library.h b/src/compiler/Library.h
@@ -30,14 +30,14 @@ namespace unlogic
         char const *name;
         llvm::orc::ExecutorSymbolDef symbol;
 
-        using PopulateScopeType = std::function<void(llvm::LLVMContext&, llvm::Module&, Scope&)>;
-        PopulateScopeType PopulateScope;
+        using DefineType = std::function<void(llvm::LLVMContext&, llvm::Module&)>;
+        DefineType Define;
 
-        LibrarySymbol(Library &lib, char const *name, void *native, PopulateScopeType populate_scope) : name(name), PopulateScope(std::move(populate_scope))
+        LibrarySymbol(Library &lib, char const *name, void *native, DefineType populate_scope) : name(name), Define(std::move(populate_scope))
         {
             this->symbol = {
                     llvm::orc::ExecutorAddr::fromPtr(native),
-                    llvm::JITSymbolFlags::Callable,
+                    llvm::JITSymbolFlags(),
             };
 
             lib.symbols.push_back(this);

diff --git a/src/compiler/std/RuntimeLibrary.cpp b/src/compiler/std/RuntimeLibrary.cpp
@@ -13,7 +13,7 @@ extern "C"
 
 Library unlogic::runtime("runtime");
 
-LibrarySymbol scene_add_plot(runtime, "unlogic_scene_add_plot", (void *)unlogic_scene_add_plot, [](llvm::LLVMContext &ctx, llvm::Module &mod, Scope &scope) {
+LibrarySymbol scene_add_plot(runtime, "unlogic_scene_add_plot", (void *)unlogic_scene_add_plot, [](llvm::LLVMContext &ctx, llvm::Module &mod) {
     std::array<llvm::Type *, 1> plot_function_args = {
             llvm::Type::getDoubleTy(ctx),
     };
@@ -27,5 +27,5 @@ LibrarySymbol scene_add_plot(runtime, "unlogic_scene_add_plot", (void *)unlogic_
     llvm::Type *ret = llvm::Type::getVoidTy(ctx);
 
     llvm::FunctionType *fn = llvm::FunctionType::get(ret, args, false);
-    scope.Insert("scene_add_plot", llvm::Function::Create(fn, llvm::GlobalValue::ExternalLinkage, "unlogic_scene_add_plot", mod));
+    llvm::Function::Create(fn, llvm::GlobalValue::ExternalLinkage, "unlogic_scene_add_plot", mod);
 });
diff --git a/src/compiler/std/StandardLibrary.cpp b/src/compiler/std/StandardLibrary.cpp
@@ -20,25 +20,25 @@ extern "C"
 
 Library unlogic::stdlib("stdlib");
 
-LibrarySymbol std_pow(stdlib, "pow", (void*)unlogic_std_pow, [](llvm::LLVMContext &ctx, llvm::Module &mod, Scope &scope) {
+LibrarySymbol std_pow(stdlib, "unlogic_std_pow", (void*)unlogic_std_pow, [](llvm::LLVMContext &ctx, llvm::Module &mod) {
     std::array args = {
         llvm::Type::getDoubleTy(ctx),
         llvm::Type::getDoubleTy(ctx),
     };
     llvm::Type *ret = llvm::Type::getDoubleTy(ctx);
 
     llvm::FunctionType *fn = llvm::FunctionType::get(ret, args, false);
-    scope.Insert("pow", llvm::Function::Create(fn, llvm::GlobalValue::ExternalLinkage, "pow", mod));
+    llvm::Function::Create(fn, llvm::GlobalValue::ExternalLinkage, "unlogic_std_pow", mod);
 });
 
-LibrarySymbol std_log(stdlib, "log", (void*)unlogic_std_log, [](llvm::LLVMContext &ctx, llvm::Module &mod, Scope &scope) {
+LibrarySymbol std_log(stdlib, "unlogic_std_log", (void*)unlogic_std_log, [](llvm::LLVMContext &ctx, llvm::Module &mod) {
     std::array<llvm::Type*, 1> args = {
         llvm::PointerType::getInt8Ty(ctx),
     };
     llvm::Type *ret = llvm::Type::getVoidTy(ctx);
 
     llvm::FunctionType *fn = llvm::FunctionType::get(ret, args, false);
-    scope.Insert("log", llvm::Function::Create(fn, llvm::GlobalValue::ExternalLinkage, "log", mod));
+    llvm::Function::Create(fn, llvm::GlobalValue::ExternalLinkage, "unlogic_std_log", mod);
 });
 
 /*

diff --git a/src/compiler/transformer/IRGenerator.cpp b/src/compiler/transformer/IRGenerator.cpp
@@ -103,9 +103,9 @@ void unlogic::IRGenerator::Visit(unlogic::PotentiationNode const *node)
     llvm::Value *rhs = this->values.top();
     this->values.pop();
 
-    llvm::Function *pow = (llvm::Function *)*this->ctx.scope.Lookup("pow");
+    llvm::Function *std_pow = this->ctx.module->getFunction("unlogic_std_pow");
 
-    llvm::Value *value = this->builder.CreateCall(pow, {lhs, rhs}, "powtmp");
+    llvm::Value *value = this->builder.CreateCall(std_pow, {lhs, rhs}, "powtmp");
     this->values.push(value);
 }
 
@@ -167,7 +167,7 @@ void unlogic::IRGenerator::Visit(unlogic::PlotCommandNode const *node)
         throw std::runtime_error("function not found");
     }
 
-    auto scene_add_plot = (llvm::Function *)*this->ctx.scope.Lookup("scene_add_plot");
+    auto scene_add_plot = this->ctx.module->getFunction("unlogic_scene_add_plot");
 
     std::array<llvm::Value *, 3> args = {scene, name, (llvm::Function *)*function};
 

diff --git a/src/graphic/Camera.h b/src/graphic/Camera.h
@@ -6,20 +6,55 @@
 #define CAMERA_H
 
 #include <glm/glm.hpp>
+#include <glm/ext.hpp>
 
 namespace unlogic
 {
-    struct Camera
+    class Camera
     {
-        alignas(4) float resolution = 50.f;
-        alignas(4) float dpi_scalar = 1.f;
+        alignas(4) float dpi = 1.f;
+        alignas(4) float fov = 45.f;
 
-        alignas(8) glm::vec2 center = {0.f, 0.f};
-        alignas(8) glm::vec2 window;
+        /**
+         * Location of camera in WORLD.
+         */
+        alignas(8) glm::vec3 location = {0.f, 0.f, 10.0f};
+        alignas(8) glm::vec2 window = {0.f, 0.f};
 
-        alignas(16) glm::mat4 model;
-        alignas(16) glm::mat4 view;
-        alignas(16) glm::mat4 projection;
+        alignas(16) glm::mat4 model = glm::mat4(1.f);
+        alignas(16) glm::mat4 view = glm::mat4(1.f);
+        alignas(16) glm::mat4 projection = glm::mat4(1.f);
+
+    protected:
+        void CalculateMVP()
+        {
+            // Plots come out of function in world space already.
+            this->model = glm::mat4(1.f);
+
+            this->view = glm::lookAt(this->location, {0.f, 0.f, 0.f}, {0.f, -1.f, 0.f});
+
+            if (this->window.y != 0)
+            {
+                this->projection = glm::perspective(glm::radians(this->fov), this->window.x / this->window.y, 0.1f, 100.f);
+            }
+        }
+
+    public:
+        void SetDPI(float new_dpi)
+        {
+            this->dpi = new_dpi;
+            this->CalculateMVP();
+        }
+
+        void SetWindowSize(glm::vec2 const &new_window)
+        {
+            this->window = new_window;
+            this->CalculateMVP();
+        }
+
+        void TranslatePixel(glm::vec2 const &distance) {}
+
+        void TranslateWorld(glm::vec2 const &distance) {}
     };
 } // namespace unlogic
 

diff --git a/src/graphic/Scene.h b/src/graphic/Scene.h
@@ -47,7 +47,14 @@ namespace unlogic
 
         void AddPlot(char const *name, Plot2dFunctionType function)
         {
-            this->plots.emplace_back(this->vertex_buffer_provider.get(), name, function, Color::Red);
+            std::array colors = {
+                    Color::Red,
+                    Color::Green,
+                    Color::Blue,
+            };
+            Color color = colors[std::rand() % colors.size()];
+
+            this->plots.emplace_back(this->vertex_buffer_provider.get(), name, function, color);
         }
 
         Scene() = delete;