Skip to content

Commit abec14f

Browse files
committed
updates
1 parent 45bb206 commit abec14f

File tree

6 files changed

+290
-379
lines changed

6 files changed

+290
-379
lines changed

openframeworks/FaceOSCReceiver/FaceOSCReceiver.xcodeproj/project.pbxproj

Lines changed: 267 additions & 365 deletions
Large diffs are not rendered by default.

openframeworks/FaceOSCReceiver/FaceOSCReceiver.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openframeworks/FaceOSCReceiver/Project.xcconfig

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,13 @@ OF_PATH = ../../..
55
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
66
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
77

8-
OTHER_LDFLAGS = $(OF_CORE_LIBS)
8+
//ICONS - NEW IN 0072
9+
ICON_NAME_DEBUG = icon-debug.icns
10+
ICON_NAME_RELEASE = icon.icns
11+
ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/
12+
13+
//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
14+
//ICON_FILE_PATH = bin/data/
15+
16+
OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
917
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>English</string>
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.yourcompany.openFrameworks</string>
10+
<string>cc.openFrameworks.ofapp</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>
@@ -16,5 +16,7 @@
1616
<string>????</string>
1717
<key>CFBundleVersion</key>
1818
<string>1.0</string>
19+
<key>CFBundleIconFile</key>
20+
<string>${ICON}</string>
1921
</dict>
2022
</plist>

openframeworks/FaceOSCReceiver/src/main.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#include "ofMain.h"
22
#include "testApp.h"
3-
#include "ofAppGlutWindow.h"
43

54
//========================================================================
65
int main( ){
76

8-
ofAppGlutWindow window;
9-
ofSetupOpenGL(&window, 640, 480, OF_WINDOW); // <-------- setup the GL context
7+
8+
ofSetupOpenGL(640, 480, OF_WINDOW); // <-------- setup the GL context
109

1110
// this kicks off the running of my app
1211
// can be OF_WINDOW or OF_FULLSCREEN

openframeworks/FaceOSCReceiver/src/testApp.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ void testApp::draw() {
5252

5353
ofSetColor(0);
5454
ofNoFill();
55-
ofEllipse(-20, face.eyeLeft * -9, 20, 7);
56-
ofEllipse(20, face.eyeRight * -9, 20, 7);
57-
ofEllipse(0, 20, face.mouthWidth * 3, face.mouthHeight * 3);
58-
ofEllipse(-5, face.nostrils * -1, 7, 3);
59-
ofEllipse(5, face.nostrils * -1, 7, 3);
55+
ofDrawEllipse(-20, face.eyeLeft * -9, 20, 7);
56+
ofDrawEllipse(20, face.eyeRight * -9, 20, 7);
57+
ofDrawEllipse(0, 20, face.mouthWidth * 3, face.mouthHeight * 3);
58+
ofDrawEllipse(-5, face.nostrils * -1, 7, 3);
59+
ofDrawEllipse(5, face.nostrils * -1, 7, 3);
6060

6161
ofSetRectMode(OF_RECTMODE_CENTER);
6262
ofFill();
63-
ofRect(-20, face.eyebrowLeft * -5, 25, 5);
64-
ofRect(20, face.eyebrowRight * -5, 25, 5);
63+
ofDrawRectangle(-20, face.eyebrowLeft * -5, 25, 5);
64+
ofDrawRectangle(20, face.eyebrowRight * -5, 25, 5);
6565
ofSetRectMode(OF_RECTMODE_CORNER);
6666
ofPopMatrix();
6767
}

0 commit comments

Comments
 (0)