STORM-IRIT · nmellado · Jul 20, 2022 · Jul 19, 2021 · Mar 31, 2022 · Mar 31, 2022
diff --git a/Shaders/Lines/Wireframe.geom.glsl b/Shaders/Lines/Wireframe.geom.glsl
@@ -20,6 +20,7 @@ in vec4 vPosition[2];
 out vec4 gColor;
 out float pixelWidthDiv2;
 uniform vec2 viewport;
+uniform float pixelWidth;
 vec4 vColor[2];
 
 void main() {
@@ -34,7 +35,6 @@ void main() {
     vec4 scss1 = css1 * css0.w;
 
     vec3 dir           = ( scss1 - scss0 ).xyz;
-    float pixelWidth   = 1.8;
     const float border = 4.;
     vec3 slope         = normalize( vec3( -dir.y, dir.x, 0 ) );
     vec4 n             = vec4( vec3( pixelWidth + border ) / vp * slope, 0 );

diff --git a/doc/concepts/mesh.md b/doc/concepts/mesh.md
@@ -3,13 +3,15 @@
 
 # Geometry types
 
+(todo update according to MultiIndexedGeometry)
 There is three kind of geometry representation included in radium source :
 
 1. Ra::Core::Geometry::*, which handles geometry data and connectivity as a indexed vertex array.
 Each vertex is a unique set of position, normal, and other attributes.
 If indexed, faces are defined with VectorXui, where X is 1 for point, 2 for lines, 3 for triangles, and N for polygons.
 See inheritance diagram of Ra::Core::Geometry::AbstractGeometry :
     - Ra::Core::Geometry::AttribArrayGeometry
+    - Ra::Core::Geometry::MultiIndexedGeometry*
     - Ra::Core::Geometry::IndexedGeometry
     - Ra::Core::Geometry::LineStrip *
     - Ra::Core::Geometry::PointCloud *
@@ -20,14 +22,12 @@ See inheritance diagram of Ra::Core::Geometry::AbstractGeometry :
 2. Ra::Core::Geometry::TopologicalMesh, which is an half-edge data structure.
 A converter allows to go back and forth to `TriangleMesh`
 without loss of data, but during the conversion, vertices with the same position represents the same topological point (and are hence merged).
-**Soon deprecated:** The other vertex attributes are stored on half-edges (to manage multiple normals per 3D positions
-for instance).
-**New:** The other vertex attributes are stored on wedges. Each half-edge has one wedge index. If multiple half-edge have the same set of attributes (including vertex position) they have the same wedge index at construction. See section [wedges](#wedges) below.
+The other vertex attributes are stored on wedges. Each half-edge has one wedge index. If multiple half-edge have the same set of attributes (including vertex position) they have the same wedge index at construction. See section [wedges](#wedges) below.
 3. Ra::Engine::Data::*, which stores a Core Geometry to handle 3D data, and manages the rendering aspect of it (VAO, VBO, draw call).
 See inheritance diagram of Ra::Engine::Data::AttribArrayDisplayable
     - Ra::Engine::Data::Displayable
     - Ra::Engine::Data::AttribArrayDisplayable
-    - Ra::Engine::Data::CoreGeometryDisplayable
+    - Ra::Engine::Data::GeometryDisplayable *
     - Ra::Engine::Data::PointCloud *
     - Ra::Engine::Data::IndexedGeometry
     - Ra::Engine::Data::IndexedAttribArrayDisplayable

diff --git a/examples/CustomCameraManipulator/main.cpp b/examples/CustomCameraManipulator/main.cpp
@@ -52,7 +52,7 @@ int main( int argc, char* argv[] ) {
 
     //! [Create a geometry component with the cube]
     auto c =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
+        new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
     //! [Create a geometry component with the cube]
 
     //! [Register the entity/component association to the geometry system ]

diff --git a/examples/DrawPrimitives/AllPrimitivesComponent.cpp b/examples/DrawPrimitives/AllPrimitivesComponent.cpp
diff --git a/examples/DrawPrimitives/minimalapp.cpp b/examples/DrawPrimitives/minimalapp.cpp
@@ -88,6 +88,12 @@ void MinimalApp::initialize( const glbinding::Version& version ) {
     m_viewer_widget->setAutoFillBackground( false );
     m_viewer_widget->resize( 500, 500 );
     m_viewer_widget->show();
+
+    auto quit_action = new QAction( this );
+    quit_action->setShortcuts( { QKeySequence::Close, QKeySequence::Quit } );
+    connect( quit_action, &QAction::triggered, this, &QApplication::quit );
+    m_viewer_widget->addAction( quit_action );
+
     return;
 }
 

diff --git a/examples/EntityAnimation/main.cpp b/examples/EntityAnimation/main.cpp
@@ -119,7 +119,7 @@ int main( int argc, char* argv[] ) {
 
         //! [Create a geometry component with the cube]
         // component ownership is transfered to entity in component ctor
-        new Scene::TriangleMeshComponent( "Fixed cube geometry", e, std::move( cube ), nullptr );
+        new Scene::SurfaceMeshComponent( "Fixed cube geometry", e, std::move( cube ), nullptr );
         //! [Create a geometry component with the cube]
     }
     //! [Create the demo fixed entity/component]
@@ -141,7 +141,7 @@ int main( int argc, char* argv[] ) {
         // an animated yellow cube
         auto cube =
             Geometry::makeSharpBox( { 0.1f, 0.1f, 0.1f }, Ra::Core::Utils::Color::Yellow() );
-        new Scene::TriangleMeshComponent( "Fixed cube geometry", e, std::move( cube ), nullptr );
+        new Scene::SurfaceMeshComponent( "Fixed cube geometry", e, std::move( cube ), nullptr );
 
         // an animated camera, thay is not the one active at startup. Use key '0' to activate
         auto camera = new Scene::CameraComponent( e, "Animated Camera" );

diff --git a/examples/EnvMap/main.cpp b/examples/EnvMap/main.cpp
@@ -87,7 +87,7 @@ int main( int argc, char* argv[] ) {
     //! [Create the engine entity for the cube]
 
     //! [Create a geometry component with the cube]
-    new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
+    new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
     //! [Create a geometry component with the cube]
 
     //! [Place the camera away from the cube]

diff --git a/examples/HelloRadium/main.cpp b/examples/HelloRadium/main.cpp
@@ -42,7 +42,7 @@ int main( int argc, char* argv[] ) {
 
     //! [Create a geometry component with the cube]
     auto c =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
+        new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
     //! [Create a geometry component with the cube]
 
     //! [Register the entity/component association to the geometry system ]

diff --git a/examples/KeyEvent/main.cpp b/examples/KeyEvent/main.cpp
@@ -24,6 +24,8 @@
 /**
  * Simple custom windows for custom KeyEvent demonstration
  */
+using Ra::Core::Geometry::makeSharpBox;
+
 class DemoWindow : public Ra::Gui::SimpleWindow
 {
     Q_OBJECT
@@ -74,19 +76,19 @@ class DemoWindow : public Ra::Gui::SimpleWindow
     //! [Manage KeyEvent reaching the window]
     /// Custom Key event management method
     void colorup() {
-        auto& mesh = dynamic_cast<Ra::Core::Geometry::TriangleMesh&>(
+        auto& mesh = dynamic_cast<Ra::Core::Geometry::MultiIndexedGeometry&>(
             m_obj->getMesh()->getAbstractGeometry() );
         m_colIdx = ( m_colIdx + 1 ) % 10;
         mesh.colorize( m_colors[m_colIdx] );
     }
     void colordown() {
-        auto& mesh = dynamic_cast<Ra::Core::Geometry::TriangleMesh&>(
+        auto& mesh = dynamic_cast<Ra::Core::Geometry::MultiIndexedGeometry&>(
             m_obj->getMesh()->getAbstractGeometry() );
         m_colIdx = ( m_colIdx + 9 ) % 10;
         mesh.colorize( m_colors[m_colIdx] );
     }
     void colorreset() {
-        auto& mesh = dynamic_cast<Ra::Core::Geometry::TriangleMesh&>(
+        auto& mesh = dynamic_cast<Ra::Core::Geometry::MultiIndexedGeometry&>(
             m_obj->getMesh()->getAbstractGeometry() );
         m_colIdx = 0;
         mesh.colorize( m_colors[m_colIdx] );
@@ -135,7 +137,7 @@ int main( int argc, char* argv[] ) {
     //! [Creating the application]
 
     //! [Creating the cube]
-    auto cube = Ra::Core::Geometry::makeSharpBox( { 0.1f, 0.1f, 0.1f } );
+    auto cube = makeSharpBox( { 0.1f, 0.1f, 0.1f } );
     //! [Creating the cube]
 
     //! [Colorize the Cube]
@@ -150,7 +152,7 @@ int main( int argc, char* argv[] ) {
 
     //! [Create a geometry component with the cube]
     auto c =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
+        new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
     //! [Create a geometry component with the cube]
 
     //! [Register the entity/component association to the geometry system ]

diff --git a/examples/Picking/main.cpp b/examples/Picking/main.cpp
@@ -122,7 +122,7 @@ void addDummyScene( Ra::Gui::BaseApplication& app ) {
     auto cube = Ra::Core::Geometry::makeSharpBox( { 0.1f, 0.1f, 0.1f } );
     auto e    = app.m_engine->getEntityManager()->createEntity( "Cube" );
     auto c =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
+        new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", e, std::move( cube ), nullptr );
 
     auto geometrySystem = app.m_engine->getSystem( "GeometrySystem" );
     geometrySystem->addComponent( e, c );

diff --git a/examples/RawShaderMaterial/main.cpp b/examples/RawShaderMaterial/main.cpp
@@ -105,8 +105,7 @@ std::shared_ptr<Ra::Engine::Rendering::RenderObject> initQuad( Ra::Gui::BaseAppl
     Ra::Core::Asset::RawShaderMaterialData mat { "Quad Material", _config1, paramProvider };
 
     //! [Create a geometry component using the custom material]
-    auto c =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Quad Mesh", e, std::move( quad ), &mat );
+    auto c = new Ra::Engine::Scene::SurfaceMeshComponent( "Quad Mesh", e, std::move( quad ), &mat );
 
     //! [Register the entity/component association to the geometry system ]
     auto system = app.m_engine->getSystem( "GeometrySystem" );

diff --git a/examples/SimpleAnimation/main.cpp b/examples/SimpleAnimation/main.cpp
@@ -39,20 +39,21 @@
  *      - Add the animation component to the animation system
  *
  */
-class KeyFramedGeometryComponent : public Ra::Engine::Scene::TriangleMeshComponent
+class KeyFramedGeometryComponent : public Ra::Engine::Scene::SurfaceMeshComponent
 {
   public:
-    /*!
+    /**
      * Constructor from an existing core mesh
      * \warning Moves the mesh and takes its ownership
      */
-    inline KeyFramedGeometryComponent( const std::string& name,
-                                       Ra::Engine::Scene::Entity* entity,
-                                       Ra::Core::Geometry::TriangleMesh&& mesh ) :
-        Ra::Engine::Scene::TriangleMeshComponent( name,
-                                                  entity,
-                                                  std::move( mesh ),
-                                                  new Ra::Core::Asset::BlinnPhongMaterialData {} ),
+    inline KeyFramedGeometryComponent(
+        const std::string& name,
+        Ra::Engine::Scene::Entity* entity,
+        Ra::Engine::Scene::SurfaceMeshComponent::CoreMeshType&& mesh ) :
+        Ra::Engine::Scene::SurfaceMeshComponent( name,
+                                                 entity,
+                                                 std::move( mesh ),
+                                                 new Ra::Core::Asset::BlinnPhongMaterialData {} ),
         m_transform( 0_ra, Ra::Core::Transform::Identity() ) {
         //! [Creating the transform KeyFrames]
         Ra::Core::Transform T = Ra::Core::Transform::Identity();

diff --git a/examples/SimpleSkinning/main.cpp b/examples/SimpleSkinning/main.cpp
@@ -5,12 +5,15 @@
 #include <Engine/FrameInfo.hpp>
 #include <Engine/RadiumEngine.hpp>
 #include <Engine/Scene/CameraManager.hpp>
+#include <Engine/Scene/DefaultLightManager.hpp>
+#include <Engine/Scene/DirLight.hpp>
 #include <Engine/Scene/EntityManager.hpp>
 #include <Engine/Scene/GeometryComponent.hpp>
 #include <Engine/Scene/SkeletonBasedAnimationSystem.hpp>
 #include <Engine/Scene/SkeletonComponent.hpp>
 #include <Engine/Scene/SkinningComponent.hpp>
 #include <Engine/Scene/System.hpp>
+#include <Engine/Scene/SystemDisplay.hpp>
 #include <Gui/BaseApplication.hpp>
 #include <Gui/RadiumWindow/SimpleWindowFactory.hpp>
 #include <Gui/Viewer/Viewer.hpp>
@@ -71,6 +74,13 @@ class SkinningSystem : public Scene::System
 };
 
 void setupScene( Ra::Engine::RadiumEngine* engine ) {
+
+    DefaultLightManager* lightManager =
+        static_cast<DefaultLightManager*>( engine->getSystem( "DefaultLightManager" ) );
+    auto light = new Engine::Scene::DirectionalLight(
+        Ra::Engine::Scene::SystemEntity::getInstance(), "light" );
+    lightManager->addLight( light );
+
     auto animationSystem = new SkinningSystem;
     engine->registerSystem( "Simple animation system", animationSystem );
 
@@ -81,7 +91,7 @@ void setupScene( Ra::Engine::RadiumEngine* engine ) {
 
     // component ownership is transfered to entity in component ctor
     auto meshComponent =
-        new TriangleMeshComponent( "Cylinder", entity, std::move( cylinder ), nullptr );
+        new SurfaceMeshComponent( "Cylinder", entity, std::move( cylinder ), nullptr );
 
     // create a squeleton with three bones.
     std::map<std::string, Core::Transform> boneMatrices;

diff --git a/examples/TexturedQuad/main.cpp b/examples/TexturedQuad/main.cpp
@@ -53,7 +53,7 @@ int main( int argc, char* argv[] ) {
                           textureHandle );
 
     // the entity get's this new component ownership. A bit wired since hidden in ctor.
-    new Ra::Engine::Scene::TriangleMeshComponent( "Quad Mesh", e, std::move( quad ), material );
+    new Ra::Engine::Scene::SurfaceMeshComponent( "Quad Mesh", e, std::move( quad ), material );
     //! [Create an entity and component to draw or data]
 
     app.m_mainWindow->prepareDisplay();

diff --git a/examples/TexturedQuadDynamic/main.cpp b/examples/TexturedQuadDynamic/main.cpp
@@ -58,7 +58,7 @@ int main( int argc, char* argv[] ) {
     material->setSpecularColor( Ra::Core::Utils::Color::Black() );
 
     // the entity get's this new component ownership. a bit wired since hidden in ctor.
-    new Ra::Engine::Scene::TriangleMeshComponent( "Quad Mesh", e, std::move( quad ), material );
+    new Ra::Engine::Scene::SurfaceMeshComponent( "Quad Mesh", e, std::move( quad ), material );
     //! [Create an entity and component to draw or data]
 
     //! [Tell the window that something is to be displayed]

diff --git a/examples/Volume/main.cpp b/examples/Volume/main.cpp
@@ -86,7 +86,7 @@ int main( int argc, char* argv[] ) {
 
     //! [Create a geometry component with the cube]
     auto cc =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", ce, std::move( cube ), nullptr );
+        new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", ce, std::move( cube ), nullptr );
     //! [Create a geometry component with the cube]
 
     //! [Register the entity/component association to the geometry system ]
@@ -125,7 +125,7 @@ int main( int argc, char* argv[] ) {
 
     //! [Create a geometry component with the cube]
     auto cc =
-        new Ra::Engine::Scene::TriangleMeshComponent( "Cube Mesh", ce, std::move( cube ), nullptr );
+        new Ra::Engine::Scene::SurfaceMeshComponent( "Cube Mesh", ce, std::move( cube ), nullptr );
     //! [Create a geometry component with the cube]
 
     //! [Register the entity/component association to the geometry system ]

diff --git a/src/Core/Animation/LinearBlendSkinning.cpp b/src/Core/Animation/LinearBlendSkinning.cpp
@@ -1,5 +1,3 @@
-#include <Core/Animation/HandleArray.hpp>
-#include <Core/Animation/HandleWeight.hpp>
 #include <Core/Animation/LinearBlendSkinning.hpp>
 #include <Core/Animation/Skeleton.hpp>
 #include <Core/Animation/SkinningData.hpp>
@@ -43,9 +41,10 @@ void linearBlendSkinning( const SkinningRefData& refData,
             const Scalar w                 = it.value();
             // prepare the pose w.r.t. the bind matrix and the mesh transform
             const Transform M = refData.m_meshTransformInverse * pose[j] * bindMatrix[j];
+            const Matrix3 N   = M.matrix().inverse().transpose().block<3, 3>( 0, 0 );
             // apply LBS
             frameData.m_currentPosition[i] += w * ( M * vertices[i] );
-            frameData.m_currentNormal[i] += w * ( M.linear() * normals[i] );
+            frameData.m_currentNormal[i] += w * ( N * normals[i] );
             frameData.m_currentTangent[i] += w * ( M.linear() * tangents[i] );
             frameData.m_currentBitangent[i] += w * ( M.linear() * bitangents[i] );
         }

diff --git a/src/Core/Animation/RotationCenterSkinning.cpp b/src/Core/Animation/RotationCenterSkinning.cpp
@@ -1,3 +1,4 @@
+#include "Core/Geometry/IndexedGeometry.hpp"
 #include <Core/Animation/RotationCenterSkinning.hpp>
 
 #include <array>
@@ -52,9 +53,9 @@ void computeCoR( SkinningRefData& dataInOut, Scalar sigma, Scalar weightEpsilon
     //
 
     // convert the mesh to TopologicalMesh for easy processing.
-    Geometry::TriangleMesh triMesh;
+    Geometry::MultiIndexedGeometry triMesh;
     triMesh.copy( dataInOut.m_referenceMesh );
-    Geometry::TopologicalMesh topoMesh( triMesh );
+    Geometry::TopologicalMesh topoMesh( triMesh, triMesh.default_layer_key() );
 
     // hashing function for Vector3
     struct hash_vec {

diff --git a/src/Core/Animation/SkinningData.hpp b/src/Core/Animation/SkinningData.hpp
@@ -3,7 +3,8 @@
 #include <Core/Animation/HandleWeight.hpp>
 #include <Core/Animation/Pose.hpp>
 #include <Core/Animation/Skeleton.hpp>
-#include <Core/Geometry/TriangleMesh.hpp>
+#include <Core/Geometry/AttribArrayGeometry.hpp>
+#include <Core/Geometry/IndexedGeometry.hpp>
 #include <Core/RaCore.hpp>
 
 namespace Ra {
@@ -13,7 +14,7 @@ namespace Animation {
 /// \brief Skinning data that get set at startup including the "reference state".
 struct SkinningRefData {
     /// The mesh in reference position.
-    Geometry::TriangleMesh m_referenceMesh;
+    Core::Geometry::MultiIndexedGeometry m_referenceMesh;
 
     /// The inverse of the mesh's transform.
     Transform m_meshTransformInverse;

diff --git a/src/Core/Asset/GeometryData.hpp b/src/Core/Asset/GeometryData.hpp
@@ -3,8 +3,9 @@
 #include <Core/Asset/AssetData.hpp>
 #include <Core/Asset/MaterialData.hpp>
 #include <Core/Containers/VectorArray.hpp>
+#include <Core/Geometry/AttribArrayGeometry.hpp>
+#include <Core/Geometry/IndexedGeometry.hpp>
 #include <Core/Geometry/StandardAttribNames.hpp>
-#include <Core/Geometry/TriangleMesh.hpp>
 #include <Core/RaCore.hpp>
 #include <Core/Types.hpp>
 #include <Core/Utils/Attribs.hpp>
@@ -139,6 +140,7 @@ class RA_CORE_API GeometryData : public AssetData
     GeometryType m_type;
 
     /// Named attributes
+    /// \todo switch to shared ptr ?
     Core::Geometry::MultiIndexedGeometry m_geometry;
 
     /// Simple tracking of geometric primitive number

diff --git a/src/Core/Asset/MaterialData.hpp b/src/Core/Asset/MaterialData.hpp
@@ -13,7 +13,7 @@ namespace Asset {
  * Material data must be identified by a unique name.
  * Radium Engine reserves the following names
  *  "AbstractMaterial"  --> unknown material, might serve for error management
- *  "BlinnPhong"        --> standar Blinn-Phong Material
+ *  "BlinnPhong"        --> standard Blinn-Phong Material
  *
  *  When extending the material system with a loader plugin (or something similar) :
  *      Define your own "Asset" class derived from Ra::Core::Asset::MaterialData with the "type"

diff --git a/src/Core/Containers/AdjacencyList.hpp b/src/Core/Containers/AdjacencyList.hpp
@@ -56,7 +56,7 @@ class RA_CORE_API AdjacencyList
     void pruneLeaves( std::vector<uint>& pruned, std::vector<bool>& delete_flag );
     /// Prune the leaves of the graph.
     void pruneLeaves();
-    /*!
+    /**
      * Return the edge list built from the given adjacency list.
      * If include_leaf is true, the list will contain the pairs:
      *       ...

diff --git a/src/Core/CoreMacros.hpp b/src/Core/CoreMacros.hpp
@@ -259,7 +259,7 @@ using Scalar = float;
 using Scalar = double;
 #endif
 
-/*!
+/**
  * User litteral for Radium's Scalar type for floating point numbers
  * \see https://en.cppreference.com/w/cpp/language/user_literal
  * To create a Scalar from a litteral float, do:
@@ -272,7 +272,7 @@ constexpr Scalar operator"" _ra ( long double n )
     return Scalar( n );
 }
 
-/*!
+/**
  * \brief User litteral for Radium's Scalar type for floating point numbers
  * \see https://en.cppreference.com/w/cpp/language/user_literal
  * To create a Scalar from a litteral, do: