Skip to content

D
deprecated-irrlicht-mac
You need to sign in or sign up before continuing.
Commit 71a1e46d authored by hybrid's avatar hybrid
Browse files
Options

Fixed some warnings and indentation. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@926 dfc29bdd-3216-0410-991c-e03cc46cb475
parent e2f8a703
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 131 deletions
include/IMeshWriter.h
View file @ 71a1e46d
...@@ -14,7 +14,7 @@ namespace scene ...@@ -14,7 +14,7 @@ namespace scene
class IMesh; class IMesh;
//! An enumeration for all supported types of built-in mesh writers //! An enumeration for all supported types of built-in mesh writers
/** A scene mesh writers is represented by a four character code /** A scene mesh writers is represented by a four character code
such as 'irrm' or 'coll' instead of simple numbers, to avoid such as 'irrm' or 'coll' instead of simple numbers, to avoid
name clashes with external mesh writers.*/ name clashes with external mesh writers.*/
enum EMESH_WRITER_TYPE enum EMESH_WRITER_TYPE
...@@ -51,21 +51,22 @@ namespace scene ...@@ -51,21 +51,22 @@ namespace scene
enumeration to return your own unique mesh type id.*/ enumeration to return your own unique mesh type id.*/
virtual EMESH_WRITER_TYPE getType() const = 0; virtual EMESH_WRITER_TYPE getType() const = 0;
//! writes a static mesh //! writes a static mesh
/** \return Returns true if sucessful */ /** \return Returns true if sucessful */
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh,
s32 flags=EMWF_NONE) = 0; s32 flags=EMWF_NONE) = 0;
// writes an animated mesh // writes an animated mesh
// for future use, no writer is able to write animated meshes currently // for future use, no writer is able to write animated meshes currently
/* \return Returns true if sucessful */ /* \return Returns true if sucessful */
//virtual bool writeAnimatedMesh(io::IWriteFile* file, //virtual bool writeAnimatedMesh(io::IWriteFile* file,
// scene::IAnimatedMesh* mesh, // scene::IAnimatedMesh* mesh,
// s32 flags=EMWF_NONE) = 0; // s32 flags=EMWF_NONE) = 0;
}; };
} // end namespace
} // end namespace } // end namespace
} // end namespace
#endif
#endif
\ No newline at end of file
include/S3DVertex.h
View file @ 71a1e46d
...@@ -46,7 +46,7 @@ struct S3DVertex ...@@ -46,7 +46,7 @@ struct S3DVertex
//! Position //! Position
core::vector3df Pos; core::vector3df Pos;
//! Normal vector //! Normal vector
core::vector3df Normal; core::vector3df Normal;
...@@ -189,17 +189,17 @@ struct S3DVertexTangents : S3DVertex ...@@ -189,17 +189,17 @@ struct S3DVertexTangents : S3DVertex
inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType) inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType)
{ {
switch (vertexType) switch (vertexType)
{ {
case video::EVT_2TCOORDS: case video::EVT_2TCOORDS:
return sizeof(video::S3DVertex2TCoords); return sizeof(video::S3DVertex2TCoords);
case video::EVT_TANGENTS: case video::EVT_TANGENTS:
return sizeof(video::S3DVertexTangents); return sizeof(video::S3DVertexTangents);
default:
return sizeof(video::S3DVertex);
} }
return sizeof(video::S3DVertex);
} }
......
source/Irrlicht/CColladaMeshWriter.cpp
View file @ 71a1e46d
#include "CColladaMeshWriter.h" #include "CColladaMeshWriter.h"
#include "os.h" #include "os.h"
#include "IFileSystem.h"
#include "IXMLWriter.h" #include "IXMLWriter.h"
#include "IMesh.h" #include "IMesh.h"
#include "IAttributes.h" #include "IAttributes.h"
...@@ -10,13 +11,13 @@ namespace scene ...@@ -10,13 +11,13 @@ namespace scene
{ {
CColladaMeshWriter::CColladaMeshWriter(irr::video::IVideoDriver* driver, CColladaMeshWriter::CColladaMeshWriter(irr::video::IVideoDriver* driver,
irr::io::IFileSystem* fs) irr::io::IFileSystem* fs)
: VideoDriver(driver), FileSystem(fs) : FileSystem(fs), VideoDriver(driver), Writer(0)
{ {
if (VideoDriver) if (VideoDriver)
VideoDriver->grab(); VideoDriver->grab();
if (FileSystem) if (FileSystem)
FileSystem->grab(); FileSystem->grab();
} }
...@@ -26,7 +27,7 @@ CColladaMeshWriter::~CColladaMeshWriter() ...@@ -26,7 +27,7 @@ CColladaMeshWriter::~CColladaMeshWriter()
{ {
if (VideoDriver) if (VideoDriver)
VideoDriver->drop(); VideoDriver->drop();
if (FileSystem) if (FileSystem)
FileSystem->drop(); FileSystem->drop();
} }
...@@ -39,7 +40,7 @@ EMESH_WRITER_TYPE CColladaMeshWriter::getType() const ...@@ -39,7 +40,7 @@ EMESH_WRITER_TYPE CColladaMeshWriter::getType() const
} }
//! writes a mesh //! writes a mesh
bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags) bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags)
{ {
if (!file) if (!file)
...@@ -57,7 +58,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -57,7 +58,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
// write COLLADA header // write COLLADA header
Writer->writeXMLHeader(); Writer->writeXMLHeader();
Writer->writeElement(L"COLLADA", false, Writer->writeElement(L"COLLADA", false,
L"xmlns", L"http://www.collada.org/2005/COLLADASchema", L"xmlns", L"http://www.collada.org/2005/COLLADASchema",
...@@ -88,12 +89,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -88,12 +89,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeElement(L"library", false, L"type", L"MATERIAL"); Writer->writeElement(L"library", false, L"type", L"MATERIAL");
Writer->writeLineBreak(); Writer->writeLineBreak();
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) u32 i;
for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
core::stringw strMat = "mat"; core::stringw strMat = "mat";
strMat += i; strMat += i;
Writer->writeElement(L"material", false, Writer->writeElement(L"material", false,
L"name", strMat.c_str(), L"name", strMat.c_str(),
L"id", strMat.c_str()); L"id", strMat.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -103,18 +105,18 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -103,18 +105,18 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
irr::io::IAttributes* attributes = VideoDriver->createAttributesFromMaterial( irr::io::IAttributes* attributes = VideoDriver->createAttributesFromMaterial(
mesh->getMeshBuffer(i)->getMaterial()); mesh->getMeshBuffer(i)->getMaterial());
int count = attributes->getAttributeCount(); s32 count = attributes->getAttributeCount();
for (int attridx=0; attridx<count; ++attridx) for (s32 attridx=0; attridx<count; ++attridx)
{ {
core::stringw str = attributes->getAttributeName(attridx); core::stringw str = attributes->getAttributeName(attridx);
Writer->writeElement(L"param", false, Writer->writeElement(L"param", false,
L"name", str.c_str(), L"name", str.c_str(),
L"type", attributes->getAttributeTypeString(attridx) ); L"type", attributes->getAttributeTypeString(attridx) );
str = attributes->getAttributeAsString(attridx).c_str(); str = attributes->getAttributeAsString(attridx).c_str();
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeClosingTag(L"param"); Writer->writeClosingTag(L"param");
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -145,11 +147,11 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -145,11 +147,11 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
// - count amount of second texture coordinates // - count amount of second texture coordinates
// - check for the need of tangents (TODO) // - check for the need of tangents (TODO)
int totalVertexCount = 0; u32 totalVertexCount = 0;
int totalTCoords2Count = 0; u32 totalTCoords2Count = 0;
bool needsTangents = false; // TODO: tangents not supported here yet bool needsTangents = false; // TODO: tangents not supported here yet
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
totalVertexCount += mesh->getMeshBuffer(i)->getVertexCount(); totalVertexCount += mesh->getMeshBuffer(i)->getVertexCount();
...@@ -171,12 +173,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -171,12 +173,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeElement(L"array", false, L"id", L"mesh-Pos-array", Writer->writeElement(L"array", false, L"id", L"mesh-Pos-array",
L"type", L"float", L"count", vertexCountStr.c_str()); L"type", L"float", L"count", vertexCountStr.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i); scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
video::E_VERTEX_TYPE vtxType = buffer->getVertexType(); video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
int vertexCount = buffer->getVertexCount(); u32 vertexCount = buffer->getVertexCount();
globalIndices[i].PosStartIndex = 0; globalIndices[i].PosStartIndex = 0;
...@@ -190,7 +192,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -190,7 +192,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_STANDARD: case video::EVT_STANDARD:
{ {
video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices(); video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].Pos.X; str += vtx[j].Pos.X;
...@@ -198,7 +200,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -198,7 +200,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
str += vtx[j].Pos.Y; str += vtx[j].Pos.Y;
str += " "; str += " ";
str += vtx[j].Pos.Z; str += vtx[j].Pos.Z;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -207,7 +209,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -207,7 +209,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_2TCOORDS: case video::EVT_2TCOORDS:
{ {
video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices(); video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].Pos.X; str += vtx[j].Pos.X;
...@@ -224,7 +226,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -224,7 +226,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_TANGENTS: case video::EVT_TANGENTS:
{ {
video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices(); video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].Pos.X; str += vtx[j].Pos.X;
...@@ -232,7 +234,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -232,7 +234,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
str += vtx[j].Pos.Y; str += vtx[j].Pos.Y;
str += " "; str += " ";
str += vtx[j].Pos.Z; str += vtx[j].Pos.Z;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -249,9 +251,9 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -249,9 +251,9 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
vertexCountStr = totalVertexCount; vertexCountStr = totalVertexCount;
Writer->writeElement(L"accessor", false, L"source", L"#mesh-Pos-array", Writer->writeElement(L"accessor", false, L"source", L"#mesh-Pos-array",
L"count", vertexCountStr.c_str(), L"stride", L"3"); L"count", vertexCountStr.c_str(), L"stride", L"3");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float", L"flow", L"OUT"); Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float", L"flow", L"OUT");
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -260,8 +262,8 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -260,8 +262,8 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float", L"flow", L"OUT"); Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float", L"flow", L"OUT");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeClosingTag(L"accessor"); Writer->writeClosingTag(L"accessor");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeClosingTag(L"technique"); Writer->writeClosingTag(L"technique");
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -269,7 +271,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -269,7 +271,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeClosingTag(L"source"); Writer->writeClosingTag(L"source");
Writer->writeLineBreak(); Writer->writeLineBreak();
// write texture coordinates // write texture coordinates
Writer->writeElement(L"source", false, L"id", L"mesh-TexCoord0"); Writer->writeElement(L"source", false, L"id", L"mesh-TexCoord0");
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -278,12 +280,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -278,12 +280,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeElement(L"array", false, L"id", L"mesh-TexCoord0-array", Writer->writeElement(L"array", false, L"id", L"mesh-TexCoord0-array",
L"type", L"float", L"count", vertexCountStr.c_str()); L"type", L"float", L"count", vertexCountStr.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i); scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
video::E_VERTEX_TYPE vtxType = buffer->getVertexType(); video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
int vertexCount = buffer->getVertexCount(); u32 vertexCount = buffer->getVertexCount();
globalIndices[i].TCoord0StartIndex = 0; globalIndices[i].TCoord0StartIndex = 0;
...@@ -297,13 +299,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -297,13 +299,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_STANDARD: case video::EVT_STANDARD:
{ {
video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices(); video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].TCoords.X; str += vtx[j].TCoords.X;
str += " "; str += " ";
str += vtx[j].TCoords.Y; str += vtx[j].TCoords.Y;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -312,13 +314,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -312,13 +314,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_2TCOORDS: case video::EVT_2TCOORDS:
{ {
video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices(); video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].TCoords.X; str += vtx[j].TCoords.X;
str += " "; str += " ";
str += vtx[j].TCoords.Y; str += vtx[j].TCoords.Y;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -327,13 +329,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -327,13 +329,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_TANGENTS: case video::EVT_TANGENTS:
{ {
video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices(); video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].TCoords.X; str += vtx[j].TCoords.X;
str += " "; str += " ";
str += vtx[j].TCoords.Y; str += vtx[j].TCoords.Y;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -350,17 +352,17 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -350,17 +352,17 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
vertexCountStr = totalVertexCount; vertexCountStr = totalVertexCount;
Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord0-array", Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord0-array",
L"count", vertexCountStr.c_str(), L"stride", L"2"); L"count", vertexCountStr.c_str(), L"stride", L"2");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeElement(L"param", true, L"name", L"U", L"type", L"float", L"flow", L"OUT"); Writer->writeElement(L"param", true, L"name", L"U", L"type", L"float", L"flow", L"OUT");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeElement(L"param", true, L"name", L"V", L"type", L"float", L"flow", L"OUT"); Writer->writeElement(L"param", true, L"name", L"V", L"type", L"float", L"flow", L"OUT");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeClosingTag(L"accessor"); Writer->writeClosingTag(L"accessor");
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeClosingTag(L"technique"); Writer->writeClosingTag(L"technique");
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -375,14 +377,14 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -375,14 +377,14 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
vertexCountStr = (totalVertexCount*3); vertexCountStr = (totalVertexCount*3);
Writer->writeElement(L"array", false, L"id", L"mesh-Normal-array", Writer->writeElement(L"array", false, L"id", L"mesh-Normal-array",
L"type", L"float", L"count", vertexCountStr.c_str()); L"type", L"float", L"count", vertexCountStr.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i); scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
video::E_VERTEX_TYPE vtxType = buffer->getVertexType(); video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
int vertexCount = buffer->getVertexCount(); u32 vertexCount = buffer->getVertexCount();
globalIndices[i].NormalStartIndex = 0; globalIndices[i].NormalStartIndex = 0;
...@@ -396,7 +398,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -396,7 +398,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_STANDARD: case video::EVT_STANDARD:
{ {
video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices(); video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].Normal.X; str += vtx[j].Normal.X;
...@@ -404,7 +406,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -404,7 +406,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
str += vtx[j].Normal.Y; str += vtx[j].Normal.Y;
str += " "; str += " ";
str += vtx[j].Normal.Z; str += vtx[j].Normal.Z;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -413,7 +415,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -413,7 +415,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_2TCOORDS: case video::EVT_2TCOORDS:
{ {
video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices(); video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].Normal.X; str += vtx[j].Normal.X;
...@@ -430,7 +432,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -430,7 +432,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_TANGENTS: case video::EVT_TANGENTS:
{ {
video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices(); video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].Normal.X; str += vtx[j].Normal.X;
...@@ -438,7 +440,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -438,7 +440,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
str += vtx[j].Normal.Y; str += vtx[j].Normal.Y;
str += " "; str += " ";
str += vtx[j].Normal.Z; str += vtx[j].Normal.Z;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -486,12 +488,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -486,12 +488,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeElement(L"array", false, L"id", L"mesh-TexCoord1-array", Writer->writeElement(L"array", false, L"id", L"mesh-TexCoord1-array",
L"type", L"float", L"count", vertexCountStr.c_str()); L"type", L"float", L"count", vertexCountStr.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i); scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
video::E_VERTEX_TYPE vtxType = buffer->getVertexType(); video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
int vertexCount = buffer->getVertexCount(); u32 vertexCount = buffer->getVertexCount();
if (hasSecondTextureCoordinates(vtxType)) if (hasSecondTextureCoordinates(vtxType))
{ {
...@@ -507,13 +509,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -507,13 +509,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
case video::EVT_2TCOORDS: case video::EVT_2TCOORDS:
{ {
video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices(); video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
for (int j=0; j<vertexCount; ++j) for (u32 j=0; j<vertexCount; ++j)
{ {
core::stringw str; core::stringw str;
str += vtx[j].TCoords2.X; str += vtx[j].TCoords2.X;
str += " "; str += " ";
str += vtx[j].TCoords2.Y; str += vtx[j].TCoords2.Y;
Writer->writeText(str.c_str()); Writer->writeText(str.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
...@@ -567,16 +569,16 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -567,16 +569,16 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
// write polygons // write polygons
for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i) for (i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i); scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
int polyCount = buffer->getIndexCount() / 3; u32 polyCount = buffer->getIndexCount() / 3;
core::stringw strPolyCount = polyCount; core::stringw strPolyCount = polyCount;
core::stringw strMat = "#mat"; core::stringw strMat = "#mat";
strMat += i; strMat += i;
Writer->writeElement(L"polygons", false, L"count", strPolyCount.c_str(), Writer->writeElement(L"polygons", false, L"count", strPolyCount.c_str(),
L"material", strMat.c_str()); L"material", strMat.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -586,7 +588,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -586,7 +588,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeElement(L"input", true, L"semantic", L"NORMAL", L"source", L"#mesh-Normal", L"idx", L"2"); Writer->writeElement(L"input", true, L"semantic", L"NORMAL", L"source", L"#mesh-Normal", L"idx", L"2");
Writer->writeLineBreak(); Writer->writeLineBreak();
bool has2ndTexCoords = hasSecondTextureCoordinates(buffer->getVertexType()); bool has2ndTexCoords = hasSecondTextureCoordinates(buffer->getVertexType());
if (has2ndTexCoords) if (has2ndTexCoords)
{ {
...@@ -596,52 +598,52 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -596,52 +598,52 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
// write indices now // write indices now
int posIdx = globalIndices[i].PosStartIndex; s32 posIdx = globalIndices[i].PosStartIndex;
int tCoordIdx = globalIndices[i].TCoord0StartIndex; s32 tCoordIdx = globalIndices[i].TCoord0StartIndex;
int normalIdx = globalIndices[i].NormalStartIndex; s32 normalIdx = globalIndices[i].NormalStartIndex;
int tCoord2Idx = globalIndices[i].TCoord1StartIndex; s32 tCoord2Idx = globalIndices[i].TCoord1StartIndex;
for (int p=0; p<polyCount; ++p) for (u32 p=0; p<polyCount; ++p)
{ {
Writer->writeElement(L"p", false); Writer->writeElement(L"p", false);
core::stringw strP; core::stringw strP;
strP += (int)(buffer->getIndices()[(p*3) + 0]) + posIdx; strP += buffer->getIndices()[(p*3) + 0] + posIdx;
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 0]) + tCoordIdx; strP += buffer->getIndices()[(p*3) + 0] + tCoordIdx;
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 0]) + normalIdx; strP += buffer->getIndices()[(p*3) + 0] + normalIdx;
strP += " "; strP += " ";
if (has2ndTexCoords) if (has2ndTexCoords)
{ {
strP += (int)(buffer->getIndices()[(p*3) + 0]) + tCoord2Idx; strP += buffer->getIndices()[(p*3) + 0] + tCoord2Idx;
strP += " "; strP += " ";
} }
strP += (int)(buffer->getIndices()[(p*3) + 1]) + posIdx; strP += buffer->getIndices()[(p*3) + 1] + posIdx;
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 1]) + tCoordIdx; strP += buffer->getIndices()[(p*3) + 1] + tCoordIdx;
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 1]) + normalIdx; strP += buffer->getIndices()[(p*3) + 1] + normalIdx;
strP += " "; strP += " ";
if (has2ndTexCoords) if (has2ndTexCoords)
{ {
strP += (int)(buffer->getIndices()[(p*3) + 1]) + tCoord2Idx; strP += buffer->getIndices()[(p*3) + 1] + tCoord2Idx;
strP += " "; strP += " ";
} }
strP += (int)(buffer->getIndices()[(p*3) + 2]) + posIdx; strP += buffer->getIndices()[(p*3) + 2] + posIdx;
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 2]) + tCoordIdx; strP += buffer->getIndices()[(p*3) + 2] + tCoordIdx;
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 2]) + normalIdx; strP += buffer->getIndices()[(p*3) + 2] + normalIdx;
if (has2ndTexCoords) if (has2ndTexCoords)
{ {
strP += " "; strP += " ";
strP += (int)(buffer->getIndices()[(p*3) + 2]) + tCoord2Idx; strP += buffer->getIndices()[(p*3) + 2] + tCoord2Idx;
} }
Writer->writeText(strP.c_str()); Writer->writeText(strP.c_str());
Writer->writeClosingTag(L"p"); Writer->writeClosingTag(L"p");
...@@ -654,7 +656,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 ...@@ -654,7 +656,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
// close mesh and geometry // close mesh and geometry
Writer->writeClosingTag(L"mesh"); Writer->writeClosingTag(L"mesh");
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -681,5 +683,5 @@ bool CColladaMeshWriter::hasSecondTextureCoordinates(video::E_VERTEX_TYPE type) ...@@ -681,5 +683,5 @@ bool CColladaMeshWriter::hasSecondTextureCoordinates(video::E_VERTEX_TYPE type)
} }
} // end namespace } // end namespace
} // end namespace } // end namespace
source/Irrlicht/CColladaMeshWriter.h
View file @ 71a1e46d
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
#include "IMeshWriter.h" #include "IMeshWriter.h"
#include "S3DVertex.h" #include "S3DVertex.h"
#include "IVideoDriver.h" #include "IVideoDriver.h"
#include "IFileSystem.h"
namespace irr namespace irr
{ {
namespace io namespace io
{ {
class IXMLWriter; class IXMLWriter;
class IFileSystem;
} }
namespace scene namespace scene
{ {
...@@ -28,7 +28,7 @@ public: ...@@ -28,7 +28,7 @@ public:
//! Returns the type of the mesh writer //! Returns the type of the mesh writer
virtual EMESH_WRITER_TYPE getType() const; virtual EMESH_WRITER_TYPE getType() const;
//! writes a mesh //! writes a mesh
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE); virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE);
protected: protected:
...@@ -37,27 +37,21 @@ protected: ...@@ -37,27 +37,21 @@ protected:
struct SComponentGlobalStartPos struct SComponentGlobalStartPos
{ {
SComponentGlobalStartPos() SComponentGlobalStartPos() : PosStartIndex(-1), PosLastIndex(-1),
{ NormalStartIndex(-1), NormalLastIndex(-1),
PosStartIndex = -1; TCoord0StartIndex(-1), TCoord0LastIndex(-1),
PosLastIndex = -1; TCoord1StartIndex(-1), TCoord1LastIndex(-1)
NormalStartIndex = -1; { }
NormalLastIndex = -1;
TCoord0LastIndex = -1;
TCoord0LastIndex = -1;
TCoord1LastIndex = -1;
TCoord1LastIndex = -1;
}
s32 PosStartIndex; s32 PosStartIndex;
s32 PosLastIndex; s32 PosLastIndex;
s32 TCoord0StartIndex;
s32 TCoord0LastIndex;
s32 NormalStartIndex; s32 NormalStartIndex;
s32 NormalLastIndex; s32 NormalLastIndex;
s32 TCoord0StartIndex;
s32 TCoord0LastIndex;
s32 TCoord1StartIndex; s32 TCoord1StartIndex;
s32 TCoord1LastIndex; s32 TCoord1LastIndex;
}; };
...@@ -68,7 +62,8 @@ protected: ...@@ -68,7 +62,8 @@ protected:
}; };
} // end namespace
} // end namespace } // end namespace
} // end namespace
#endif
#endif
\ No newline at end of file
source/Irrlicht/CIrrMeshWriter.cpp
View file @ 71a1e46d
...@@ -10,13 +10,13 @@ namespace scene ...@@ -10,13 +10,13 @@ namespace scene
{ {
CIrrMeshWriter::CIrrMeshWriter(irr::video::IVideoDriver* driver, CIrrMeshWriter::CIrrMeshWriter(irr::video::IVideoDriver* driver,
irr::io::IFileSystem* fs) irr::io::IFileSystem* fs)
: VideoDriver(driver), FileSystem(fs) : FileSystem(fs), VideoDriver(driver), Writer(0)
{ {
if (VideoDriver) if (VideoDriver)
VideoDriver->grab(); VideoDriver->grab();
if (FileSystem) if (FileSystem)
FileSystem->grab(); FileSystem->grab();
} }
...@@ -26,7 +26,7 @@ CIrrMeshWriter::~CIrrMeshWriter() ...@@ -26,7 +26,7 @@ CIrrMeshWriter::~CIrrMeshWriter()
{ {
if (VideoDriver) if (VideoDriver)
VideoDriver->drop(); VideoDriver->drop();
if (FileSystem) if (FileSystem)
FileSystem->drop(); FileSystem->drop();
} }
...@@ -39,7 +39,7 @@ EMESH_WRITER_TYPE CIrrMeshWriter::getType() const ...@@ -39,7 +39,7 @@ EMESH_WRITER_TYPE CIrrMeshWriter::getType() const
} }
//! writes a mesh //! writes a mesh
bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags) bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags)
{ {
if (!file) if (!file)
...@@ -57,7 +57,7 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla ...@@ -57,7 +57,7 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
// write IRR MESH header // write IRR MESH header
Writer->writeXMLHeader(); Writer->writeXMLHeader();
Writer->writeElement(L"irrmesh", false, Writer->writeElement(L"irrmesh", false,
L"xmlns", L"http://irrlicht.sourceforge.net/IRRMESH_08_2007", L"xmlns", L"http://irrlicht.sourceforge.net/IRRMESH_08_2007",
...@@ -74,5 +74,5 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla ...@@ -74,5 +74,5 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
} // end namespace } // end namespace
} // end namespace } // end namespace
source/Irrlicht/CIrrMeshWriter.h
View file @ 71a1e46d
...@@ -28,7 +28,7 @@ public: ...@@ -28,7 +28,7 @@ public:
//! Returns the type of the mesh writer //! Returns the type of the mesh writer
virtual EMESH_WRITER_TYPE getType() const; virtual EMESH_WRITER_TYPE getType() const;
//! writes a mesh //! writes a mesh
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE); virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE);
protected: protected:
...@@ -39,7 +39,8 @@ protected: ...@@ -39,7 +39,8 @@ protected:
}; };
} // end namespace
} // end namespace } // end namespace
} // end namespace
#endif
#endif
\ No newline at end of file
source/Irrlicht/Makefile
View file @ 71a1e46d
...@@ -19,7 +19,7 @@ VERSION = 1.4alpha ...@@ -19,7 +19,7 @@ VERSION = 1.4alpha
# #
#List of object files, separated based on engine architecture #List of object files, separated based on engine architecture
IRRMESHOBJ = CSkinnedMesh.o CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o CBoneSceneNode.o CBSPMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o CMD3MeshFileLoader.o CAnimatedMeshSceneNode.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMeshSceneNode.o CMY3DMeshFileLoader.o COCTLoader.o CQ3LevelMesh.o CXMeshFileLoader.o CQuake3ShaderSceneNode.o IRRMESHOBJ = CSkinnedMesh.o CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o CBoneSceneNode.o CBSPMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o CMD3MeshFileLoader.o CAnimatedMeshSceneNode.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMeshSceneNode.o CMY3DMeshFileLoader.o COCTLoader.o CQ3LevelMesh.o CXMeshFileLoader.o CQuake3ShaderSceneNode.o CColladaMeshWriter.o CIrrMeshWriter.o
IRROBJ = CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctTreeSceneNode.o COctTreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o IRROBJ = CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctTreeSceneNode.o COctTreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o
IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o
IRRANIMOBJ = CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o IRRANIMOBJ = CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment