refactor abuffer and add msaa support. volumes temporarily disabled.

2026-05-02 00:44:43 -05:00 · 2016-02-02 11:30:27 +01:00
parent 4f7ab5321f
commit d4ff8119d1
79 changed files with 2354 additions and 3106 deletions
@@ -0,0 +1,128 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+#include <openspace/util/boxgeometry.h>
+#include <ghoul/logging/logmanager.h>
+#include <string>
+
+namespace {
+const std::string _loggerCat = "BoxGeometry";
+}
+
+namespace openspace {
+
+BoxGeometry::BoxGeometry(glm::vec3 size)
+    : _vaoId(0)
+    , _vBufferId(0)
+    , _size(size)
+{}
+
+BoxGeometry::~BoxGeometry() {
+    glDeleteBuffers(1, &_vBufferId);
+    glDeleteVertexArrays(1, &_vaoId);
+}
+
+
+bool BoxGeometry::initialize() {
+    // Initialize and upload to graphics card
+    float x = _size.x * 0.5;
+    float y = _size.y * 0.5;
+    float z = _size.z * 0.5;
+
+    const GLfloat vertices[] = {
+        -x, y,  z,
+        x,  y,  z,
+        -x,  y,  z,
+        -x, -y,  z,
+        x, -y,  z,
+        x,  y,  z,
+    
+        -x, -y, -z,
+        x,  y, -z,
+        -x,  y, -z,
+        -x, -y, -z,
+        x, -y, -z,
+        x,  y, -z,
+    
+        x, -y, -z,
+        x,  y,  z,
+        x, -y,  z,
+        x, -y, -z,
+        x,  y, -z,
+        x,  y,  z,
+    
+        -x, -y, -z,
+        -x,  y,  z,
+        -x, -y,  z,
+        -x, -y, -z,
+        -x,  y, -z,
+        -x,  y,  z,
+    
+        -x,  y, -z,
+        x,  y,  z,
+        -x,  y,  z,
+        -x,  y, -z,
+        x,  y, -z,
+        x,  y,  z,
+    
+        -x, -y, -z,
+        x, -y,  z,
+        -x, -y,  z,
+        -x, -y, -z,
+        x, -y, -z,
+        x, -y,  z
+    };
+    
+    if (_vaoId == 0)
+        glGenVertexArrays(1, &_vaoId);
+
+    if (_vBufferId == 0) {
+        glGenBuffers(1, &_vBufferId);
+
+        if (_vBufferId == 0) {
+            LERROR("Could not create vertex buffer");
+            return false;
+        }
+    }
+
+    // First VAO setup
+    glBindVertexArray(_vaoId);
+
+    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), &vertices, GL_STATIC_DRAW);
+
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3, 0);
+
+    glBindVertexArray(0);
+    return true;
+}
+
+void BoxGeometry::render() {
+    glBindVertexArray(_vaoId);  // select first VAO
+    glDrawArrays(GL_TRIANGLES, 0, 6*6);
+    glBindVertexArray(0);
+}
+
+}