Simulation texture replaced by renderer-compatible raw buffer

BlueBrain · Aug 5, 2016 · 08f3dbb · 08f3dbb
1 parent 4713749
commit 08f3dbb
Show file tree

Hide file tree

Showing 19 changed files with 278 additions and 285 deletions.
diff --git a/brayns/Brayns.cpp b/brayns/Brayns.cpp
@@ -449,7 +449,7 @@ struct Brayns::Impl
         parameter --report)
         @return the number of simulation frames loaded
     */
-    size_t _loadCompartmentReport()
+    void _loadCompartmentReport()
     {
         GeometryParameters& geometryParameters =
             _parametersManager->getGeometryParameters();
@@ -463,8 +463,8 @@ struct Brayns::Impl
             filename << std::endl;
         MorphologyLoader morphologyLoader( geometryParameters );
         const servus::URI uri( filename );
-        return morphologyLoader.importSimulationIntoTexture(
-            uri, target, report, *_engine->getScene());
+        if( morphologyLoader.importSimulationData( uri, target, report, *_engine->getScene()))
+            _engine->getScene()->commitSimulationData();
     }
 
     void _buildDefaultScene()

diff --git a/brayns/common/log.h b/brayns/common/log.h
@@ -37,4 +37,16 @@
         throw exc;\
     }
 
+#define BRAYNS_PROGRESS( __value, __maxValue ) \
+{\
+    std::cout << "[";\
+    size_t __percent = 100 * ( __value + 1 ) / __maxValue;\
+    for( size_t __progress = 0; __progress < 100; ++__progress )\
+        std::cout << ( __progress <= __percent ? "=" : " " );\
+    std::cout << "] " << int( __percent ) << " %\r";\
+    std::cout.flush();\
+    if( __value >= __maxValue - 1 )\
+        std::cout << std::endl;\
+}
+
 #endif
diff --git a/brayns/common/scene/Scene.cpp b/brayns/common/scene/Scene.cpp
@@ -58,12 +58,9 @@ void Scene::setMaterials(
     {
         MaterialPtr material( new Material );
 
-        // Special materials (Simulation, skybox, etc)
+        // Special materials ( skybox, etc )
         switch( i )
         {
-            case MATERIAL_SIMULATION:
-                material->setTexture( TT_DIFFUSE, TEXTURE_NAME_SIMULATION );
-                break;
             case MATERIAL_BOUNDING_BOX:
                 material->setColor( Vector3f( 1.f, 1.f, 1.f ));
                 material->setEmission( 1.f );

diff --git a/brayns/common/scene/Scene.h b/brayns/common/scene/Scene.h
@@ -99,6 +99,11 @@ class Scene
     */
     BRAYNS_API virtual void buildGeometry() = 0;
 
+    /**
+        Attach simulation data to renderer
+    */
+    BRAYNS_API virtual void commitSimulationData() = 0;
+
     /**
         Returns the bounding box for the whole scene
     */
@@ -152,6 +157,8 @@ class Scene
     BRAYNS_API TexturesMap& getTextures() { return _textures; }
     BRAYNS_API TrianglesMeshMap& getTriangleMeshes() { return _trianglesMeshes; }
 
+    BRAYNS_API SimulationData& getSimulationData() { return _simulationData; }
+
 protected:
     // Parameters
     SceneParameters& _sceneParameters;
@@ -165,6 +172,9 @@ class Scene
     TexturesMap _textures;
     Lights _lights;
 
+    // Simulation
+    SimulationData _simulationData;
+
     Boxf _bounds;
     bool _isEmpty;
 };

diff --git a/brayns/common/types.h b/brayns/common/types.h
@@ -211,16 +211,21 @@ struct ExtensionParameters
     EnginePtr engine;
 };
 
+/** Extension parameters */
+struct SimulationData
+{
+    std::map< uint64_t, floats > valuesPerFrame;
+};
+
 /** Some 'special' materials are used by Brayns to acomplish specific features
- *  such as simulations, or skyboxes.
+ *  such as skyboxes.
  */
 const size_t NO_MATERIAL = -1;
 const size_t NB_MAX_MATERIALS = 200;
 const size_t NB_SYSTEM_MATERIALS = 3;
 const size_t MATERIAL_SYSTEM = NB_MAX_MATERIALS - NB_SYSTEM_MATERIALS;
 const size_t MATERIAL_SKYBOX = MATERIAL_SYSTEM + 0;
-const size_t MATERIAL_SIMULATION = MATERIAL_SYSTEM + 1;
-const size_t MATERIAL_BOUNDING_BOX = MATERIAL_SYSTEM + 2;
+const size_t MATERIAL_BOUNDING_BOX = MATERIAL_SYSTEM + 1;
 const std::string TEXTURE_NAME_SKYBOX = "SKYBOX";
 const std::string TEXTURE_NAME_SIMULATION = "SIMULATION";