luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 17:15:21 +02:00
Code Activity

commit before some radicallish changes to water behavior

Browse Source
This commit is contained in:
Perttu Ahola
2010-12-11 18:11:03 +02:00
parent 5e0c284f3a
commit 2a0d1a059e
15 changed files with 1436 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/utility.h
View File

@@ -394,12 +394,18 @@ private:
class TimeTaker
{
public:
TimeTaker(const char *name, IrrlichtDevice *dev)
TimeTaker(const char *name, IrrlichtDevice *dev, u32 *result=NULL)
{
m_name = name;
m_dev = dev;
m_time1 = m_dev->getTimer()->getRealTime();
m_result = result;
m_running = true;
if(dev == NULL)
{
m_time1 = 0;
return;
}
m_time1 = m_dev->getTimer()->getRealTime();
}
~TimeTaker()
{
@@ -409,10 +415,24 @@ public:
{
if(m_running)
{
if(m_dev == NULL)
{
/*if(quiet == false)
std::cout<<"Couldn't measure time for "<<m_name
<<": dev==NULL"<<std::endl;*/
return 0;
}
u32 time2 = m_dev->getTimer()->getRealTime();
u32 dtime = time2 - m_time1;
if(quiet == false)
std::cout<<m_name<<" took "<<dtime<<"ms"<<std::endl;
if(m_result != NULL)
{
(*m_result) += dtime;
}
else
{
if(quiet == false)
std::cout<<m_name<<" took "<<dtime<<"ms"<<std::endl;
}
m_running = false;
return dtime;
}
@@ -423,6 +443,7 @@ private:
IrrlichtDevice *m_dev;
u32 m_time1;
bool m_running;
u32 *m_result;
};
// Calculates the borders of a "d-radius" cube