updates

CreativeInquiry · Sep 30, 2016 · abec14f · abec14f
1 parent 45bb206
commit abec14f
Show file tree

Hide file tree

Showing 6 changed files with 290 additions and 379 deletions.
diff --git a/openframeworks/FaceOSCReceiver/FaceOSCReceiver.xcodeproj/project.pbxproj b/openframeworks/FaceOSCReceiver/FaceOSCReceiver.xcodeproj/project.pbxproj
diff --git a/...ks/FaceOSCReceiver/FaceOSCReceiver.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...ks/FaceOSCReceiver/FaceOSCReceiver.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/openframeworks/FaceOSCReceiver/Project.xcconfig b/openframeworks/FaceOSCReceiver/Project.xcconfig
@@ -5,5 +5,13 @@ OF_PATH = ../../..
 //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
 #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
 
-OTHER_LDFLAGS = $(OF_CORE_LIBS) 
+//ICONS - NEW IN 0072 
+ICON_NAME_DEBUG = icon-debug.icns
+ICON_NAME_RELEASE = icon.icns
+ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/
+
+//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
+//ICON_FILE_PATH = bin/data/
+
+OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
 HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
diff --git a/openframeworks/FaceOSCReceiver/openFrameworks-Info.plist b/openframeworks/FaceOSCReceiver/openFrameworks-Info.plist
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.openFrameworks</string>
+	<string>cc.openFrameworks.ofapp</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -16,5 +16,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundleIconFile</key>
+	<string>${ICON}</string>
 </dict>
 </plist>
diff --git a/openframeworks/FaceOSCReceiver/src/main.cpp b/openframeworks/FaceOSCReceiver/src/main.cpp
@@ -1,12 +1,11 @@
 #include "ofMain.h"
 #include "testApp.h"
-#include "ofAppGlutWindow.h"
 
 //========================================================================
 int main( ){
 
-    ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 640, 480, OF_WINDOW);			// <-------- setup the GL context
+
+	ofSetupOpenGL(640, 480, OF_WINDOW);			// <-------- setup the GL context
 
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN

diff --git a/openframeworks/FaceOSCReceiver/src/testApp.cpp b/openframeworks/FaceOSCReceiver/src/testApp.cpp
@@ -52,16 +52,16 @@ void testApp::draw() {
 
             ofSetColor(0);
             ofNoFill();
-            ofEllipse(-20, face.eyeLeft * -9, 20, 7);
-            ofEllipse(20, face.eyeRight * -9, 20, 7);
-            ofEllipse(0, 20, face.mouthWidth * 3, face.mouthHeight * 3);
-            ofEllipse(-5, face.nostrils * -1, 7, 3);
-            ofEllipse(5, face.nostrils * -1, 7, 3);
+            ofDrawEllipse(-20, face.eyeLeft * -9, 20, 7);
+            ofDrawEllipse(20, face.eyeRight * -9, 20, 7);
+            ofDrawEllipse(0, 20, face.mouthWidth * 3, face.mouthHeight * 3);
+            ofDrawEllipse(-5, face.nostrils * -1, 7, 3);
+            ofDrawEllipse(5, face.nostrils * -1, 7, 3);
 
             ofSetRectMode(OF_RECTMODE_CENTER);
             ofFill();
-            ofRect(-20, face.eyebrowLeft * -5, 25, 5);
-            ofRect(20, face.eyebrowRight * -5, 25, 5);
+            ofDrawRectangle(-20, face.eyebrowLeft * -5, 25, 5);
+            ofDrawRectangle(20, face.eyebrowRight * -5, 25, 5);
             ofSetRectMode(OF_RECTMODE_CORNER);
         ofPopMatrix();
     }