From d5c02bf43d058b0f13aebf54da9e3d7ab986109d Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 5 Aug 2016 09:08:56 +0200 Subject: [PATCH] Graphics/Model: Add AddToRenderQueue(renderQueue, matrix, order) overload Former-commit-id: 84e4c22e9258c89e3b4f67fdd8427cbde6b0bc14 [formerly 7c51c3128ccc083461a5e356373c1ba77c038d3c] [formerly 49faee43ee1701bed909ae89cfc4d5c6a1df90a8 [formerly 81c535d074e9f5806ba01c39347770d08b8133a8]] Former-commit-id: a02d7cc0b59cad0d5b6875d14ff4068bc1e98b41 [formerly c4c7643fa3c420a337d6a637dfc92a2ed70e98b3] Former-commit-id: 8a4dbcacdf612510a4a999aec54be913896e3cf4 --- include/Nazara/Graphics/Model.hpp | 1 + include/Nazara/Graphics/Model.inl | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/Nazara/Graphics/Model.hpp b/include/Nazara/Graphics/Model.hpp index f119072c8..b1755c7d8 100644 --- a/include/Nazara/Graphics/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -45,6 +45,7 @@ namespace Nz virtual ~Model(); void AddToRenderQueue(AbstractRenderQueue* renderQueue, const InstanceData& instanceData) const override; + inline void AddToRenderQueue(AbstractRenderQueue* renderQueue, const Matrix4f& transformMatrix, unsigned int renderOrder = 0); Material* GetMaterial(const String& subMeshName) const; Material* GetMaterial(unsigned int matIndex) const; diff --git a/include/Nazara/Graphics/Model.inl b/include/Nazara/Graphics/Model.inl index a2b4c3967..243611fb5 100644 --- a/include/Nazara/Graphics/Model.inl +++ b/include/Nazara/Graphics/Model.inl @@ -7,6 +7,22 @@ namespace Nz { + /*! + * \brief Adds this model to a render queue, using user-specified transform matrix and render order + * + * This can be useful when drawing particles + * + * \param renderQueue Queue to be added + * \param transformMatrix Transform matrix to be used for rendering the model + * \param renderOrder Specify the renderqueue layer to be used + */ + inline void Model::AddToRenderQueue(AbstractRenderQueue* renderQueue, const Matrix4f& transformMatrix, unsigned int renderOrder) + { + InstanceData instanceData(transformMatrix); + instanceData.renderOrder = renderOrder; + return AddToRenderQueue(renderQueue, instanceData); + } + /*! * \brief Creates a new Model from the arguments * \return A reference to the newly created model