Merge with antialiased abuffer

include/openspace/util/blockplaneintersectiongeometry.h

@@ -0,0 +1,60 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2016                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __BLOCKPLANEINTERSECTIONGEOMETRY_H__
+#define __BLOCKPLANEINTERSECTIONGEOMETRY_H__
+
+#include <ghoul/opengl/ghoul_gl.h>
+#include <glm/glm.hpp>
+
+#include <vector>
+
+namespace openspace {
+
+class BlockPlaneIntersectionGeometry {
+public:
+    // initializers
+    BlockPlaneIntersectionGeometry(glm::vec3 blockSize, glm::vec3 planeNormal, float planeDistance);
+    ~BlockPlaneIntersectionGeometry();
+
+    bool initialize();
+    void render();
+
+    void setBlockSize(glm::vec3 size);
+    void setPlane(glm::vec3 normal, float distance);
+
+private:
+    void updateVertices();
+    std::vector<float> _vertices;
+    bool _initialized;
+	GLuint _vaoId;
+	GLuint _vBufferId;
+    glm::vec3 _size;
+    glm::vec3 _normal;
+    float _planeDistance;
+};
+
+}
+
+#endif // __BLOCKPLANEINTERSECTIONGEOMETRY_H__

include/openspace/util/boxgeometry.h

@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2016                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __BOXGEOMETRY_H__
+#define __BOXGEOMETRY_H__
+
+#include <ghoul/opengl/ghoul_gl.h>
+#include <glm/glm.hpp>
+
+namespace openspace {
+
+class BoxGeometry {
+public:
+    // initializers
+    BoxGeometry(glm::vec3 size);
+    ~BoxGeometry();
+
+    bool initialize();
+    void render();
+ 
+	GLuint _vaoId;
+	GLuint _vBufferId;
+    glm::vec3 _size;
+};
+
+} // namespace openspace
+
+#endif // __BOXGEOMETRY_H__

include/openspace/util/camera.h

@@ -111,7 +111,6 @@ public:
 	void setProjectionMatrix(glm::mat4 projectionMatrix);
 	const glm::mat4& projectionMatrix() const;
 
-    void setViewProjectionMatrix(glm::mat4 viewProjectionMatrix);
     const glm::mat4& viewProjectionMatrix() const;
 
     void setCameraDirection(glm::vec3 cameraDirection);
@@ -148,10 +147,11 @@ public:
 private:
     float _maxFov;
     float _sinMaxFov;
-    glm::mat4 _viewProjectionMatrix;
+    mutable glm::mat4 _viewProjectionMatrix;
 	glm::mat4 _modelMatrix;
 	glm::mat4 _viewMatrix;
 	glm::mat4 _projectionMatrix;
+    mutable bool _dirtyViewProjectionMatrix;
     glm::vec3 _viewDirection;
     glm::vec3 _cameraDirection;
 	psc _focusPosition;
@@ -159,7 +159,7 @@ private:
     
     glm::vec3 _lookUp;
 
-	std::mutex _mutex;
+	mutable std::mutex _mutex;
 	
 	//local variables
 	glm::mat4 _localViewRotationMatrix;