Merge branch 'dev' of https://github.com/VTX-Molecular-Visualization/VTX

into dev-vge
VTX-Molecular-Visualization · Sep 10, 2024 · da773a3 · da773a3
2 parents 2e88307 + 660a0ed
commit da773a3
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 331 deletions.
diff --git a/app/bench/src/scene.cpp b/app/bench/src/scene.cpp
@@ -43,8 +43,8 @@ namespace VTX::Bench
 			_molecules.emplace_back( std::make_unique<Core::Struct::Molecule>( downloadMolecule( p_name ) ) );
 		}
 
-		_molecules.back()->transform
-			= Math::translate( _molecules.back()->transform, Math::randomVec3f() * 200.f - 100.f );
+		//_molecules.back()->transform
+		//	= Math::translate( _molecules.back()->transform, Math::randomVec3f() * 200.f - 100.f );
 		IO::Util::SecondaryStructure::computeStride( *_molecules.back() );
 		_proxyMolecules.emplace_back( _proxify( *_molecules.back() ) );
 		_directions.emplace_back( Math::randomVec3f() * 2.f - 1.f );

diff --git a/lib/app/include/app/controller/shortcut/debug.hpp b/lib/app/include/app/controller/shortcut/debug.hpp
diff --git a/lib/app/include/app/controller/shortcut/global.hpp b/lib/app/include/app/controller/shortcut/global.hpp
diff --git a/lib/app/include/app/controller/shortcut/visualization.hpp b/lib/app/include/app/controller/shortcut/visualization.hpp
diff --git a/lib/app/include/app/core/controller/base_controller.hpp b/lib/app/include/app/core/controller/base_controller.hpp
@@ -24,7 +24,7 @@ namespace VTX::App::Core::Controller
 
 		// inline bool isTargetWidgetFocused() const { return _widgetTarget == nullptr || _widgetTarget->hasFocus(); }
 
-		virtual VTX::Hash		getHashedCollectionID() const = 0;
+		virtual VTX::Hash						getHashedCollectionID() const = 0;
 		virtual std::unique_ptr<BaseController> clone() const				  = 0;
 
 	  protected:

diff --git a/lib/app/include/app/core/controller/base_shortcut_controller.hpp b/lib/app/include/app/core/controller/base_shortcut_controller.hpp
diff --git a/lib/app/include/app/core/controller/concepts.hpp b/lib/app/include/app/core/controller/concepts.hpp
@@ -0,0 +1,12 @@
+#ifndef __VTX_APP_CORE_CONTROLLER_CONCEPT__
+#define __VTX_APP_CORE_CONTROLLER_CONCEPT__
+
+#include <concepts>
+
+template<typename C>
+concept Concept = requires( C p_controller, const float p_deltaTime ) {
+	{ p_controller.init() } -> std::same_as<void>;
+	{ p_controller.update( p_deltaTime ) } -> std::same_as<void>;
+};
+
+#endif
diff --git a/lib/app/include/app/core/init_visualization_mode.hpp b/lib/app/include/app/core/init_visualization_mode.hpp
diff --git a/lib/app/include/app/mode/base_mode.hpp b/lib/app/include/app/mode/base_mode.hpp
@@ -15,6 +15,7 @@ namespace VTX::App::Mode
 		virtual const std::string & getName() const = 0;
 
 		virtual void enter() {}
+		// TODO: use concept to avoid virtual call in main loop.
 		virtual void update( const float p_deltaTime ) {};
 		virtual void exit() {};
 	};

diff --git a/lib/app/src/app/controller/shortcut/debug.cpp b/lib/app/src/app/controller/shortcut/debug.cpp
diff --git a/lib/app/src/app/controller/shortcut/global.cpp b/lib/app/src/app/controller/shortcut/global.cpp
diff --git a/lib/app/src/app/controller/shortcut/visualization.cpp b/lib/app/src/app/controller/shortcut/visualization.cpp
diff --git a/lib/app/src/app/core/animation/animation_system.cpp b/lib/app/src/app/core/animation/animation_system.cpp
@@ -4,13 +4,7 @@
 
 namespace VTX::App::Core::Animation
 {
-	AnimationSystem::AnimationSystem()
-	{
-		_currentAnimationIt = _animationSequence.end();
-
-		// TODO: call from app::update().
-		// APP::onUpdate += [ this ]( const float p_deltaTime, const float p_elapsedTime ) { update( p_deltaTime ); };
-	}
+	AnimationSystem::AnimationSystem() { _currentAnimationIt = _animationSequence.end(); }
 
 	void AnimationSystem::play()
 	{

diff --git a/lib/app/src/app/core/controller/base_shortcut_controller.cpp b/lib/app/src/app/core/controller/base_shortcut_controller.cpp
diff --git a/lib/app/src/app/core/init_visualization_mode.cpp b/lib/app/src/app/core/init_visualization_mode.cpp