Merge branch '#77' into #92

Jin02 · Jul 22, 2018 · 78c86b4 · 78c86b4
2 parents 38ec6cb + e900560
commit 78c86b4
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 28 deletions.
diff --git a/SOCEngine/SOCEngine/Rendering/Buffer/BaseBuffer.h b/SOCEngine/SOCEngine/Rendering/Buffer/BaseBuffer.h
@@ -2,6 +2,7 @@
 
 #include <d3d11_1.h>
 #include "DXResource.h"
+
 namespace Device
 {
 	class DirectX;

diff --git a/SOCEngine/SOCEngine/Rendering/Mesh/MeshManager.h b/SOCEngine/SOCEngine/Rendering/Mesh/MeshManager.h
@@ -3,8 +3,9 @@
 #include <tuple>
 #include <assert.h>
 #include "OpaqueMeshRenderQueue.h"
-#include "VectorIndexer.hpp"
+
 #include "VBSortedMeshPool.h"
+#include "UnsortedMeshPool.h"
 
 namespace Core
 {
@@ -15,7 +16,7 @@ namespace Rendering
 {
 	namespace Geometry
 	{
-		using TransparentMeshPool	= Core::VectorHashMap<Core::ObjectID::LiteralType, Mesh>;
+		using TransparentMeshPool	= UnsortedMeshPool;
 		using OpaqueMeshPool		= VBSortedMeshPool;
 		using AlphaTestMeshPool		= OpaqueMeshPool;
 
@@ -56,7 +57,7 @@ namespace Rendering
 			Geometry::Mesh& Add(Geometry::Mesh& mesh, Geometry::TransparentMeshPool& meshPool)
 			{
 				assert(mesh.GetVBKey() != 0); //Error, mesh does not init yet.
-				return meshPool.Add(mesh.GetObjectID().Literal(), mesh);
+				return meshPool.Add(mesh.GetObjectID(), 0, mesh);
 			}
 
 			Geometry::Mesh& Add(Geometry::Mesh& mesh, Geometry::OpaqueMeshPool& meshPool) // or AlphaTestMeshPool
@@ -103,29 +104,9 @@ namespace Rendering
 
 			void ClearDirty() { _dirtyMeshes.clear(); _mustUpdateCBMeshes.clear(); _dirty = false; }
 
+			template <class FromMeshPool, class ToMeshPool>
 			void ChangeTrait(Core::ObjectID id,
-				Geometry::OpaqueMeshPool& fromPool, Geometry::OpaqueMeshPool& toPool) // Opaque <-> AlphaTest
-			{
-				uint literlID = id.Literal();
-				assert(fromPool.Has(literlID));
-				assert(toPool.Has(literlID) == false);
-
-				Geometry::Mesh* mesh = fromPool.Find(literlID);
-				toPool.Add(id, mesh->GetVBKey(), *mesh);
-				fromPool.Delete(literlID);
-			}
-			void ChangeTrait(Core::ObjectID id,
-							 Geometry::OpaqueMeshPool& fromPool, Geometry::TransparentMeshPool& toPool) // Opaque or AlphaTest -> Transparent
-			{
-				uint literlID = id.Literal();
-				assert(fromPool.Has(literlID));
-				assert(toPool.Has(literlID) == false);
-
-				toPool.Add(literlID, *fromPool.Find(literlID));
-				fromPool.Delete(literlID);
-			}
-			void ChangeTrait(Core::ObjectID id,
-							 Geometry::TransparentMeshPool& fromPool, Geometry::OpaqueMeshPool& toPool) // Transparent -> Opaque / AlphaTest
+				FromMeshPool& fromPool, ToMeshPool& toPool)
 			{
 				uint literlID = id.Literal();
 				assert(fromPool.Has(literlID));

diff --git a/SOCEngine/SOCEngine/Rendering/Mesh/UnsortedMeshPool.cpp b/SOCEngine/SOCEngine/Rendering/Mesh/UnsortedMeshPool.cpp
@@ -0,0 +1,13 @@
+#include "UnsortedMeshPool.h"
+
+#include "Mesh.h"
+#include "ObjectID.hpp"
+
+using namespace Rendering;
+using namespace Rendering::Geometry;
+using namespace Core;
+
+Mesh& UnsortedMeshPool::Add(Core::ObjectID id, int, Mesh& mesh)
+{
+	return Parent::Add(id.Literal(), mesh);
+}
diff --git a/SOCEngine/SOCEngine/Rendering/Mesh/UnsortedMeshPool.h b/SOCEngine/SOCEngine/Rendering/Mesh/UnsortedMeshPool.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "VectorIndexer.hpp"
+#include "ObjectID.hpp"
+
+namespace Rendering
+{
+	namespace Geometry
+	{
+		class Mesh;
+
+		class UnsortedMeshPool final 
+			: public Core::VectorHashMap<Core::ObjectID::LiteralType, Mesh>
+		{
+		public:
+			using Parent = Core::VectorHashMap<Core::ObjectID::LiteralType, Mesh>;
+			using Parent::Parent;
+
+		public:
+			// int는 VBSortedPool과 interface 맞추는 용도에 불과함.
+			Mesh& Add(Core::ObjectID id, int, Mesh& mesh);
+		};
+	}
+}
diff --git a/SOCEngine/SOCEngine/Rendering/Postprocessing/Bloom.cpp b/SOCEngine/SOCEngine/Rendering/Postprocessing/Bloom.cpp
@@ -133,8 +133,17 @@ void Bloom::RenderBloom(DirectX& dx, RenderTexture& outRT, const RenderTexture&
 
 void Bloom::SetElapsedTime(float time)
 {
-	Half hTime(time);
-	Half hInvTime(1.0f / time);
+	uint packedTime = 0;
 
-	_paramData.packedDeltaTime = (hInvTime.GetValue() << 16) | hTime.GetValue();
+	if (fabsf(time) <= FLT_EPSILON)
+		packedTime = 0;
+	else
+	{
+		Half hTime(time);
+		Half hInvTime(1.0f / time);
+
+		packedTime = (hInvTime.GetValue() << 16) | hTime.GetValue();
+	}
+
+	_paramData.packedDeltaTime = packedTime;
 }
diff --git a/SOCEngine/SOCEngine/SOCEngine.vcxproj b/SOCEngine/SOCEngine/SOCEngine.vcxproj
@@ -157,6 +157,7 @@
     <ClInclude Include="Rendering\Mesh\MeshRawPtrs.h" />
     <ClInclude Include="Rendering\Mesh\MeshRenderQueue.h" />
     <ClInclude Include="Rendering\Mesh\OpaqueMeshRenderQueue.h" />
+    <ClInclude Include="Rendering\Mesh\UnsortedMeshPool.h" />
     <ClInclude Include="Rendering\Mesh\VBSortedMeshPool.h" />
     <ClInclude Include="Rendering\Mesh\MeshRawPool.h" />
     <ClInclude Include="Rendering\Mesh\MeshUtility.h" />
@@ -393,6 +394,7 @@
     <ClCompile Include="Rendering\Mesh\MeshManager.cpp" />
     <ClCompile Include="Rendering\Mesh\MeshRawPtrs.cpp" />
     <ClCompile Include="Rendering\Mesh\OpaqueMeshRenderQueue.cpp" />
+    <ClCompile Include="Rendering\Mesh\UnsortedMeshPool.cpp" />
     <ClCompile Include="Rendering\Mesh\VBSortedMeshPool.cpp" />
     <ClCompile Include="Rendering\Mesh\MeshRawPool.cpp" />
     <ClCompile Include="Rendering\Mesh\MeshUtility.cpp" />

diff --git a/SOCEngine/SOCEngine/SOCEngine.vcxproj.filters b/SOCEngine/SOCEngine/SOCEngine.vcxproj.filters
@@ -1030,6 +1030,9 @@
     <ClInclude Include="Core\VectorIndexer.hpp">
       <Filter>Core\Transform</Filter>
     </ClInclude>
+    <ClInclude Include="Rendering\Mesh\UnsortedMeshPool.h">
+      <Filter>Rendering\Mesh\Pool</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Device\DirectX.cpp">
@@ -1350,6 +1353,9 @@
     <ClCompile Include="Rendering\PostProcessing\MotionBlur.cpp">
       <Filter>Rendering\Postprocessing\MotionBlur</Filter>
     </ClCompile>
+    <ClCompile Include="Rendering\Mesh\UnsortedMeshPool.cpp">
+      <Filter>Rendering\Mesh\Pool</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="ShaderCodes\BilateralFiltering.hlsl">