Inline BuilderAllocatorDataStorage.

digitall · Dec 10, 2015 · d78563d · d78563d
1 parent 5c12997
commit d78563d
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 67 deletions.
diff --git a/src/xrAICore/Navigation/builder_allocator_constructor.h b/src/xrAICore/Navigation/builder_allocator_constructor.h
diff --git a/src/xrAICore/Navigation/data_storage_constructor.h b/src/xrAICore/Navigation/data_storage_constructor.h
@@ -12,13 +12,13 @@ template <typename T>				class CEmptyClassTemplate	{};
 template <typename T1, typename T2> class CEmptyClassTemplate2	{};
 
 #include "xrAICore/Navigation/manager_builder_allocator_constructor.h"
-
+// instantiated in CDijkstra
 template <
 	typename _algorithm, // CDataStorageBucketList|CDataStorageBinaryHeap
 	typename _manager, // CVertexManagerFixed|CVertexManagerHashFixed
 	typename _builder, // CEdgePath|CVertexPath
 	typename _allocator, // CVertexAllocatorFixed
-	template <typename _T> class _vertex = CEmptyClassTemplate // _Vertex
+	template <typename _T> class _vertex = CEmptyClassTemplate // _Vertex -- dijkstra vertex
 >
 struct CDataStorageConstructor : // CDataStorageBucketList::CDataStorage<CManagerBuilderAllocatorConstructor<manager, path, allocator> >
     public _algorithm::template CDataStorage<
@@ -30,8 +30,7 @@ struct CDataStorageConstructor : // CDataStorageBucketList::CDataStorage<CManage
 	typedef typename inherited::CGraphVertex	CGraphVertex;
 	typedef typename CGraphVertex::_index_type	_index_type;
 
-	IC	CDataStorageConstructor (const u32 vertex_count) :
-		inherited(vertex_count)
-	{
-	}
+	CDataStorageConstructor (const u32 vertex_count) :
+	    inherited(vertex_count)
+	{}
 };
diff --git a/src/xrAICore/Navigation/manager_builder_allocator_constructor.h b/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "xrAICore/Navigation/builder_allocator_constructor.h"
-
 template <
 	typename _manager, 
 	typename _builder, // CVertexPath
@@ -30,7 +28,7 @@ struct CManagerBuilderAllocatorConstructor {
 	{
 	public:
 	    typedef typename _manager::template CDataStorage<_builder, _allocator, _vertex, _index_vertex> inherited;
-		typedef typename inherited::inherited		inherited_allocator;
+		typedef typename inherited::CDataStorageAllocator inherited_allocator;
 		typedef typename inherited::CGraphVertex	CGraphVertex;
 		typedef typename CGraphVertex::_index_type	_index_type;
 

diff --git a/src/xrAICore/Navigation/vertex_manager_fixed.h b/src/xrAICore/Navigation/vertex_manager_fixed.h
@@ -41,14 +41,17 @@ struct CVertexManagerFixed {
 		template <typename _T> class _vertex = CEmptyClassTemplate,
 		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2
 	> 
-    class CDataStorage : public BuilderAllocatorDataStorage<VertexManager<_vertex>::_vertex, _builder, _allocator>
+    class CDataStorage :
+        public _builder::template CDataStorage<VertexManager<_vertex>::_vertex>,
+        public _allocator::template CDataStorage<typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex>::CGraphVertex>
     {
 	public:
-        typedef BuilderAllocatorDataStorage<
-			VertexManager<_vertex>::_vertex, _builder, _allocator
-		>												inherited;
-		typedef typename inherited::CGraphVertex		CGraphVertex;
-		typedef typename CGraphVertex::_index_type		_index_type;
+        typedef typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex> CDataStorageBase;
+        typedef typename _allocator::template CDataStorage<
+            typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex>::CGraphVertex> CDataStorageAllocator;
+		typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
+		typedef typename CGraphVertex::_index_type _index_type;
+        //using inherited = CDataStorageAllocator;
 
 #pragma pack(push,1)
 		template <typename _path_id_type>

diff --git a/src/xrAICore/Navigation/vertex_manager_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
@@ -25,7 +25,8 @@
 
 TEMPLATE_SPECIALIZATION
 IC	CFixedVertexManager::CDataStorage		(const u32 vertex_count) :
-	inherited				(vertex_count)
+    CDataStorageBase(vertex_count),
+    CDataStorageAllocator()
 {
 	m_current_path_id		= _path_id_type(0);
 	m_max_node_count		= vertex_count;
@@ -48,7 +49,8 @@ CFixedVertexManager::~CDataStorage		()
 TEMPLATE_SPECIALIZATION
 IC	void CFixedVertexManager::init		()
 {
-	inherited::init			();
+    CDataStorageBase::init();
+    CDataStorageAllocator::init();
 	++m_current_path_id;
 	if (!m_current_path_id) {
 		ZeroMemory			(m_indexes,(m_max_node_count)*sizeof(CGraphIndexVertex));

diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
@@ -52,13 +52,15 @@ struct CVertexManagerHashFixed {
 		template <typename _T> class _vertex = CEmptyClassTemplate,
 		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2
 	> 
-    class CDataStorage : public BuilderAllocatorDataStorage<VertexManager<_vertex>::_vertex, _builder, _allocator>
+    class CDataStorage :
+        public _builder::template CDataStorage<VertexManager<_vertex>::_vertex>,
+        public _allocator::template CDataStorage<typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex>::CGraphVertex>
     {
 	public:
-        typedef BuilderAllocatorDataStorage<
-			VertexManager<_vertex>::_vertex, _builder, _allocator
-		>												inherited;
-		typedef typename inherited::CGraphVertex		CGraphVertex;
+        typedef typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex> CDataStorageBase;
+        typedef typename _allocator::template CDataStorage<
+            typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex>::CGraphVertex> CDataStorageAllocator;
+		typedef typename CDataStorageBase::CGraphVertex		CGraphVertex;
 		typedef typename CGraphVertex::_index_type		_index_type;
 
 #pragma pack(push,1)

diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
@@ -26,8 +26,9 @@
 
 TEMPLATE_SPECIALIZATION
 IC	CHashFixedVertexManager::CDataStorage		(const u32 vertex_count) :
-	inherited				(vertex_count),
-	m_current_path_id		(_path_id_type(0))
+    CDataStorageBase(vertex_count),
+    CDataStorageAllocator(),
+	m_current_path_id(_path_id_type(0))
 {
 	u32						memory_usage = 0;
 	u32						byte_count;
@@ -53,7 +54,8 @@ CHashFixedVertexManager::~CDataStorage		()
 TEMPLATE_SPECIALIZATION
 IC	void CHashFixedVertexManager::init		()
 {
-	inherited::init			();
+    CDataStorageBase::init();
+    CDataStorageAllocator::init();
 	++m_current_path_id;
 	m_vertex_count			= 0;
 	if (!m_current_path_id) {

diff --git a/src/xrAICore/xrAICore.vcxproj b/src/xrAICore/xrAICore.vcxproj
@@ -261,7 +261,6 @@
     <ClInclude Include="Navigation\ai_object_location_inline.h" />
     <ClInclude Include="Navigation\a_star.h" />
     <ClInclude Include="Navigation\a_star_inline.h" />
-    <ClInclude Include="Navigation\builder_allocator_constructor.h" />
     <ClInclude Include="Navigation\data_storage_binary_heap.h" />
     <ClInclude Include="Navigation\data_storage_binary_heap_inline.h" />
     <ClInclude Include="Navigation\data_storage_bucket_list.h" />

diff --git a/src/xrAICore/xrAICore.vcxproj.filters b/src/xrAICore/xrAICore.vcxproj.filters
@@ -180,9 +180,6 @@
     <ClInclude Include="Navigation\dijkstra_inline.h">
       <Filter>AI\Navigation\Pathfinding\Algorithms\Dijkstra</Filter>
     </ClInclude>
-    <ClInclude Include="Navigation\builder_allocator_constructor.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\data_storage_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>