From 5d27ca38a781a66d9a46fb2898d06d2478322d4e Mon Sep 17 00:00:00 2001 From: cutealien Date: Sun, 15 May 2022 13:43:32 +0000 Subject: [PATCH] Minor const changes. Also kicked out "Use constexpr for constants" warning in VS analyser ruleset (we haven't switched to c++11 yet) git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6402 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CAnimatedMeshMD3.cpp | 2 +- source/Irrlicht/CAnimatedMeshMD3.h | 2 +- source/Irrlicht/CB3DMeshWriter.cpp | 2 +- source/Irrlicht/CB3DMeshWriter.h | 2 +- source/Irrlicht/Irrlicht.ruleset | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/Irrlicht/CAnimatedMeshMD3.cpp b/source/Irrlicht/CAnimatedMeshMD3.cpp index 0d3a091b..329500cb 100644 --- a/source/Irrlicht/CAnimatedMeshMD3.cpp +++ b/source/Irrlicht/CAnimatedMeshMD3.cpp @@ -211,7 +211,7 @@ IMesh* CAnimatedMeshMD3::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, //! create a Irrlicht MeshBuffer for a MD3 MeshBuffer IMeshBuffer * CAnimatedMeshMD3::createMeshBuffer(const SMD3MeshBuffer* source, - io::IFileSystem* fs, video::IVideoDriver * driver) + const io::IFileSystem* fs, video::IVideoDriver * driver) { SMeshBufferLightMap * dest = new SMeshBufferLightMap(); dest->Vertices.set_used(source->MeshHeader.numVertices); diff --git a/source/Irrlicht/CAnimatedMeshMD3.h b/source/Irrlicht/CAnimatedMeshMD3.h index c3f2f925..bea2ea98 100644 --- a/source/Irrlicht/CAnimatedMeshMD3.h +++ b/source/Irrlicht/CAnimatedMeshMD3.h @@ -117,7 +117,7 @@ namespace scene SMD3QuaternionTagList TagListIPol; IMeshBuffer* createMeshBuffer(const SMD3MeshBuffer* source, - io::IFileSystem* fs, video::IVideoDriver* driver); + const io::IFileSystem* fs, video::IVideoDriver* driver); void buildVertexArray(u32 frameA, u32 frameB, f32 interpolate, const SMD3MeshBuffer* source, diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp index a7a17b59..92c297aa 100644 --- a/source/Irrlicht/CB3DMeshWriter.cpp +++ b/source/Irrlicht/CB3DMeshWriter.cpp @@ -498,7 +498,7 @@ core::array CB3DMeshWriter::getRootJoints(const ISkinnedM return roots; } -u32 CB3DMeshWriter::getUVlayerCount(IMesh* mesh) +u32 CB3DMeshWriter::getUVlayerCount(const IMesh* mesh) { const u32 numBeshBuffers = mesh->getMeshBufferCount(); for (u32 i = 0; i < numBeshBuffers; i++) diff --git a/source/Irrlicht/CB3DMeshWriter.h b/source/Irrlicht/CB3DMeshWriter.h index 12c7324f..48fe5395 100644 --- a/source/Irrlicht/CB3DMeshWriter.h +++ b/source/Irrlicht/CB3DMeshWriter.h @@ -37,7 +37,7 @@ private: u32 getJointChunkSize(const ISkinnedMesh* mesh, ISkinnedMesh::SJoint* joint); core::array getRootJoints(const ISkinnedMesh* mesh); - u32 getUVlayerCount(IMesh *mesh); + u32 getUVlayerCount(const IMesh *mesh); ISkinnedMesh* getSkinned (IMesh *mesh); inline void writeVector2(io::IWriteFile* file, const core::vector2df& vec); diff --git a/source/Irrlicht/Irrlicht.ruleset b/source/Irrlicht/Irrlicht.ruleset index 8766033d..10618656 100644 --- a/source/Irrlicht/Irrlicht.ruleset +++ b/source/Irrlicht/Irrlicht.ruleset @@ -1,5 +1,5 @@  - + @@ -273,6 +273,7 @@ +