- changed selection code to use color picking, can disable using new ini setting:

EnableColorPicking=false
This commit is contained in:
Mark Vejvoda
2011-12-13 01:30:52 +00:00
parent 3ed8b3a58a
commit 2dd2afb296
10 changed files with 682 additions and 110 deletions

View File

@@ -116,7 +116,7 @@ void PerformanceTimer::reset(){
// Chrono
// =====================================
Chrono::Chrono() {
Chrono::Chrono(bool autoStart) {
freq = 1000;
stopped= true;
accumCount= 0;
@@ -126,6 +126,10 @@ Chrono::Chrono() {
lastResult = 0;
lastMultiplier = 0;
lastStopped = false;
if(autoStart == true) {
start();
}
}
void Chrono::start() {
@@ -140,6 +144,16 @@ void Chrono::stop() {
stopped= true;
}
void Chrono::reset() {
accumCount = 0;
lastStartCount = 0;
lastTickCount = 0;
lastResult = 0;
lastMultiplier = 0;
startCount = SDL_GetTicks();
}
int64 Chrono::getMicros() {
return queryCounter(1000000);
}