Merge pull request #20 from bakercp/gsoc

Continuous Integration
olab-io · Jun 5, 2014 · a70585c · a70585c
2 parents 0f2ab1f + d924c87
commit a70585c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/ofSketchApp/bin/data/media/openFrameworks.png b/ofSketchApp/bin/data/media/openFrameworks.png
diff --git a/ofSketchApp/src/App.cpp b/ofSketchApp/src/App.cpp
@@ -54,6 +54,9 @@ App::App():
     _loggerChannel = WebSocketLoggerChannel::makeShared();
     _loggerChannel->setWebSocketRoute(server->getWebSocketRoute());
     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
@@ -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
@@ -28,6 +28,6 @@
 
 int main()
 {
-	ofSetupOpenGL(100, 100, OF_WINDOW);
+	ofSetupOpenGL(200, 40, OF_WINDOW);
 	ofRunApp(new of::Sketch::App());
 }