Добавлено: новые GUI окна, счетчик FPS, DeltaTime, изменение цвета Sk…

…yBox, VSync

OpenGL.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGL", "OpenGL.vcxproj", "{F94A0F9C-C9E4-470F-B52D-FA1A45DC2485}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HykoSetup", "..\HykoSetup\HykoSetup.vdproj", "{B443B8C5-0397-44EF-9587-0A8333AB550B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -21,6 +23,10 @@ Global
 		{F94A0F9C-C9E4-470F-B52D-FA1A45DC2485}.Release|x64.Build.0 = Release|x64
 		{F94A0F9C-C9E4-470F-B52D-FA1A45DC2485}.Release|x86.ActiveCfg = Release|Win32
 		{F94A0F9C-C9E4-470F-B52D-FA1A45DC2485}.Release|x86.Build.0 = Release|Win32
+		{B443B8C5-0397-44EF-9587-0A8333AB550B}.Debug|x64.ActiveCfg = Debug
+		{B443B8C5-0397-44EF-9587-0A8333AB550B}.Debug|x86.ActiveCfg = Debug
+		{B443B8C5-0397-44EF-9587-0A8333AB550B}.Release|x64.ActiveCfg = Release
+		{B443B8C5-0397-44EF-9587-0A8333AB550B}.Release|x86.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OpenGL.vcxproj

@@ -70,6 +70,14 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)bin\$(Configuration)-$(Platform)\$(ProjectName)</OutDir>
+    <IntDir>$(SolutionDir)bin-int\$(Configuration)-$(Platform)\$(ProjectName)</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)bin\$(Configuration)-$(Platform)\$(ProjectName)</OutDir>
+    <IntDir>$(SolutionDir)bin-int\$(Configuration)-$(Platform)\$(ProjectName)</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -104,13 +112,13 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>C:\C++\OpenGL\src\libSource;C:\C++\OpenGL\libs;C:\C++\OpenGL\libs\GLFW\include;C:\C++\OpenGL\libs\GLAD\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>D:\C++\Hyko_Engine\libs\vld\include;D:\C++\Hyko_Engine\libs;D:\C++\Hyko_Engine\libs\GLFW\include;D:\C++\Hyko_Engine\src\libSource;D:\C++\Hyko_Engine\libs\GLAD\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>C:\C++\OpenGL\libs\GLFW\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>D:\C++\Hyko_Engine\libs\GLFW\lib;D:\C++\Hyko_Engine\libs\vld\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>opengl32.lib;glfw3.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -122,22 +130,25 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>D:\C++\Hyko_Engine\libs\vld\include;D:\C++\Hyko_Engine\libs;D:\C++\Hyko_Engine\libs\GLFW\include;D:\C++\Hyko_Engine\src\libSource;D:\C++\Hyko_Engine\libs\GLAD\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>D:\C++\Hyko_Engine\libs\GLFW\lib;D:\C++\Hyko_Engine\libs\vld\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;glfw3.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="libs\GLAD\src\glad.c" />
     <ClCompile Include="libs\GLM\detail\glm.cpp" />
-    <ClCompile Include="src\Engine\Debug.cpp" />
+    <ClCompile Include="src\Engine\Debug\Debug.cpp" />
+    <ClCompile Include="src\Engine\Events\EditorInput.cpp" />
     <ClCompile Include="src\Engine\ImGui\ImGuiWindows.cpp" />
     <ClCompile Include="src\Engine\Meshes\Triangle.cpp" />
-    <ClCompile Include="src\Engine\System\System.cpp" />
-    <ClCompile Include="src\Engine\System\WindowSystem.cpp" />
+    <ClCompile Include="src\Engine\Projection\EditorProjection.cpp" />
     <ClCompile Include="src\glad.c" />
     <ClCompile Include="src\GL\VAO.cpp" />
     <ClCompile Include="src\GL\VBO.cpp" />
@@ -149,11 +160,14 @@
     <ClCompile Include="src\libSource\imgui_tables.cpp" />
     <ClCompile Include="src\libSource\imgui_widgets.cpp" />
     <ClCompile Include="src\main.cpp" />
-    <ClCompile Include="src\Render.cpp" />
     <ClCompile Include="src\shader.cpp" />
     <ClCompile Include="src\window.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="libs\GLAD\include\glad\glad.h" />
+    <ClInclude Include="libs\GLAD\include\KHR\khrplatform.h" />
+    <ClInclude Include="libs\GLFW\include\glfw3.h" />
+    <ClInclude Include="libs\GLFW\include\glfw3native.h" />
     <ClInclude Include="libs\GLM\common.hpp" />
     <ClInclude Include="libs\GLM\detail\compute_common.hpp" />
     <ClInclude Include="libs\GLM\detail\compute_vector_relational.hpp" />
@@ -436,11 +450,11 @@
     <ClInclude Include="libs\GLM\vec3.hpp" />
     <ClInclude Include="libs\GLM\vec4.hpp" />
     <ClInclude Include="libs\GLM\vector_relational.hpp" />
-    <ClInclude Include="src\Engine\Debug.h" />
+    <ClInclude Include="src\Engine\Debug\Debug.h" />
+    <ClInclude Include="src\Engine\Events\EditorInput.h" />
     <ClInclude Include="src\Engine\ImGui\ImGuiWindows.h" />
     <ClInclude Include="src\Engine\Meshes\Triangle.h" />
-    <ClInclude Include="src\Engine\System\System.h" />
-    <ClInclude Include="src\Engine\System\WindowSystem.h" />
+    <ClInclude Include="src\Engine\Projection\EditorProjection.h" />
     <ClInclude Include="src\GL\VAO.h" />
     <ClInclude Include="src\GL\VBO.h" />
     <ClInclude Include="src\libSource\imconfig.h" />
@@ -452,11 +466,13 @@
     <ClInclude Include="src\libSource\imstb_rectpack.h" />
     <ClInclude Include="src\libSource\imstb_textedit.h" />
     <ClInclude Include="src\libSource\imstb_truetype.h" />
-    <ClInclude Include="src\Render.h" />
     <ClInclude Include="src\shader.h" />
     <ClInclude Include="src\window.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include=".gitattributes" />
+    <None Include=".gitignore" />
+    <None Include="imgui.ini" />
     <None Include="libs\GLM\detail\func_common.inl" />
     <None Include="libs\GLM\detail\func_common_simd.inl" />
     <None Include="libs\GLM\detail\func_exponential.inl" />
@@ -593,8 +609,16 @@
     <None Include="libs\GLM\gtx\vector_angle.inl" />
     <None Include="libs\GLM\gtx\vector_query.inl" />
     <None Include="libs\GLM\gtx\wrap.inl" />
-    <None Include="res\fragmentShader.glsl" />
-    <None Include="res\vertexShader.glsl" />
+    <Text Include="res\fragmentShader.glsl">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </Text>
+    <Text Include="res\vertexShader.glsl">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </Text>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

OpenGL.vcxproj.filters

@@ -21,9 +21,6 @@
     <ClCompile Include="src\window.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Render.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
     <ClCompile Include="src\shader.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
@@ -33,7 +30,7 @@
     <ClCompile Include="src\glad.c">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Engine\Debug.cpp">
+    <ClCompile Include="src\Engine\Debug\Debug.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
     <ClCompile Include="src\Engine\Meshes\Triangle.cpp">
@@ -48,9 +45,6 @@
     <ClCompile Include="libs\GLM\detail\glm.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Engine\System\System.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
     <ClCompile Include="src\libSource\imgui.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
@@ -75,21 +69,21 @@
     <ClCompile Include="src\Engine\ImGui\ImGuiWindows.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Engine\System\WindowSystem.cpp">
+    <ClCompile Include="src\Engine\Projection\EditorProjection.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Engine\Events\EditorInput.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\window.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Render.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
     <ClInclude Include="src\shader.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Engine\Debug.h">
+    <ClInclude Include="src\Engine\Debug\Debug.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
     <ClInclude Include="src\Engine\Meshes\Triangle.h">
@@ -947,9 +941,6 @@
     <ClInclude Include="libs\GLM\vector_relational.hpp">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Engine\System\System.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
     <ClInclude Include="src\libSource\imconfig.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
@@ -980,13 +971,26 @@
     <ClInclude Include="src\Engine\ImGui\ImGuiWindows.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Engine\System\WindowSystem.h">
+    <ClInclude Include="libs\GLAD\include\glad\glad.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\GLAD\include\KHR\khrplatform.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\GLFW\include\glfw3.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\GLFW\include\glfw3native.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Engine\Projection\EditorProjection.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Engine\Events\EditorInput.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\fragmentShader.glsl" />
-    <None Include="res\vertexShader.glsl" />
     <None Include="libs\GLM\detail\func_common.inl">
       <Filter>Файлы заголовков</Filter>
     </None>
@@ -1395,5 +1399,12 @@
     <None Include="libs\GLM\gtx\wrap.inl">
       <Filter>Файлы заголовков</Filter>
     </None>
+    <None Include=".gitattributes" />
+    <None Include=".gitignore" />
+    <None Include="imgui.ini" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="res\fragmentShader.glsl" />
+    <Text Include="res\vertexShader.glsl" />
   </ItemGroup>
 </Project>

bin-int/Debug-x64/OpenGL/OpenGL.exe.recipe

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ProjectOutputs>
+    <ProjectOutput>
+      <FullPath>D:\C++\Hyko_Engine\bin\Debug-x64\OpenGL\OpenGL.exe</FullPath>
+    </ProjectOutput>
+  </ProjectOutputs>
+  <ContentFiles />
+  <SatelliteDlls />
+  <NonRecipeFileRefs />
+</Project>

bin-int/Debug-x64/OpenGL/OpenGL.tlog/OpenGL.lastbuildstate

@@ -0,0 +1,2 @@
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:
+Debug|x64|D:\C++\Hyko_Engine\|

bin-int/Release-x64/OpenGL/OpenGL.exe.recipe

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ProjectOutputs>
+    <ProjectOutput>
+      <FullPath>D:\C++\Hyko_Engine\bin\Release-x64\OpenGL\OpenGL.exe</FullPath>
+    </ProjectOutput>
+  </ProjectOutputs>
+  <ContentFiles>
+    <ContentFile>
+      <FullPath>D:\C++\Hyko_Engine\res\fragmentShader.glsl</FullPath>
+    </ContentFile>
+    <ContentFile>
+      <FullPath>D:\C++\Hyko_Engine\res\vertexShader.glsl</FullPath>
+    </ContentFile>
+  </ContentFiles>
+  <SatelliteDlls />
+  <NonRecipeFileRefs />
+</Project>

bin-int/Release-x64/OpenGL/OpenGL.tlog/OpenGL.lastbuildstate

@@ -0,0 +1,2 @@
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:
+Release|x64|D:\C++\Hyko_Engine\|

bin-int/Release-x64/OpenGL/_IsIncrementalBuild

@@ -0,0 +1 @@
+D:\C++\Hyko_Engine\bin-int\Release-x64\OpenGL\\_IsIncrementalBuild

imgui.ini

@@ -4,7 +4,47 @@ Size=400,400
 Collapsed=0
 
 [Window][Test]
-Pos=289,29
-Size=1359,209
+Pos=5,12
+Size=201,127
+Collapsed=0
+
+[Window][Debug]
+Pos=10,154
+Size=201,85
+Collapsed=0
+
+[Window][Dispaly settings]
+Pos=1079,194
+Size=159,95
+Collapsed=0
+
+[Window][Scene components]
+Pos=967,61
+Size=213,159
+Collapsed=0
+
+[Window][Primitive meshes]
+Pos=47,269
+Size=216,131
+Collapsed=0
+
+[Window][Mesh edit]
+Pos=978,257
+Size=233,188
+Collapsed=0
+
+[Window][Main window]
+Pos=60,60
+Size=199,130
+Collapsed=0
+
+[Window][Dear ImGui Demo]
+Pos=256,14
+Size=550,680
+Collapsed=1
+
+[Window][Scene settings]
+Pos=31,474
+Size=360,80
 Collapsed=0