Added Graphic Context

yugansharora01 · Sep 15, 2021 · dec1604 · dec1604
1 parent 5e8c433
commit dec1604
Show file tree

Hide file tree

Showing 49 changed files with 4,824 additions and 725 deletions.
diff --git a/Aurora/Aurora.vcxproj b/Aurora/Aurora.vcxproj
@@ -23,19 +23,19 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dist|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
@@ -54,25 +54,22 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
     <OutDir>..\bin\Debug-windows-x86_64\Aurora\</OutDir>
     <IntDir>..\bin-int\Debug-windows-x86_64\Aurora\</IntDir>
     <TargetName>Aurora</TargetName>
-    <TargetExt>.dll</TargetExt>
+    <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
     <OutDir>..\bin\Release-windows-x86_64\Aurora\</OutDir>
     <IntDir>..\bin-int\Release-windows-x86_64\Aurora\</IntDir>
     <TargetName>Aurora</TargetName>
-    <TargetExt>.dll</TargetExt>
+    <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dist|x64'">
-    <LinkIncremental>false</LinkIncremental>
     <OutDir>..\bin\Dist-windows-x86_64\Aurora\</OutDir>
     <IntDir>..\bin-int\Dist-windows-x86_64\Aurora\</IntDir>
     <TargetName>Aurora</TargetName>
-    <TargetExt>.dll</TargetExt>
+    <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -89,11 +86,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\bin\Debug-windows-x86_64\Aurora\Aurora.lib</ImportLibrary>
     </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\bin\Debug-windows-x86_64\Aurora\Aurora.dll\ (xcopy /Q /E /Y /I ..\bin\Debug-windows-x86_64\Aurora\Aurora.dll ..\bin\Debug-windows-x86_64\Sandbox &gt; nul) ELSE (xcopy /Q /Y /I ..\bin\Debug-windows-x86_64\Aurora\Aurora.dll ..\bin\Debug-windows-x86_64\Sandbox &gt; nul)</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -114,11 +107,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\bin\Release-windows-x86_64\Aurora\Aurora.lib</ImportLibrary>
     </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\bin\Release-windows-x86_64\Aurora\Aurora.dll\ (xcopy /Q /E /Y /I ..\bin\Release-windows-x86_64\Aurora\Aurora.dll ..\bin\Release-windows-x86_64\Sandbox &gt; nul) ELSE (xcopy /Q /Y /I ..\bin\Release-windows-x86_64\Aurora\Aurora.dll ..\bin\Release-windows-x86_64\Sandbox &gt; nul)</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Dist|x64'">
     <ClCompile>
@@ -139,16 +128,13 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\bin\Dist-windows-x86_64\Aurora\Aurora.lib</ImportLibrary>
     </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\bin\Dist-windows-x86_64\Aurora\Aurora.dll\ (xcopy /Q /E /Y /I ..\bin\Dist-windows-x86_64\Aurora\Aurora.dll ..\bin\Dist-windows-x86_64\Sandbox &gt; nul) ELSE (xcopy /Q /Y /I ..\bin\Dist-windows-x86_64\Aurora\Aurora.dll ..\bin\Dist-windows-x86_64\Sandbox &gt; nul)</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="src\Aurora.h" />
     <ClInclude Include="src\Aurora\Application.h" />
     <ClInclude Include="src\Aurora\Core.h" />
+    <ClInclude Include="src\Aurora\Core\AuTimer.h" />
     <ClInclude Include="src\Aurora\EntryPoint.h" />
     <ClInclude Include="src\Aurora\Events\ApplicationEvents.h" />
     <ClInclude Include="src\Aurora\Events\Events.h" />
@@ -159,30 +145,36 @@
     <ClInclude Include="src\Aurora\LayerStack.h" />
     <ClInclude Include="src\Aurora\Log.h" />
     <ClInclude Include="src\Aurora\Window.h" />
-    <ClInclude Include="src\Platform\DirectX\imgui_dx11Renderer.h" />
-    <ClInclude Include="src\Platform\DirectX\imgui_impl_win32.h" />
+    <ClInclude Include="src\Platform\DirectX\imgui_impl_dx11.h" />
     <ClInclude Include="src\Platform\Windows\AuroraException.h" />
     <ClInclude Include="src\Platform\Windows\AuroraWin.h" />
+    <ClInclude Include="src\Platform\Windows\DxgiInfoManager.h" />
+    <ClInclude Include="src\Platform\Windows\Graphics.h" />
+    <ClInclude Include="src\Platform\Windows\GraphicsThrowMacros.h" />
     <ClInclude Include="src\Platform\Windows\Keyboard.h" />
     <ClInclude Include="src\Platform\Windows\Mouse.h" />
     <ClInclude Include="src\Platform\Windows\Win32_Window.h" />
     <ClInclude Include="src\Platform\Windows\WindowsThrowMacros.h" />
     <ClInclude Include="src\Platform\Windows\WindowsWindow.h" />
+    <ClInclude Include="src\Platform\Windows\dxerr.h" />
     <ClInclude Include="src\pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Aurora\Application.cpp" />
+    <ClCompile Include="src\Aurora\Core\AuTimer.cpp" />
     <ClCompile Include="src\Aurora\Imgui\ImguiLayer.cpp" />
     <ClCompile Include="src\Aurora\Layer.cpp" />
     <ClCompile Include="src\Aurora\LayerStack.cpp" />
     <ClCompile Include="src\Aurora\Log.cpp" />
-    <ClCompile Include="src\Platform\DirectX\imgui_dx11Renderer.cpp" />
-    <ClCompile Include="src\Platform\DirectX\imgui_impl_win32.cpp" />
+    <ClCompile Include="src\Platform\DirectX\imgui_impl_dx11.cpp" />
     <ClCompile Include="src\Platform\Windows\AuroraException.cpp" />
+    <ClCompile Include="src\Platform\Windows\DxgiInfoManager.cpp" />
+    <ClCompile Include="src\Platform\Windows\Graphics.cpp" />
     <ClCompile Include="src\Platform\Windows\Keyboard.cpp" />
     <ClCompile Include="src\Platform\Windows\Mouse.cpp" />
     <ClCompile Include="src\Platform\Windows\Win32_Window.cpp" />
     <ClCompile Include="src\Platform\Windows\WindowsWindow.cpp" />
+    <ClCompile Include="src\Platform\Windows\dxerr.cpp" />
     <ClCompile Include="src\pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>

diff --git a/Aurora/Aurora.vcxproj.filters b/Aurora/Aurora.vcxproj.filters
@@ -4,12 +4,21 @@
     <Filter Include="Aurora">
       <UniqueIdentifier>{0FF303A8-FB94-2E7E-E44F-42D2D090B5CE}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Aurora\Core">
+      <UniqueIdentifier>{C758EA1D-330E-6313-BC02-5DEA28B75917}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Aurora\Events">
       <UniqueIdentifier>{13B80547-7F78-817D-48B3-CAFAB432C659}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Aurora\Imgui">
+      <UniqueIdentifier>{99BFA0DB-8522-3080-2EA8-68361AEAFB02}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Platform">
       <UniqueIdentifier>{2AC788B4-1694-E3BF-3FAD-D1672BD9184E}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Platform\DirectX">
+      <UniqueIdentifier>{EC338E64-D82C-ADB6-015F-923BEDB68CC2}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Platform\Windows">
       <UniqueIdentifier>{64FBD71A-50F4-F66C-7926-DCF1657ED678}</UniqueIdentifier>
     </Filter>
@@ -22,6 +31,9 @@
     <ClInclude Include="src\Aurora\Core.h">
       <Filter>Aurora</Filter>
     </ClInclude>
+    <ClInclude Include="src\Aurora\Core\AuTimer.h">
+      <Filter>Aurora\Core</Filter>
+    </ClInclude>
     <ClInclude Include="src\Aurora\EntryPoint.h">
       <Filter>Aurora</Filter>
     </ClInclude>
@@ -37,6 +49,9 @@
     <ClInclude Include="src\Aurora\Events\MouseEvents.h">
       <Filter>Aurora\Events</Filter>
     </ClInclude>
+    <ClInclude Include="src\Aurora\Imgui\ImguiLayer.h">
+      <Filter>Aurora\Imgui</Filter>
+    </ClInclude>
     <ClInclude Include="src\Aurora\Layer.h">
       <Filter>Aurora</Filter>
     </ClInclude>
@@ -49,12 +64,24 @@
     <ClInclude Include="src\Aurora\Window.h">
       <Filter>Aurora</Filter>
     </ClInclude>
+    <ClInclude Include="src\Platform\DirectX\imgui_impl_dx11.h">
+      <Filter>Platform\DirectX</Filter>
+    </ClInclude>
     <ClInclude Include="src\Platform\Windows\AuroraException.h">
       <Filter>Platform\Windows</Filter>
     </ClInclude>
     <ClInclude Include="src\Platform\Windows\AuroraWin.h">
       <Filter>Platform\Windows</Filter>
     </ClInclude>
+    <ClInclude Include="src\Platform\Windows\DxgiInfoManager.h">
+      <Filter>Platform\Windows</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Platform\Windows\Graphics.h">
+      <Filter>Platform\Windows</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Platform\Windows\GraphicsThrowMacros.h">
+      <Filter>Platform\Windows</Filter>
+    </ClInclude>
     <ClInclude Include="src\Platform\Windows\Keyboard.h">
       <Filter>Platform\Windows</Filter>
     </ClInclude>
@@ -70,15 +97,21 @@
     <ClInclude Include="src\Platform\Windows\WindowsWindow.h">
       <Filter>Platform\Windows</Filter>
     </ClInclude>
+    <ClInclude Include="src\Platform\Windows\dxerr.h">
+      <Filter>Platform\Windows</Filter>
+    </ClInclude>
     <ClInclude Include="src\pch.h" />
-    <ClInclude Include="src\Aurora\Imgui\ImguiLayer.h" />
-    <ClInclude Include="src\Platform\DirectX\imgui_dx11Renderer.h" />
-    <ClInclude Include="src\Platform\DirectX\imgui_impl_win32.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Aurora\Application.cpp">
       <Filter>Aurora</Filter>
     </ClCompile>
+    <ClCompile Include="src\Aurora\Core\AuTimer.cpp">
+      <Filter>Aurora\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Aurora\Imgui\ImguiLayer.cpp">
+      <Filter>Aurora\Imgui</Filter>
+    </ClCompile>
     <ClCompile Include="src\Aurora\Layer.cpp">
       <Filter>Aurora</Filter>
     </ClCompile>
@@ -88,9 +121,18 @@
     <ClCompile Include="src\Aurora\Log.cpp">
       <Filter>Aurora</Filter>
     </ClCompile>
+    <ClCompile Include="src\Platform\DirectX\imgui_impl_dx11.cpp">
+      <Filter>Platform\DirectX</Filter>
+    </ClCompile>
     <ClCompile Include="src\Platform\Windows\AuroraException.cpp">
       <Filter>Platform\Windows</Filter>
     </ClCompile>
+    <ClCompile Include="src\Platform\Windows\DxgiInfoManager.cpp">
+      <Filter>Platform\Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Platform\Windows\Graphics.cpp">
+      <Filter>Platform\Windows</Filter>
+    </ClCompile>
     <ClCompile Include="src\Platform\Windows\Keyboard.cpp">
       <Filter>Platform\Windows</Filter>
     </ClCompile>
@@ -103,9 +145,9 @@
     <ClCompile Include="src\Platform\Windows\WindowsWindow.cpp">
       <Filter>Platform\Windows</Filter>
     </ClCompile>
+    <ClCompile Include="src\Platform\Windows\dxerr.cpp">
+      <Filter>Platform\Windows</Filter>
+    </ClCompile>
     <ClCompile Include="src\pch.cpp" />
-    <ClCompile Include="src\Aurora\Imgui\ImguiLayer.cpp" />
-    <ClCompile Include="src\Platform\DirectX\imgui_dx11Renderer.cpp" />
-    <ClCompile Include="src\Platform\DirectX\imgui_impl_win32.cpp" />
   </ItemGroup>
 </Project>
diff --git a/Aurora/src/Aurora.h b/Aurora/src/Aurora.h
@@ -6,6 +6,8 @@
 #include "Aurora/Log.h"
 #include "Aurora/Layer.h"
 
+#include "Aurora/Imgui/ImguiLayer.h"
+
 // ------Entry Point--------------
 #include "Aurora/EntryPoint.h"
 //--------------------------------
diff --git a/Aurora/src/Aurora/Application.cpp b/Aurora/src/Aurora/Application.cpp
@@ -5,8 +5,13 @@
 
 namespace Aurora {
 
+	Application* Application::s_Instance = nullptr;
+
 	Application::Application()
 	{
+		AU_CORE_ASSERT(!s_Instance, "Application already exists");
+		s_Instance = this;
+
 		m_Window = Window::Create();
 	}
 
@@ -37,11 +42,13 @@ namespace Aurora {
 	void Application::PushLayer(Layer* layer)
 	{
 		m_LayerStack.PushLayer(layer);
+		layer->OnAttach();
 	}
 
 	void Application::PushOverlay(Layer* layer)
 	{
 		m_LayerStack.PushOverlay(layer);
+		layer->OnAttach();
 	}
 
 }
diff --git a/Aurora/src/Aurora/Application.h b/Aurora/src/Aurora/Application.h
@@ -21,12 +21,17 @@ namespace Aurora {
 		void PushLayer(Layer* layer);
 		void PushOverlay(Layer* layer);
 
+		static Application& Get() { return *s_Instance; }
+		inline Window& GetWindow() { return *m_Window; }
+
 	private:
 		std::unique_ptr<Window> m_Window;
 		bool m_Running = true;
 
 		LayerStack m_LayerStack;
 
+		static Application* s_Instance;
+
 	};
 
 	//To be defined in client

diff --git a/Aurora/src/Aurora/Core.h b/Aurora/src/Aurora/Core.h
@@ -1,11 +1,15 @@
 #pragma once
 
 #ifdef AU_PLATFORM_WINDOWS
+#if AU_DYNAMIC_LINK
 	#ifdef AU_BUILD_DLL
 		#define AURORA_API __declspec(dllexport)
 	#else
 		#define AURORA_API __declspec(dllimport)
 	#endif // AU_BUILD_DLL
+#else 
+#define AURORA_API
+#endif
 #else
 	#error Aurora only supports windows
 

diff --git a/Aurora/src/Aurora/Core/AuTimer.cpp b/Aurora/src/Aurora/Core/AuTimer.cpp
@@ -0,0 +1,22 @@
+#include "pch.h"
+#include "AuTimer.h"
+
+using namespace std::chrono;
+
+AuTimer::AuTimer()
+{
+    last = steady_clock::now();
+}
+
+float AuTimer::Mark()
+{
+    const auto old = last;
+    last = steady_clock::now();
+    const duration<float> frameTime = last - old;
+    return frameTime.count();
+}
+
+float AuTimer::Peek() const noexcept
+{
+    return duration<float>(steady_clock::now() - last).count();
+}
diff --git a/Aurora/src/Aurora/Core/AuTimer.h b/Aurora/src/Aurora/Core/AuTimer.h
@@ -0,0 +1,15 @@
+#ifndef AUTIMER_H_INCLUDED
+#define AUTIMER_H_INCLUDED
+
+
+class AuTimer
+{
+public : 
+    AuTimer();
+    float Mark();
+    float Peek() const noexcept;
+private:
+    std::chrono::steady_clock::time_point last;
+};
+
+#endif // AUTIMER_H_INCLUDED