Refresh renderer from representation settings

VTX-Molecular-Visualization · Nov 13, 2024 · 10d941c · 10d941c
1 parent 7bb0fe0
commit 10d941c
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 17 deletions.
diff --git a/lib/app/include/app/component/representation/representation.hpp b/lib/app/include/app/component/representation/representation.hpp
@@ -36,7 +36,7 @@ namespace VTX::App::Component::Representation
 			{
 				_representation.radiusSphereAdd = p_value;
 			}
-			else if constexpr ( S == E_REPRESENTATION_SETTINGS::RADIUS_FIXED )
+			else if constexpr ( S == E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED )
 			{
 				_representation.radiusFixed = p_value;
 			}

diff --git a/lib/app/src/app/component/representation/representation.cpp b/lib/app/src/app/component/representation/representation.cpp
@@ -8,11 +8,11 @@ namespace VTX::App::Component::Representation
 	{
 		// TODO: move default layout.
 		_representation.hasSphere		  = true;
-		_representation.radiusSphereFixed = 0.4f;
+		_representation.radiusSphereFixed = 0.1f;
 		_representation.radiusSphereAdd	  = 0.f;
-		_representation.radiusFixed		  = false;
+		_representation.radiusFixed		  = true;
 
-		_representation.hasCylinder			  = true;
+		_representation.hasCylinder			  = false;
 		_representation.radiusCylinder		  = 0.1f;
 		_representation.cylinderColorBlending = false;
 
@@ -31,7 +31,7 @@ namespace VTX::App::Component::Representation
 		_proxy->set( E_REPRESENTATION_SETTINGS::HAS_SPHERE, _representation.hasSphere );
 		_proxy->set( E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_FIXED, _representation.radiusSphereFixed );
 		_proxy->set( E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_ADD, _representation.radiusSphereAdd );
-		_proxy->set( E_REPRESENTATION_SETTINGS::RADIUS_FIXED, _representation.radiusFixed );
+		_proxy->set( E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED, _representation.radiusFixed );
 
 		_proxy->set( E_REPRESENTATION_SETTINGS::HAS_CYLINDER, _representation.hasCylinder );
 		_proxy->set( E_REPRESENTATION_SETTINGS::RADIUS_CYLINDER, _representation.radiusCylinder );

diff --git a/lib/renderer/include/renderer/proxy/proxy_pointer_collection.hpp b/lib/renderer/include/renderer/proxy/proxy_pointer_collection.hpp
@@ -13,21 +13,21 @@ namespace VTX::Renderer::Proxy
 		template<typename T>
 		void set( const uint p_key, const T & p_value )
 		{
-			settings.emplace( p_key, &p_value );
+			_collection.emplace( p_key, &p_value );
 		}
 
 		// TODO: type check?
 		template<typename T>
 		const T & get( const uint p_key )
 		{
-			assert( settings.contains( p_key ) );
-			assert( settings[ p_key ] != nullptr );
+			assert( _collection.contains( p_key ) );
+			assert( _collection[ p_key ] != nullptr );
 
-			return *static_cast<const T *>( settings[ p_key ] );
+			return *static_cast<const T *>( _collection[ p_key ] );
 		}
 
 	  private:
-		std::unordered_map<uint, const void *> settings;
+		std::unordered_map<uint, const void *> _collection;
 	};
 
 } // namespace VTX::Renderer::Proxy

diff --git a/lib/renderer/include/renderer/proxy/representation.hpp b/lib/renderer/include/renderer/proxy/representation.hpp
@@ -10,7 +10,7 @@ namespace VTX::Renderer::Proxy
 		HAS_SPHERE,
 		RADIUS_SPHERE_FIXED,
 		RADIUS_SPHERE_ADD,
-		RADIUS_FIXED,
+		IS_SPHERE_RADIUS_FIXED,
 
 		HAS_CYLINDER,
 		RADIUS_CYLINDER,

diff --git a/lib/renderer/src/renderer/renderer.cpp b/lib/renderer/src/renderer/renderer.cpp
@@ -460,22 +460,88 @@ namespace VTX::Renderer
 			std::end( _proxyRepresentations ), std::begin( p_proxies ), std::end( p_proxies )
 		);
 
+		// We need to draw spheres at cylinder radius when no spheres asked.
+		static auto refreshSphereUniFun = [ & ]( Proxy::Representation * const p_representation )
+		{
+			showAtoms = true;
+			if ( p_representation->get<bool>( E_REPRESENTATION_SETTINGS::HAS_SPHERE ) )
+			{
+				setValue(
+					p_representation->get<float>( E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_FIXED ),
+					"Sphere radius fixed",
+					0
+				);
+				setValue(
+					p_representation->get<float>( E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_ADD ), "Sphere radius add", 0
+				);
+				setValue(
+					uint( p_representation->get<bool>( E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED ) ),
+					"Is sphere radius fixed",
+					0
+				);
+			}
+			else
+			{
+				if ( p_representation->get<bool>( E_REPRESENTATION_SETTINGS::HAS_CYLINDER ) )
+				{
+					setValue( uint( true ), "Is sphere radius fixed", 0 );
+					setValue(
+						p_representation->get<float>( E_REPRESENTATION_SETTINGS::RADIUS_CYLINDER ),
+						"Sphere radius fixed",
+						0
+					);
+				}
+				else
+				{
+					showAtoms = false;
+				}
+			}
+		};
+
 		std::vector<_StructUBORepresentation> representations;
-		for ( Proxy::Representation * const representation : p_proxies )
+		for ( Proxy::Representation * const representation : _proxyRepresentations )
 		{
 			representations.emplace_back( _StructUBORepresentation {
 				representation->get<float>( E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_FIXED ),
 				representation->get<float>( E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_ADD ),
-				representation->get<bool>( E_REPRESENTATION_SETTINGS::RADIUS_FIXED ),
+				representation->get<bool>( E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED ),
 				representation->get<float>( E_REPRESENTATION_SETTINGS::RADIUS_CYLINDER ),
 				representation->get<bool>( E_REPRESENTATION_SETTINGS::CYLINDER_COLOR_BLENDING ),
 				representation->get<bool>( E_REPRESENTATION_SETTINGS::RIBBON_COLOR_BLENDING ) } );
 
+			// showAtoms	= representation->get<bool>( E_REPRESENTATION_SETTINGS::HAS_SPHERE );
+			showBonds	= representation->get<bool>( E_REPRESENTATION_SETTINGS::HAS_CYLINDER );
+			showRibbons = representation->get<bool>( E_REPRESENTATION_SETTINGS::HAS_RIBBON );
+
+			refreshSphereUniFun( representation );
+
 			// Callbacks.
+			representation->onChange<E_REPRESENTATION_SETTINGS::HAS_SPHERE, bool>() +=
+				[ &, representation ]( const bool p_value ) { refreshSphereUniFun( representation ); };
+			representation->onChange<E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED, bool>() +=
+				[ this ]( const bool p_value ) { setValue( uint( p_value ), "Is sphere radius fixed", 0 ); };
+			representation->onChange<E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_FIXED, float>() +=
+				[ this ]( const float p_value ) { setValue( p_value, "Sphere radius fixed", 0 ); };
+			representation->onChange<E_REPRESENTATION_SETTINGS::RADIUS_SPHERE_ADD, float>() +=
+				[ this ]( const float p_value ) { setValue( p_value, "Sphere radius add", 0 ); };
+
+			representation->onChange<E_REPRESENTATION_SETTINGS::HAS_CYLINDER, bool>() +=
+				[ &, representation ]( const bool p_value )
+			{
+				showBonds = p_value;
+				refreshSphereUniFun( representation );
+			};
 			representation->onChange<E_REPRESENTATION_SETTINGS::RADIUS_CYLINDER, float>() +=
-				[ this ]( const float p_value ) { setValue( p_value, "Cylinder radius", 0 ); };
+				[ &, representation ]( const float p_value )
+			{
+				setValue( p_value, "Cylinder radius", 0 );
+				refreshSphereUniFun( representation );
+			};
 			representation->onChange<E_REPRESENTATION_SETTINGS::CYLINDER_COLOR_BLENDING, bool>() +=
 				[ this ]( const bool p_value ) { setValue( uint( p_value ), "Cylinder color blending", 0 ); };
+
+			representation->onChange<E_REPRESENTATION_SETTINGS::HAS_RIBBON, bool>() +=
+				[ this ]( const bool p_value ) { showRibbons = p_value; };
 			representation->onChange<E_REPRESENTATION_SETTINGS::RIBBON_COLOR_BLENDING, bool>() +=
 				[ this ]( const bool p_value ) { setValue( uint( p_value ), "Ribbon color blending", 0 ); };
 		}

diff --git a/lib/ui/qt/src/ui/qt/dock_widget/representations.cpp b/lib/ui/qt/src/ui/qt/dock_widget/representations.cpp
@@ -68,7 +68,7 @@ namespace VTX::UI::QT::DockWidget
 			{
 				App::ACTION_SYSTEM()
 					.execute<App::Action::Representation::
-								 ChangeRepresentation<E_REPRESENTATION_SETTINGS::RADIUS_FIXED, bool>>( p_index );
+								 ChangeRepresentation<E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED, bool>>( p_index );
 			}
 
 		);
@@ -118,7 +118,7 @@ namespace VTX::UI::QT::DockWidget
 		// Callbacks.
 		p_component->callback<E_REPRESENTATION_SETTINGS::HAS_SPHERE, bool>() +=
 			[ groupBox ]( const bool p_value ) { groupBox->setChecked( p_value ); };
-		p_component->callback<E_REPRESENTATION_SETTINGS::RADIUS_FIXED, bool>() +=
+		p_component->callback<E_REPRESENTATION_SETTINGS::IS_SPHERE_RADIUS_FIXED, bool>() +=
 			[ comboBox, labelRadiusAdd, sliderRadiusAdd, labelRadiusFixed, sliderRadiusFixed ]( const bool p_value )
 		{
 			comboBox->setCurrentIndex( int( p_value ) );
@@ -171,7 +171,7 @@ namespace VTX::UI::QT::DockWidget
 		);
 
 		// Radius.
-		auto * labelRadius = new QLabel( "Intensity", groupBox );
+		auto * labelRadius = new QLabel( "Radius", groupBox );
 		auto * slider	   = new QSlider( Qt::Orientation::Horizontal, groupBox );
 		layout->addWidget( labelRadius );
 		layout->addWidget( slider );