From: Matt Keeter <matt.j.keeter@gmail.com>
Date: Sat, 15 Mar 2014 01:49:07 +0000 (-0400)
Subject: Adding default model
X-Git-Tag: v0.9.0~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c2d07bc40c26223c5cf0d58e54b906154ddedf3f;p=fstl

Adding default model
---

diff --git a/gl/gl.qrc b/gl/gl.qrc
index 38d525c..ef93a0e 100644
--- a/gl/gl.qrc
+++ b/gl/gl.qrc
@@ -4,5 +4,6 @@
         <file>mesh.vert</file>
         <file>quad.frag</file>
         <file>quad.vert</file>
+        <file>sphere.stl</file>
     </qresource>
 </RCC>
diff --git a/gl/sphere.stl b/gl/sphere.stl
new file mode 100644
index 0000000..b78c7b4
Binary files /dev/null and b/gl/sphere.stl differ
diff --git a/src/app.cpp b/src/app.cpp
index 5378368..afa4ea7 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -8,6 +8,7 @@ App::App(int argc, char *argv[]) :
     QApplication(argc, argv), window(new Window())
 {
     window->show();
+    window->load_stl(":gl/sphere.stl");
 }
 
 bool App::event(QEvent* e)
diff --git a/src/window.cpp b/src/window.cpp
index a3c94d0..885b0a8 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -88,8 +88,11 @@ bool Window::load_stl(const QString& filename)
     connect(loader, &Loader::finished,
             [=](){ canvas->set_status(""); });
 
-    connect(loader, &Loader::loaded_file,
-            this, &Window::setWindowTitle);
+    if (filename[0] != ':')
+    {
+        connect(loader, &Loader::loaded_file,
+                this, &Window::setWindowTitle);
+    }
 
     loader->start();
     return true;