64 bit mac os x build working!!!

CLOUDS-Interactive-Documentary · Jun 8, 2014 · af039b1 · af039b1
1 parent 029db50
commit af039b1
Show file tree

Hide file tree

Showing 31 changed files with 4,842 additions and 1,106 deletions.
diff --git a/CLOUDS/CLOUDS_64.xcodeproj/project.pbxproj b/CLOUDS/CLOUDS_64.xcodeproj/project.pbxproj
diff --git a/CLOUDS/src/testApp.cpp b/CLOUDS/src/testApp.cpp
@@ -51,7 +51,7 @@ void testApp::keyPressed(int key){
 	if(key == 'L'){
 #ifdef OCULUS_RIFT
 		ofPixels p;
-		CloudsVisualSystem::getOculusRift().getRenderTarget().readToPixels(p);
+//		CloudsVisualSystem::getOculusRift().getRenderTarget().readToPixels(p);
 		ofSaveImage(p,"OCULUS_BG.png");
 #endif
 	}

diff --git a/CloudsData/secondaryDisplay/ssl/libwebsockets-test-server.key.pem b/CloudsData/secondaryDisplay/ssl/libwebsockets-test-server.key.pem
diff --git a/CloudsData/secondaryDisplay/ssl/libwebsockets-test-server.pem b/CloudsData/secondaryDisplay/ssl/libwebsockets-test-server.pem
diff --git a/CloudsLibrary/src/RGBD/HUD/CloudsSVGMesh.cpp b/CloudsLibrary/src/RGBD/HUD/CloudsSVGMesh.cpp
@@ -8,10 +8,6 @@
 
 #include "CloudsSVGMesh.h"
 
-string strrephack(string& input, const string& searchStr, const string& replaceStr){
-	ofStringReplace(input, searchStr, replaceStr);
-	return input;
-}
 
 //constructor
 CloudsSVGMesh::CloudsSVGMesh(){
@@ -28,6 +24,11 @@ bool CloudsSVGMesh::loadDirectory(string file){
 	return true;
 }
 
+string CloudsSVGMesh::strrephack(string input, string searchStr, string replaceStr){
+	ofStringReplace(input, searchStr, replaceStr);
+	return input;
+}
+
 bool CloudsSVGMesh::load(string file){
 	ofxXmlSettings svg;
 	if(!svg.loadFile(file)){

diff --git a/CloudsLibrary/src/RGBD/HUD/CloudsSVGMesh.h b/CloudsLibrary/src/RGBD/HUD/CloudsSVGMesh.h
@@ -43,6 +43,7 @@ class CloudsSVGMesh
   protected:
 	//void recurseSVGTag(ofxXmlSettings& xml, const string& parentId, float parentOpacity);
 	void recurseSVGTag(ofxXmlSettings& xml, const string& parentId, float parentOpacity);
+	string strrephack(string input, string searchStr, string replaceStr);
 
 	vector<SVGMesh> meshes;
 	map<string,int> meshIdIndex;

diff --git a/CloudsLibrary/src/StoryEngine/CloudsStoryEngine.cpp b/CloudsLibrary/src/StoryEngine/CloudsStoryEngine.cpp
@@ -1161,7 +1161,7 @@ float CloudsStoryEngine::scoreForTopic(CloudsStoryState& state, string potential
         return 0;
     }
 
-    if(ofContains(state.topicHistory, potentialNextTopic) && !state.topicNum == maxTopicsPerAct-1){
+    if(ofContains(state.topicHistory, potentialNextTopic) && state.topicNum != maxTopicsPerAct-1){
 		if(bLogTopicDetails)state.log << state.duration << "\t\t\t\t\tREJECTED Topic " << potentialNextTopic << " has already been explored" << endl;
         return 0;
     }

diff --git a/CloudsLibrary/src/VisualSystems/DrawnLine/vs_src/lineMatchUtils.h b/CloudsLibrary/src/VisualSystems/DrawnLine/vs_src/lineMatchUtils.h
@@ -41,7 +41,7 @@ typedef struct {
 } polyPtr;
 
 
-typedef struct lineSet{
+typedef struct lineSet {
 
     vector < ofPolyline > lines;
     vector < ofPolyline > normalizeLines;
@@ -55,8 +55,8 @@ typedef struct lineSet{
         return distance < input.distance;
     }
 
-    
-} ;
+};
+
 
 
 bool sortFunc(const distanceResult & a, const distanceResult & b);

diff --git a/CloudsLibrary/src/VisualSystems/ExampleMPMFluid/vs_src/CloudsVisualSystemExampleMPMFluid.cpp b/CloudsLibrary/src/VisualSystems/ExampleMPMFluid/vs_src/CloudsVisualSystemExampleMPMFluid.cpp
@@ -1,6 +1,3 @@
-//
-//  CloudsVisualSystemEmpty.cpp
-//
 
 #include "CloudsVisualSystemExampleMPMFluid.h"
 #include "CloudsRGBDVideoPlayer.h"
@@ -314,21 +311,22 @@ void CloudsVisualSystemExampleMPMFluid:: selfInteractionMoved(CloudsInteractionE
     }
 }
 
-void CloudsVisualSystemExampleMPMFluid :: selfInteractionStarted(CloudsInteractionEventArgs& args){
+void CloudsVisualSystemExampleMPMFluid::selfInteractionStarted(CloudsInteractionEventArgs& args){
 
 }
 
-void CloudsVisualSystemExampleMPMFluid:: selfInteractionDragged(CloudsInteractionEventArgs& args){
+void CloudsVisualSystemExampleMPMFluid::selfInteractionDragged(CloudsInteractionEventArgs& args){
 
 }
 
-void CloudsVisualSystemExampleMPMFluid:: selfInteractionEnded(CloudsInteractionEventArgs& args){
+void CloudsVisualSystemExampleMPMFluid::selfInteractionEnded(CloudsInteractionEventArgs& args){
 
     map<int, int >::iterator it;
     for(it = currentPlayers.begin(); it != currentPlayers.end(); ){
 
         if (it->first == args.playerId) {
-            it = currentPlayers.erase(it);
+            currentPlayers.erase(it);
+			break;
 //            cout<<"removing from map "<<it->first<<endl;
         }
 		else {

diff --git a/CloudsLibrary/src/VisualSystems/Flying/vs_src/CloudsVisualSystemFlying.cpp b/CloudsLibrary/src/VisualSystems/Flying/vs_src/CloudsVisualSystemFlying.cpp
@@ -209,8 +209,9 @@ void CloudsVisualSystemFlying::selfUpdate()
 
     const float maxPlantDist = growDist * 5.f;
     const float maxPlantDistSq = maxPlantDist * maxPlantDist;
-
-    for (auto& it = plants.begin(); it != plants.end();)
+
+	list<Plant>::iterator it;
+    for (it = plants.begin(); it != plants.end(); it++)
     {
         if ((it->pos - floorLookAt).lengthSquared() > maxPlantDistSq) {
 			it = plants.erase(it);

diff --git a/CloudsLibrary/src/VisualSystems/Histogram/vs_src/CloudsVisualSystemHistogram.cpp b/CloudsLibrary/src/VisualSystems/Histogram/vs_src/CloudsVisualSystemHistogram.cpp
@@ -313,7 +313,10 @@ void CloudsVisualSystemHistogram::selfDraw()
 	glFogi(GL_FOG_COORD_SRC, GL_FRAGMENT_DEPTH);
 	glFogi(GL_FOG_MODE, GL_EXP);
 
-    GLfloat fogColor[4] = { bgColor.r/255., bgColor.g/255., bgColor.b/255., 1.0 };
+    GLfloat fogColor[4] = {
+		(GLfloat)(bgColor.r/255.),
+		(GLfloat)(bgColor.g/255.),
+		(GLfloat)(bgColor.b/255.), (GLfloat)(1.0) };
     glFogfv(GL_FOG_COLOR, fogColor);
 
 	glFogf(GL_FOG_DENSITY, powf(fogDensity, 4));

diff --git a/CloudsLibrary/src/VisualSystems/MazeGenerator/vs_src/MazeCell.cpp b/CloudsLibrary/src/VisualSystems/MazeGenerator/vs_src/MazeCell.cpp
@@ -24,7 +24,7 @@ MazeCell::MazeCell(int _x, int _y, float s, float t, float h)
     visible = true;
 }
 
-size_t MazeCell::addGeometry(vector<ofVec3f> &verts, vector<ofVec3f> &normals, vector<ofVec2f> &uvs)
+unsigned long long MazeCell::addGeometry(vector<ofVec3f> &verts, vector<ofVec3f> &normals, vector<ofVec2f> &uvs)
 {
     ofVec3f wallPoints[] = {
         // north wall bottom

diff --git a/CloudsLibrary/src/VisualSystems/MazeGenerator/vs_src/MazeCell.h b/CloudsLibrary/src/VisualSystems/MazeGenerator/vs_src/MazeCell.h
@@ -6,10 +6,9 @@
 //
 //
 
-#ifndef __MazeGenerator__MazeCell__
-#define __MazeGenerator__MazeCell__
+#pragma once
 
-#include <ofMain.h>
+#include "ofMain.h"
 
 class MazeCell
 {
@@ -43,4 +42,4 @@ class MazeCell
 };
 
 
-#endif /* defined(__MazeGenerator__MazeCell__) */
+