Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 76 insertions, 0 deletions

diff --git a/src/QGLView.h b/src/QGLView.h
new file mode 100644
index 0000000..f3e3681
--- /dev/null
+++ b/src/QGLView.h
@@ -0,0 +1,76 @@
+#ifndef QGLVIEW_H_
+#define QGLVIEW_H_
+
+#include "system-gl.h"
+#include <QGLWidget>
+#include <QLabel>
+
+#include <Eigen/Core>
+#include <Eigen/Geometry>
+#include "GLView.h"
+#include "renderer.h"
+
+class QGLView : public QGLWidget, public GLView
+{
+	Q_OBJECT
+	Q_PROPERTY(bool showFaces READ showFaces WRITE setShowFaces);
+	Q_PROPERTY(bool showEdges READ showEdges WRITE setShowEdges);
+	Q_PROPERTY(bool showAxes READ showAxes WRITE setShowAxes);
+	Q_PROPERTY(bool showCrosshairs READ showCrosshairs WRITE setShowCrosshairs);
+	Q_PROPERTY(bool orthoMode READ orthoMode WRITE setOrthoMode);
+
+public:
+	QGLView(QWidget *parent = NULL);
+	QGLView(const QGLFormat & format, QWidget *parent = NULL);
+#ifdef ENABLE_OPENCSG
+	bool hasOpenCSGSupport() { return this->opencsg_support; }
+#endif
+	// Properties
+	bool showFaces() const { return this->showfaces; }
+	void setShowFaces(bool enabled) { this->showfaces = enabled; }
+	bool showEdges() const { return this->showedges; }
+	void setShowEdges(bool enabled) { this->showedges = enabled; }
+	bool showAxes() const { return this->showaxes; }
+	void setShowAxes(bool enabled) { this->showaxes = enabled; }
+	bool showCrosshairs() const { return this->showcrosshairs; }
+	void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; }
+	bool orthoMode() const { return (this->cam.projection == Camera::ORTHOGONAL); }
+	void setOrthoMode(bool enabled) {
+		if (enabled) this->cam.projection = Camera::ORTHOGONAL;
+		else this->cam.projection = Camera::PERSPECTIVE;
+	}
+	std::string getRendererInfo() const;
+	bool save(const char *filename);
+
+public:
+	QLabel *statusLabel;
+
+private:
+	void init();
+
+	bool mouse_drag_active;
+	QPoint last_mouse;
+
+	void keyPressEvent(QKeyEvent *event);
+	void wheelEvent(QWheelEvent *event);
+	void mousePressEvent(QMouseEvent *event);
+	void mouseMoveEvent(QMouseEvent *event);
+	void mouseReleaseEvent(QMouseEvent *event);
+
+	void initializeGL();
+	void resizeGL(int w, int h);
+
+	void paintGL();
+	void normalizeAngle(GLdouble& angle);
+
+#ifdef ENABLE_OPENCSG
+	void display_opencsg_warning();
+private slots:
+	void display_opencsg_warning_dialog();
+#endif
+
+signals:
+	void doAnimateUpdate();
+};
+
+#endif