Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
This commit is contained in:
commit
2a2c92929e
|
|
@ -161,12 +161,23 @@ namespace Ndk
|
||||||
InvalidateProjectionMatrix();
|
InvalidateProjectionMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Sets the camera projection scale
|
||||||
|
*
|
||||||
|
* \param scale New projection scale
|
||||||
|
*/
|
||||||
|
inline void CameraComponent::SetProjectionScale(const Nz::Vector3f& scale)
|
||||||
|
{
|
||||||
|
m_projectionScale = scale;
|
||||||
|
|
||||||
|
InvalidateProjectionMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Sets the projection type of the camera
|
* \brief Sets the projection type of the camera
|
||||||
*
|
*
|
||||||
* \param projectionType Projection type of the camera
|
* \param projectionType Projection type of the camera
|
||||||
*/
|
*/
|
||||||
|
|
||||||
inline void CameraComponent::SetProjectionType(Nz::ProjectionType projectionType)
|
inline void CameraComponent::SetProjectionType(Nz::ProjectionType projectionType)
|
||||||
{
|
{
|
||||||
m_projectionType = projectionType;
|
m_projectionType = projectionType;
|
||||||
|
|
|
||||||
|
|
@ -165,18 +165,6 @@ namespace Ndk
|
||||||
m_entity->Invalidate(); // Invalidate the entity to make it passes through RenderSystem validation
|
m_entity->Invalidate(); // Invalidate the entity to make it passes through RenderSystem validation
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
|
||||||
* \brief Sets the camera projection scale
|
|
||||||
*
|
|
||||||
* \param scale New projection scale
|
|
||||||
*/
|
|
||||||
inline void CameraComponent::SetProjectionScale(const Nz::Vector3f& scale)
|
|
||||||
{
|
|
||||||
m_projectionScale = scale;
|
|
||||||
|
|
||||||
InvalidateProjectionMatrix();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Operation to perform when component is attached to an entity
|
* \brief Operation to perform when component is attached to an entity
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue