Merge pull request #1185 from moai/hotfix/partition-results-buffer

Hotfix/partition results buffer
moai · Feb 22, 2017 · 31fc0be · 31fc0be
2 parents 9530271 + a8eb11b
commit 31fc0be
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 13 deletions.
diff --git a/src/moai-sim/MOAICollisionWorld.cpp b/src/moai-sim/MOAICollisionWorld.cpp
@@ -348,7 +348,9 @@ void MOAICollisionWorld::ProcessOverlaps () {
 
 		// this gives us the coarse filter based on world space bounds
 		// TODO: find a way to utilize overlap flags?
-		MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+		MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+		MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
+
 		u32 totalResults = this->mPartition->GatherProps ( buffer, &prop, prop.GetBounds (), interfaceMask );
 
 		for ( u32 i = 0; i < totalResults; ++i ) {

diff --git a/src/moai-sim/MOAILayer.cpp b/src/moai-sim/MOAILayer.cpp
@@ -225,7 +225,8 @@ int	MOAILayer::_getPropViewList ( lua_State* L ) {
 		ZLFrustum viewVolume;
 		viewVolume.Init ( invViewProjMtx );
 
-		MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+		MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+		MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 		u32 totalResults = 0;
 
@@ -789,7 +790,9 @@ void MOAILayer::Draw ( int subPrimID, float lod  ) {
 		u32 interfaceMask = this->mPartition->GetInterfaceMask < MOAIGraphicsProp >();
 		if ( !interfaceMask ) return;
 
-		MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+		MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+		MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
+
 		const ZLFrustum& viewVolume = gfxMgr.mGfxState.GetViewVolume ();
 
 		u32 totalResults = 0;
@@ -1125,4 +1128,4 @@ void MOAILayer::SerializeIn ( MOAILuaState& state, MOAIDeserializer& serializer
 //----------------------------------------------------------------//
 void MOAILayer::SerializeOut ( MOAILuaState& state, MOAISerializer& serializer ) {
 	MOAIGraphicsProp::SerializeOut ( state, serializer );
-}
+}
diff --git a/src/moai-sim/MOAIPartition.cpp b/src/moai-sim/MOAIPartition.cpp
@@ -99,7 +99,8 @@ int MOAIPartition::_propForPoint ( lua_State* L ) {
 	u32 interfaceMask	= state.GetValue < u32 >( 10, MASK_ANY );
 	u32 queryMask		= state.GetValue < u32 >( 11, MASK_ANY );
 
-	MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+	MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+	MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 	u32 total = self->GatherProps ( buffer, 0, vec, interfaceMask, queryMask );
 	if ( total ) {
@@ -152,7 +153,8 @@ int MOAIPartition::_propForRay ( lua_State* L ) {
 	u32 interfaceMask	= state.GetValue < u32 >( 8, MASK_ANY );
 	u32 queryMask		= state.GetValue < u32 >( 9, MASK_ANY );
 
-	MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+	MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+	MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 	u32 total = self->GatherProps ( buffer, 0, vec, direction, interfaceMask, queryMask );
 
@@ -193,7 +195,8 @@ int MOAIPartition::_propList ( lua_State* L ) {
 	u32 interfaceMask	= state.GetValue < u32 >( 7, MASK_ANY );
 	u32 queryMask		= state.GetValue < u32 >( 8, MASK_ANY );
 
-	MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+	MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+	MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 	u32 total = self->GatherProps ( buffer, 0, interfaceMask, queryMask );
 	if ( total ) {
@@ -239,7 +242,8 @@ int MOAIPartition::_propListForPoint ( lua_State* L ) {
 	u32 interfaceMask	= state.GetValue < u32 >( 10, MASK_ANY );
 	u32 queryMask		= state.GetValue < u32 >( 11, MASK_ANY );
 
-	MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+	MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+	MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 	u32 total = self->GatherProps ( buffer, 0, vec, interfaceMask, queryMask );
 	if ( total ) {
@@ -294,7 +298,8 @@ int MOAIPartition::_propListForRay ( lua_State* L ) {
 	u32 interfaceMask	= state.GetValue < u32 >( 13, MASK_ANY );
 	u32 queryMask		= state.GetValue < u32 >( 14, MASK_ANY );
 
-	MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+	MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+	MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 	u32 total = self->GatherProps ( buffer, 0, vec, direction, interfaceMask, queryMask );
 
@@ -345,7 +350,8 @@ int MOAIPartition::_propListForRect ( lua_State* L ) {
 	u32 interfaceMask	= state.GetValue < u32 >( 11, MASK_ANY );
 	u32 queryMask		= state.GetValue < u32 >( 12, MASK_ANY );
 
-	MOAIPartitionResultBuffer& buffer = MOAIPartitionResultMgr::Get ().GetBuffer ();
+	MOAIScopedPartitionResultBufferHandle scopedBufferHandle = MOAIPartitionResultMgr::Get ().GetBufferHandle ();
+	MOAIPartitionResultBuffer& buffer = scopedBufferHandle;
 
 	u32 total = self->GatherProps ( buffer, 0, rect, interfaceMask, queryMask );
 	if ( total ) {

diff --git a/src/moai-sim/MOAIPartitionResultMgr.cpp b/src/moai-sim/MOAIPartitionResultMgr.cpp
@@ -4,14 +4,70 @@
 #include "pch.h"
 #include <moai-sim/MOAIPartitionResultMgr.h>
 
+//================================================================//
+// MOAIScopedPartitionResultBufferHandle
+//================================================================//
+
+//----------------------------------------------------------------//
+MOAIPartitionResultBuffer& MOAIScopedPartitionResultBufferHandle::Buffer () {
+
+	return *this->mBuffer;
+}
+
+//----------------------------------------------------------------//
+MOAIScopedPartitionResultBufferHandle::MOAIScopedPartitionResultBufferHandle ( MOAIPartitionResultMgr& mgr ) :
+	mMgr ( mgr ) {
+}
+
+//----------------------------------------------------------------//
+MOAIScopedPartitionResultBufferHandle::~MOAIScopedPartitionResultBufferHandle () {
+
+	if ( this->mBuffer ) {
+		this->mMgr.ReleaseBuffer ( this->mBuffer );
+	}
+}
+
 //================================================================//
 // MOAIPartitionResultMgr
 //================================================================//
 
+//----------------------------------------------------------------//
+MOAIScopedPartitionResultBufferHandle MOAIPartitionResultMgr::GetBufferHandle () {
+
+	MOAIScopedPartitionResultBufferHandle handle ( *this );
+
+	if ( this->mAvailable.GetTop () == 0 ) {
+
+		handle.mBuffer = new MOAIPartitionResultBuffer ();
+
+		size_t index = this->mBuffers.Size ();
+		this->mBuffers.Grow ( index + 1, 1, 0 );
+		this->mBuffers [ index ] = handle.mBuffer;
+
+		return handle;
+	}
+
+	handle.mBuffer = this->mAvailable.Pop ();
+	assert ( handle.mBuffer );
+	return handle;
+}
+
 //----------------------------------------------------------------//
 MOAIPartitionResultMgr::MOAIPartitionResultMgr () {
 }
 
 //----------------------------------------------------------------//
 MOAIPartitionResultMgr::~MOAIPartitionResultMgr () {
+
+	for ( size_t i = 0; i < this->mBuffers.Size (); ++i ) {
+		delete this->mBuffers [ i ];
+	}
+}
+
+//----------------------------------------------------------------//
+void MOAIPartitionResultMgr::ReleaseBuffer ( MOAIPartitionResultBuffer* buffer ) {
+
+	if ( buffer ) {
+		this->mAvailable.Push ( buffer );
+	}
 }
diff --git a/src/moai-sim/MOAIPartitionResultMgr.h b/src/moai-sim/MOAIPartitionResultMgr.h
@@ -6,22 +6,70 @@
 
 #include <moai-sim/MOAIPartitionResultBuffer.h>
 
+class MOAIPartitionResultMgr;
+
+//================================================================//
+// MOAIScopedPartitionResultBufferHandle
+//================================================================//
+class MOAIScopedPartitionResultBufferHandle {
+private:
+
+	friend class MOAIPartitionResultMgr;
+
+	MOAIPartitionResultMgr&			mMgr;
+	MOAIPartitionResultBuffer*		mBuffer;
+
+	//----------------------------------------------------------------//
+			MOAIScopedPartitionResultBufferHandle		( MOAIPartitionResultMgr& mgr );
+
+	//----------------------------------------------------------------//
+	inline void operator = ( const MOAIScopedPartitionResultBufferHandle& assign ) {
+		this->mBuffer = assign.mBuffer;
+		(( MOAIScopedPartitionResultBufferHandle& )assign ).mBuffer = 0;
+	}
+
+public:
+
+	//----------------------------------------------------------------//
+	MOAIPartitionResultBuffer&		Buffer										();
+									~MOAIScopedPartitionResultBufferHandle		();
+
+	//----------------------------------------------------------------//
+	inline operator MOAIPartitionResultBuffer* () {
+		return this->mBuffer;
+	}
+
+	//----------------------------------------------------------------//
+	inline operator MOAIPartitionResultBuffer& () {
+		return *this->mBuffer;
+	}
+};
+
 //================================================================//
 // MOAIPartitionResultMgr
 //================================================================//
 class MOAIPartitionResultMgr :
 	public MOAIGlobalClass < MOAIPartitionResultMgr > {
 private:
 
+	friend class MOAIScopedPartitionResultBufferHandle;
+
+	ZLLeanArray < MOAIPartitionResultBuffer* >	mBuffers;
+	ZLLeanStack < MOAIPartitionResultBuffer* >	mAvailable;
+
 	MOAIPartitionResultBuffer	mBuffer;
 
+	//----------------------------------------------------------------//
+	void			ReleaseBuffer					( MOAIPartitionResultBuffer* buffer );
+
 public:
 
-	GET ( MOAIPartitionResultBuffer&, Buffer, mBuffer )
+	typedef MOAIScopedPartitionResultBufferHandle Handle;
 
 	//----------------------------------------------------------------//
-			MOAIPartitionResultMgr		();
-			~MOAIPartitionResultMgr		();
+	Handle			GetBufferHandle					();
+					MOAIPartitionResultMgr			();
+					~MOAIPartitionResultMgr			();
 };
 
 #endif