Flags and Fullscreen Support

Drizzle3D/Drizzle3D.vcxproj

@@ -23,6 +23,7 @@
     <ClCompile Include="Camera.cpp" />
     <ClCompile Include="Events.cpp" />
     <ClCompile Include="FirstPersonCamera.cpp" />
+    <ClCompile Include="Flags.cpp" />
     <ClCompile Include="ImGuiLayer.cpp" />
     <ClCompile Include="Layer.cpp" />
     <ClCompile Include="Light.cpp" />
@@ -51,6 +52,7 @@
     <ClInclude Include="base.h" />
     <ClInclude Include="Events.h" />
     <ClInclude Include="FirstPersonCamera.h" />
+    <ClInclude Include="Flags.h" />
     <ClInclude Include="ImGuiLayer.h" />
     <ClInclude Include="KeyCodes.h" />
     <ClInclude Include="KeyEvent.h" />

Drizzle3D/Drizzle3D.vcxproj.filters

@@ -79,6 +79,9 @@
     <Filter Include="Source Files\Rendering\Material">
       <UniqueIdentifier>{766b5aaf-57a2-477b-82c9-2cc16b3d97a4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Flags">
+      <UniqueIdentifier>{d2494ee0-6d9c-46f2-8671-60f383df2474}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -156,6 +159,9 @@
     <ClCompile Include="vendor\glm\glm\glm.cppm">
       <Filter>Vendor</Filter>
     </ClCompile>
+    <ClCompile Include="Flags.cpp">
+      <Filter>Source Files\Flags</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Window.h">
@@ -239,6 +245,9 @@
     <ClInclude Include="main.h">
       <Filter>Vendor</Filter>
     </ClInclude>
+    <ClInclude Include="Flags.h">
+      <Filter>Source Files\Flags</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="VertexShader.glsl">

Drizzle3D/Flags.cpp

@@ -0,0 +1,31 @@
+#include "Flags.h"
+
+namespace Drizzle3D {
+	void Flags::AddFlag(const std::string& name, bool& pointer) {
+		flagMap[name] = &pointer;
+	}
+
+    void Flags::ChangeFlag(const std::string& name, const bool newValue) {
+        if (flagMap.find(name) != flagMap.end()) {
+            try {
+                *flagMap[name] = newValue;
+            }
+            catch (const std::bad_any_cast& e) {
+                log.Error("Failed to cast to the correct type: " + (std::string)e.what() + "\n");
+            }
+        }
+        else {
+            log.Error("Flag with name " + name + " not found.\n");
+        }
+    }
+
+    bool Flags::GetFlag(const std::string& name) {
+        if (flagMap.find(name) != flagMap.end()) {
+            return *flagMap[name];
+        }
+        else {
+            log.Error("Flag with name " + name + " not found.\n");
+            return false; 
+        }
+    }
+}

Drizzle3D/Flags.h

@@ -0,0 +1,23 @@
+#pragma once
+#include <map>
+#include <string>
+#include <any>
+#include "base.h"
+#include "Logging.h"
+
+namespace Drizzle3D {
+	class Flags {
+	public:
+		Drizzle3D_API Flags() {}
+
+		Drizzle3D_API void AddFlag(const std::string& name, bool& pointer);
+
+        Drizzle3D_API void ChangeFlag(const std::string& name, const bool newValue);
+
+		Drizzle3D_API bool GetFlag(const std::string& name);
+
+	private:
+		std::map<std::string, bool*> flagMap;
+		Logging log;
+	};
+}

Drizzle3D/RenderingLayer.cpp

@@ -15,6 +15,12 @@
 
 namespace Drizzle3D {
 
+    RenderingLayer::RenderingLayer(Window* window, std::shared_ptr<ResourceManager> resmgr) : name("3DLayer"), show(true), pWindow(window), resourcemgr(resmgr) {
+        flags.AddFlag("Lighting", Lighting);
+        flags.AddFlag("Fullscreen", fullscreen);
+        flags.AddFlag("Show", show);
+    }
+
     Drizzle3D_API std::pair<std::vector<float>, std::vector<unsigned int>> LoadObjFile(const std::string& filePath) {
         std::vector<float> vertices;
         std::vector<unsigned int> indices;
@@ -152,6 +158,11 @@ namespace Drizzle3D {
     }
 
     void RenderingLayer::Render() {
+        if (fullscreen) {
+            glfwMaximizeWindow(pWindow->returnwindow());
+        } else {
+            glfwRestoreWindow(pWindow->returnwindow());
+        }
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         glUseProgram(shaderProgram);

Drizzle3D/RenderingLayer.h

@@ -16,6 +16,7 @@
 #include "Material.h"
 #include "ResourceManager.h"
 #include "base.h"
+#include "Flags.h"
 
 namespace Drizzle3D {
 
@@ -65,7 +66,7 @@ namespace Drizzle3D {
 
     class RenderingLayer : public Layer {
     public:
-        Drizzle3D_API RenderingLayer(Window* window, std::shared_ptr<ResourceManager> resmgr) : name("3DLayer"), show(true), pWindow(window), resourcemgr(resmgr) {}
+        Drizzle3D_API RenderingLayer(Window* window, std::shared_ptr<ResourceManager> resmgr);
 
         Drizzle3D_API void OnAttach() override;
         Drizzle3D_API void OnDetach() override {}
@@ -90,10 +91,10 @@ namespace Drizzle3D {
         Drizzle3D_API char* GetActiveCamera() { return current_camera; }
         Drizzle3D_API Camera ReturnActiveCamera();
         Drizzle3D_API Camera GetCameraFromID(char* cam);
-
-        bool Lighting = true;
-
+        Drizzle3D_API Flags* GetFlags() { return &flags; }
     private:
+        bool Lighting = true;
+        bool fullscreen = false;
         bool show;
         GLuint shaderProgram = 0;
         GLuint OldshaderProgram = 0;
@@ -102,6 +103,7 @@ namespace Drizzle3D {
         std::vector<Object> Objects;
         std::vector<Light> Lights;
         std::vector<Camera> Cameras;
+        Flags flags;
 
         GLuint lightsBuffer = 0;
         char* current_camera = (char*)"Default";

Drizzle3D/main.cpp

@@ -94,7 +94,7 @@ Drizzle3D_API int TestProgram() {
 
     app->dispatcher()->AddEventListener(EWindowClose, Closed);
 
-    app->GetRenderingLayer()->Lighting = false;
+    app->GetRenderingLayer()->GetFlags()->ChangeFlag("Lighting", false);
 
     app->ImguiLayer()->code = ImGUICode;
     app->GetRenderingLayer()->AddObject("Cube", app->GetRenderingLayer()->DrawVerts(Drizzle3D::LoadObjFile("Scene1_Cube.obj"), modelMatrix));

Drizzle3D/x64/Debug/Drizzle3D.log

@@ -1,9 +1,18 @@
   Scanning sources for module dependencies...
+  App.cpp
   Camera.cpp
-  ResourceManager.cpp
-C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\ResourceManager.cpp(14,34): warning C4302: 'type cast': truncation from 'const char []' to 'char'
-C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\ResourceManager.cpp(41,31): warning C4302: 'type cast': truncation from 'const char []' to 'char'
+  FirstPersonCamera.cpp
+  Light.cpp
+C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Light.cpp(13,16): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+  Object.cpp
+  RenderingLayer.cpp
+C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\RenderingLayer.cpp(289,59): warning C4267: 'argument': conversion from 'size_t' to 'GLsizei', possible loss of data
+  Shader.cpp
+  Skybox.cpp
+  main.cpp
   Generating Code...
-C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Camera.cpp(46,1): warning C4715: 'Drizzle3D::RenderingLayer::ReturnActiveCamera': not all control paths return a value
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Camera.cpp(54,1): warning C4715: 'Drizzle3D::RenderingLayer::GetCameraFromID': not all control paths return a value
+C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Camera.cpp(46,1): warning C4715: 'Drizzle3D::RenderingLayer::ReturnActiveCamera': not all control paths return a value
+     Creating library C:\Users\ronit\Desktop\Drizzle3D\x64\Debug\Drizzle3D.lib and object C:\Users\ronit\Desktop\Drizzle3D\x64\Debug\Drizzle3D.exp
+LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
   Drizzle3D.vcxproj -> C:\Users\ronit\Desktop\Drizzle3D\x64\Debug\Drizzle3D.dll

Drizzle3D/x64/Debug/Drizzle3D.tlog/Cl.items.tlog

@@ -2,6 +2,7 @@ C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\App.cpp;C:\Users\ronit\Desktop\Drizzl
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Camera.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\Camera.obj
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Events.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\Events.obj
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\FirstPersonCamera.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\FirstPersonCamera.obj
+C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Flags.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\Flags.obj
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\ImGuiLayer.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\ImGuiLayer.obj
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Layer.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\Layer.obj
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\Light.cpp;C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\Light.obj

Drizzle3D/x64/Debug/Drizzle3D.tlog/link.secondary.1.tlog

@@ -1,4 +1,4 @@
-^C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\APP.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\CAMERA.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\EVENTS.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\FIRSTPERSONCAMERA.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\GLAD.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\GLM.CPPM.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUILAYER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_DEMO.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_DRAW.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_IMPL_GLFW.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_IMPL_OPENGL3.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_TABLES.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_WIDGETS.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\LAYER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\LIGHT.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\LOGGING.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\MAIN.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\MATERIAL.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\OBJECT.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\RENDERINGLAYER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\RESOURCEMANAGER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\SHADER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\SKYBOX.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\WINDOW.OBJ
+^C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\APP.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\CAMERA.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\EVENTS.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\FIRSTPERSONCAMERA.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\FLAGS.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\GLAD.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\GLM.CPPM.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUILAYER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_DEMO.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_DRAW.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_IMPL_GLFW.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_IMPL_OPENGL3.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_TABLES.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\IMGUI_WIDGETS.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\LAYER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\LIGHT.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\LOGGING.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\MAIN.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\MATERIAL.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\OBJECT.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\RENDERINGLAYER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\RESOURCEMANAGER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\SHADER.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\SKYBOX.OBJ|C:\USERS\RONIT\DESKTOP\DRIZZLE3D\DRIZZLE3D\X64\DEBUG\WINDOW.OBJ
 C:\Users\ronit\Desktop\Drizzle3D\x64\Debug\Drizzle3D.lib
 C:\Users\ronit\Desktop\Drizzle3D\x64\Debug\Drizzle3D.EXP
 C:\Users\ronit\Desktop\Drizzle3D\Drizzle3D\x64\Debug\Drizzle3D.ilk

ExampleProject/ExampleProject.cpp

@@ -10,6 +10,8 @@ glm::vec3 camera_la_pos;
 char* cam;
 float streg = 0.0f;
 bool use_ios = true;
+bool sld = false;
+bool sh = true;
 
 void Closed(GLFWwindow* window, std::unique_ptr<Drizzle3D::Event> ev, std::any a) {
     std::cout << "Closeda";
@@ -61,6 +63,14 @@ void ImGUICode(std::shared_ptr<Drizzle3D::ImGuiLayer> rend) {
     ImGui::SliderFloat("Camera Look-At X", &camera_la_pos.x, 0.0f, 50.0f);
     ImGui::SliderFloat("Camera Look-At Y", &camera_la_pos.y, 0.0f, 50.0f);
     ImGui::SliderFloat("Camera Look-At Z", &camera_la_pos.z, 0.0f, 50.0f);
+
+    if (ImGui::Button("Fullscreen")) {
+        sld = !sld;
+    }
+
+    if (ImGui::Button("Show")) {
+        sh = !sh;
+    }
 }
 
 int main() {
@@ -80,7 +90,7 @@ int main() {
 
     app->dispatcher()->AddEventListener(EWindowClose, Closed);
 
-    app->GetRenderingLayer()->Lighting = false;
+    app->GetRenderingLayer()->GetFlags()->ChangeFlag("Lighting", false);
 
     app->ImguiLayer()->code = ImGUICode;
     app->GetRenderingLayer()->AddObject("Cube", app->GetRenderingLayer()->DrawVerts(Drizzle3D::LoadObjFile("Scene1_Cube.obj"), modelMatrix));
@@ -116,6 +126,8 @@ int main() {
         app->GetRenderingLayer()->returnCamera("Acam")->position = camera_pos;
         app->GetRenderingLayer()->returnCamera("Acam")->up = camera_up_pos;
         app->GetRenderingLayer()->returnCamera("Acam")->look_at_position = camera_la_pos;
+        app->GetRenderingLayer()->GetFlags()->ChangeFlag("Fullscreen", sld);
+        app->GetRenderingLayer()->GetFlags()->ChangeFlag("Show", sh);
     }
 
     return 0;