flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Little improvement to save some cpu time but it´s still very heavy cpu load

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@141 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
lapayo94@gmail.com 2011-12-28 02:38:00 +00:00
parent 1e9af56a67
commit e3be6b1a47
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/cFluidSimulator.cpp
View File

@ -85,6 +85,9 @@ cFluidSimulator::~cFluidSimulator()
void cFluidSimulator::AddBlock( int a_X, int a_Y, int a_Z ) void cFluidSimulator::AddBlock( int a_X, int a_Y, int a_Z )
{ {
if(!IsAllowedBlock(m_World->GetBlock(a_X, a_Y, a_Z))) //This should save very much time because it doesn´t have to iterate through all blocks
return;
// Check for duplicates // Check for duplicates
std::vector< Vector3i > & ActiveFluid = *m_Data->m_ActiveFluid; std::vector< Vector3i > & ActiveFluid = *m_Data->m_ActiveFluid;
for( std::vector< Vector3i >::iterator itr = ActiveFluid.begin(); itr != ActiveFluid.end(); ++itr ) for( std::vector< Vector3i >::iterator itr = ActiveFluid.begin(); itr != ActiveFluid.end(); ++itr )
@ -100,7 +103,7 @@ void cFluidSimulator::AddBlock( int a_X, int a_Y, int a_Z )
char cFluidSimulator::GetHighestLevelAround( int a_X, int a_Y, int a_Z ) char cFluidSimulator::GetHighestLevelAround( int a_X, int a_Y, int a_Z )
{ {
char Max = m_MaxHeight + 1; char Max = m_MaxHeight + 1;
//TODO Remove define function
#define __HIGHLEVEL_CHECK__( x, y, z ) \ #define __HIGHLEVEL_CHECK__( x, y, z ) \
if( IsAllowedBlock( m_World->GetBlock( x, y, z ) ) ) \ if( IsAllowedBlock( m_World->GetBlock( x, y, z ) ) ) \
{ \ { \
@ -131,6 +134,7 @@ void cFluidSimulator::Simulate( float a_Dt )
std::vector< Vector3i > & FluidBlocks = *m_Data->m_Buffer; std::vector< Vector3i > & FluidBlocks = *m_Data->m_Buffer;
for( std::vector< Vector3i >::iterator itr = FluidBlocks.begin(); itr != FluidBlocks.end(); ++itr ) for( std::vector< Vector3i >::iterator itr = FluidBlocks.begin(); itr != FluidBlocks.end(); ++itr )
{ {
Vector3i & pos = *itr; Vector3i & pos = *itr;
char BlockID = m_World->GetBlock( pos.x, pos.y, pos.z ); char BlockID = m_World->GetBlock( pos.x, pos.y, pos.z );
if( IsAllowedBlock( BlockID ) ) // only care about own fluid if( IsAllowedBlock( BlockID ) ) // only care about own fluid

3
source/cSandSimulator.cpp
View File

@ -51,6 +51,9 @@ bool cSandSimulator::IsAllowedBlock( char a_BlockID )
void cSandSimulator::AddBlock(int a_X, int a_Y, int a_Z) void cSandSimulator::AddBlock(int a_X, int a_Y, int a_Z)
{ {
if(!IsAllowedBlock(m_World->GetBlock(a_X, a_Y, a_Z))) //This should save very much time because it doesn´t have to iterate through all blocks
return;
Vector3i *Block = new Vector3i(a_X, a_Y, a_Z); Vector3i *Block = new Vector3i(a_X, a_Y, a_Z);
//check for duplicates //check for duplicates