Castor3D: Fixed some SonarLint issues.

DragonJoker · Jan 16, 2025 · b7045c0 · b7045c0
1 parent 819ef7d
commit b7045c0
Show file tree

Hide file tree

Showing 51 changed files with 584 additions and 633 deletions.
diff --git a/include/Core/Castor3D/Animation/Animable.hpp b/include/Core/Castor3D/Animation/Animable.hpp
@@ -43,7 +43,7 @@ namespace castor3d
 		 *\~french
 		 *\return		\p true si l'objet a une animation.
 		 */
-		C3D_API bool hasAnimation()const;
+		C3D_API virtual bool hasAnimation()const noexcept;
 		/**
 		 *\~english
 		 *\param[in]	name	The animation name

diff --git a/include/Core/Castor3D/Engine.hpp b/include/Core/Castor3D/Engine.hpp
@@ -78,7 +78,7 @@ namespace castor3d
 		uint32_t overlayCount;
 		uint32_t samplerCount;
 
-		C3D_API EngineCounts( castor3d::Engine const & engine );
+		C3D_API explicit EngineCounts( castor3d::Engine const & engine );
 	};
 
 	struct EngineConfig
@@ -781,7 +781,7 @@ namespace castor3d
 		 *\~french
 		 *\return		Un random engine, avec graine aléatoir si activé.
 		 */
-		C3D_API std::default_random_engine createRandomEngine();
+		C3D_API std::default_random_engine createRandomEngine()const;
 		/**
 		 *\~english
 		 *\brief		Retrieves plug-ins path

diff --git a/include/Core/Castor3D/Gui/Controls/CtrlEdit.hpp b/include/Core/Castor3D/Gui/Controls/CtrlEdit.hpp
@@ -217,7 +217,7 @@ namespace castor3d
 		/** Event when a keyboard key is pressed
 		 *\param[in]	event		The mouse event
 		 */
-		void onKeyUp( KeyboardEvent const & event );
+		void onKeyUp( KeyboardEvent const & event )const;
 
 		/** adds a character at caret index
 		 */
@@ -300,7 +300,7 @@ namespace castor3d
 
 		/** Normalises selection.
 		 */
-		Selection doGetNormalisedSelection();
+		Selection doGetNormalisedSelection()const;
 
 		/** Deletes selected text.
 		 */

diff --git a/include/Core/Castor3D/Gui/GuiModule.hpp b/include/Core/Castor3D/Gui/GuiModule.hpp
@@ -476,7 +476,7 @@ namespace castor3d
 	 *\param[in]	pass	The pass.
 	 *\param[in]	colour	The material colour.
 	 */
-	void setMaterialColour( Pass & pass, castor::HdrRgbColour const & colour );
+	void setMaterialColour( Pass const & pass, castor::HdrRgbColour const & colour );
 
 	/** Retrieves the pass colour.
 	 *\param[in]	pass	The pass.

diff --git a/include/Core/Castor3D/Material/Pass/Pass.hpp b/include/Core/Castor3D/Material/Pass/Pass.hpp
@@ -259,7 +259,7 @@ namespace castor3d
 		 *\brief		Définit la couleur basique de la passe.
 		 *\param[in]	value	La nouvelle valeur.
 		 */
-		C3D_API void setColour( castor::HdrRgbColour const & value );
+		C3D_API void setColour( castor::HdrRgbColour const & value )const;
 		/**
 		 *\~english
 		 *\return		The basic pass colour.
@@ -286,7 +286,7 @@ namespace castor3d
 		*\param vis
 		*	Le ... visiteur.
 		*/
-		C3D_API void accept( ConfigurationVisitorBase & vis );
+		C3D_API void accept( ConfigurationVisitorBase & vis )const;
 		/**
 		 *\~english
 		 *\brief			Fills the pass buffer with this pass data.
@@ -331,7 +331,7 @@ namespace castor3d
 		*	Le ... visiteur.
 		*/
 		C3D_API void fillConfig( TextureConfiguration & config
-			, ConfigurationVisitorBase & vis );
+			, ConfigurationVisitorBase & vis )const;
 
 		C3D_API static void addParsers( castor::AttributeParsers & result
 			, castor::UInt32StrMap const & textureChannels );
@@ -502,17 +502,17 @@ namespace castor3d
 		}
 
 		void setColour( castor::RgbColour const & v
-			, float gamma = 2.2f )
+			, float gamma = 2.2f )const
 		{
 			setColour( castor::HdrRgbColour{ v, gamma } );
 		}
 
-		void setColour( castor::Coords3f const & v )
+		void setColour( castor::Coords3f const & v )const
 		{
 			setColour( castor::HdrRgbColour{ v[0u], v[1u], v[2u] } );
 		}
 
-		void setColour( castor::Point3f const & v )
+		void setColour( castor::Point3f const & v )const
 		{
 			setColour( castor::HdrRgbColour{ v[0u], v[1u], v[2u] } );
 		}
@@ -536,9 +536,6 @@ namespace castor3d
 	private:
 		void onSssChanged( SubsurfaceScattering const & sss );
 		void doPrepareImage( PassTextureSource const & cfg );
-		void doAddUnit( TextureUnitData & unitData
-			, TextureUnitRPtr unit
-			, UnitArray & result );
 		void doUpdateTextureFlags();
 		castor::Vector< PassComponentUPtr > doRemoveDependencies( castor::String const & name );
 		void doRemoveConfiguration( PassComponentTextureFlag flag );

diff --git a/include/Core/Castor3D/Material/Texture/TextureUnit.hpp b/include/Core/Castor3D/Material/Texture/TextureUnit.hpp
@@ -226,7 +226,7 @@ namespace castor3d
 			return *m_device;
 		}
 
-		bool hasAnimation()const noexcept
+		bool hasAnimation()const noexcept override
 		{
 			return m_animated || hasAnimation( cuT( "Default" ) );
 		}

diff --git a/include/Core/Castor3D/Render/Opaque/SubsurfaceScatteringPass.hpp b/include/Core/Castor3D/Render/Opaque/SubsurfaceScatteringPass.hpp
@@ -63,7 +63,7 @@ namespace castor3d
 		 *\brief			Met à jour la passe de rendu, au niveau CPU.
 		 *\param[in, out]	updater	Les données d'update.
 		 */
-		C3D_API void update( CpuUpdater & updater );
+		C3D_API void update( CpuUpdater const & updater );
 		/**
 		 *\copydoc		castor3d::RenderTechniquePass::accept
 		 */

diff --git a/include/Core/Castor3D/Render/PBR/IblTextures.hpp b/include/Core/Castor3D/Render/PBR/IblTextures.hpp
@@ -47,7 +47,7 @@ namespace castor3d
 		 *\brief		Met à jour les textures d'environnement.
 		 *\param[in]	queueData	La queue recevant les commandes GPU.
 		 */
-		C3D_API void update( QueueData const & queueData );
+		C3D_API void update( QueueData const & queueData )const;
 		/**
 		 *\~english
 		 *\brief		Updates the environment maps.

diff --git a/include/Core/Castor3D/Render/Passes/GaussianBlur.hpp b/include/Core/Castor3D/Render/Passes/GaussianBlur.hpp
@@ -84,7 +84,7 @@ namespace castor3d
 			, castor::String const & prefix
 			, crg::ImageViewIdArray const & views
 			, uint32_t kernelSize
-			, crg::RunnablePass::IsEnabledCallback isEnabled = crg::RunnablePass::IsEnabledCallback( []() { return true; } ) );
+			, crg::RunnablePass::IsEnabledCallback const & isEnabled = crg::RunnablePass::IsEnabledCallback( []() { return true; } ) );
 		/**
 		 *\~english
 		 *\brief		Constructor.
@@ -111,7 +111,7 @@ namespace castor3d
 			, castor::String const & prefix
 			, crg::ImageViewId const & view
 			, uint32_t kernelSize
-			, crg::RunnablePass::IsEnabledCallback isEnabled = crg::RunnablePass::IsEnabledCallback( []() { return true; } ) );
+			, crg::RunnablePass::IsEnabledCallback const & isEnabled = crg::RunnablePass::IsEnabledCallback( []() { return true; } ) );
 		/**
 		 *\~english
 		 *\brief		Constructor.
@@ -141,11 +141,11 @@ namespace castor3d
 			, crg::ImageViewId const & view
 			, crg::ImageViewId const & intermediateView
 			, uint32_t kernelSize
-			, crg::RunnablePass::IsEnabledCallback isEnabled = crg::RunnablePass::IsEnabledCallback( []() { return true; } ) );
+			, crg::RunnablePass::IsEnabledCallback const & isEnabled = crg::RunnablePass::IsEnabledCallback( []() { return true; } ) );
 		/**
 		 *\copydoc		castor3d::RenderTechniquePass::accept
 		 */
-		C3D_API void accept( ConfigurationVisitorBase & visitor );
+		C3D_API void accept( ConfigurationVisitorBase & visitor )const;
 		/**
 		*\~english
 		*name

diff --git a/include/Core/Castor3D/Render/RenderModule.hpp b/include/Core/Castor3D/Render/RenderModule.hpp
@@ -791,7 +791,7 @@ namespace castor3d
 		AllocationStats uboAllocated;
 		castor::Vector< castor::Pair< MemChunk, castor::String > > uboAllocations;
 
-		C3D_API DeviceCounts( RenderDevice const & device );
+		C3D_API explicit DeviceCounts( RenderDevice const & device );
 	};
 
 	using RenderQueueArray = castor::Vector< castor::ReferenceWrapper< RenderQueue > >;

diff --git a/include/Core/Castor3D/Render/RenderTarget.hpp b/include/Core/Castor3D/Render/RenderTarget.hpp
@@ -126,16 +126,13 @@ namespace castor3d
 		 *\~english
 		 *\brief		Initialisation function.
 		 *\param[in]	device		The GPU device.
-		 *\param[in]	queueData	The queue receiving the GPU commands.
 		 *\param[in]	progress	The optional progress bar.
 		 *\~french
 		 *\brief		Fonction d'initialisation.
 		 *\param[in]	device		Le device GPU.
-		 *\param[in]	queueData	La queue recevant les commandes GPU.
 		 *\param[in]	progress	La barre de progression optionnelle.
 		 */
 		C3D_API void initialise( RenderDevice const & device
-			, QueueData const & queueData
 			, ProgressBar * progress = nullptr );
 		/**
 		 *\~english
@@ -173,7 +170,7 @@ namespace castor3d
 		 *\brief		Définit le ViewportType.
 		 *\param[in]	value	Le nouveau ViewportType.
 		 */
-		C3D_API void setViewportType( ViewportType value );
+		C3D_API void setViewportType( ViewportType value )const;
 		/**
 		 *\~english
 		 *\brief		Sets the camera.
@@ -213,7 +210,7 @@ namespace castor3d
 		 */
 		C3D_API PostEffectRPtr getPostEffect( castor::String const & name )const;
 		C3D_API void resetSemaphore();
-		C3D_API crg::FramePass const & createVertexTransformPass( crg::FramePassGroup & graph );
+		C3D_API crg::FramePass const & createVertexTransformPass( crg::FramePassGroup & graph )const;
 
 		C3D_API static void addParsers( castor::AttributeParsers & result );
 		/**
@@ -465,18 +462,15 @@ namespace castor3d
 
 	private:
 		void doInitialise( RenderDevice const & device
-			, QueueData const & queueData
 			, ProgressBar * progress = nullptr );
 		crg::FramePass & doCreateOverlayPass( ProgressBar * progress
 			, RenderDevice const & device );
 		crg::FramePass & doCreateCombinePass( ProgressBar * progress
 			, crg::ImageViewIdArray source );
 		bool doInitialiseTechnique( RenderDevice const & device
-			, QueueData const & queueData
 			, ProgressBar * progress
 			, crg::FramePassArray previousPasses );
 		void doCleanupTechnique();
-		void doCleanupCopyCommands();
 		void doInitCombineProgram();
 		void doCleanupCombineProgram();
 		Texture const & doUpdatePostEffects( CpuUpdater & updater

diff --git a/include/Core/Castor3D/Render/RenderWindow.hpp b/include/Core/Castor3D/Render/RenderWindow.hpp
@@ -208,17 +208,14 @@ namespace castor3d
 		/**
 		 *\~english
 		 *\brief			Renders one frame.
-		 *\param[in,out]	info		Receives the render infos.
 		 *\param[in]		signalOnly	\p true to only signal the semaphores.
 		 *\param[in]		toWait		The semaphores to wait.
 		 *\~french
 		 *\brief			Renders one frame.
-		 *\param[in,out]	info		Reçoit les infos de rendu.
 		 *\param[in]		signalOnly	\p true pour ne faire que signaler les semaphores.
 		 *\param[in]		toWait		Les sémaphores à attendre.
 		 */
-		C3D_API void render( RenderInfo & info
-			, bool signalOnly
+		C3D_API void render( bool signalOnly
 			, crg::SemaphoreWaitArray & toWait );
 		/**
 		 *\~english

diff --git a/include/Core/Castor3D/Render/Ssao/SsaoBlurPass.hpp b/include/Core/Castor3D/Render/Ssao/SsaoBlurPass.hpp
@@ -76,7 +76,7 @@ namespace castor3d
 		 *\brief			Met à jour la passe de rendu, au niveau CPU.
 		 *\param[in, out]	updater	Les données d'update.
 		 */
-		C3D_API void update( CpuUpdater & updater );
+		C3D_API void update( CpuUpdater const & updater );
 		/**
 		 *\~english
 		 *\brief		Accepts a visitor.

diff --git a/include/Core/Castor3D/Shader/Shaders/GlslBaseIO.hpp b/include/Core/Castor3D/Shader/Shaders/GlslBaseIO.hpp
@@ -28,6 +28,11 @@ namespace castor3d::shader
 	using UvStructT = sdw::IOStructInstanceHelperT< FlagT
 		, "C3D_Uv"
 		, sdw::IOStructFieldT< UvTypeT, "uv", 0u > >;
+	template< typename UvTypeT, sdw::var::Flag FlagT >
+	using TwoUvStructT = sdw::IOStructInstanceHelperT< FlagT
+		, "C3D_TwoUv"
+		, sdw::IOStructFieldT< UvTypeT, "uv0", 0u >
+		, sdw::IOStructFieldT< UvTypeT, "uv1", 1u > >;
 
 	template< typename ColTypeT, sdw::var::Flag FlagT >
 	struct ColourT
@@ -85,6 +90,21 @@ namespace castor3d::shader
 
 		auto uv()const { return this->template getMember< "uv" >(); }
 	};
+
+	template< typename UvTypeT, sdw::var::Flag FlagT >
+	struct TwoUvT
+		: public TwoUvStructT< UvTypeT, FlagT >
+	{
+		TwoUvT( sdw::ShaderWriter & writer
+			, sdw::expr::ExprPtr expr
+			, bool enabled )
+			: TwoUvStructT< UvTypeT, FlagT >{ writer, castor::move( expr ), enabled }
+		{
+		}
+
+		auto uv0()const { return this->template getMember< "uv0" >(); }
+		auto uv1()const { return this->template getMember< "uv1" >(); }
+	};
 }
 
 #endif
diff --git a/include/Core/Castor3D/Shader/Shaders/SdwModule.hpp b/include/Core/Castor3D/Shader/Shaders/SdwModule.hpp
@@ -105,6 +105,8 @@ namespace castor3d::shader
 	struct PosUvT;
 	template< typename UvTypeT, sdw::var::Flag FlagT >
 	struct UvT;
+	template< typename UvTypeT, sdw::var::Flag FlagT >
+	struct TwoUvT;
 	template< typename ValueT, sdw::StringLiteralT StructNameT >
 	struct DerivativeValueT;
 
@@ -152,6 +154,10 @@ namespace castor3d::shader
 	using Uv2FT = UvT< sdw::Vec2, FlagT >;
 	template< sdw::var::Flag FlagT >
 	using Uv3FT = UvT< sdw::Vec3, FlagT >;
+	template< sdw::var::Flag FlagT >
+	using TwoUv2FT = TwoUvT< sdw::Vec2, FlagT >;
+	template< sdw::var::Flag FlagT >
+	using TwoUv3FT = TwoUvT< sdw::Vec3, FlagT >;
 
 	class BackgroundModel;
 	class BufferBase;

diff --git a/include/Core/CastorUtils/Data/File.hpp b/include/Core/CastorUtils/Data/File.hpp
@@ -391,11 +391,11 @@ namespace castor
 			, bool allowReplace = false );
 		/**
 		 *\~english
-		 *\brief		Replaces the characters non valid for file name with '_'
+		 *\brief		Replaces the characters non valid for file name with given replacement character
 		 *\~french
-		 *\brief		Remplace les caractères non valides pour un nim de fichier par des '_'
+		 *\brief		Remplace les caractères non valides pour un nim de fichier par le caractère de remplacement donné
 		 */
-		CU_API static String normaliseFileName( String const & name );
+		CU_API static String normaliseFileName( String const & name, castor::StringView repl = cuT( "_" ) );
 		/**
 		 *\~english
 		 *\brief		Retrieves the file size

diff --git a/include/Core/CastorUtils/Math/Angle.hpp b/include/Core/CastorUtils/Math/Angle.hpp
@@ -560,17 +560,17 @@ namespace castor
 	using Angle = AngleT< float >;
 }
 
-inline constexpr castor::Angle operator "" _turns( long double value )
+constexpr castor::Angle operator "" _turns( long double value )
 {
 	return castor::Angle::fromTurns( value );
 }
 
-inline constexpr castor::Angle operator "" _degrees( long double value )
+constexpr castor::Angle operator "" _degrees( long double value )
 {
 	return castor::Angle::fromDegrees( value );
 }
 
-inline constexpr castor::Angle operator "" _radians( long double value )
+constexpr castor::Angle operator "" _radians( long double value )
 {
 	return castor::Angle::fromRadians( value );
 }

diff --git a/include/Core/CastorUtils/Miscellaneous/StringUtils.hpp b/include/Core/CastorUtils/Miscellaneous/StringUtils.hpp
@@ -1337,6 +1337,11 @@ namespace castor::string
 	}
 }
 
+constexpr castor::StringView operator "" _sv( castor::xchar const * const value, size_t length )noexcept
+{
+	return castor::StringView{ value, length };
+}
+
 #include "StringUtils.inl"
 
 #endif
diff --git a/source/Core/Castor3D/Animation/Animable.cpp b/source/Core/Castor3D/Animation/Animable.cpp
@@ -20,7 +20,7 @@ namespace castor3d
 		m_animations.clear();
 	}
 
-	bool Animable::hasAnimation()const
+	bool Animable::hasAnimation()const noexcept
 	{
 		return !m_animations.empty();
 	}

diff --git a/source/Core/Castor3D/Buffer/ObjectBufferPool.cpp b/source/Core/Castor3D/Buffer/ObjectBufferPool.cpp
@@ -398,7 +398,7 @@ namespace castor3d
 
 		if ( it == buffers.end() )
 		{
-			auto & submeshComponents = getOwner()->getEngine()->getSubmeshComponentsRegister();
+			auto const & submeshComponents = getOwner()->getEngine()->getSubmeshComponentsRegister();
 			auto name = objbuf::getName( components, isGpuComputed );
 			ModelBuffers modelBuffers;
 

diff --git a/source/Core/Castor3D/Buffer/PoolUniformBuffer.cpp b/source/Core/Castor3D/Buffer/PoolUniformBuffer.cpp
@@ -93,13 +93,15 @@ namespace castor3d
 			? 0u
 			: m_allocated.rbegin()->first.offset + m_allocated.rbegin()->first.size;
 		auto realSize = getAlignedSize( uint32_t( size ) );
-		castor::String stackTrace;
 #if !defined( NDEBUG )
+		castor::String stackTrace;
 		castor::StringStream stream = castor::makeStringStream();
 		stream << castor::debug::Backtrace{ 20, 4 };
 		stackTrace = stream.str();
-#endif
 		m_allocated.try_emplace( MemChunk{ offset, realSize, size }, stackTrace );
+#else
+		m_allocated.try_emplace( MemChunk{ offset, realSize, size } );
+#endif
 		return { offset / elemSize, realSize / elemSize, size };
 	}