example-ofxUVC for of_v0.9.

example-ofxUVC/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)

example-ofxUVC/example-ofxUVC.xcodeproj/xcshareddata/xcschemes/example-ofxUVC Debug.xcscheme

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+   LastUpgradeVersion = "0600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example-ofxUVC/example-ofxUVC.xcodeproj/xcshareddata/xcschemes/example-ofxUVC Release.xcscheme

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+   LastUpgradeVersion = "0600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -22,8 +23,8 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "Release">
       <Testables>
@@ -39,8 +40,8 @@
       </MacroExpansion>
    </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"

example-ofxUVC/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>

example-ofxUVC/src/testApp.cpp

@@ -3,20 +3,24 @@
 //--------------------------------------------------------------
 void testApp::setup(){
 
-    yaml.load("camera_settings.yml");
+    //yaml.load("camera_settings.yml");
 
     int cameraToUse;
-    yaml.doc["cameraToUse"] >> cameraToUse;
+    //yaml.doc["cameraToUse"] >> cameraToUse;
 
-    int vendorId, productId, interfaceNum;
-    yaml.doc["cameras"][cameraToUse]["vendorId"] >> vendorId;
-    yaml.doc["cameras"][cameraToUse]["productId"] >> productId;
-    yaml.doc["cameras"][cameraToUse]["interfaceNum"] >> interfaceNum;
-    yaml.doc["cameras"][cameraToUse]["name"] >> cameraName;
-    yaml.doc["cameras"][cameraToUse]["width"] >> camWidth;
-    yaml.doc["cameras"][cameraToUse]["height"] >> camHeight;
+    // CHECK bin/data/camera_settings.yaml for some proper values
+    int vendorId = 0x46d, productId = 0x821, interfaceNum = 0x2;
+    cameraName = "Logitech Camera #2";
+    camWidth = 640;
+    camHeight = 360;
+    //yaml.doc["cameras"][cameraToUse]["vendorId"] >> vendorId;
+    //yaml.doc["cameras"][cameraToUse]["productId"] >> productId;
+    //yaml.doc["cameras"][cameraToUse]["interfaceNum"] >> interfaceNum;
+    //yaml.doc["cameras"][cameraToUse]["name"] >> cameraName;
+    //yaml.doc["cameras"][cameraToUse]["width"] >> camWidth;
+    //yaml.doc["cameras"][cameraToUse]["height"] >> camHeight;
 
-    vidGrabber.initGrabber(camWidth, camHeight);
+    vidGrabber.setup(camWidth, camHeight);
 
     int deviceId = 0;
     vector<string> availableCams = vidGrabber.listVideoDevices();
@@ -29,7 +33,7 @@ void testApp::setup(){
 
     vidGrabber.setDeviceID(deviceId);
 
-    focus = 0.5;
+    focus = 0.1;
 
     uvcControl.useCamera(vendorId, productId, interfaceNum); 
     uvcControl.setAutoExposure(true);
@@ -42,7 +46,7 @@ void testApp::update(){
     vidGrabber.update();
     if(vidGrabber.isFrameNew())
     {
-        tex.loadData(vidGrabber.getPixelsRef());
+        tex.loadData(vidGrabber.getPixels());
     }
     controls = uvcControl.getCameraControls();
 }

example-ofxUVC/src/testApp.h

@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxUVC.h"
 //#include "ofxQTKitVideoGrabber.h"
-#include "ofxYAML.h"
+//#include "ofxYAML.h"
 
 /*
 struct ofxUVCCameraSetting {
@@ -41,7 +41,7 @@ class testApp : public ofBaseApp{
     ofTexture tex;
 
     ofxUVC uvcControl;
-    ofxYAML yaml;
+    //ofxYAML yaml;
     string cameraName;
 
     int camWidth, camHeight;