zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of some clang compiler warnings. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5451 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-04-22 10:19:56 +00:00
parent ae61c51c65
commit 8990dbcf28
5 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/Irrlicht/CB3DMeshWriter.cpp
View File

@ -2,7 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
// TODO: replace printf's by logging messages
// TODO: replace printf's by logging messages
#include "IrrCompileConfig.h"
@ -26,7 +26,7 @@ namespace scene
using namespace core;
using namespace video;
CB3DMeshWriter::CB3DMeshWriter(io::IFileSystem *fs): FileSystem(fs)
CB3DMeshWriter::CB3DMeshWriter()
{
#ifdef _DEBUG
setDebugName("CB3DMeshWriter");
@ -64,14 +64,14 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
array<SB3dTexture> texs;
map<ITexture *, u32> tex2id; // TODO: texture pointer as key not sufficient as same texture can have several id's
u32 texsizes = 0;
for (u32 i = 0; i < numBeshBuffers; i++)
for (u32 i = 0; i < numBeshBuffers; i++)
{
const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
const SMaterial &mat = mb->getMaterial();
for (u32 j = 0; j < MATERIAL_MAX_TEXTURES; j++)
for (u32 j = 0; j < MATERIAL_MAX_TEXTURES; j++)
{
if (mat.getTexture(j))
if (mat.getTexture(j))
{
SB3dTexture t;
t.TextureName = core::stringc(mat.getTexture(j)->getName().getPath());
@ -98,7 +98,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
write(file, &texsizes, 4);
u32 numTexture = texs.size();
for (u32 i = 0; i < numTexture; i++)
for (u32 i = 0; i < numTexture; i++)
{
write(file, texs[i].TextureName.c_str(), texs[i].TextureName.size() + 1);
write(file, &texs[i].Flags, 7*4);
@ -113,7 +113,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
const u32 usedtex = MATERIAL_MAX_TEXTURES;
write(file, &usedtex, 4);
for (u32 i = 0; i < numBeshBuffers; i++)
for (u32 i = 0; i < numBeshBuffers; i++)
{
const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
const SMaterial &mat = mb->getMaterial();
@ -134,14 +134,14 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
tmp = 0;
write(file, &tmp, 4);
for (u32 j = 0; j < MATERIAL_MAX_TEXTURES; j++)
for (u32 j = 0; j < MATERIAL_MAX_TEXTURES; j++)
{
if (mat.getTexture(j))
if (mat.getTexture(j))
{
const u32 id = tex2id[mat.getTexture(j)];
write(file, &id, 4);
}
else
}
else
{
const int id = -1;
write(file, &id, 4);
@ -250,7 +250,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
{
const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
irr::u32 numVertices = mb->getVertexCount();
for (u32 j = 0; j < numVertices; j++)
for (u32 j = 0; j < numVertices; j++)
{
const vector3df &pos = mb->getPosition(j);
write(file, &pos.X, 4);
@ -263,7 +263,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
write(file, &n.Z, 4);
const u32 zero = 0;
switch (mb->getVertexType())
switch (mb->getVertexType())
{
case EVT_STANDARD:
{
@ -308,7 +308,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
write(file, &col.a, 4);
write(file, &v[j].TCoords.X, 4);
write(file, &v[j].TCoords.Y, 4);
write(file, &v[j].TCoords.Y, 4);
if (texcoords == 2)
{
write(file, &zero, 4);
@ -342,7 +342,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
u32 numIndices = mb->getIndexCount();
const u16 * const idx = (u16 *) mb->getIndices();
for (u32 j = 0; j < numIndices; j += 3)
for (u32 j = 0; j < numIndices; j += 3)
{
u32 tmp = idx[j] + currentMeshBufferIndex;
write(file, &tmp, sizeof(u32));

5
source/Irrlicht/CB3DMeshWriter.h
View File

@ -8,7 +8,7 @@
#define __IRR_B3D_MESH_WRITER_H_INCLUDED__
#include "IMeshWriter.h"
#include "IFileSystem.h"
#include "IWriteFile.h"
#include "SB3DStructs.h"
#include "ISkinnedMesh.h"
@ -24,7 +24,7 @@ class CB3DMeshWriter : public IMeshWriter
{
public:
CB3DMeshWriter(io::IFileSystem *fs);
CB3DMeshWriter();
//! Returns the type of the mesh writer
virtual EMESH_WRITER_TYPE getType() const;
@ -33,7 +33,6 @@ public:
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE);
private:
io::IFileSystem *FileSystem;
u32 Size;
void writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint);

2
source/Irrlicht/CMY3DHelper.h
View File

@ -269,7 +269,7 @@ unsigned long process_comp(
unsigned char *out_buf, int out_buf_size)
{
// we start out with 3 repeating bytes
register int len = 3;
int len = 3;
unsigned char ch;

2
source/Irrlicht/CSceneManager.cpp
View File

@ -2573,7 +2573,7 @@ IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)
case EMWT_B3D:
#ifdef _IRR_COMPILE_WITH_B3D_WRITER_
return new CB3DMeshWriter(FileSystem);
return new CB3DMeshWriter();
#else
return 0;
#endif

12
source/Irrlicht/CZipReader.cpp
View File

@ -492,8 +492,16 @@ IReadFile* CZipReader::createAndOpenFile(const io::path& filename)
//! Used for LZMA decompression. The lib has no default memory management
namespace
{
void *SzAlloc(void *p, size_t size) { p = p; return malloc(size); }
void SzFree(void *p, void *address) { p = p; free(address); }
void *SzAlloc(void *p, size_t size)
{
(void)p; // disable unused variable warnings
return malloc(size);
}
void SzFree(void *p, void *address)
{
(void)p; // disable unused variable warnings
free(address);
}
ISzAlloc lzmaAlloc = { SzAlloc, SzFree };
}
#endif