sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/ViewerInstance: fix typo

This commit is contained in:
SirLynix 2022-03-31 13:35:08 +02:00
parent a4bca0f169
commit f14b10baf4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/ViewerInstance.hpp
View File

@ -63,7 +63,7 @@ namespace Nz
Matrix4f m_viewMatrix; Matrix4f m_viewMatrix;
Vector2f m_targetSize; Vector2f m_targetSize;
Vector3f m_eyePosition; Vector3f m_eyePosition;
bool m_dataInvalided; bool m_dataInvalidated;
}; };
} }

18
include/Nazara/Graphics/ViewerInstance.inl
View File

@ -61,7 +61,7 @@ namespace Nz
inline void ViewerInstance::UpdateEyePosition(const Vector3f& eyePosition) inline void ViewerInstance::UpdateEyePosition(const Vector3f& eyePosition)
{ {
m_eyePosition = eyePosition; m_eyePosition = eyePosition;
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateProjectionMatrix(const Matrix4f& projectionMatrix) inline void ViewerInstance::UpdateProjectionMatrix(const Matrix4f& projectionMatrix)
@ -70,7 +70,7 @@ namespace Nz
if (!m_projectionMatrix.GetInverse(&m_invProjectionMatrix)) if (!m_projectionMatrix.GetInverse(&m_invProjectionMatrix))
NazaraError("failed to inverse projection matrix"); NazaraError("failed to inverse projection matrix");
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateProjectionMatrix(const Matrix4f& projectionMatrix, const Matrix4f& invProjectionMatrix) inline void ViewerInstance::UpdateProjectionMatrix(const Matrix4f& projectionMatrix, const Matrix4f& invProjectionMatrix)
@ -78,7 +78,7 @@ namespace Nz
m_projectionMatrix = projectionMatrix; m_projectionMatrix = projectionMatrix;
m_invProjectionMatrix = invProjectionMatrix; m_invProjectionMatrix = invProjectionMatrix;
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateProjViewMatrices(const Matrix4f& projectionMatrix, const Matrix4f& viewMatrix) inline void ViewerInstance::UpdateProjViewMatrices(const Matrix4f& projectionMatrix, const Matrix4f& viewMatrix)
@ -95,7 +95,7 @@ namespace Nz
if (!m_viewProjMatrix.GetInverse(&m_invViewProjMatrix)) if (!m_viewProjMatrix.GetInverse(&m_invViewProjMatrix))
NazaraError("failed to inverse view proj matrix"); NazaraError("failed to inverse view proj matrix");
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateProjViewMatrices(const Matrix4f& projectionMatrix, const Matrix4f& invProjectionMatrix, const Matrix4f& viewMatrix, const Matrix4f& invViewMatrix) inline void ViewerInstance::UpdateProjViewMatrices(const Matrix4f& projectionMatrix, const Matrix4f& invProjectionMatrix, const Matrix4f& viewMatrix, const Matrix4f& invViewMatrix)
@ -108,7 +108,7 @@ namespace Nz
m_viewProjMatrix = m_viewMatrix * m_projectionMatrix; m_viewProjMatrix = m_viewMatrix * m_projectionMatrix;
m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix; m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix;
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateProjViewMatrices(const Matrix4f& projectionMatrix, const Matrix4f& invProjectionMatrix, const Matrix4f& viewMatrix, const Matrix4f& invViewMatrix, const Matrix4f& viewProjMatrix, const Matrix4f& invViewProjMatrix) inline void ViewerInstance::UpdateProjViewMatrices(const Matrix4f& projectionMatrix, const Matrix4f& invProjectionMatrix, const Matrix4f& viewMatrix, const Matrix4f& invViewMatrix, const Matrix4f& viewProjMatrix, const Matrix4f& invViewProjMatrix)
@ -121,14 +121,14 @@ namespace Nz
m_viewProjMatrix = viewProjMatrix; m_viewProjMatrix = viewProjMatrix;
m_invViewProjMatrix = invViewProjMatrix; m_invViewProjMatrix = invViewProjMatrix;
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateTargetSize(const Vector2f& targetSize) inline void ViewerInstance::UpdateTargetSize(const Vector2f& targetSize)
{ {
m_targetSize = targetSize; m_targetSize = targetSize;
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateViewMatrix(const Matrix4f& viewMatrix) inline void ViewerInstance::UpdateViewMatrix(const Matrix4f& viewMatrix)
@ -140,7 +140,7 @@ namespace Nz
m_viewProjMatrix = m_viewMatrix * m_projectionMatrix; m_viewProjMatrix = m_viewMatrix * m_projectionMatrix;
m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix; m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix;
m_dataInvalided = true; m_dataInvalidated = true;
} }
inline void ViewerInstance::UpdateViewMatrix(const Matrix4f& viewMatrix, const Matrix4f& invViewMatrix) inline void ViewerInstance::UpdateViewMatrix(const Matrix4f& viewMatrix, const Matrix4f& invViewMatrix)
@ -151,7 +151,7 @@ namespace Nz
m_viewProjMatrix = m_viewMatrix * m_projectionMatrix; m_viewProjMatrix = m_viewMatrix * m_projectionMatrix;
m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix; m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix;
m_dataInvalided = true; m_dataInvalidated = true;
} }
} }

6
src/Nazara/Graphics/ViewerInstance.cpp
View File

@ -22,7 +22,7 @@ namespace Nz
m_viewMatrix(Matrix4f::Identity()), m_viewMatrix(Matrix4f::Identity()),
m_targetSize(Vector2f::Zero()), m_targetSize(Vector2f::Zero()),
m_eyePosition(Vector3f::Zero()), m_eyePosition(Vector3f::Zero()),
m_dataInvalided(true) m_dataInvalidated(true)
{ {
PredefinedViewerData viewerUboOffsets = PredefinedViewerData::GetOffsets(); PredefinedViewerData viewerUboOffsets = PredefinedViewerData::GetOffsets();
@ -31,7 +31,7 @@ namespace Nz
void ViewerInstance::UpdateBuffers(UploadPool& uploadPool, CommandBufferBuilder& builder) void ViewerInstance::UpdateBuffers(UploadPool& uploadPool, CommandBufferBuilder& builder)
{ {
if (m_dataInvalided) if (m_dataInvalidated)
{ {
PredefinedViewerData viewerDataOffsets = PredefinedViewerData::GetOffsets(); PredefinedViewerData viewerDataOffsets = PredefinedViewerData::GetOffsets();
@ -49,7 +49,7 @@ namespace Nz
builder.CopyBuffer(allocation, m_viewerDataBuffer.get()); builder.CopyBuffer(allocation, m_viewerDataBuffer.get());
m_dataInvalided = false; m_dataInvalidated = false;
} }
} }
} }