Created solutions and fixed: LIA, OpenP5Spaghetti, OpenP5TextUniverse…

…, Pages, PhotoGlitch.
CLOUDS-Interactive-Documentary · Apr 5, 2014 · 7bc34cb · 7bc34cb
1 parent c85fc47
commit 7bc34cb
Show file tree

Hide file tree

Showing 32 changed files with 3,628 additions and 26 deletions.
diff --git a/CloudsLibrary/src/VisualSystems/PhotoGlitch/vs_src/CloudsVisualSystemPhotoGlitch.cpp b/CloudsLibrary/src/VisualSystems/PhotoGlitch/vs_src/CloudsVisualSystemPhotoGlitch.cpp
@@ -954,16 +954,16 @@ void CloudsVisualSystemPhotoGlitch::selfDrawDebug(){
 // or you can use selfDrawBackground to do 2D drawings that don't use the 3D camera
 void CloudsVisualSystemPhotoGlitch::selfDrawBackground()
 {
-    ofPushMatrix();
-    ofTranslate(getCanvasWidth()/2, getCanvasHeight()/2);
-    ofPushMatrix();
-    ofScale(mScale, mScale);
-    ofTranslate(-getCanvasWidth()/2, -getCanvasHeight()/2);
-
     if(! bSourceFolderExists || !bTargetFolderExists || !bSourceImageExists || !bTargetImageExists){
 //        ofLogError("[ CloudsVisualSystemPhotoGlitch::selfDrawBackground ]")<<" Image folders not found"<<endl;
         return;
     }
+
+	ofPushMatrix();
+    ofTranslate(getCanvasWidth()/2, getCanvasHeight()/2);
+    ofPushMatrix();
+    ofScale(mScale, mScale);
+    ofTranslate(-getCanvasWidth()/2, -getCanvasHeight()/2);
 
     if (bUseColors) {
         sourcePhoto.vbo.enableColors();

diff --git a/CloudsLibrary/src/VisualSystems/PhotoGlitch/vs_src/CloudsVisualSystemPhotoGlitch.h b/CloudsLibrary/src/VisualSystems/PhotoGlitch/vs_src/CloudsVisualSystemPhotoGlitch.h
@@ -72,6 +72,14 @@ class PhotoGlitch
     ofVbo vbo;
 
     PGCell* cells;
+
+	PhotoGlitch(){
+		verts = NULL;
+		texCoords = NULL;
+		colors = NULL;
+		indices = NULL;
+		cells = NULL;
+	}
 
     void clear(){
             tex.clear();

diff --git a/VSLia/VSLIA.sln b/VSLia/VSLIA.sln
@@ -0,0 +1,55 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxUILib", "..\..\..\addons\ofxUI\ofxUILib\ofxUILib.vcxproj", "{641DB976-E775-4D72-86EB-897E2C4A0EEE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxTimelineLib", "..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimelineLib.vcxproj", "{A72C4F16-CB16-4143-BA5C-5E4FA802D636}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSLIA", "VSLIA.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.Build.0 = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.ActiveCfg = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.Build.0 = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.ActiveCfg = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.Build.0 = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.ActiveCfg = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.Build.0 = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.Build.0 = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.ActiveCfg = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.Build.0 = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.ActiveCfg = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.Build.0 = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.ActiveCfg = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.Build.0 = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal