From b79cb84b09afb362f3c4dc6a36b46e98fc438ffb Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 5 Aug 2016 09:09:14 +0200 Subject: [PATCH] Graphics/InstancedRenderable: Take a const reference to the matrix instead of a non-const one Former-commit-id: 7b2476238be361818cfb02cb4a0e425097854027 [formerly f6551951502fa86158ccba1e3e5e6ff4c5c6bcc3] [formerly ee7a6ccecb0e572be66b5ddc0fb3ebb3be4d9f37 [formerly 9417bcb7a725bff89f21af518de9634942afcd4e]] Former-commit-id: 3f8556fba2a463a9ad170d3e9bcd5d6681c6b211 [formerly 6e7a249b442e1d3dd7f03fa1736bbbfd9c3ea532] Former-commit-id: 6ee9e742d25a71962953557137c6e9bdf9be669b --- SDK/include/NDK/Components/GraphicsComponent.hpp | 2 +- include/Nazara/Graphics/InstancedRenderable.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDK/include/NDK/Components/GraphicsComponent.hpp b/SDK/include/NDK/Components/GraphicsComponent.hpp index a7ac3ebc2..92aeeed2f 100644 --- a/SDK/include/NDK/Components/GraphicsComponent.hpp +++ b/SDK/include/NDK/Components/GraphicsComponent.hpp @@ -66,7 +66,7 @@ namespace Ndk struct Renderable { - Renderable(Nz::Matrix4f& transformMatrix) : + Renderable(const Nz::Matrix4f& transformMatrix) : data(transformMatrix), dataUpdated(false) { diff --git a/include/Nazara/Graphics/InstancedRenderable.hpp b/include/Nazara/Graphics/InstancedRenderable.hpp index d1c07bf9b..d854a41d6 100644 --- a/include/Nazara/Graphics/InstancedRenderable.hpp +++ b/include/Nazara/Graphics/InstancedRenderable.hpp @@ -54,7 +54,7 @@ namespace Nz struct InstanceData { - InstanceData(Matrix4f& referenceMatrix) : + InstanceData(const Matrix4f& referenceMatrix) : transformMatrix(&referenceMatrix), flags(0) { @@ -75,7 +75,7 @@ namespace Nz std::vector data; BoundingVolumef volume; - Matrix4f* transformMatrix; + const Matrix4f* transformMatrix; UInt32 flags; int renderOrder; };