update

Crafter.Graphics-Camera.cpp

@@ -3,13 +3,20 @@ module;
 #include <cstdint>
 #include "VulkanBuffer.h"
 #include <vulkan/vulkan.h>
+#include <iostream>
+#include <format>
 
 module Crafter.Graphics;
 import Crafter.Math;
+import Crafter.Event;
 using namespace Crafter;
 
 Camera::Camera(float fov, float aspectRatio, float near, float far) {
-    projection = Matrix<float, 4, 4, 1>::Projection(fov, aspectRatio, near, far);
+    projection = MatrixRowMajor<float, 4, 4, 1>::Perspective(fov, aspectRatio, near, far);
-    view = Matrix<float, 4, 4, 1>::Idenity();
+    view = MatrixRowMajor<float, 4, 4, 1>::Identity();
-    projectionView = camera.matrices.perspective*camera.matrices.view;
+}
+
+void Camera::Update() {
+    projectionView = projection*view;
+    onUpdate.Invoke();
 }

Crafter.Graphics-Camera.cppm

@@ -6,13 +6,16 @@ export module Crafter.Graphics:Camera;
 import :VulkanBuffer;
 import Crafter.Component;
 import Crafter.Math;
+import Crafter.Event;
 
 namespace Crafter {
     export class Camera : public Component {
     public:
-        Matrix<float, 4, 4, 1> projection;
+        MatrixRowMajor<float, 4, 4, 1> projection;
-        Matrix<float, 4, 4, 1> view;
+        MatrixRowMajor<float, 4, 4, 1> view;
-        Matrix<float, 4, 4, 1> projectionView;
+        MatrixRowMajor<float, 4, 4, 1> projectionView;
+        Event<void> onUpdate;
         Camera(float fov, float aspectRatio, float near, float far);
+        void Update();
     };
 }

Crafter.Graphics-MeshShader.cppm

@@ -11,19 +11,24 @@ import Crafter.Component;
 import :Mesh;
 import :Camera;
 import :VulkanPipeline;
-
+import Crafter.Math;
 
 namespace Crafter {
     export template <typename VertexType>
-    class MeshShader {
+    class MeshShader : public Component {
     public:
-        //glm::mat4 transform;
+        MatrixRowMajor<float, 4, 4, 1> transform;
         ComponentRefOwning<Mesh<VertexType>> mesh;
         ComponentRefOwning<Camera> camera;
-        Buffer<float> mvp;
+        Buffer<MatrixRowMajor<float, 4, 4, 1>> mvp;
         std::uint32_t threadCount;
-        MeshShader(Mesh<VertexType>* mesh, Camera* camera) : threadCount(std::ceil(static_cast<double>(mesh->indexCount)/64/3)), mvp(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT), mesh(mesh), camera(camera) {
+        EventListener<void> cameraUpdate;
-
+        MeshShader(Mesh<VertexType>* mesh, Camera* camera) : threadCount(std::ceil(static_cast<double>(mesh->indexCount)/64/3)), mvp(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT), mesh(mesh), camera(camera), cameraUpdate(
+            &camera->onUpdate, [this](){
+                Update();
+            }
+        ) {
+            transform = MatrixRowMajor<float, 4, 4, 1>::Identity();
         }
         void WriteDescriptors(DescriptorSet& set) {
             set.Write(0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &mvp.descriptor);
@@ -31,7 +36,7 @@ namespace Crafter {
             set.Write(0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, &mesh.component->indicies.descriptor);
         }
         void Update() {
-            //mvp.value[0] = camera.component->projectionView*transform;
+            *mvp.value = camera.component->projectionView*transform;
         }
     };
 }

Crafter.Graphics-TextureShader.cppm

@@ -4,13 +4,6 @@ module;
 #include <vulkan/vulkan.h>
 #include <cstring>
 #include <iostream>
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/matrix_inverse.hpp>
-#include <glm/gtc/type_ptr.hpp>
 
 export module Crafter.Graphics:TextureShader;
 import Crafter.Component;

Crafter.Graphics-VulkanTexture.cppm

@@ -4,13 +4,6 @@ module;
 #include <vulkan/vulkan.h>
 #include <cstring>
 #include <iostream>
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/matrix_inverse.hpp>
-#include <glm/gtc/type_ptr.hpp>
 
 export module Crafter.Graphics:VulkanTexture;
 import Crafter.Component;

Crafter.Graphics-WindowWayland.cpp

@@ -155,9 +155,11 @@ void keyboard_key(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t t
 			if(window->heldkeys[keypress]) {
 				window->onKeyHold[keypress].Invoke();
 			} else{
+				window->heldkeys[keypress] = true;
 				window->onKeyDown[keypress].Invoke();
 			}
 		} else{
+			window->heldkeys[keypress] = false;
 			window->onKeyUp[keypress].Invoke();
 		}
 		
@@ -196,7 +198,7 @@ void WindowWayland::seat_handle_capabilities(void* data, wl_seat* seat, uint32_t
 	}
 	if (capabilities & WL_SEAT_CAPABILITY_KEYBOARD) {
         wl_keyboard* keyboard = wl_seat_get_keyboard(seat);
-        wl_keyboard_add_listener(keyboard, &keyboard_listener, NULL);
+        wl_keyboard_add_listener(keyboard, &keyboard_listener, window);
     }
 }
 

Crafter.Graphics-WindowWaylandVulkan.cpp

@@ -439,6 +439,7 @@ void WindowWaylandVulkan::Start() {
 		vkCmdSetScissor(drawCmdBuffers[currentBuffer], 0, 1, &scissor);
 	
 		onDraw.Invoke(drawCmdBuffers[currentBuffer]);
+		mouseDelta = {0, 0};
 	
 		VulkanDevice::vkCmdEndRenderingKHRProc(drawCmdBuffers[currentBuffer]);
 	

main.cpp

@@ -2,16 +2,10 @@
 #include <exception>
 #include <thread>
 #include <vulkan/vulkan.h>
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/matrix_inverse.hpp>
-#include <glm/gtc/type_ptr.hpp>
 import Crafter.Graphics;
 import Crafter.Asset;
 import Crafter.Event;
+import Crafter.Math;
 using namespace Crafter;
 
 typedef VulkanShader<"MeshShaderXYZUV.spirv", "main", VK_SHADER_STAGE_MESH_BIT_EXT, 3, {{{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2}}}> MeshVulkanShader;
@@ -29,14 +23,14 @@ int main() {
     Asset asset;
     asset.LoadFull("cannon.cras");
 
-    Camera camera;
+    Camera camera(1.57079633, 16 / 9, 0.01, 512);
+    camera.Update();
     Mesh<VertexUV>* mesh = Mesh<VertexUV>::FromAssetUV(asset.entries[0].data.data());
     DescriptorSet descriptors;
     Pipeline::GetDescriptorSet(descriptors);
 
     MeshShader<VertexUV> meshShader(mesh, &camera);
     meshShader.WriteDescriptors(descriptors);
-    meshShader.transform = glm::mat4(1.0f);
     meshShader.Update();
 
     Asset asset2;