update to Radium master 082020

src/Mara/Gui/RendererControl.cpp

@@ -27,14 +27,12 @@ RendererControl::RendererControl( QWidget* /*parent*/ ) {
     auto vertFiller = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
     panelLayout->addSpacerItem( vertFiller );
 
-    connect(
-        rendererList,
-        static_cast<void ( QComboBox::* )( const QString& )>( &QComboBox::currentIndexChanged ),
-        [=]( const QString& s ) { this->changeRenderer( s.toStdString() ); } );
-    connect(
-        m_textureList,
-        static_cast<void ( QComboBox::* )( const QString& )>( &QComboBox::currentIndexChanged ),
-        [=]( const QString& s ) { this->changeTexture( s.toStdString() ); } );
+    connect( rendererList,
+             static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ),
+             [=]( int i ) { this->changeRenderer( rendererList->itemText( i ).toStdString() ); } );
+    connect( m_textureList,
+             static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ),
+             [=]( int i ) { this->changeTexture( m_textureList->itemText( i ).toStdString() ); } );
     connect( b_fitCamera, &QPushButton::clicked, this, &RendererControl::fitCamera );
     connect( b_resetCamera, &QPushButton::clicked, this, &RendererControl::resetCamera );
 }

src/libRender/RadiumNBR/EnvMap.cpp

@@ -202,7 +202,7 @@ static Geometry::TriangleMesh makeSkyBox( const Aabb& aabb ) {
                          Vector3( 0, +1, 0 ),
                          Vector3( 0, +1, 0 ) } );
 
-    result.m_indices = {
+    result.setIndices( {
         Vector3ui( 0, 1, 2 ),
         Vector3ui( 0, 2, 3 ), // Floor
         Vector3ui( 4, 5, 6 ),
@@ -215,7 +215,7 @@ static Geometry::TriangleMesh makeSkyBox( const Aabb& aabb ) {
         Vector3ui( 16, 18, 19 ), // Bottom
         Vector3ui( 20, 21, 22 ),
         Vector3ui( 20, 22, 23 ) // Top
-    };
+    } );
 
     Vector3Array texcoord = { // Floor Face (Z-)
                               Vector3( 0_ra, 0_ra, 0_ra ),