Merge remote-tracking branch 'origin/dev-ndy' into dev-sge

VTX-Molecular-Visualization · Mar 13, 2024 · dcb36d5 · dcb36d5
2 parents a105b53 + c6ab637
commit dcb36d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/app/include/app/component/render/proxy_molecule.hpp b/lib/app/include/app/component/render/proxy_molecule.hpp
@@ -20,9 +20,9 @@ namespace VTX::App::Component::Render
 	  private:
 		std::vector<uchar> generateAtomColors( const VTX::Core::Struct::Molecule & p_molStruct ) const;
 		std::vector<float> generateAtomRadii( const VTX::Core::Struct::Molecule & p_molStruct ) const;
-		std::vector<uint>  generateAtomUids( const Component::Chemistry::Molecule & p_molStruct ) const;
+		std::vector<uint>  generateAtomUids( const Component::Chemistry::Molecule & p_molComp ) const;
 		std::vector<uchar> generateResidueColors( const VTX::Core::Struct::Molecule & p_molStruct ) const;
-		std::vector<uint>  generateResidueUids( const Component::Chemistry::Molecule & p_molStruct ) const;
+		std::vector<uint>  generateResidueUids( const Component::Chemistry::Molecule & p_molComp ) const;
 
 		std::unique_ptr<VTX::Renderer::Proxy::Molecule> _proxyPtr = nullptr;
 	};

diff --git a/lib/app/src/app/component/render/proxy_molecule.cpp b/lib/app/src/app/component/render/proxy_molecule.cpp
@@ -20,9 +20,9 @@ namespace VTX::App::Component::Render
 
 		const std::vector<uchar> atomColors	   = generateAtomColors( molStruct );
 		const std::vector<float> atomRadii	   = generateAtomRadii( molStruct );
-		const std::vector<uint>	 atomIds	   = generateAtomUids( molStruct );
+		const std::vector<uint>	 atomIds	   = generateAtomUids( molComp );
 		const std::vector<uchar> residueColors = generateResidueColors( molStruct );
-		const std::vector<uint>	 residueIds	   = generateResidueUids( molStruct );
+		const std::vector<uint>	 residueIds	   = generateResidueUids( molComp );
 
 		_proxyPtr = std::make_unique<VTX::Renderer::Proxy::Molecule>( VTX::Renderer::Proxy::Molecule {
 			&transformComp.getTransform().get(),

diff --git a/lib/app/src/app/entity/scene/molecule_entity.cpp b/lib/app/src/app/entity/scene/molecule_entity.cpp
@@ -47,6 +47,5 @@ namespace VTX::App::Entity::Scene
 	)
 	{
 		SceneItemEntityBuilder::postSetup( p_entity, p_extraData );
-		RENDERER().addProxyMolecule( MAIN_REGISTRY().getComponent<Renderer::Proxy::Molecule>( p_entity ) );
 	}
 } // namespace VTX::App::Entity::Scene