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

robmint · Nov 30, 2011 · 8c1982d · 8c1982d
1 parent b4156d3
commit 8c1982d
Show file tree

Hide file tree

Showing 5 changed files with 851 additions and 500 deletions.
diff --git a/skyLight.xcodeproj/project.pbxproj b/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;

diff --git a/skyLight.xcodeproj/rcar004.mode1v3 b/skyLight.xcodeproj/rcar004.mode1v3
@@ -321,22 +321,21 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>testApp.cpp</string>
+								<string>testApp.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
 									<dict>
 										<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>