Index: GTP/trunk/Lib/Vis/OnlineCullingCHC/include/CoherentHierarchicalCullingPlusPlusManager.h
===================================================================
--- GTP/trunk/Lib/Vis/OnlineCullingCHC/include/CoherentHierarchicalCullingPlusPlusManager.h	(revision 2553)
+++ GTP/trunk/Lib/Vis/OnlineCullingCHC/include/CoherentHierarchicalCullingPlusPlusManager.h	(revision 2553)
@@ -0,0 +1,37 @@
+#ifndef _BatchedQueriesCullingManager_H__
+#define _BatchedQueriesCullingManager_H__
+
+#include "CoherentHierarchicalCullingManager.h"
+#include "HierarchyInterface.h"
+
+
+namespace GtpVisibility
+{
+
+/** Renders the scene with the coherent hierarchical culling algorithm. 
+*/
+class BatchedQueriesCullingManager : public CoherentHierarchicalCullingManager
+{
+public:
+	BatchedQueriesCullingManager();
+	/** Constructor taking the assumed visibility into account, i.e., the estimation
+		for how many frames the current visibility is considered to be valid
+	*/
+	BatchedQueriesCullingManager(const unsigned int assumedVisibility);
+
+	void RenderScene();
+	
+	void SetMaxPending(int maxPending);
+
+protected:
+
+	void IssueMultipleQueries(PendingQueue &pendingQueue, QueryQueue &queryQueue);
+
+	/** maximal pending nodes.
+	*/
+	int mMaxPending;
+};
+
+} // namespace GtpVisibility
+
+#endif // BatchedQueriesCullingManager_H
Index: GTP/trunk/Lib/Vis/OnlineCullingCHC/include/BatchedQueriesCullingManager.h
===================================================================
--- GTP/trunk/Lib/Vis/OnlineCullingCHC/include/BatchedQueriesCullingManager.h	(revision 373)
+++ 	(revision )
@@ -1,37 +1,0 @@
-#ifndef _BatchedQueriesCullingManager_H__
-#define _BatchedQueriesCullingManager_H__
-
-#include "CoherentHierarchicalCullingManager.h"
-#include "HierarchyInterface.h"
-
-
-namespace GtpVisibility
-{
-
-/** Renders the scene with the coherent hierarchical culling algorithm. 
-*/
-class BatchedQueriesCullingManager : public CoherentHierarchicalCullingManager
-{
-public:
-	BatchedQueriesCullingManager();
-	/** Constructor taking the assumed visibility into account, i.e., the estimation
-		for how many frames the current visibility is considered to be valid
-	*/
-	BatchedQueriesCullingManager(const unsigned int assumedVisibility);
-
-	void RenderScene();
-	
-	void SetMaxPending(int maxPending);
-
-protected:
-
-	void IssueMultipleQueries(PendingQueue &pendingQueue, QueryQueue &queryQueue);
-
-	/** maximal pending nodes.
-	*/
-	int mMaxPending;
-};
-
-} // namespace GtpVisibility
-
-#endif // BatchedQueriesCullingManager_H
Index: GTP/trunk/Lib/Vis/OnlineCullingCHC/include/CoherentHierarchicalCullingManager2.h
===================================================================
--- GTP/trunk/Lib/Vis/OnlineCullingCHC/include/CoherentHierarchicalCullingManager2.h	(revision 2455)
+++ 	(revision )
@@ -1,60 +1,0 @@
-#ifndef _CoherentHierarchicalCullingManager2_H__
-#define _CoherentHierarchicalCullingManager2_H__
-
-#include "CullingManager.h"
-#include "HierarchyInterface.h"
-
-
-namespace GtpVisibility
-{
-
-/** Renders the scene with the coherent hierarchical culling algorithm with
-	some additional features
-*/
-class CoherentHierarchicalCullingManager2: public CullingManager
-{
-public:
-	CoherentHierarchicalCullingManager2();
-
-	/** Constructor taking the assumed visibility into account, i.e., the estimation
-		for how many frames the current visibility is considered to be valid
-	*/
-	CoherentHierarchicalCullingManager2(const unsigned int assumedVisibility);
-
-	/** The main render routine.
-	*/
-	void RenderScene();
-
-	/** Sets assumed visibility (i.e., an estimation for 
-		how many frames the visibility is considered to be valid).
-		@param assumedVisibility indicates for how many frames the 
-		same visibility is be assumed.
-		if 0, the visibility is tested deterministically for each frame.
-	*/
-	void SetAssumedVisibility(const unsigned int assumedVisibility);
-
-protected:
-
-	/** Decides if node is considered to be visible depeding on the 
-		assumed visibility factor.
-		@returns if node is considered to be visible
-	*/
-	bool DecideVisible(HierarchyNode *node) const;
-
-	/** Skip query for this node.
-	*/
-	void SkipQuery(HierarchyNode *node) const;
-
-	/** number of steps the visibility is assumed to be valid.
-	*/
-	unsigned int mAssumedVisibility;
-
-	/** Threshold for rand function to return positive result with respect to
-		mAssumedVisibility.
-	*/
-	int mThreshold;
-};
-
-} // namespace GtpVisibility
-
-#endif // CoherentHierarchicalCullingManager2_H
