Merge branch 'columbia-fixes' into 'development'

Columbia fixes

See merge request !96

application/CMakeLists.txt

@@ -117,6 +117,7 @@ IF(CAMPVIS_GROUP_SOURCE_FILES)
 ENDIF()
 
 IF(CAMPVIS_DEPLOY_SHADERS)
+    LIST(APPEND CampvisShaderDirectories "application/data")
     LIST(APPEND CampvisShaderDirectories "application/glsl")
     LIST(APPEND CampvisShaderDirectories "core/glsl")
 

application/campvisapplication.cpp

@@ -155,7 +155,7 @@ namespace campvis {
 
         // load textureData from file
         tgt::TextureReaderTga trt;
-        _errorTexture = trt.loadTexture(CAMPVIS_SOURCE_DIR "/application/data/no_input.tga", tgt::Texture::LINEAR);
+        _errorTexture = trt.loadTexture(ShdrMgr.completePath("application/data/no_input.tga"), tgt::Texture::LINEAR);
 
 
 #ifdef CAMPVIS_HAS_SCRIPTING

core/datastructures/facegeometry.cpp

@@ -64,21 +64,19 @@ namespace campvis {
     }
 
     FaceGeometry* FaceGeometry::clone() const {
-        return new FaceGeometry(_vertices, _textureCoordinates, _colors, _normals);
+        FaceGeometry* toReturn = new FaceGeometry(_vertices, _textureCoordinates, _colors, _normals);
+        toReturn->setPickingInformation(_pickingInformation);
+        return toReturn;
     }
 
     size_t FaceGeometry::getLocalMemoryFootprint() const {
         size_t sum = 0;
-        if (_verticesBuffer != 0)
-            sum += sizeof(tgt::BufferObject);
-        if (_texCoordsBuffer != 0)
-            sum += sizeof(tgt::BufferObject);
-        if (_colorsBuffer != 0)
-            sum += sizeof(tgt::BufferObject);
-        if (_normalsBuffer != 0)
-            sum += sizeof(tgt::BufferObject);
+        for (size_t i = 0; i < NUM_BUFFERS; ++i) {
+            if (_buffers[i] != nullptr)
+                sum += sizeof(tgt::BufferObject);
+        }
 
-        return sizeof(*this) + sum + (sizeof(tgt::vec3) * (_vertices.size() + _textureCoordinates.size() + _normals.size())) + (sizeof(tgt::vec4) * _colors.size());
+        return sizeof(*this) + sum + (sizeof(tgt::vec3) * (_vertices.size() + _textureCoordinates.size() + _normals.size())) + (sizeof(tgt::vec4) * (_colors.size() + _pickingInformation.size()));
     }
 
     size_t FaceGeometry::size() const {
@@ -101,6 +99,16 @@ namespace campvis {
         return _textureCoordinates;
     }
 
+    const std::vector<tgt::col4>& FaceGeometry::getPickingInformation() const {
+        return _pickingInformation;
+    }
+
+    void FaceGeometry::setPickingInformation(const std::vector<tgt::col4>& pickingInformation) {
+        tgtAssert(pickingInformation.size() == 0 || pickingInformation.size() == _vertices.size(), "Number of picking informations does not match number of vertices!");
+        _pickingInformation = pickingInformation;
+        _buffersDirty = true;
+    }
+
     const tgt::vec3& FaceGeometry::getFaceNormal() const {
         return _faceNormal;
     }
@@ -124,6 +132,8 @@ namespace campvis {
             vao.setVertexAttributePointer(2, _colorsBuffer);
         if (_normalsBuffer)
             vao.setVertexAttributePointer(3, _normalsBuffer);
+        if (_pickingBuffer)
+            vao.setVertexAttributePointer(4, _pickingBuffer);
         LGL_ERROR;
 
         glDrawArrays(mode, 0, static_cast<GLsizei>(_vertices.size()));
@@ -150,6 +160,10 @@ namespace campvis {
                     _normalsBuffer = new tgt::BufferObject(tgt::BufferObject::ARRAY_BUFFER, tgt::BufferObject::USAGE_STATIC_DRAW);
                     _normalsBuffer->data(&_normals.front(), _normals.size() * sizeof(tgt::vec3), tgt::BufferObject::FLOAT, 3);
                 }
+                if (! _pickingInformation.empty()) {
+                    _pickingBuffer = new tgt::BufferObject(tgt::BufferObject::ARRAY_BUFFER, tgt::BufferObject::USAGE_STATIC_DRAW);
+                    _pickingBuffer->data(&_pickingInformation.front(), _pickingInformation.size() * sizeof(tgt::col4), tgt::BufferObject::UNSIGNED_BYTE, 4);
+                }
             }
             catch (tgt::Exception& e) {
                 LERROR("Error creating OpenGL Buffer objects: " << e.what());
@@ -177,6 +191,7 @@ namespace campvis {
 
         std::vector<tgt::vec3> verts, texCoords, norms;
         std::vector<tgt::vec4> cols;
+        std::vector<tgt::col4> picks;
         size_t lastIndex = _vertices.size() - 1;
         float lastDistance = distanceToPlane(_vertices.back(), p, pNormal, epsilon);
 
@@ -195,6 +210,8 @@ namespace campvis {
                     cols.push_back(tgt::mix(_colors[lastIndex], _colors[i], t));
                 if (!_normals.empty())
                     norms.push_back(tgt::mix(_normals[lastIndex], _normals[i], t));
+                if (!_pickingInformation.empty())
+                    picks.push_back(_pickingInformation[i]);
             }
             // case 2: last vertex inside, this vertex outside clip region => clip
             else if (lastDistance <= 0 && currrentDistance > 0) {
@@ -207,6 +224,8 @@ namespace campvis {
                     cols.push_back(tgt::mix(_colors[lastIndex], _colors[i], t));
                 if (!_normals.empty())
                     norms.push_back(tgt::mix(_normals[lastIndex], _normals[i], t));
+                if (!_pickingInformation.empty())
+                    picks.push_back(_pickingInformation[lastIndex]);
             }
 
             // case 1.2 + case 3: current vertix in front of plane => keep
@@ -218,13 +237,17 @@ namespace campvis {
                     cols.push_back(_colors[i]);
                 if (!_normals.empty())
                     norms.push_back(_normals[i]);
+                if (!_pickingInformation.empty())
+                    picks.push_back(_pickingInformation[i]);
             }
 
             lastIndex = i;
             lastDistance = currrentDistance;
         }
 
-        return FaceGeometry(verts, texCoords, cols, norms);
+        FaceGeometry toReturn(verts, texCoords, cols, norms);
+        toReturn.setPickingInformation(picks);
+        return toReturn;
     }
 
     tgt::Bounds FaceGeometry::getWorldBounds() const {
@@ -238,6 +261,10 @@ namespace campvis {
         return ! _textureCoordinates.empty();
     }
 
+    bool FaceGeometry::hasPickingInformation() const {
+        return !_pickingInformation.empty();
+    }
+
     void FaceGeometry::applyTransformationToVertices(const tgt::mat4& t) {
         for (size_t i = 0; i < _vertices.size(); ++i) {
             tgt::vec4 tmp = t * tgt::vec4(_vertices[i], 1.f);
@@ -247,4 +274,5 @@ namespace campvis {
         _buffersDirty = true;
     }
 
+
 }
\ No newline at end of file

core/datastructures/facegeometry.h

@@ -105,6 +105,18 @@ namespace campvis {
          * \return _textureCoordinates
          */
         const std::vector<tgt::vec3>& getTextureCoordinates() const;
+        
+        /**
+         * The list of picking information colors, may be empty.
+         * \return  _pickingInformation
+         */
+        const std::vector<tgt::col4>& getPickingInformation() const;
+
+        /**
+         * Sets the picking information of this geometry to \a pickingInformation
+         * \param   pickingInformation  The new list of picking information for this geometry
+         */
+        void setPickingInformation(const std::vector<tgt::col4>& pickingInformation);
 
         /**
          * The normal vector of this face.
@@ -134,6 +146,8 @@ namespace campvis {
         virtual tgt::Bounds getWorldBounds() const;
         /// \see GeometryData::hasTextureCoordinates
         virtual bool hasTextureCoordinates() const;
+        /// \see GeometryData::hasPickingInformation
+        virtual bool hasPickingInformation() const;
         /// \see GeometryData::applyTransformationToVertices
         virtual void applyTransformationToVertices(const tgt::mat4& t);
 
@@ -149,6 +163,8 @@ namespace campvis {
         std::vector<tgt::vec4> _colors;                 ///< The list of vertex colors, may be empty.
         std::vector<tgt::vec3> _normals;                ///< The list of vertex normals, may be empty.
 
+        std::vector<tgt::col4> _pickingInformation;     ///< The list of picking information colors, max be empty.
+
         tgt::vec3 _faceNormal;                          ///< The normal vector of this face.
 
         static const std::string loggerCat_;

core/datastructures/genericpointerdata.h

@@ -70,7 +70,7 @@ namespace campvis {
          * \return  _data, may be 0, GenericPointerData has ownership
          */
         const T* getData() const {
-            return _data;
+            return _data.get();
         };
 
         /**
@@ -78,7 +78,7 @@ namespace campvis {
          * \return  _data, may be 0, GenericPointerData has ownership
          */
         T* getData() {
-            return _data;
+            return _data.get();
         };
 
         /**

core/datastructures/geometrydata.cpp

@@ -37,20 +37,22 @@ namespace campvis {
     GeometryData::GeometryData() 
         : AbstractData()
         , _buffersDirty(true)
-        , _verticesBuffer(0)
-        , _texCoordsBuffer(0)
-        , _colorsBuffer(0)
-        , _normalsBuffer(0)
+        , _verticesBuffer(nullptr)
+        , _texCoordsBuffer(nullptr)
+        , _colorsBuffer(nullptr)
+        , _normalsBuffer(nullptr)
+        , _pickingBuffer(nullptr)
     {
     }
 
     GeometryData::GeometryData(const GeometryData& rhs)
         : AbstractData(rhs)
         , _buffersDirty(true)
-        , _verticesBuffer(0)
-        , _texCoordsBuffer(0)
-        , _colorsBuffer(0)
-        , _normalsBuffer(0)
+        , _verticesBuffer(nullptr)
+        , _texCoordsBuffer(nullptr)
+        , _colorsBuffer(nullptr)
+        , _normalsBuffer(nullptr)
+        , _pickingBuffer(nullptr)
     {
 
     }
@@ -74,21 +76,23 @@ namespace campvis {
     void GeometryData::deleteBuffers() const {
         for (int i = 0; i < NUM_BUFFERS; ++i) {
             delete _buffers[i];
-            _buffers[i] = 0;
+            _buffers[i] = nullptr;
         }
     }
 
     size_t GeometryData::getVideoMemoryFootprint() const {
         size_t sum = 0;
 
-        if (_verticesBuffer != 0)
+        if (_verticesBuffer != nullptr)
             sum += _verticesBuffer->getBufferSize();
-        if (_texCoordsBuffer != 0)
+        if (_texCoordsBuffer != nullptr)
             sum += _texCoordsBuffer->getBufferSize();
-        if (_colorsBuffer != 0)
+        if (_colorsBuffer != nullptr)
             sum += _colorsBuffer->getBufferSize();
-        if (_normalsBuffer != 0)
+        if (_normalsBuffer != nullptr)
             sum += _normalsBuffer->getBufferSize();
+        if (_pickingBuffer != nullptr)
+            sum += _pickingBuffer->getBufferSize();
 
         return sum;
     }
@@ -109,4 +113,8 @@ namespace campvis {
         return _normalsBuffer;
     }
 
+    const tgt::BufferObject* GeometryData::getPickingBuffer() const {
+        return _pickingBuffer;
+    }
+
 }
\ No newline at end of file

core/datastructures/geometrydata.h

@@ -36,6 +36,7 @@ namespace tgt {
 }
 
 namespace campvis {
+
     /**
      * Abstract base class for geometry data in CAMPVis.
      * 
@@ -91,12 +92,19 @@ namespace campvis {
          */
         virtual tgt::Bounds getWorldBounds() const = 0;
 
+
         /**
          * Returns whether the geometry has texture coordinates.
          * \return  True if this geometry sets texture coordinates during rendering.
          */
         virtual bool hasTextureCoordinates() const = 0;
 
+        /**
+         * Returns whether this geometry has picking information.
+         * \return  True if this geometry sets picking information during rendering.
+         */
+        virtual bool hasPickingInformation() const = 0;
+
         /**
          * Applies the transformation matrix \a t to each vertex of this geometry.
          * \param   t   Transformation matrix to apply
@@ -131,6 +139,13 @@ namespace campvis {
          */
         const tgt::BufferObject* getNormalsBuffer() const;
 
+        /**
+         * Returns the Pointer to the OpenGL Buffer with the vertex normals.
+         * May be 0 if none are present or not yet created.
+         * \return  _normalsBuffer
+         */
+        const tgt::BufferObject* getPickingBuffer() const;
+
         /// \see AbstractData::getVideoMemoryFootprint()
         virtual size_t getVideoMemoryFootprint() const;
 
@@ -140,10 +155,11 @@ namespace campvis {
          */
         void deleteBuffers() const;
 
+
         // mutable to support const lazy initialization
         mutable bool _buffersDirty;             ///< Flag whether the buffers are dirty (i.e. need to be (re)initialized)
 
-        enum { NUM_BUFFERS = 4 };               ///< Number of buffers in _buffers array
+        enum { NUM_BUFFERS = 5 };               ///< Number of buffers in _buffers array
 
         union {
             struct {
@@ -151,6 +167,7 @@ namespace campvis {
                 mutable tgt::BufferObject* _texCoordsBuffer;    ///< Pointer to the OpenGL Buffer with the vertex texture coordinates
                 mutable tgt::BufferObject* _colorsBuffer;       ///< Pointer to the OpenGL Buffer with the vertex colors
                 mutable tgt::BufferObject* _normalsBuffer;      ///< Pointer to the OpenGL Buffer with the vertex normals
+                mutable tgt::BufferObject* _pickingBuffer;      ///< Pointer to the OpenGL Buffer with the picking information
             };
 
             mutable tgt::BufferObject* _buffers[NUM_BUFFERS];   ///< Array of all buffers
@@ -163,4 +180,75 @@ namespace campvis {
 
 }
 
+/*
+=== This is a draft for a new, generic GeometryData class design that manages arbitrary OpenGL buffers ====
+
+class CAMPVIS_CORE_API GeometryDataBase {
+public:
+    /// Enumeration for defining semantics of stored buffer data
+    enum ElementSemantic {
+        VERTEX                  = 0,    ///< Vextex data
+        TEXTURE_COORDINATE      = 1,    ///< Texture coordinate data
+        COLOR                   = 2,    ///< Color data
+        NORMAL                  = 3,    ///< Normal data
+        PICKING_INFORMATION     = 4     ///< Picking information
+    };
+
+    /// Enumeration for defining the host data type of the element
+    enum ElementHostType {
+        UINT8,
+        UINT16,
+        UINT32,
+        FLOAT,
+        VEC2,
+        VEC3,
+        VEC4
+    };
+};
+
+template<GeometryDataBase::ElementSemantic SEMANTIC>
+struct GeometryDataTraits {};
+
+template<>
+struct GeometryDataTraits<GeometryDataBase::VERTEX> {
+    typedef tgt::vec3 HostType;
+};
+
+class CAMPVIS_CORE_API DraftNewGeometryData {
+public:
+    template<GeometryDataBase::ElementSemantic SEMANTIC>
+    const std::vector<typename GeometryDataTraits<SEMANTIC>::HostType>* getElementData() const;
+
+    template<GeometryDataBase::ElementSemantic SEMANTIC>
+    void setElementData(std::vector<typename GeometryDataTraits<SEMANTIC>::HostType>* elementData);
+
+protected:
+    std::vector<void*> _elementPointers;
+};
+
+
+template<GeometryDataBase::ElementSemantic SEMANTIC>
+const std::vector<typename GeometryDataTraits<SEMANTIC>::HostType>* GeometryData::getElementData() const {
+    if (_elementPointers.size() >= SEMANTIC) {
+        return static_cast< std::vector<typename GeometryDataTraits<SEMANTIC>::HostType>* >(_elementPointers[SEMANTIC]);
+    }
+
+    return nullptr;
+}
+
+template<GeometryDataBase::ElementSemantic SEMANTIC>
+void GeometryData::setElementData(std::vector<typename GeometryDataTraits<SEMANTIC>::HostType>* elementData) {
+    if (_elementPointers.size() < SEMANTIC + 1)
+        _elementPointers.resize(SEMANTIC, nullptr);
+
+    void* oldPtr = _elementPointers[SEMANTIC];
+    if (oldPtr != elementData)
+        delete static_cast< std::vector<typename GeometryDataTraits<SEMANTIC>::HostType>* >(oldPtr);
+
+    _elementPointers[SEMANTIC] = elementData;
+}
+
+*/
+
+
 #endif // GEOMETRYDATA_H__

core/datastructures/geometrydatacollection.cpp

@@ -114,6 +114,15 @@ namespace campvis {
         return true;
     }
 
+    bool GeometryDataCollection::hasPickingInformation() const {
+        for (size_t i = 0; i < _geometries.size(); ++i) {
+            if (! _geometries[i]->hasPickingInformation())
+                return false;
+        }
+
+        return true;
+    }
+
     void GeometryDataCollection::applyTransformationToVertices(const tgt::mat4& t) {
         for (size_t i = 0; i < _geometries.size(); ++i)
             _geometries[i]->applyTransformationToVertices(t);
@@ -136,5 +145,4 @@ namespace campvis {
 
         return sum;
     }
-
 }
\ No newline at end of file

core/datastructures/geometrydatacollection.h

@@ -109,6 +109,12 @@ namespace campvis {
          */
         virtual bool hasTextureCoordinates() const;
 
+        /**
+         * Returns whether all geometries of the collection have picking information.
+         * \return  True if all geometries of the collection set picking information during rendering.
+         */
+        virtual bool hasPickingInformation() const;
+
         /**
          * Applies the transformation matrix \a t to each vertex of this geometry.
          * \param   t   Transformation matrix to apply

core/datastructures/imagedata.h

@@ -26,6 +26,8 @@
 #define IMAGEDATA_H__
 
 #include <tbb/concurrent_vector.h>
+#include <tbb/spin_mutex.h>