From b28a850a8ab4532ee425439446f5b4e01f9471a9 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 18 Sep 2017 22:32:45 +0100 Subject: threading working --- gui/src/threadedChainImageLoader.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gui/src/threadedChainImageLoader.cpp') diff --git a/gui/src/threadedChainImageLoader.cpp b/gui/src/threadedChainImageLoader.cpp index ba3dd26..2927fb2 100644 --- a/gui/src/threadedChainImageLoader.cpp +++ b/gui/src/threadedChainImageLoader.cpp @@ -28,6 +28,7 @@ void threadedChainImageLoader::loadFromDisk(chainImage& image, string filename) entry.name = filename; images_to_load_from_disk.send(entry); + } @@ -50,7 +51,9 @@ void threadedChainImageLoader::threadedFunction() { setThreadName("threadedChainImageLoader " + ofToString(thread.get_id())); chainImageLoaderEntry entry; while( images_to_load_from_disk.receive(entry) ) { - if(entry.image->load(entry.filename) ) { + if(entry.image->tload(entry.filename) ) { + ofLogNotice() << "Loaded " << entry.image->filename; + images_to_update.send(entry); }else{ ofLogError("threadedChainImageLoader") << "couldn't load file: \"" << entry.filename << "\""; @@ -92,8 +95,7 @@ void threadedChainImageLoader::update(ofEventArgs & a){ // Load 1 image per update so we don't block the gl thread for too long chainImageLoaderEntry entry; if (images_to_update.tryReceive(entry)) { - entry.image->setUseTexture(true); - entry.image->update(); + entry.image->setupTextures(); } } -- cgit v1.2.3