Support vertex colors for meshes

BlueBrain · Jul 25, 2018 · 73291a6 · 73291a6
1 parent ba0fd09
commit 73291a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![C++ Build Status](https://bbpcode.epfl.ch/ci/buildStatus/icon?job=oss.Brayns)](https://bbpcode.epfl.ch/ci/job/oss.Brayns/)
 [![Docker Build Status](https://bbpcode.epfl.ch/ci/buildStatus/icon?job=oss.Brayns.docker)](https://bbpcode.epfl.ch/ci/job/oss.Brayns.docker/)
-[![Python Build Status](https://travis-ci.org/BlueBrain/Brayns.svg?branch=pypi)](https://travis-ci.org/BlueBrain/Brayns)
+[![Python Build Status](https://travis-ci.org/BlueBrain/Brayns.svg)](https://travis-ci.org/BlueBrain/Brayns)
 [![Read the Docs](https://readthedocs.org/projects/brayns/badge/?version=latest)](http://brayns.readthedocs.io/en/latest/?badge=latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/bluebrain/brayns.svg)](https://hub.docker.com/r/bluebrain/brayns/)
 [![GitHub release](https://img.shields.io/github/release/BlueBrain/Brayns.svg)](https://github.com/BlueBrain/Brayns/releases)

diff --git a/brayns/common/scene/Scene.cpp b/brayns/common/scene/Scene.cpp
@@ -212,6 +212,8 @@ ModelDescriptorPtr Scene::load(Blob&& blob,
     auto loader = _loaderRegistry.createLoader(blob.type);
     loader->setProgressCallback(cb);
     auto model = loader->importFromBlob(std::move(blob), 0, materialID);
+    if (!model)
+        throw std::runtime_error("No model returned by loader");
     model->setTransformation(transformation);
     addModel(model);
     saveToCacheFile();

diff --git a/brayns/io/MeshLoader.cpp b/brayns/io/MeshLoader.cpp
@@ -249,6 +249,8 @@ void MeshLoader::_postLoad(const aiScene* aiScene, Model& model,
             triangleMeshes.normals.reserve(nbVertices);
         if (mesh->HasTextureCoords(0))
             triangleMeshes.textureCoordinates.reserve(nbVertices);
+        if (mesh->HasVertexColors(0))
+            triangleMeshes.colors.reserve(nbVertices);
         for (size_t i = 0; i < mesh->mNumVertices; ++i)
         {
             const auto& v = mesh->mVertices[i];
@@ -268,8 +270,13 @@ void MeshLoader::_postLoad(const aiScene* aiScene, Model& model,
             if (mesh->HasTextureCoords(0))
             {
                 const auto& t = mesh->mTextureCoords[0][i];
-                const Vector2f texCoord(t.x, -t.y);
-                triangleMeshes.textureCoordinates.push_back(texCoord);
+                triangleMeshes.textureCoordinates.push_back({t.x, -t.y});
+            }
+
+            if (mesh->HasVertexColors(0))
+            {
+                const auto& c = mesh->mColors[0][i];
+                triangleMeshes.colors.push_back({c.r, c.g, c.b, c.a});
             }
         }
         bool nonTriangulatedFaces = false;