tweaks to taskqueue, alphawheel orientation, formatting tweaks

Author: RandomEtc

blocks/BloomTasks/src/TaskQueue.h

@@ -23,7 +23,7 @@ class TaskQueue {
 
     static void pushTask( VoidFunc f )
     {
-        // TODO: later, use a single thread and queue the tasks 
+        // TODO: later, optionally use a single thread and queue the tasks 
         // e.g. http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html 
         // for now, a thread per task will help spec out the right interface:
         std::thread taskThread( &TaskQueue::doWork, f );
@@ -67,7 +67,7 @@ class UiTaskQueue {
         return mCompletedTasks > taskId;
     }
 
-    // only call from main thread, no canceling from background threads mmmkay?
+    // only call from main thread, no canceling from background threads yet :(
     static void cancelTask( uint64_t taskId )
     {
         if (!isTaskComplete(taskId)) {
@@ -76,44 +76,58 @@ class UiTaskQueue {
     }
 
     // call this from the UI thread, or pain will occur
-    static void popTask( )
+    // default ~5ms budget (but will always do at least one call)        
+    static void update( const float &budgetSeconds = 0.005f )
     {
-        float t = ci::app::getElapsedSeconds();
-        do {
-            // TODO: within a certain time limit, keep popping tasks
-            if (mFunctionsMutex.try_lock()) {
-                if (mFunctions.empty()) {                
-                    mFunctionsMutex.unlock();
-                    break; // quit the do/while
+        // empty while loop *shiver*
+        const float t = ci::app::getElapsedSeconds();
+        while ( popTask() && ci::app::getElapsedSeconds() - t < budgetSeconds );
+    }
+        
+private:
+
+    // returns true if it got a lock and has more tasks, false otherwise
+    static bool popTask( )
+    {
+        if (mFunctionsMutex.try_lock()) {
+            if (mFunctions.empty()) {                
+                mFunctionsMutex.unlock();
+                return false;
+            }
+            else {
+                // remember this id and increment too; 
+                // (it's about to be gone from mFunctions so cancelTask won't work anyway)
+                uint64_t thisTaskId = mCompletedTasks++; 
+                
+                 // grab the next task and remove it; there is no undo
+                VoidFunc f = mFunctions.front();                
+                mFunctions.pop();
+                
+                // let callers know if it's worth calling again
+                bool hasMoreTasks = !mFunctions.empty();
+                
+                // unlock first so that tasks can queue other tasks
+                mFunctionsMutex.unlock();
+                
+                // if it's not canceled, do it (otherwise just clean up the canceled marker)
+                std::set<uint64_t>::iterator iter = mCanceledIds.find( thisTaskId );
+                if ( iter == mCanceledIds.end() ) {
+                    f();
                 }
                 else {
-                    uint64_t thisTaskId = mCompletedTasks++; // remember this id and increment too; 
-                    // (it's about to be gone from mFunctions so cancelTask won't work anyway)
-                    VoidFunc f = mFunctions.front(); // grab the next task
-                    mFunctions.pop();                // remove it; there is no undo
-                    mFunctionsMutex.unlock();        // unlock first so that tasks can queue other tasks
-                    std::set<uint64_t>::iterator iter = mCanceledIds.find( thisTaskId );
-                    if ( iter == mCanceledIds.end() ) {
-                        // if it's not canceled, do it
-                        std::cout << "performing task " << thisTaskId << std::endl;
-                        f();
-                    }
-                    else {
-                        std::cout << "skipping task " << thisTaskId << std::endl;
-                        // otherwise remove it
-                        mCanceledIds.erase( iter );
-                    }
+                    mCanceledIds.erase( iter );
                 }
+                
+                return hasMoreTasks;
             }
-        } while ( ci::app::getElapsedSeconds() - t < 0.005 ); // ~5ms budget (but always do at least one call)
+        }
+        return false;
     }
 
-private:
-    
     static std::mutex mFunctionsMutex;
     static std::queue<VoidFunc> mFunctions;
     static uint64_t mCompletedTasks;
     static uint64_t mTotalTasks;
-    static std::set<uint64_t> mCanceledIds;
+    static std::set<uint64_t> mCanceledIds; // FIXME: no mutex for canceling so not thread safe :(
 
 };

src/AlphaChooser.cpp

@@ -70,7 +70,6 @@ bool AlphaChooser::touchBegan( TouchEvent::Touch touch )
 {
     if (!mWheelOverlay->getShowWheel()) return false;    
     Vec2f pos = globalToLocal( touch.getPos() );
-    // TODO: make a padded hitrect
     return mFullRect.contains( pos );
 }
 
@@ -104,13 +103,13 @@ bool AlphaChooser::touchEnded( TouchEvent::Touch touch )
 			if( mAlphaChar != mAlphaString[i] ){            
                 mAlphaChar = mAlphaString[i];
                 mCallbacksAlphaCharSelected.call( mAlphaChar );
-                mWheelOverlay->setShowWheel(false);
             }
+            mWheelOverlay->setShowWheel(false);
             return true;
         }
     }
 
-    return false;
+    return mFullRect.contains( pos );
 }
 
 void AlphaChooser::setNumberAlphaPerChar( float *numberAlphaPerChar )

src/KeplerApp.cpp

@@ -1618,7 +1618,7 @@ void KeplerApp::update()
     }    
 
     // do UI thread things...
-    UiTaskQueue::popTask();
+    UiTaskQueue::update();
 }
 
 void KeplerApp::updateArcball()

src/OrbitRing.cpp

@@ -43,7 +43,7 @@ void OrbitRing::setup()
     glGenBuffers(1, &mLowResVBO);
     glBindBuffer(GL_ARRAY_BUFFER, mLowResVBO);
     glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData) * G_RING_LOW_RES, mVertsLowRes, GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER,0); // Leave no VBO bound.        
+    glBindBuffer(GL_ARRAY_BUFFER, 0); // Leave no VBO bound.        
 
     delete[] mVertsLowRes;
 
@@ -59,7 +59,7 @@ void OrbitRing::setup()
     glGenBuffers(1, &mHighResVBO);
     glBindBuffer(GL_ARRAY_BUFFER, mHighResVBO);
     glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData) * G_RING_HIGH_RES, mVertsHighRes, GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER,0); // Leave no VBO bound.        
+    glBindBuffer(GL_ARRAY_BUFFER, 0); // Leave no VBO bound.        
 
     delete[] mVertsHighRes;    
 }