Object Moved

Drizzle3D/App.cpp

@@ -22,6 +22,8 @@ namespace Drizzle3D {
 		LayerDispatcher->AddLayer(renderinglayer);
 		LayerDispatcher->AddLayer(imguilayer);
 		LayerDispatcher->DispatchLayerAttach();
+
+		D3DWindow->AddRLayer(renderinglayer->getObjects());
 	}
 
 	bool App::Run() {

Drizzle3D/Drizzle3D.vcxproj

@@ -69,6 +69,7 @@
     <ClInclude Include="MouseCodes.h" />
     <ClInclude Include="MouseEvent.h" />
     <ClInclude Include="Object.h" />
+    <ClInclude Include="ObjectWindow.h" />
     <ClInclude Include="RenderingLayer.h" />
     <ClInclude Include="Renderer2D.h" />
     <ClInclude Include="ResourceManager.h" />

Drizzle3D/Drizzle3D.vcxproj.filters

@@ -296,5 +296,8 @@
     <ClInclude Include="Object.h">
       <Filter>Source Files\Events\Object</Filter>
     </ClInclude>
+    <ClInclude Include="ObjectWindow.h">
+      <Filter>Source Files\Window</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Drizzle3D/ObjectWindow.h

@@ -0,0 +1,16 @@
+#pragma once
+
+namespace Drizzle3D {
+    struct Object {
+        GLuint VertexArray, VertexBuffer, IndexBuffer = 0;
+        std::vector<float> vertices;
+        std::vector<unsigned int> indices;
+        glm::mat4 modelMatrix;
+        glm::mat4 OldmodelMatrix;
+        GLuint textureID = NULL;
+        GLuint mat = 0;
+        char* name = (char*)"PLZ_SPECIFY_A_NAME";
+        bool hide = false;
+        VkPipeline Pipeline;
+    };
+}

Drizzle3D/RenderingLayer.h

@@ -19,6 +19,7 @@
 #include "base.h"
 #include "Flags.h"
 #include "Vulkan.h"
+#include "ObjectWindow.h"
 
 namespace Drizzle3D {
 
@@ -51,19 +52,6 @@ namespace Drizzle3D {
         float quadratic;
     };
 
-    struct Object {
-        GLuint VertexArray, VertexBuffer, IndexBuffer = 0;
-        std::vector<float> vertices;
-        std::vector<unsigned int> indices;
-        glm::mat4 modelMatrix;
-        glm::mat4 OldmodelMatrix;
-        GLuint textureID = NULL;
-        GLuint mat = 0;
-        char* name = (char*)"PLZ_SPECIFY_A_NAME";
-        bool hide = false;
-        VkPipeline Pipeline;
-    };
-
     struct Camera {
         glm::vec3 position;
         glm::vec3 look_at_position;
@@ -102,6 +90,7 @@ namespace Drizzle3D {
         Drizzle3D_API Flags* GetFlags() { return &flags; }
         Drizzle3D_API GLuint GetTexture(const char* TexturePath);
         Drizzle3D_API VulkanPipeline* getVkPipe() { return &pVulkanPipe; }
+        Drizzle3D_API std::vector<Object>* getObjects() { return &Objects; }
     private:
         void InitGlRendering();
         void RenderInitGlRendering();

Drizzle3D/Window.cpp

@@ -235,6 +235,19 @@ namespace Drizzle3D {
 			std::unique_ptr<MouseScrolledEvent> at = std::make_unique<MouseScrolledEvent>((float)xffset, (float)yffset);
 			dispatcher->AddEvent(std::move(at));
 		}
+
+		std::vector<Object>* objes = std::any_cast<std::vector<Object>*>(rLayer);
+
+		for (int i = 0; i < objes->size(); i++) {
+			if (objes->at(i).modelMatrix == objes->at(i).OldmodelMatrix) {
+				continue;
+			}
+			else {
+				std::unique_ptr<ObjectMovedEvent> attt = std::make_unique<ObjectMovedEvent>(objes->at(i).modelMatrix, objes->at(i).OldmodelMatrix);
+				dispatcher->AddEvent(std::move(attt));
+				objes->at(i).OldmodelMatrix = objes->at(i).modelMatrix;
+			}
+		}
 	}
 
 	void Window::Render() {

Drizzle3D/Window.h

@@ -13,10 +13,13 @@
 #include <iostream>
 #include <backends/imgui_impl_glfw.h>
 #include <backends/imgui_impl_opengl3.h>
+#include <glm/glm.hpp>
 #include "AppEvent.h"
 #include "KeyEvent.h"
 #include "MouseEvent.h"
+#include "Object.h"
 #include "base.h"
+#include "ObjectWindow.h"
 
 namespace Drizzle3D {
 
@@ -36,6 +39,7 @@ namespace Drizzle3D {
 		Drizzle3D_API void clearKeyReleasedCodes() { keyRel_codes.clear(); }
 		Drizzle3D_API double returnMouseX() { return lastMouseX; }
 		Drizzle3D_API double returnMouseY() { return lastMouseY; }
+		Drizzle3D_API void AddRLayer(std::any rL) { rLayer = rL; }
 
 		Drizzle3D_API void ProcessEvents();
 		Drizzle3D_API void Render();
@@ -44,6 +48,7 @@ namespace Drizzle3D {
 	private:
 		GLFWwindow* window = NULL;
 		RenderingAPI renderingAPI;
+		std::any rLayer;
 		int winwidth;
 		int winheight;
 		int winx;

ExampleProject/ExampleProject.cpp

@@ -98,6 +98,10 @@ int main() {
         std::cout << "Mouse Moved\n";
         });
 
+    app->dispatcher()->AddEventListener(Drizzle3D::EventType::ObjectMoved, [](GLFWwindow* window, std::unique_ptr<Drizzle3D::Event> ev, std::any a) {
+        std::cout << "Object Moved\n";
+        });
+
     app->dispatcher()->AddEventListener(EWindowClose, Closed);
 
     app->ImguiLayer()->code = ImGUICode;

ExampleProject/vendor/Drizzle3D/Drizzle3D.h

@@ -2260,6 +2260,7 @@ namespace Drizzle3D {
         Drizzle3D_API void clearKeyReleasedCodes() { keyRel_codes.clear(); }
         Drizzle3D_API double returnMouseX() { return lastMouseX; }
         Drizzle3D_API double returnMouseY() { return lastMouseY; }
+        Drizzle3D_API void AddRLayer(std::any rL) { rLayer = rL; }
 
         Drizzle3D_API void ProcessEvents();
         Drizzle3D_API void Render();
@@ -2268,6 +2269,7 @@ namespace Drizzle3D {
     private:
         GLFWwindow* window = NULL;
         RenderingAPI renderingAPI;
+        std::any rLayer;
         int winwidth;
         int winheight;
         int winx;
@@ -2449,6 +2451,7 @@ namespace Drizzle3D {
         Drizzle3D_API Flags* GetFlags() { return &flags; }
         Drizzle3D_API GLuint GetTexture(const char* TexturePath);
         Drizzle3D_API VulkanPipeline* getVkPipe() { return &pVulkanPipe; }
+        Drizzle3D_API std::vector<Object>* getObjects() { return &Objects; }
     private:
         void InitGlRendering();
         void RenderInitGlRendering();

ExampleProject/x64/Debug/ExampleProject.log

@@ -1,2 +1,4 @@
-  ExampleProject.cpp
+C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(517,5): warning MSB8004: Output Directory does not end with a trailing slash.  This build instance will add the slash as it is required to allow proper evaluation of the Output Directory.
+  Scanning sources for module dependencies...
+  ExampleProject.cpp
   ExampleProject.vcxproj -> D:\Drizzle3D\ExampleProject\x64\Debug\ExampleProject.exe