Skip to content

refactored testApp to ofApp #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactored testApp to ofApp #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2415efb
refactored testApp to ofApp
kylemcdonald Aug 13, 2013
e844e0e
Merge branch 'master' of github.com:ofZach/projectGeneratorSimple
kylemcdonald Aug 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projectGenerator.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@
<Unit filename="src/pugixmlLib/src/pugiconfig.hpp" />
<Unit filename="src/pugixmlLib/src/pugixml.cpp" />
<Unit filename="src/pugixmlLib/src/pugixml.hpp" />
<Unit filename="src/testApp.cpp">
<Unit filename="src/ofApp.cpp">
<Option virtualFolder="src" />
</Unit>
<Unit filename="src/testApp.h">
<Unit filename="src/ofApp.h">
<Option virtualFolder="src" />
</Unit>
<Unit filename="src/utils/Utils.cpp" />
Expand Down
4 changes: 2 additions & 2 deletions projectGenerator.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<ClInclude Include="src\projects\xcodeProject.h" />
<ClInclude Include="src\pugixmlLib\src\pugiconfig.hpp" />
<ClInclude Include="src\pugixmlLib\src\pugixml.hpp" />
<ClInclude Include="src\testApp.h" />
<ClInclude Include="src\ofApp.h" />
<ClInclude Include="src\textButton.h" />
<ClInclude Include="src\utils\ofAppNoWindow.h" />
<ClInclude Include="src\utils\Utils.h" />
Expand All @@ -135,7 +135,7 @@
<ClCompile Include="src\projects\visualStudioProject.cpp" />
<ClCompile Include="src\projects\xcodeProject.cpp" />
<ClCompile Include="src\pugixmlLib\src\pugixml.cpp" />
<ClCompile Include="src\testApp.cpp" />
<ClCompile Include="src\ofApp.cpp" />
<ClCompile Include="src\utils\ofAppNoWindow.cpp" />
<ClCompile Include="src\utils\Utils.cpp" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions projectGenerator.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ClInclude Include="..\..\..\addons\ofxGui\src\ofxSlider.h">
<Filter>addons\ofxGui\src</Filter>
</ClInclude>
<ClInclude Include="src\testApp.h">
<ClInclude Include="src\ofApp.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\addons\ofAddon.h">
Expand Down Expand Up @@ -128,7 +128,7 @@
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\testApp.cpp">
<ClCompile Include="src\ofApp.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\addons\ofAddon.cpp">
Expand Down
12 changes: 6 additions & 6 deletions projectGenerator.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -135,8 +135,8 @@
E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
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 = "<group>"; };
E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
Expand Down Expand Up @@ -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 */,
);
Expand Down Expand Up @@ -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 */,
Expand Down
4 changes: 2 additions & 2 deletions projectGeneratorLinux.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<Unit filename="src/pugixmlLib/src/pugiconfig.hpp" />
<Unit filename="src/pugixmlLib/src/pugixml.cpp" />
<Unit filename="src/pugixmlLib/src/pugixml.hpp" />
<Unit filename="src/testApp.cpp">
<Unit filename="src/ofApp.cpp">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="src/testApp.h">
<Unit filename="src/ofApp.h">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="src/utils/Utils.cpp" />
Expand Down
4 changes: 2 additions & 2 deletions projectGeneratorSimple.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,10 @@
<Unit filename="src\pugixmlLib\src\pugixml.hpp">
<Option virtualFolder="src\pugixmlLib\src" />
</Unit>
<Unit filename="src\testApp.cpp">
<Unit filename="src\ofApp.cpp">
<Option virtualFolder="src" />
</Unit>
<Unit filename="src\testApp.h">
<Unit filename="src\ofApp.h">
<Option virtualFolder="src" />
</Unit>
<Unit filename="src\textButton.h">
Expand Down
4 changes: 2 additions & 2 deletions projectGeneratorSimple.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<ClInclude Include="src\projects\xcodeProject.h" />
<ClInclude Include="src\pugixmlLib\src\pugiconfig.hpp" />
<ClInclude Include="src\pugixmlLib\src\pugixml.hpp" />
<ClInclude Include="src\testApp.h" />
<ClInclude Include="src\ofApp.h" />
<ClInclude Include="src\textButton.h" />
<ClInclude Include="src\utils\ofAppNoWindow.h" />
<ClInclude Include="src\utils\Utils.h" />
Expand All @@ -135,7 +135,7 @@
<ClCompile Include="src\projects\visualStudioProject.cpp" />
<ClCompile Include="src\projects\xcodeProject.cpp" />
<ClCompile Include="src\pugixmlLib\src\pugixml.cpp" />
<ClCompile Include="src\testApp.cpp" />
<ClCompile Include="src\ofApp.cpp" />
<ClCompile Include="src\utils\ofAppNoWindow.cpp" />
<ClCompile Include="src\utils\Utils.cpp" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions projectGeneratorSimple.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ClInclude Include="..\..\..\addons\ofxGui\src\ofxSlider.h">
<Filter>addons\ofxGui\src</Filter>
</ClInclude>
<ClInclude Include="src\testApp.h">
<ClInclude Include="src\ofApp.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\addons\ofAddon.h">
Expand Down Expand Up @@ -128,7 +128,7 @@
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\testApp.cpp">
<ClCompile Include="src\ofApp.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\addons\ofAddon.cpp">
Expand Down
4 changes: 2 additions & 2 deletions projectGenerator_linux64.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@
<Unit filename="src/pugixmlLib/src/pugixml.hpp">
<Option virtualFolder="src/pugixmlLib/" />
</Unit>
<Unit filename="src/testApp.cpp">
<Unit filename="src/ofApp.cpp">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="src/testApp.h">
<Unit filename="src/ofApp.h">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="src/utils/Utils.cpp">
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ofMain.h"
#include "testApp.h"
#include "ofApp.h"
#include "ofAppGlutWindow.h"
#include "ofAppNoWindow.h"

Expand All @@ -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 );
}
34 changes: 17 additions & 17 deletions src/testApp.cpp → src/ofApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "testApp.h"
#include "ofApp.h"
#include "Utils.h"
#include <stdio.h>
#include "ofConstants.h"
Expand All @@ -17,7 +17,7 @@ string windowsFromUnixPath(string path){
}

//------------------------------------------------------
bool testApp::isAddonCore(string addon){
bool ofApp::isAddonCore(string addon){


if (bInited == false){
Expand Down Expand Up @@ -68,7 +68,7 @@ void fixStringCharacters(string &toFix){


//------------------------------------------------------
string testApp::setupForTarget(int targ){
string ofApp::setupForTarget(int targ){

if(project){
delete project;
Expand Down Expand Up @@ -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();
Expand All @@ -119,7 +119,7 @@ void testApp::setStatus(string newStatus){


//--------------------------------------------------------------
void testApp::setup(){
void ofApp::setup(){
ofEnableAlphaBlending();
ofEnableSmoothing();
ofSetLogLevel(OF_LOG_VERBOSE);
Expand Down Expand Up @@ -336,7 +336,7 @@ void testApp::setup(){


//--------------------------------------------------------------
void testApp::update(){
void ofApp::update(){

float diff = ofGetElapsedTimef()- statusSetTime;
if (diff > 3){
Expand Down Expand Up @@ -386,7 +386,7 @@ void testApp::update(){
}

//--------------------------------------------------------------
void testApp::draw(){
void ofApp::draw(){



Expand Down Expand Up @@ -440,7 +440,7 @@ void testApp::draw(){
}

//--------------------------------------------------------------
void testApp::keyPressed(int key){
void ofApp::keyPressed(int key){

if (key == ' '){

Expand All @@ -451,7 +451,7 @@ void testApp::keyPressed(int key){

}

void testApp::generateProject(){
void ofApp::generateProject(){

vector <int> targetsToMake;
if( osxToggle ) targetsToMake.push_back(OF_TARGET_OSX);
Expand Down Expand Up @@ -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){

Expand Down Expand Up @@ -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();
Expand All @@ -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){

}
2 changes: 1 addition & 1 deletion src/testApp.h → src/ofApp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@



class testApp : public ofBaseApp{
class ofApp : public ofBaseApp{

public:
void setup();
Expand Down
10 changes: 5 additions & 5 deletions src/projects/baseProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
// }
Expand Down