Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

image loading as a separate thread seems too tricky, disabled it

  • Loading branch information...
commit 8c1982d61f260d41455db5b0cdea51c0f1b2d39f 1 parent b4156d3
@robmint authored
View
2  skyLight.xcodeproj/project.pbxproj
@@ -159,6 +159,7 @@
CBF69FE1148598EE00F8881D /* COPYING.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYING.txt; sourceTree = "<group>"; };
CBF69FE8148598EE00F8881D /* ofxRuiThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxRuiThread.cpp; sourceTree = "<group>"; };
CBF69FE9148598EE00F8881D /* ofxRuiThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxRuiThread.h; sourceTree = "<group>"; };
+ CBF6A2081485D68700F8881D /* imageLoaderThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imageLoaderThread.h; sourceTree = "<group>"; };
E45BE0390E8CC647009D7055 /* FreeImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FreeImage.h; path = ../../../libs/freeimage/include/FreeImage.h; sourceTree = SOURCE_ROOT; };
E45BE03F0E8CC650009D7055 /* fmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fmod.h; path = ../../../libs/fmodex/include/fmod.h; sourceTree = SOURCE_ROOT; };
E45BE0400E8CC650009D7055 /* fmod.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fmod.hpp; path = ../../../libs/fmodex/include/fmod.hpp; sourceTree = SOURCE_ROOT; };
@@ -695,6 +696,7 @@
CBF69535147DEB8300F8881D /* util.h */,
CBF69536147DEB8300F8881D /* util.cpp */,
CBF69F9F1485923D00F8881D /* httpThread.h */,
+ CBF6A2081485D68700F8881D /* imageLoaderThread.h */,
);
path = src;
sourceTree = SOURCE_ROOT;
View
25 skyLight.xcodeproj/rcar004.mode1v3
@@ -321,7 +321,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>testApp.cpp</string>
+ <string>testApp.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -329,14 +329,13 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>testApp.cpp</string>
+ <string>testApp.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>CBF6A2061485D58700F8881D</string>
+ <string>CBF6A2401486064700F8881D</string>
<key>history</key>
<array>
- <string>CBF695D2147DFD9A00F8881D</string>
<string>CBF6997D1480953000F8881D</string>
<string>CBF69B021481DA0400F8881D</string>
<string>CBF69CA014823B4E00F8881D</string>
@@ -355,15 +354,18 @@
<string>CBF6A0501485A13300F8881D</string>
<string>CBF6A0C21485ABD500F8881D</string>
<string>CBF6A0D51485B76900F8881D</string>
- <string>CBF6A0D61485B76900F8881D</string>
<string>CBF6A0E61485B8AC00F8881D</string>
- <string>CBF6A0FF1485BB2E00F8881D</string>
- <string>CBF6A13B1485C06900F8881D</string>
- <string>CBF6A13C1485C06900F8881D</string>
<string>CBF6A1C01485C7D500F8881D</string>
<string>CBF6A1D71485CF9700F8881D</string>
- <string>CBF6A1D81485CF9700F8881D</string>
- <string>CBF6A1CE1485CF4B00F8881D</string>
+ <string>CBF6A2161485D76D00F8881D</string>
+ <string>CBF6A2171485D76D00F8881D</string>
+ <string>CBF6A21A1485D76D00F8881D</string>
+ <string>CBF6A22E1485D95D00F8881D</string>
+ <string>CBF6A22F1485D95D00F8881D</string>
+ <string>CBF6A2301485D95D00F8881D</string>
+ <string>CBF6A23E1486064700F8881D</string>
+ <string>CBF6A23F1486064700F8881D</string>
+ <string>CBF6A22D1485D95D00F8881D</string>
</array>
</dict>
<key>SplitCount</key>
@@ -561,7 +563,6 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>CBF6A2071485D58700F8881D</string>
<string>1C530D57069F1CE1000CFCEE</string>
<string>CBF69517147DC8DF00F8881D</string>
<string>CBF69518147DC8DF00F8881D</string>
@@ -592,7 +593,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>httpThread.h</string>
+ <string>testApp.cpp</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
View
1,295 skyLight.xcodeproj/rcar004.pbxuser
819 additions, 476 deletions not shown
View
20 src/testApp.cpp
@@ -65,7 +65,8 @@ void testApp::setup(){
ofSetFrameRate(30);
// start thread
- HttpThread.initAndSleep();
+ Http.initAndSleep();
+ //ImageLoader.initAndSleep();
}
@@ -110,7 +111,7 @@ void testApp::updateSequenceList( string s ) {
}
// initialise imageSequence
- sequence.loadSequence(files);
+// sequence.loadSequence(files);
// sequence.preloadAllFrames();
// sequence.setFrameRate(25);
@@ -140,10 +141,10 @@ void testApp::update(){
sprintf(imgPath, "%s/sky-%02i-%02i.jpg", path, ofGetMinutes(), ofGetSeconds());
message = "Trigger: Network camera capture";
- HttpThread.imageLoader = imageLoader;
- HttpThread.cameraUrl = cameraUrl;
- HttpThread.imgPath = imgPath;
- HttpThread.updateOnce();
+ Http.imageLoader = imageLoader;
+ Http.cameraUrl = cameraUrl;
+ Http.imgPath = imgPath;
+ Http.updateOnce();
} else if (webcamCapture) {
camera.grabFrame();
@@ -164,7 +165,12 @@ void testApp::update(){
if(time%newSequence==0) {
updateSequenceList(storagePath);
-
+ /*
+ ImageLoader.files = files;
+ ImageLoader.sequence = sequence;
+ ImageLoader.start();
+ */
+ cout<<"Just called ImageLoader.start()\n";
}
time++;
View
9 src/testApp.h
@@ -1,7 +1,6 @@
#ifndef _TEST_APP
#define _TEST_APP
-
#include "ofMain.h"
#include "ofxFileLoader.h"
#include "ofxDirList.h"
@@ -9,15 +8,14 @@
#include "ofxOpenCv.h"
#include "ofxThread.h"
-
#include "httpThread.h"
-#include "util.h"
+//#include "imageLoaderThread.h"
+#include "util.h"
#include <string.h>
#include <vector.h>
-
#define CONFIG_FILE "data/skylight.xml"
class testApp : public ofBaseApp{
@@ -51,7 +49,8 @@ class testApp : public ofBaseApp{
int xpos, ypos;
double xscale, yscale;
- SimpleThread HttpThread;
+ HttpThread Http;
+ //ImageLoaderThread ImageLoader;
vector<string> files;
Please sign in to comment.
Something went wrong with that request. Please try again.