Browse Source

Remove example_shortcuts in favour to example_pocketvj

master
Krisjanis Rijnieks 8 years ago
parent
commit
56ccd72294
  1. 6
      example_shortcuts/.gitignore
  2. 13
      example_shortcuts/Makefile
  3. 17
      example_shortcuts/Project.xcconfig
  4. 4
      example_shortcuts/addons.make
  5. 36
      example_shortcuts/bin/data/ofxpimapper.xml
  6. BIN
      example_shortcuts/bin/data/sources/images/image1.jpg
  7. 1335
      example_shortcuts/example_shortcuts.xcodeproj/project.pbxproj
  8. 93
      example_shortcuts/example_shortcuts.xcodeproj/xcshareddata/xcschemes/example_shortcuts Debug.xcscheme
  9. 93
      example_shortcuts/example_shortcuts.xcodeproj/xcshareddata/xcschemes/example_shortcuts Release.xcscheme
  10. 22
      example_shortcuts/openFrameworks-Info.plist
  11. 7
      example_shortcuts/src/main.cpp
  12. 102
      example_shortcuts/src/ofApp.cpp
  13. 21
      example_shortcuts/src/ofApp.h

6
example_shortcuts/.gitignore

@ -1,6 +0,0 @@
obj
*.xcworkspace
*.xcuserdatad
*~
config.make
bin/*.app

13
example_shortcuts/Makefile

@ -1,13 +0,0 @@
# Attempt to load a config.make file.
# If none is found, project defaults in config.project.make will be used.
ifneq ($(wildcard config.make),)
include config.make
endif
# make sure the the OF_ROOT location is defined
ifndef OF_ROOT
OF_ROOT=$(realpath ../../..)
endif
# call the project makefile!
include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk

17
example_shortcuts/Project.xcconfig

@ -1,17 +0,0 @@
//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
OF_PATH = ../../..
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
//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)

4
example_shortcuts/addons.make

@ -1,4 +0,0 @@
ofxGui
ofxPiMapper
ofxXmlSettings
ofxOMXPlayer

36
example_shortcuts/bin/data/ofxpimapper.xml

@ -1,36 +0,0 @@
<surfaces>
<surface type="0">
<vertices>
<vertex>
<x>431.000000000</x>
<y>13.000000000</y>
</vertex>
<vertex>
<x>781.000000000</x>
<y>363.000000000</y>
</vertex>
<vertex>
<x>81.000000000</x>
<y>363.000000000</y>
</vertex>
</vertices>
<texCoords>
<texCoord>
<x>0.500000000</x>
<y>0.000000000</y>
</texCoord>
<texCoord>
<x>1.000000000</x>
<y>1.000000000</y>
</texCoord>
<texCoord>
<x>0.000000000</x>
<y>1.000000000</y>
</texCoord>
</texCoords>
<source>
<source-type>image</source-type>
<source-name>image1.jpg</source-name>
</source>
</surface>
</surfaces>

BIN
example_shortcuts/bin/data/sources/images/image1.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

1335
example_shortcuts/example_shortcuts.xcodeproj/project.pbxproj

File diff suppressed because it is too large

93
example_shortcuts/example_shortcuts.xcodeproj/xcshareddata/xcschemes/example_shortcuts Debug.xcscheme

@ -1,93 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
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 = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Debug"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

93
example_shortcuts/example_shortcuts.xcodeproj/xcshareddata/xcschemes/example_shortcuts Release.xcscheme

@ -1,93 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
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 = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "example_shortcuts.app"
BlueprintName = "example_shortcuts"
ReferencedContainer = "container:example_shortcuts.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

22
example_shortcuts/openFrameworks-Info.plist

@ -1,22 +0,0 @@
<?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>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>${ICON}</string>
<key>CFBundleIdentifier</key>
<string>cc.openFrameworks.ofapp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
</dict>
</plist>

7
example_shortcuts/src/main.cpp

@ -1,7 +0,0 @@
#include "ofMain.h"
#include "ofApp.h"
int main(){
ofSetupOpenGL(800, 450, OF_WINDOW);
ofRunApp(new ofApp());
}

102
example_shortcuts/src/ofApp.cpp

@ -1,102 +0,0 @@
#include "ofApp.h"
void ofApp::setup(){
ofBackground(0);
mapper.setup();
}
void ofApp::update(){
mapper.update();
}
void ofApp::draw(){
mapper.draw();
}
void ofApp::keyPressed(int key){
if(key == '1'){
mapper.setMode(ofx::piMapper::PRESENTATION_MODE);
}else if(key == '2'){
mapper.setMode(ofx::piMapper::MAPPING_MODE);
}else if(key == '3'){
mapper.setMode(ofx::piMapper::TEXTURE_MODE);
}else if(key == '4'){
mapper.setMode(ofx::piMapper::SOURCE_MODE);
}else if(key == 'w'){
mapper.createSurface(ofx::piMapper::QUAD_SURFACE);
}else if(key == 'e'){
mapper.createSurface(ofx::piMapper::HEXAGON_SURFACE);
}else if(key == 'r'){
mapper.createSurface(ofx::piMapper::GRID_WARP_SURFACE);
}else if(key == 't'){
mapper.createSurface(ofx::piMapper::TRIANGLE_SURFACE);
}else if(key == OF_KEY_BACKSPACE){
mapper.eraseSurface(mapper.getNumSurfaces() - 1);
}else if(key == OF_KEY_LEFT){
mapper.moveSelection(ofx::piMapper::Vec3(-20.0f, 0.0f, 0.0f));
}else if(key == OF_KEY_RIGHT){
mapper.moveSelection(ofx::piMapper::Vec3(20.0f, 0.0f, 0.0f));
}else if(key == OF_KEY_UP){
mapper.moveSelection(ofx::piMapper::Vec3(0.0f, -20.0f, 0.0f));
}else if(key == OF_KEY_DOWN){
mapper.moveSelection(ofx::piMapper::Vec3(0.0f, 20.0f, 0.0f));
}else if(key == 'k'){
mapper.selectNextSurface();
}else if(key == 'j'){
mapper.selectPrevSurface();
}else if(key == 'v'){
mapper.setNextSource();
}else if(key == 'd'){
mapper.duplicateSurface();
}else if(key == 'l'){
if(mapper.getMode() == ofx::piMapper::Mode::MAPPING_MODE){
mapper.selectNextVertex();
}else if(mapper.getMode() == ofx::piMapper::Mode::TEXTURE_MODE){
mapper.selectNextTexCoord();
}
}else if(key == 'h'){
if(mapper.getMode() == ofx::piMapper::Mode::MAPPING_MODE){
mapper.selectPrevVertex();
}else if(mapper.getMode() == ofx::piMapper::Mode::TEXTURE_MODE){
mapper.selectPrevTexCoord();
}
}else if(key == 'i'){
mapper.moveLayerUp();
}else if(key == 'u'){
mapper.moveLayerDown();
}else if(key == 'p'){
mapper.togglePerspective();
}else if(key == '+'){
mapper.scaleUp();
}else if(key == '-'){
mapper.scaleDown();
}else if(key == '\\'){
mapper.togglePause();
}else if(key == 'n'){
std::string multilineInfoText =
"Custom ofxPiMapper shortcuts\n\n"
"Good day user.\n"
"Shortcuts have been customized.\n"
"Please make sure to provide your own documentation.";
mapper.setInfoText(multilineInfoText);
mapper.toggleInfo();
}else{
mapper.keyPressed(key);
}
}
void ofApp::keyReleased(int key){
mapper.keyReleased(key);
}
void ofApp::mousePressed(int x, int y, int button){
mapper.mousePressed(x, y, button);
}
void ofApp::mouseReleased(int x, int y, int button){
mapper.mouseReleased(x, y, button);
}
void ofApp::mouseDragged(int x, int y, int button){
mapper.mouseDragged(x, y, button);
}

21
example_shortcuts/src/ofApp.h

@ -1,21 +0,0 @@
#pragma once
#include "ofMain.h"
#include "ofxPiMapper.h"
#include "Vec3.h"
class ofApp : public ofBaseApp {
public:
void setup();
void update();
void draw();
void keyPressed(int key);
void keyReleased(int key);
void mousePressed(int x, int y, int button);
void mouseReleased(int x, int y, int button);
void mouseDragged(int x, int y, int button);
ofxPiMapper mapper;
};
Loading…
Cancel
Save