Permalink
Browse files

merged

  • Loading branch information...
kylemcdonald committed Dec 3, 2015
2 parents d6da13d + dac282e commit f93d67aebbfaa2a0323a8231c1267eaf44a1fc6f

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>D8413608-2A1A-4D47-B847-F760BB34D667</string>
<key>IDESourceControlProjectName</key>
<string>ofApp</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>37526DA425E5430474A14FBFA1BC4525160B5FC1</key>
<string>https://github.com/kylemcdonald/ofxCv.git</string>
<key>A4D0373C699384D3146D509694B516AB9C7B5AD6</key>
<string>https://github.com/kylemcdonald/ofxFaceTracker.git</string>
<key>EB7A88F936C8746344691DE012893581596223F7</key>
<string>github.com:arturoc/FaceSubstitution.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>FaceSubstitution/ofApp.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>37526DA425E5430474A14FBFA1BC4525160B5FC1</key>
<string>../../../../../addons/ofxCv</string>
<key>A4D0373C699384D3146D509694B516AB9C7B5AD6</key>
<string>../../../../../addons/ofxFaceTracker</string>
<key>EB7A88F936C8746344691DE012893581596223F7</key>
<string>../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>github.com:arturoc/FaceSubstitution.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>EB7A88F936C8746344691DE012893581596223F7</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>EB7A88F936C8746344691DE012893581596223F7</string>
<key>IDESourceControlWCCName</key>
<string>FaceSubstitution</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>37526DA425E5430474A14FBFA1BC4525160B5FC1</string>
<key>IDESourceControlWCCName</key>
<string>ofxCv</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>A4D0373C699384D3146D509694B516AB9C7B5AD6</string>
<key>IDESourceControlWCCName</key>
<string>ofxFaceTracker</string>
</dict>
</array>
</dict>
</plist>
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Debug"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Release">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "ofApp.app"
BlueprintName = "ofApp"
ReferencedContainer = "container:ofApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>E4B69B5A0A3A1756003C02F2</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
@@ -1,8 +1,6 @@
#include "ofApp.h"
#include "ofAppGlutWindow.h"
int main() {
ofAppGlutWindow window;
ofSetupOpenGL(&window, 1280, 720, OF_WINDOW);
ofSetupOpenGL(1280, 720, OF_WINDOW);
ofRunApp(new ofApp());
}
}

1 comment on commit f93d67a

@jupaesbri

This comment has been minimized.

Show comment
Hide comment
@jupaesbri

jupaesbri Aug 1, 2016

Hey kylemcdonald, I need some help, I'm new on of so I can't make FaceSubstitution run, first I've got a Clone.h error, I fixed it copying it on FaceSubstitution folder, after that there was an error with "DrawHighLightString", I don't know how to fix it, would you help me please? thank you very much

jupaesbri commented on f93d67a Aug 1, 2016

Hey kylemcdonald, I need some help, I'm new on of so I can't make FaceSubstitution run, first I've got a Clone.h error, I fixed it copying it on FaceSubstitution folder, after that there was an error with "DrawHighLightString", I don't know how to fix it, would you help me please? thank you very much

Please sign in to comment.