Adding default model

diff --git a/gl/gl.qrc b/gl/gl.qrc
index 38d525ca93b60477e734b48f249e018997e0bf56..ef93a0e4895e6d87a73ed11ef709646cbbb65d74 100644 (file)
--- 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 (file)
index 0000000..b78c7b4
Binary files /dev/null and b/gl/sphere.stl differ

diff --git a/src/app.cpp b/src/app.cpp
index 53783686b0503e01bde4660b944856ef0242990e..afa4ea7d7307d1e19c6b430bdbc6d973e1618fb2 100644 (file)
--- 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 a3c94d06cea48488abc8b66c67974ce8fee5a196..885b0a832cdaf51e3f35d24a3c75890cf7a97969 100644 (file)
--- 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;