Fix Sprite & GraphicsComponent copy constructors leaving some members uninitialized (#166)
* Fix Sprite copy constructor (corner colors) * Also add change to changelog * [GraphicsComponent] Bugfix: Initialize m_scissorRect in copy ctor * Add change to changelog * Move GraphicsComponent fix change to correct section in Changelog * Use default copy constructor for Sprite
This commit is contained in:
parent
8cdc36c948
commit
858d0da5f2
|
|
@ -115,6 +115,7 @@ Nazara Engine:
|
||||||
- ⚠️ SocketPoller::Wait now returns the number of socket marked as ready, and takes an additional optional parameter allowing to query the last error.
|
- ⚠️ SocketPoller::Wait now returns the number of socket marked as ready, and takes an additional optional parameter allowing to query the last error.
|
||||||
- SocketPoller will now silently ignore "interrupt errors"
|
- SocketPoller will now silently ignore "interrupt errors"
|
||||||
- Added RigidBody2D::ClosestPointQuery
|
- Added RigidBody2D::ClosestPointQuery
|
||||||
|
- Fix Sprite copy constructor not copying corner colors
|
||||||
|
|
||||||
Nazara Development Kit:
|
Nazara Development Kit:
|
||||||
- Added ImageWidget (#139)
|
- Added ImageWidget (#139)
|
||||||
|
|
@ -166,6 +167,7 @@ Nazara Development Kit:
|
||||||
- Add GraphicsComponent:ForEachRenderable method
|
- Add GraphicsComponent:ForEachRenderable method
|
||||||
- Fixed GraphicsComponent reflective material count which was not initialized
|
- Fixed GraphicsComponent reflective material count which was not initialized
|
||||||
- Added PhysicsComponent2D::ClosestPointQuery
|
- Added PhysicsComponent2D::ClosestPointQuery
|
||||||
|
- Fix GraphicsComponent copy constructor not copying scissor rect
|
||||||
|
|
||||||
# 0.4:
|
# 0.4:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ namespace Ndk
|
||||||
m_reflectiveMaterialCount(0),
|
m_reflectiveMaterialCount(0),
|
||||||
m_boundingVolume(graphicsComponent.m_boundingVolume),
|
m_boundingVolume(graphicsComponent.m_boundingVolume),
|
||||||
m_transformMatrix(graphicsComponent.m_transformMatrix),
|
m_transformMatrix(graphicsComponent.m_transformMatrix),
|
||||||
|
m_scissorRect(graphicsComponent.m_scissorRect),
|
||||||
m_boundingVolumeUpdated(graphicsComponent.m_boundingVolumeUpdated),
|
m_boundingVolumeUpdated(graphicsComponent.m_boundingVolumeUpdated),
|
||||||
m_transformMatrixUpdated(graphicsComponent.m_transformMatrixUpdated)
|
m_transformMatrixUpdated(graphicsComponent.m_transformMatrixUpdated)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ namespace Nz
|
||||||
inline Sprite();
|
inline Sprite();
|
||||||
inline Sprite(MaterialRef material);
|
inline Sprite(MaterialRef material);
|
||||||
inline Sprite(Texture* texture);
|
inline Sprite(Texture* texture);
|
||||||
inline Sprite(const Sprite& sprite);
|
Sprite(const Sprite&) = default;
|
||||||
Sprite(Sprite&&) = delete;
|
Sprite(Sprite&&) = delete;
|
||||||
~Sprite() = default;
|
~Sprite() = default;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,21 +50,6 @@ namespace Nz
|
||||||
SetTexture(texture, true);
|
SetTexture(texture, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
|
||||||
* \brief Constructs a Sprite object by assignation
|
|
||||||
*
|
|
||||||
* \param sprite Sprite to copy into this
|
|
||||||
*/
|
|
||||||
|
|
||||||
inline Sprite::Sprite(const Sprite& sprite) :
|
|
||||||
InstancedRenderable(sprite),
|
|
||||||
m_color(sprite.m_color),
|
|
||||||
m_textureCoords(sprite.m_textureCoords),
|
|
||||||
m_size(sprite.m_size),
|
|
||||||
m_origin(sprite.m_origin)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Gets the color of the sprite
|
* \brief Gets the color of the sprite
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue