From c2d07bc40c26223c5cf0d58e54b906154ddedf3f Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Fri, 14 Mar 2014 21:49:07 -0400 Subject: [PATCH] Adding default model --- gl/gl.qrc | 1 + gl/sphere.stl | Bin 0 -> 4084 bytes src/app.cpp | 1 + src/window.cpp | 7 +++++-- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 gl/sphere.stl 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 @@ mesh.vert quad.frag quad.vert + sphere.stl diff --git a/gl/sphere.stl b/gl/sphere.stl new file mode 100644 index 0000000000000000000000000000000000000000..b78c7b49e3cd4b198c0b2b22a29acabea1dfdcd8 GIT binary patch literal 4084 zcmb7`ziSjx5XVy_1Opbf7ILK)iYNpNeWGw+X>BRFz=;|;l}i(_i@oTdaCI7m6h3WY z8w9mT8~h7YY@L~%-Tl11ojbf{_wMHNX1;HJyf@r^wljG#+8S(6cAgCGJ{~>Y8ci-= zyRvy>aPj%ehl8t^R{raAKd^o@Uiox$`XFr_UdUgkC;9W~?Bn_ItNdNwOXT#&VLDpf z&#ym>GKuZ!Nm9$*wfzoJ^Xh}^o^#9DoDUMTayrdNMS@lyVNy-CP4%P>#(w6`?{r;u zp|sX-!@p5?d{FjtlmHv8Pl zCIkDX*M|{|kaS7VifUtm`|f$R=@Vy=gzthyNV<%QR#Y1koNAl~?3>aD3Dy|tlAsmU z#)R^ioI0Je{^tF!=Srt*NwACJNlh#EU`$B7%~|Ag*P;@-nS2^Y`ys)4CEZ%<8?88T zV#5Ei{cwNw?oruvEq#z+y^<~oTCv(=LVOfwYJDzw25o|uK1g)ywWdpgR;+fl>L=WX zWlc0Sr&?TBBt&g<-yvN_MJskuOo$J?u~<~1sX000x+39f?M_9yjEYuN8xzc}bg)II zr*m9aB>ded(q&Y%qS}~n9d^g@*zE=o*A)rhx1_(3*6;0yR#Y1kqC+dg*7ZEwEra=Q z*Vi`^;;-oy(j`$?;T{wdavC&uH94;=x*6^}a<+HwiX>RCeRLHat*AC8$Q)rR-qNEJto|T-8t!RX;enAUi;{36{W5VOLdo3f3qawk2?W2pmvMyq^ X#{_dre{obKSg(C_wF<4++a>W2;Mt%E literal 0 HcmV?d00001 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; -- 2.39.5