Skip to content
This repository
Browse code

moved png's o resources dir, update file path

  • Loading branch information...
commit c6afd5b2562f38c5247345930253489d4605226e 1 parent 135768b
wrongentertainment authored
49 MultitouchPadOsc.xcodeproj/project.pbxproj
@@ -36,7 +36,15 @@
36 36 AF6E4B8215B2FEDE00D281DB /* THIRDPARTYLICENSEREADME.txt in Copy Files Resources */ = {isa = PBXBuildFile; fileRef = AF6E4B7C15B2FE1C00D281DB /* THIRDPARTYLICENSEREADME.txt */; };
37 37 AF6E4BB015B300D300D281DB /* ofxXmlDefaultSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF6E4BAE15B300D300D281DB /* ofxXmlDefaultSettings.cpp */; };
38 38 AF6E4C2415B30D0800D281DB /* Vera.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C1015B30CE200D281DB /* Vera.ttf */; };
39   - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
  39 + AF6E4C4E15B30F3500D281DB /* background.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4515B30F1C00D281DB /* background.png */; };
  40 + AF6E4C4F15B30F3900D281DB /* console_off.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4615B30F1C00D281DB /* console_off.png */; };
  41 + AF6E4C5015B30F3900D281DB /* console_on.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4715B30F1C00D281DB /* console_on.png */; };
  42 + AF6E4C5115B30F3900D281DB /* oscactive_off.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4815B30F1C00D281DB /* oscactive_off.png */; };
  43 + AF6E4C5215B30F3900D281DB /* oscactive_on.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4915B30F1C00D281DB /* oscactive_on.png */; };
  44 + AF6E4C5315B30F3900D281DB /* oscactive_send.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4A15B30F1C00D281DB /* oscactive_send.png */; };
  45 + AF6E4C5415B30F3900D281DB /* settings_off.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4B15B30F1C00D281DB /* settings_off.png */; };
  46 + AF6E4C5515B30F3900D281DB /* settings_on.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF6E4C4C15B30F1C00D281DB /* settings_on.png */; };
  47 + BBAB23CB13894F3D00AA2426 /* GLUT.framework in Copy Files Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
40 48 E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
41 49 E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
42 50 E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; };
@@ -88,18 +96,27 @@
88 96 dstPath = "";
89 97 dstSubfolderSpec = 6;
90 98 files = (
  99 + AF6E4C4F15B30F3900D281DB /* console_off.png in CopyFiles */,
  100 + AF6E4C5015B30F3900D281DB /* console_on.png in CopyFiles */,
  101 + AF6E4C5115B30F3900D281DB /* oscactive_off.png in CopyFiles */,
  102 + AF6E4C5215B30F3900D281DB /* oscactive_on.png in CopyFiles */,
  103 + AF6E4C5315B30F3900D281DB /* oscactive_send.png in CopyFiles */,
  104 + AF6E4C5415B30F3900D281DB /* settings_off.png in CopyFiles */,
  105 + AF6E4C5515B30F3900D281DB /* settings_on.png in CopyFiles */,
  106 + AF6E4C4E15B30F3500D281DB /* background.png in CopyFiles */,
91 107 AF6E4C2415B30D0800D281DB /* Vera.ttf in CopyFiles */,
92 108 );
93 109 runOnlyForDeploymentPostprocessing = 0;
94 110 };
95   - E4C2427710CC5ABF004149E2 /* CopyFiles */ = {
  111 + E4C2427710CC5ABF004149E2 /* Copy Files Frameworks */ = {
96 112 isa = PBXCopyFilesBuildPhase;
97 113 buildActionMask = 2147483647;
98 114 dstPath = "";
99 115 dstSubfolderSpec = 10;
100 116 files = (
101   - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */,
  117 + BBAB23CB13894F3D00AA2426 /* GLUT.framework in Copy Files Frameworks */,
102 118 );
  119 + name = "Copy Files Frameworks";
103 120 runOnlyForDeploymentPostprocessing = 0;
104 121 };
105 122 /* End PBXCopyFilesBuildPhase section */
@@ -164,6 +181,14 @@
164 181 AF6E4BAE15B300D300D281DB /* ofxXmlDefaultSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxXmlDefaultSettings.cpp; path = ../../../addons/ofxXmlDefaultSettings/src/ofxXmlDefaultSettings.cpp; sourceTree = SOURCE_ROOT; };
165 182 AF6E4BAF15B300D300D281DB /* ofxXmlDefaultSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxXmlDefaultSettings.h; path = ../../../addons/ofxXmlDefaultSettings/src/ofxXmlDefaultSettings.h; sourceTree = SOURCE_ROOT; };
166 183 AF6E4C1015B30CE200D281DB /* Vera.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Vera.ttf; path = resources/Vera.ttf; sourceTree = "<group>"; };
  184 + AF6E4C4515B30F1C00D281DB /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = resources/background.png; sourceTree = "<group>"; };
  185 + AF6E4C4615B30F1C00D281DB /* console_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = console_off.png; path = resources/console_off.png; sourceTree = "<group>"; };
  186 + AF6E4C4715B30F1C00D281DB /* console_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = console_on.png; path = resources/console_on.png; sourceTree = "<group>"; };
  187 + AF6E4C4815B30F1C00D281DB /* oscactive_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = oscactive_off.png; path = resources/oscactive_off.png; sourceTree = "<group>"; };
  188 + AF6E4C4915B30F1C00D281DB /* oscactive_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = oscactive_on.png; path = resources/oscactive_on.png; sourceTree = "<group>"; };
  189 + AF6E4C4A15B30F1C00D281DB /* oscactive_send.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = oscactive_send.png; path = resources/oscactive_send.png; sourceTree = "<group>"; };
  190 + AF6E4C4B15B30F1C00D281DB /* settings_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settings_off.png; path = resources/settings_off.png; sourceTree = "<group>"; };
  191 + AF6E4C4C15B30F1C00D281DB /* settings_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settings_on.png; path = resources/settings_on.png; sourceTree = "<group>"; };
167 192 BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
168 193 E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
169 194 E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
@@ -368,6 +393,8 @@
368 393 AF6E4B7515B2FE0A00D281DB /* resources */ = {
369 394 isa = PBXGroup;
370 395 children = (
  396 + AF6E4C4D15B30F2000D281DB /* gui */,
  397 + AF6E4C4515B30F1C00D281DB /* background.png */,
371 398 AF6E4B7C15B2FE1C00D281DB /* THIRDPARTYLICENSEREADME.txt */,
372 399 AF6E4C1015B30CE200D281DB /* Vera.ttf */,
373 400 );
@@ -391,6 +418,20 @@
391 418 name = src;
392 419 sourceTree = "<group>";
393 420 };
  421 + AF6E4C4D15B30F2000D281DB /* gui */ = {
  422 + isa = PBXGroup;
  423 + children = (
  424 + AF6E4C4615B30F1C00D281DB /* console_off.png */,
  425 + AF6E4C4715B30F1C00D281DB /* console_on.png */,
  426 + AF6E4C4815B30F1C00D281DB /* oscactive_off.png */,
  427 + AF6E4C4915B30F1C00D281DB /* oscactive_on.png */,
  428 + AF6E4C4A15B30F1C00D281DB /* oscactive_send.png */,
  429 + AF6E4C4B15B30F1C00D281DB /* settings_off.png */,
  430 + AF6E4C4C15B30F1C00D281DB /* settings_on.png */,
  431 + );
  432 + name = gui;
  433 + sourceTree = "<group>";
  434 + };
394 435 BB4B014C10F69532006C3DED /* addons */ = {
395 436 isa = PBXGroup;
396 437 children = (
@@ -495,7 +536,7 @@
495 536 E4B69B580A3A1756003C02F2 /* Sources */,
496 537 E4B69B590A3A1756003C02F2 /* Frameworks */,
497 538 E4B6FFFD0C3F9AB9008CF71C /* ShellScript */,
498   - E4C2427710CC5ABF004149E2 /* CopyFiles */,
  539 + E4C2427710CC5ABF004149E2 /* Copy Files Frameworks */,
499 540 AF6E4B7615B2FE0A00D281DB /* Copy Files Resources */,
500 541 AF6E4C3715B30D1000D281DB /* CopyFiles */,
501 542 );
0  bin/data/background.png → resources/background.png
File renamed without changes
0  bin/data/console_off.png → resources/console_off.png
File renamed without changes
0  bin/data/console_on.png → resources/console_on.png
File renamed without changes
0  bin/data/oscactive_off.png → resources/oscactive_off.png
File renamed without changes
0  bin/data/oscactive_on.png → resources/oscactive_on.png
File renamed without changes
0  bin/data/oscactive_send.png → resources/oscactive_send.png
File renamed without changes
0  bin/data/settings_off.png → resources/settings_off.png
File renamed without changes
0  bin/data/settings_on.png → resources/settings_on.png
File renamed without changes
10 src/MultitouchPadOscApp.cpp
@@ -164,18 +164,18 @@ void MultitouchPadOscApp::setup() {
164 164
165 165
166 166 // Images
167   - backgroundImage.loadImage("background.png");
168   - oscSendImage.loadImage("oscactive_send.png");
  167 + backgroundImage.loadImage(ofFilePath::getCurrentWorkingDirectory() + "/background.png");
  168 + oscSendImage.loadImage(ofFilePath::getCurrentWorkingDirectory() + "/oscactive_send.png");
169 169
170 170
171 171 // GUI
172 172 // set the status to osc:out settings value
173   - btnOscActive.init("oscactive_on.png", "oscactive_off.png", 40, 10);
  173 + btnOscActive.init(ofFilePath::getCurrentWorkingDirectory() + "/oscactive_on.png", ofFilePath::getCurrentWorkingDirectory() + "/oscactive_off.png", 40, 10);
174 174 if(defXmlOscOut == 0) btnOscActive.status = true;
175 175 else btnOscActive.status = false;
176 176
177   - btnSettings.init("settings_on.png", "settings_off.png", 90, 10);
178   - btnConsole.init("console_on.png", "console_off.png", 171, 10);
  177 + btnSettings.init(ofFilePath::getCurrentWorkingDirectory() + "/settings_on.png", ofFilePath::getCurrentWorkingDirectory() + "/settings_off.png", 90, 10);
  178 + btnConsole.init(ofFilePath::getCurrentWorkingDirectory() + "/console_on.png", ofFilePath::getCurrentWorkingDirectory() + "/console_off.png", 171, 10);
179 179
180 180 cbFrame.init(vera, "frame active", 60, 155, defXmlPadFrame);
181 181 //cbTimestamp.init(vera, "timestamp active", 60, 170, defXmlPadTimestamp);
3  src/MultitouchPadOscApp.h
@@ -100,9 +100,6 @@ class MultitouchPadOscApp : public ofBaseApp {
100 100 // Multitouch Trackpad
101 101 ofxMultiTouchPad pad;
102 102
103   -
104   -
105   -
106 103 // Console
107 104 TextConsole console;
108 105

0 comments on commit c6afd5b

Please sign in to comment.
Something went wrong with that request. Please try again.