diff --git a/projectGenerator.cbp b/projectGenerator.cbp
index 9ba734b..64d21b8 100644
--- a/projectGenerator.cbp
+++ b/projectGenerator.cbp
@@ -162,10 +162,10 @@
-
+
-
+
diff --git a/projectGenerator.vcxproj b/projectGenerator.vcxproj
index 9aeb053..3f2645e 100644
--- a/projectGenerator.vcxproj
+++ b/projectGenerator.vcxproj
@@ -109,7 +109,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/projectGenerator.vcxproj.filters b/projectGenerator.vcxproj.filters
index ef32ec9..645693f 100644
--- a/projectGenerator.vcxproj.filters
+++ b/projectGenerator.vcxproj.filters
@@ -57,7 +57,7 @@
addons\ofxGui\src
-
+
src
@@ -128,7 +128,7 @@
src
-
+
src
diff --git a/projectGenerator.xcodeproj/project.pbxproj b/projectGenerator.xcodeproj/project.pbxproj
index ffe0e46..9b8503b 100644
--- a/projectGenerator.xcodeproj/project.pbxproj
+++ b/projectGenerator.xcodeproj/project.pbxproj
@@ -40,7 +40,7 @@
E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; };
E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; };
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; };
- E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; };
+ E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; };
E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; };
E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; };
E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; };
@@ -135,8 +135,8 @@
E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; };
E4B69B5B0A3A1756003C02F2 /* projectGeneratorDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = projectGeneratorDebug.app; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
- E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; };
- E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; };
+ E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; };
+ E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; };
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; };
E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; };
E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
@@ -363,8 +363,8 @@
1120712314AE3D4F0035CB7E /* projects */,
119B95D214A65CA0001E1E20 /* pugixmlLib */,
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */,
- E4B69E1F0A3A1BDC003C02F2 /* testApp.h */,
- E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */,
+ E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */,
+ E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */,
11BCDC821607709900FCCD85 /* textButton.h */,
11D6814214A8EC0F008E3E3D /* addons */,
);
@@ -466,7 +466,7 @@
buildActionMask = 2147483647;
files = (
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
- E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */,
+ E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */,
1120713014AE3D4F0035CB7E /* xcodeProject.cpp in Sources */,
1120713614AE3D840035CB7E /* ofAddon.cpp in Sources */,
113CAA5B14F88EDD00D3906E /* ofAppNoWindow.cpp in Sources */,
diff --git a/projectGeneratorLinux.cbp b/projectGeneratorLinux.cbp
index b4aba41..b17052c 100644
--- a/projectGeneratorLinux.cbp
+++ b/projectGeneratorLinux.cbp
@@ -48,10 +48,10 @@
-
+
-
+
diff --git a/projectGeneratorSimple.cbp b/projectGeneratorSimple.cbp
index c7ba9a9..f628a02 100644
--- a/projectGeneratorSimple.cbp
+++ b/projectGeneratorSimple.cbp
@@ -286,10 +286,10 @@
-
+
-
+
diff --git a/projectGeneratorSimple.vcxproj b/projectGeneratorSimple.vcxproj
index 365a968..6a205f3 100644
--- a/projectGeneratorSimple.vcxproj
+++ b/projectGeneratorSimple.vcxproj
@@ -109,7 +109,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/projectGeneratorSimple.vcxproj.filters b/projectGeneratorSimple.vcxproj.filters
index ef32ec9..645693f 100644
--- a/projectGeneratorSimple.vcxproj.filters
+++ b/projectGeneratorSimple.vcxproj.filters
@@ -57,7 +57,7 @@
addons\ofxGui\src
-
+
src
@@ -128,7 +128,7 @@
src
-
+
src
diff --git a/projectGenerator_linux64.cbp b/projectGenerator_linux64.cbp
index 3865643..0c17adb 100644
--- a/projectGenerator_linux64.cbp
+++ b/projectGenerator_linux64.cbp
@@ -126,10 +126,10 @@
-
+
-
+
diff --git a/src/main.cpp b/src/main.cpp
index 390bf81..286d0de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
#include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
#include "ofAppGlutWindow.h"
#include "ofAppNoWindow.h"
@@ -10,7 +10,7 @@ int main( int argc, char *argv[] ){
ofAppGlutWindow window;
ofSetupOpenGL(&window, 1024, 610, OF_WINDOW);
- testApp * app = new testApp;
+ ofApp * app = new ofApp;
//app->buildAllExamples = false;
ofRunApp( app );
}
diff --git a/src/testApp.cpp b/src/ofApp.cpp
similarity index 96%
rename from src/testApp.cpp
rename to src/ofApp.cpp
index 9b4d062..4144a1b 100644
--- a/src/testApp.cpp
+++ b/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
#include "Utils.h"
#include
#include "ofConstants.h"
@@ -17,7 +17,7 @@ string windowsFromUnixPath(string path){
}
//------------------------------------------------------
-bool testApp::isAddonCore(string addon){
+bool ofApp::isAddonCore(string addon){
if (bInited == false){
@@ -68,7 +68,7 @@ void fixStringCharacters(string &toFix){
//------------------------------------------------------
-string testApp::setupForTarget(int targ){
+string ofApp::setupForTarget(int targ){
if(project){
delete project;
@@ -110,7 +110,7 @@ string testApp::setupForTarget(int targ){
-void testApp::setStatus(string newStatus){
+void ofApp::setStatus(string newStatus){
statusEnergy = 1;
status = newStatus;
statusSetTime = ofGetElapsedTimef();
@@ -119,7 +119,7 @@ void testApp::setStatus(string newStatus){
//--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
ofEnableAlphaBlending();
ofEnableSmoothing();
ofSetLogLevel(OF_LOG_VERBOSE);
@@ -336,7 +336,7 @@ void testApp::setup(){
//--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
float diff = ofGetElapsedTimef()- statusSetTime;
if (diff > 3){
@@ -386,7 +386,7 @@ void testApp::update(){
}
//--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
@@ -440,7 +440,7 @@ void testApp::draw(){
}
//--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
if (key == ' '){
@@ -451,7 +451,7 @@ void testApp::keyPressed(int key){
}
-void testApp::generateProject(){
+void ofApp::generateProject(){
vector targetsToMake;
if( osxToggle ) targetsToMake.push_back(OF_TARGET_OSX);
@@ -520,24 +520,24 @@ void testApp::generateProject(){
}
//--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
}
//--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
}
//--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
}
//--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
if (mode == MODE_NORMAL){
@@ -668,12 +668,12 @@ void testApp::mousePressed(int x, int y, int button){
}
//--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
}
//--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
generateButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - generateButton.rect.width + 10 ,
ofGetHeight() - generateButton.rect.height - 40);// 535);
generateButton.calculateRect();
@@ -685,11 +685,11 @@ void testApp::windowResized(int w, int h){
}
//--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
}
//--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
}
diff --git a/src/testApp.h b/src/ofApp.h
similarity index 98%
rename from src/testApp.h
rename to src/ofApp.h
index 76172e6..6f8f29f 100644
--- a/src/testApp.h
+++ b/src/ofApp.h
@@ -16,7 +16,7 @@
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
public:
void setup();
diff --git a/src/projects/baseProject.cpp b/src/projects/baseProject.cpp
index 49f37c2..77d2151 100644
--- a/src/projects/baseProject.cpp
+++ b/src/projects/baseProject.cpp
@@ -57,10 +57,10 @@ bool baseProject::create(string path){
#else
splitFromLast(fileNames[i], "/", first, last);
#endif
- if (fileNames[i] != "src/testApp.cpp" &&
- fileNames[i] != "src/testApp.h" &&
+ if (fileNames[i] != "src/ofApp.cpp" &&
+ fileNames[i] != "src/ofApp.h" &&
fileNames[i] != "src/main.cpp" &&
- fileNames[i] != "src/testApp.mm" &&
+ fileNames[i] != "src/ofApp.mm" &&
fileNames[i] != "src/main.mm"){
addSrc(fileNames[i], first);
}
@@ -75,9 +75,9 @@ bool baseProject::create(string path){
// string first, last;
// splitFromLast(fileNames[i], "/", first, last);
// if (fileNames[i] != "Default.png" &&
-// fileNames[i] != "src/testApp.h" &&
+// fileNames[i] != "src/ofApp.h" &&
// fileNames[i] != "src/main.cpp" &&
-// fileNames[i] != "src/testApp.mm" &&
+// fileNames[i] != "src/ofApp.mm" &&
// fileNames[i] != "src/main.mm"){
// addSrc(fileNames[i], first);
// }