diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
| commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
| tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /src/GLView.cc | |
| parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
| parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.cc
Diffstat (limited to 'src/GLView.cc')
| -rw-r--r-- | src/GLView.cc | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/GLView.cc b/src/GLView.cc index c851497..2f6d69f 100644 --- a/src/GLView.cc +++ b/src/GLView.cc @@ -5,14 +5,29 @@ GLView::GLView() { - std::cout << "glview();" << std::endl; - this->renderer = NULL; + viewer_distance = 500; + object_trans << 0, 0, 0; + camera_eye << 0, 0, 0; + camera_center << 0, 0, 0; + showedges = false; + showfaces = true; + orthomode = false; + showaxes = false; + showcrosshairs = false; + renderer = NULL; +#ifdef ENABLE_OPENCSG + is_opencsg_capable = false; + has_shaders = false; + opencsg_support = true; + static int sId = 0; + this->opencsg_id = sId++; + for (int i = 0; i < 10; i++) this->shaderinfo[i] = 0; +#endif } void GLView::setRenderer(Renderer* r) { - std::cout << "setr " << r << "\n" << std::endl; - this->renderer = r; + renderer = r; } void GLView::resizeGL(int w, int h) |