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

Some updates, submitted by puh 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1710 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-11-07 23:29:03 +00:00
parent 9f25d03159
commit aec173e15c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/Irrlicht/CLMTSMeshFileLoader.cpp
View File

@ -90,8 +90,8 @@ namespace irr
namespace scene
{
CLMTSMeshFileLoader::CLMTSMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver,
io::IAttributes* parameters)
CLMTSMeshFileLoader::CLMTSMeshFileLoader(io::IFileSystem* fs,
video::IVideoDriver* driver, io::IAttributes* parameters)
: Textures(0), Subsets(0), Triangles(0),
Parameters(parameters), Driver(driver), FileSystem(fs)
{
@ -116,6 +116,7 @@ CLMTSMeshFileLoader::~CLMTSMeshFileLoader()
FileSystem->drop();
}
void CLMTSMeshFileLoader::cleanup()
{
delete [] Textures;
@ -143,6 +144,12 @@ IAnimatedMesh* CLMTSMeshFileLoader::createMesh(io::IReadFile* file)
return 0;
}
//Skip any User Data (additional chunk of data called MATI)
const s32 UserSize = Header.HeaderSize - sizeof(SLMTSHeader);
if (UserSize>0)
file->seek(UserSize,true);
// TEXTURES
file->read(&id, sizeof(u32));
@ -223,7 +230,8 @@ void CLMTSMeshFileLoader::constructMesh(SMesh* mesh)
{
scene::SMeshBufferLightMap* meshBuffer = new scene::SMeshBufferLightMap();
meshBuffer->Material.MaterialType = video::EMT_LIGHTMAP; // EMT_LIGHTMAP_M2/EMT_LIGHTMAP_M4 also possible
// EMT_LIGHTMAP_M2/EMT_LIGHTMAP_M4 also possible
meshBuffer->Material.MaterialType = video::EMT_LIGHTMAP;
meshBuffer->Material.Wireframe = false;
meshBuffer->Material.Lighting = false;
@ -272,8 +280,6 @@ void CLMTSMeshFileLoader::loadTextures(SMesh* mesh, u32 numTextures, u32 numLigh
if (!Driver || !FileSystem)
return;
core::stringc s;
// load textures
core::array<video::ITexture*> tex;
@ -286,6 +292,7 @@ void CLMTSMeshFileLoader::loadTextures(SMesh* mesh, u32 numTextures, u32 numLigh
s32 lm_count = 0;
const core::stringc Path = Parameters->getAttributeAsString(LMTS_TEXTURE_PATH);
core::stringc s;
for (s32 t=0; t<Header.TextureCount; ++t)
{
video::ITexture* tmptex = 0;
@ -295,11 +302,7 @@ void CLMTSMeshFileLoader::loadTextures(SMesh* mesh, u32 numTextures, u32 numLigh
if (FileSystem->existFile(s.c_str()))
tmptex = Driver->getTexture(s.c_str());
else
{
char buf[512]; // filenames may be 256 bytes long
sprintf(buf, "LMTS WARNING: Texture does not exist: %s", s.c_str());
os::Printer::log(buf, ELL_WARNING);
}
os::Printer::log("LMTS WARNING: Texture does not exist", s.c_str(), ELL_WARNING);
if (Textures[t].Flags & 1)
lig[lm_count++] = tmptex;