From d924c8794ed3e4ad00ee126b4662cd67f5c11980 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Thu, 5 Jun 2014 09:27:29 +0800 Subject: [PATCH] Fixes https://github.com/brannondorsey/ofSketch/issues/19 --- ofSketchApp/bin/data/media/openFrameworks.png | Bin 0 -> 4053 bytes ofSketchApp/src/App.cpp | 17 ++++++++++++++++- ofSketchApp/src/App.h | 5 +++++ ofSketchApp/src/main.cpp | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ofSketchApp/bin/data/media/openFrameworks.png diff --git a/ofSketchApp/bin/data/media/openFrameworks.png b/ofSketchApp/bin/data/media/openFrameworks.png new file mode 100644 index 0000000000000000000000000000000000000000..a9a9dbb23ca037b28cb98926b381b43a778c8cbf GIT binary patch literal 4053 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 ofSetLoggerChannel(_loggerChannel); + + _logo.loadImage("media/openFrameworks.png"); + _font.loadFont(OF_TTF_SANS, 20); } @@ -163,9 +166,21 @@ void App::update() void App::draw() { - ofBackground(0); + ofBackground(255); + + _logo.draw(10, 0); + + ofSetColor(80); + _font.drawString("Launch", 70, 30); } + +void App::mousePressed(int x, int y, int button) +{ + ofLaunchBrowser(server->getURL()); +} + + void App::loadProject(const void* pSender, JSONRPC::MethodArgs& args) { if (args.params.isMember("projectName")) { diff --git a/ofSketchApp/src/App.h b/ofSketchApp/src/App.h index 013ec18..44889ef 100644 --- a/ofSketchApp/src/App.h +++ b/ofSketchApp/src/App.h @@ -60,6 +60,8 @@ class App: public ofBaseApp void update(); void draw(); + void mousePressed(int x, int y, int button); + void loadProject(const void* pSender, JSONRPC::MethodArgs& args); void loadTemplateProject(const void* pSender, JSONRPC::MethodArgs& args); void saveProject(const void* pSender, JSONRPC::MethodArgs& args); @@ -116,6 +118,9 @@ class App: public ofBaseApp ProjectManager _projectManager; AddonManager _addonManager; + ofImage _logo; + ofTrueTypeFont _font; + }; diff --git a/ofSketchApp/src/main.cpp b/ofSketchApp/src/main.cpp index abd3684..9f7aa2d 100644 --- a/ofSketchApp/src/main.cpp +++ b/ofSketchApp/src/main.cpp @@ -28,6 +28,6 @@ int main() { - ofSetupOpenGL(100, 100, OF_WINDOW); + ofSetupOpenGL(200, 40, OF_WINDOW); ofRunApp(new of::Sketch::App()); }