further cleanup
This commit is contained in:
parent
075d18b4b8
commit
05dea19436
8 changed files with 54 additions and 25 deletions
|
@ -38,7 +38,7 @@ struct rect_ {
|
|||
|
||||
rect_(point_<T_> const & p,size_<T_> const & s) : size(s), position(p) {}
|
||||
|
||||
bool contains(const point_<T_>& p)
|
||||
bool contains(const point_<T_>& p) const
|
||||
{
|
||||
return p.x >= position.x && p.x <= position.x + size.width &&
|
||||
p.y >= position.y && p.y <= position.y + size.height;
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
|
||||
namespace pw {
|
||||
|
||||
static timer global_timer;
|
||||
|
||||
timer::timer()
|
||||
{
|
||||
reset();
|
||||
|
@ -48,6 +46,7 @@ double timer::elapsed() const
|
|||
|
||||
double timer::now()
|
||||
{
|
||||
static timer global_timer;
|
||||
return global_timer.elapsed();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue