Skip to content

D
deprecated-irrlicht-mac
Commit 40abacae authored by hybrid's avatar hybrid
Browse files
Options

Cleaned the my3d loader to avoid corrupted char arrays. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@754 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 020eae4f
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 381 deletions
source/Irrlicht/CMY3DHelper.h
View file @ 40abacae
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//********************************************************************** //**********************************************************************
// some usefull functions // some useful functions
//********************************************************************** //**********************************************************************
#ifndef __C_MY3D_HELPER_H_INCLUDED__ #ifndef __C_MY3D_HELPER_H_INCLUDED__
...@@ -24,106 +24,6 @@ namespace irr ...@@ -24,106 +24,6 @@ namespace irr
namespace core namespace core
{ {
//---------------------------------------------------------------------
inline f32 fmax(f32 v1, f32 v2)
{ return (v1>v2)?v1:v2;
}
//----------------------------------------------------------------------------
template <class T>
s32 strlen(T* str)
{ int len = 0;
while(true)
{ if (*(str+len)==0)
break;
len++;
}
return len;
}
//----------------------------------------------------------------------------
template <class T>
T* strcpy (T* src, T* dst)
{ if (src&&dst)
{ s32 len = strlen(src);
for (s32 i=0; i<len+1; i++)
dst[i] = src[i];
return dst;
}
return NULL;
}
//----------------------------------------------------------------------------
template <class T>
T* strcpy (T* src, T* dst, s32 startPos, s32 endPos)
{ if (src&&dst)
{ s32 len = strlen(src);
s32 charIndex=0;
for (s32 i=startPos; i<=endPos && endPos<len; i++)
{ dst[charIndex] = src[i];
charIndex++;
}
dst[charIndex]=0;
return dst;
}
return NULL;
}
//----------------------------------------------------------------------------
template <class T>
s32 findLast(T* Str, c8 ch)
{
s32 lenSrc = strlen(Str);
s32 n=lenSrc-1;
s32 lastCharInStringPos = -1;
while(true)
{ if (Str[n] == ch)
{ lastCharInStringPos = n;
break;
}
if (n==0) break;
n--;
}
return lastCharInStringPos;
}
//----------------------------------------------------------------------------
template <class T>
s32 findLastDelimiter(T* Str)
{
s32 lenSrc = strlen(Str);
s32 n=lenSrc-1;
s32 lastDelimiterInStringPos = -1;
while(true)
{ if (Str[n] == '\\' || Str[n] == '/')
{ lastDelimiterInStringPos = n;
break;
}
if (n==0) break;
n--;
}
return lastDelimiterInStringPos;
}
//----------------------------------------------------------------------------
template <class T>
T* extractFilePath(T* sourceStr, T* buffer, s32 bufSize)
{
s32 lastDelimiterInStringPos = findLastDelimiter(sourceStr);
if (lastDelimiterInStringPos>=0 && lastDelimiterInStringPos<bufSize)
strcpy(sourceStr, buffer, 0, lastDelimiterInStringPos);
return buffer;
}
//----------------------------------------------------------------------------
template <class T>
T* extractFileName(T* sourceStr, T* buffer, s32 bufSize)
{ s32 lastDelimiterInStringPos = findLastDelimiter(sourceStr);
s32 lenSrc = strlen(sourceStr);
if (lastDelimiterInStringPos>=-1 && (lenSrc-lastDelimiterInStringPos)<bufSize)
strcpy(sourceStr, buffer, lastDelimiterInStringPos+1, lenSrc-1);
return buffer;
}
//-----------------RLE stuff----------------------------------------- //-----------------RLE stuff-----------------------------------------
int rle_encode ( int rle_encode (
......
source/Irrlicht/CMY3DMeshFileLoader.cpp
View file @ 40abacae
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include "IReadFile.h" #include "IReadFile.h"
#include "IAttributes.h" #include "IAttributes.h"
#include "CMY3DStuff.h"
#include "CMY3DHelper.h" #include "CMY3DHelper.h"
#include "os.h" #include "os.h"
...@@ -69,20 +67,13 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file) ...@@ -69,20 +67,13 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
core::stringc file_name = file->getFileName(); core::stringc file_name = file->getFileName();
// working directory (from wich we loading the scene) // working directory (from which we load the scene)
c8 WorkDir[1024]; core::stringc filepath = FileSystem->getFileDir(file_name);
core::extractFilePath((c8*)file_name.c_str(), (c8*)WorkDir, 1024); filepath.append("/");
core::stringc msg=""; core::stringc msg="";
//msg="Loading 3d data from ";
//msg.append(file_name);
//os::Printer::log(msg.c_str(), ELL_INFORMATION);
// read file into memory // read file into memory
u16 id;
c8 name[256];
SMyFileHeader fileHeader; SMyFileHeader fileHeader;
file->read(&fileHeader, sizeof(SMyFileHeader)); file->read(&fileHeader, sizeof(SMyFileHeader));
...@@ -92,11 +83,13 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file) ...@@ -92,11 +83,13 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
return 0; return 0;
} }
u16 id;
file->read(&id, sizeof(id)); file->read(&id, sizeof(id));
if (id!=MY_SCENE_HEADER_ID) if (id!=MY_SCENE_HEADER_ID)
{ {
os::Printer::log("Can not find MY_SCENE_HEADER_ID, loading failed!", ELL_ERROR); os::Printer::log("Cannot find MY_SCENE_HEADER_ID, loading failed!", ELL_ERROR);
return 0; return 0;
} }
...@@ -119,34 +112,28 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file) ...@@ -119,34 +112,28 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
return 0; return 0;
} }
// loading materials and textures
//c8 ch[255];
//sprintf(ch, "Loading materials (%d to go) and textures...", sceneHeader.MaterialCount);
//os::Printer::log(ch, ELL_INFORMATION);
core::stringc texturePath = core::stringc texturePath =
SceneManager->getParameters()->getAttributeAsString(MY3D_TEXTURE_PATH); SceneManager->getParameters()->getAttributeAsString(MY3D_TEXTURE_PATH);
s32 texCount=0, ligCount=0, matCount=0; file->read(&id, sizeof(id));
file->read(&id, sizeof(id));
int m; s32 texCount=0, ligCount=0, matCount=0;
for (m=0; m<sceneHeader.MaterialCount; m++) c8 name[256];
{ for (s32 m=0; m<sceneHeader.MaterialCount; ++m)
{
if (id!=MY_MAT_HEADER_ID) if (id!=MY_MAT_HEADER_ID)
{ os::Printer::log("Can not find MY_MAT_HEADER_ID, loading failed!", ELL_ERROR); {
return 0; os::Printer::log("Cannot find MY_MAT_HEADER_ID, loading failed!", ELL_ERROR);
} return 0;
}
matCount++; matCount++;
SMyMaterialEntry me;
// read material header // read material header
SMyMaterialHeader materialHeader; SMyMaterialHeader materialHeader;
file->read(&materialHeader, sizeof(SMyMaterialHeader)); file->read(&materialHeader, sizeof(SMyMaterialHeader));
SMyMaterialEntry me;
me.Header = materialHeader; me.Header = materialHeader;
// read next identificator // read next identificator
...@@ -155,214 +142,215 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file) ...@@ -155,214 +142,215 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
bool GetLightMap=false, GetMainMap=false; bool GetLightMap=false, GetMainMap=false;
static int LightMapIndex=0; static int LightMapIndex=0;
for (int t=0; t<materialHeader.TextureCount; t++) for (int t=0; t<materialHeader.TextureCount; t++)
{ {
if (id==MY_TEX_FNAME_ID) if (id==MY_TEX_FNAME_ID)
file->read(name, 256); file->read(name, 256);
else else
{ {
file->read(&id, sizeof(id)); file->read(&id, sizeof(id));
if (id!=MY_TEXDATA_HEADER_ID) if (id!=MY_TEXDATA_HEADER_ID)
{ os::Printer::log("Can not find MY_TEXDATA_HEADER_ID, loading failed!", ELL_ERROR); {
return 0; os::Printer::log("Can not find MY_TEXDATA_HEADER_ID, loading failed!", ELL_ERROR);
} return 0;
}
SMyTexDataHeader texDataHeader; SMyTexDataHeader texDataHeader;
file->read(&texDataHeader, sizeof(SMyTexDataHeader)); file->read(&texDataHeader, sizeof(SMyTexDataHeader));
core::strcpy(texDataHeader.Name, name); strcpy(texDataHeader.Name, name);
char LightMapName[255]; char LightMapName[255];
sprintf(LightMapName,"My3D.Lightmap.%d",++LightMapIndex); sprintf(LightMapName,"My3D.Lightmap.%d",++LightMapIndex);
core::stringc pixFormatStr; core::stringc pixFormatStr;
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24) if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
pixFormatStr = "24bit,"; pixFormatStr = "24bit,";
else
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_16)
pixFormatStr = "16bit,";
else
{
msg="Unknown format of image data (";
msg.append(LightMapName);
msg.append("), loading failed!");
os::Printer::log(msg.c_str(), ELL_ERROR);
return 0;
}
if (texDataHeader.ComprMode != MY_TEXDATA_COMPR_NONE_ID &&
texDataHeader.ComprMode != MY_TEXDATA_COMPR_RLE_ID &&
texDataHeader.ComprMode != MY_TEXDATA_COMPR_SIMPLE_ID )
{
os::Printer::log("Unknown method of compression image data, loading failed!", ELL_ERROR);
return 0;
}
s32 num_pixels = texDataHeader.Width*texDataHeader.Height;
void* data = 0;
if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_NONE_ID)
{
// none compressed image data
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
{
data = (void*) new SMyPixelColor24[num_pixels];
file->read(data, sizeof(SMyPixelColor24)*num_pixels);
}
else
{
data = (void*) new SMyPixelColor16[num_pixels];
file->read(data, sizeof(SMyPixelColor16)*num_pixels);
}
}
else else
if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_RLE_ID) if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_16)
pixFormatStr = "16bit,";
else
{ {
// read RLE header identificator msg="Unknown format of image data (";
file->read(&id, sizeof(id)); msg.append(LightMapName);
if (id!=MY_TEXDATA_RLE_HEADER_ID) msg.append("), loading failed!");
os::Printer::log(msg.c_str(), ELL_ERROR);
return 0;
}
if (texDataHeader.ComprMode != MY_TEXDATA_COMPR_NONE_ID &&
texDataHeader.ComprMode != MY_TEXDATA_COMPR_RLE_ID &&
texDataHeader.ComprMode != MY_TEXDATA_COMPR_SIMPLE_ID )
{ {
os::Printer::log("Can not find MY_TEXDATA_RLE_HEADER_ID, loading failed!", ELL_ERROR); os::Printer::log("Unknown method of compression image data, loading failed!", ELL_ERROR);
return 0; return 0;
} }
// read RLE header u32 num_pixels = texDataHeader.Width*texDataHeader.Height;
SMyRLEHeader rleHeader;
file->read(&rleHeader, sizeof(SMyRLEHeader));
//allocate memory for input and output buffers void* data = 0;
void *input_buffer = (void*) new unsigned char[rleHeader.nEncodedBytes];
void *output_buffer = (void*) new unsigned char[rleHeader.nDecodedBytes];
// read encoded data if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_NONE_ID)
file->read(input_buffer, rleHeader.nEncodedBytes); {
// none compressed image data
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
{
data = (void*) new SMyPixelColor24[num_pixels];
file->read(data, sizeof(SMyPixelColor24)*num_pixels);
}
else
{
data = (void*) new SMyPixelColor16[num_pixels];
file->read(data, sizeof(SMyPixelColor16)*num_pixels);
}
}
else
if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_RLE_ID)
{
// read RLE header identificator
file->read(&id, sizeof(id));
if (id!=MY_TEXDATA_RLE_HEADER_ID)
{
os::Printer::log("Can not find MY_TEXDATA_RLE_HEADER_ID, loading failed!", ELL_ERROR);
return 0;
}
// read RLE header
SMyRLEHeader rleHeader;
file->read(&rleHeader, sizeof(SMyRLEHeader));
//allocate memory for input and output buffers
void *input_buffer = (void*) new unsigned char[rleHeader.nEncodedBytes];
void *output_buffer = (void*) new unsigned char[rleHeader.nDecodedBytes];
// read encoded data
file->read(input_buffer, rleHeader.nEncodedBytes);
// decode data
data = 0;//(void*) new unsigned char[rleHeader.nDecodedBytes];
s32 decodedBytes = core::rle_decode(
(unsigned char*)input_buffer, rleHeader.nEncodedBytes,
(unsigned char*)output_buffer, rleHeader.nDecodedBytes);
if (decodedBytes!=(s32)rleHeader.nDecodedBytes)
{
os::Printer::log("Error extracting data from RLE compression, loading failed!", ELL_ERROR);
return 0;
}
// free input buffer
delete [] (unsigned char*)input_buffer;
// here decoded data
data = output_buffer;
}
else if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_SIMPLE_ID)
{
// simple compressed image data
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
data = (void*) new SMyPixelColor24[num_pixels];
else
data = (void*) new SMyPixelColor16[num_pixels];
// decode data u32 nReadedPixels =0, nToRead =0;
data = 0;//(void*) new unsigned char[rleHeader.nDecodedBytes]; while (true)
s32 decodedBytes = core::rle_decode( {
(unsigned char*)input_buffer, rleHeader.nEncodedBytes, file->read(&nToRead, sizeof(nToRead));
(unsigned char*)output_buffer, rleHeader.nDecodedBytes);
if (decodedBytes!=(s32)rleHeader.nDecodedBytes) if ((nReadedPixels+nToRead) > num_pixels)
{ break;
os::Printer::log("Error extracting data from RLE compression, loading failed!", ELL_ERROR);
return 0; if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
} {
SMyPixelColor24 col24;
file->read(&col24, sizeof(SMyPixelColor24));
for (u32 p=0; p<nToRead; p++)
{
((SMyPixelColor24*)data)[nReadedPixels+p] =
SMyPixelColor24(col24.r, col24.g, col24.b);
}
}
else
{
SMyPixelColor16 col16;
file->read(&col16, sizeof(SMyPixelColor16));
for (u32 p=0; p<nToRead; p++)
{
((SMyPixelColor16*)data)[nReadedPixels+p].argb = col16.argb;
}
}
// free input buffer nReadedPixels+=nToRead;
delete [] (unsigned char*)input_buffer;
// here decoded data if (nReadedPixels >= num_pixels)
data = output_buffer; break;
}
if (nReadedPixels != num_pixels)
{
os::Printer::log("Image data seems to be corrupted, loading failed!", ELL_ERROR);
return 0;
}
} }
else if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_SIMPLE_ID)
{
// simple compressed image data
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
data = (void*) new SMyPixelColor24[num_pixels];
else
data = (void*) new SMyPixelColor16[num_pixels];
u32 nReadedPixels =0, nToRead =0;
while (true)
{
file->read(&nToRead, sizeof(nToRead));
if ((s32)(nReadedPixels+nToRead)>(s32)num_pixels) break;
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
{
SMyPixelColor24 col24;
file->read(&col24, sizeof(SMyPixelColor24));
for (u32 p=0; p<nToRead; p++)
{ ((SMyPixelColor24*)data)[nReadedPixels+p] =
SMyPixelColor24(col24.r, col24.g, col24.b);
}
}
else
{
SMyPixelColor16 col16;
file->read(&col16, sizeof(SMyPixelColor16));
for (u32 p=0; p<nToRead; p++)
{ ((SMyPixelColor16*)data)[nReadedPixels+p].argb = col16.argb;
}
}
nReadedPixels+=nToRead;
if ((s32)nReadedPixels>=(s32)num_pixels) break;
}
if ((s32)nReadedPixels!=(s32)num_pixels)
{
os::Printer::log("Image data seems to be corrupted, loading failed!", ELL_ERROR);
return 0;
}
}
//! Creates a software image from a byte array.
video::IImage* light_img = 0;
if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
{
// 24 bit lightmap format
light_img = Driver->createImageFromData(
video::ECF_R8G8B8,
core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height),
data, true);
}
else
{
// 16 bit lightmap format
light_img = Driver->createImageFromData(
video::ECF_A1R5G5B5,
core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height),
data, true);
}
bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS); //! Creates a software image from a byte array.
Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false); video::IImage* light_img = 0;
me.Texture2 = Driver->addTexture(LightMapName, light_img); if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
ligCount++; {
// 24 bit lightmap format
light_img = Driver->createImageFromData(
video::ECF_R8G8B8,
core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height),
data, true);
}
else
{
// 16 bit lightmap format
light_img = Driver->createImageFromData(
video::ECF_A1R5G5B5,
core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height),
data, true);
}
Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState); bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
light_img->drop(); me.Texture2 = Driver->addTexture(LightMapName, light_img);
ligCount++;
GetLightMap = true; Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
}
core::stringc Name = name; light_img->drop();
int pos2 = Name.findLast('.');
core::stringc LightingMapStr = "LightingMap";
int ls = LightingMapStr.size();
core::stringc sub = Name.subString((s32)core::fmax((f32)0, (f32)(pos2 - ls)), ls);
core::stringc texFName;
if ((sub == LightingMapStr || (Name[pos2-1]=='m' && GetLightMap = true;
}
core::stringc Name = name;
int pos2 = Name.findLast('.');
core::stringc LightingMapStr = "LightingMap";
int ls = LightingMapStr.size();
core::stringc sub = Name.subString(core::max_(0, (pos2 - ls)), ls);
if ((sub == LightingMapStr || (Name[pos2-1]=='m' &&
Name[pos2-2]=='l' && Name[pos2-3]=='_')) && Name[pos2-2]=='l' && Name[pos2-3]=='_')) &&
!GetLightMap) !GetLightMap)
{ {
bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS); bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false); Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
texFName = texturePath.size() ? texturePath : core::stringc(WorkDir); me.Texture2FileName = texturePath.size() ? texturePath : filepath;
texFName.append("Lightmaps/"); me.Texture2FileName.append("Lightmaps/");
texFName.append(Name); me.Texture2FileName.append(Name);
me.Texture2FileName = texFName;
if (Name.size()>0) if (Name.size()>0)
{ {
me.Texture2 = Driver->getTexture(texFName.c_str()); me.Texture2 = Driver->getTexture(me.Texture2FileName.c_str());
ligCount++; ligCount++;
} }
GetLightMap = true; GetLightMap = true;
me.MaterialType = video::EMT_LIGHTMAP_M2; me.MaterialType = video::EMT_LIGHTMAP_M2;
...@@ -371,13 +359,12 @@ for (u32 p=0; p<nToRead; p++) ...@@ -371,13 +359,12 @@ for (u32 p=0; p<nToRead; p++)
else else
if (!GetLightMap&&GetMainMap) if (!GetLightMap&&GetMainMap)
{ {
texFName = texturePath.size() ? texturePath : core::stringc(WorkDir); me.Texture2FileName = texturePath.size() ? texturePath : filepath;
texFName.append(Name); me.Texture2FileName.append(Name);
me.Texture2FileName = texFName;
if (Name.size()>0) if (Name.size())
{ {
me.Texture2 = Driver->getTexture(texFName.c_str()); me.Texture2 = Driver->getTexture(me.Texture2FileName.c_str());
ligCount++; ligCount++;
} }
...@@ -386,16 +373,15 @@ for (u32 p=0; p<nToRead; p++) ...@@ -386,16 +373,15 @@ for (u32 p=0; p<nToRead; p++)
else else
if (!GetMainMap && !GetLightMap ) if (!GetMainMap && !GetLightMap )
{ {
texFName = WorkDir; me.Texture1FileName = filepath;
texFName.append(Name); me.Texture1FileName.append(Name);
me.Texture1FileName = texFName; if (Name.size())
if (Name.size()>0)
{ {
me.Texture1 = Driver->getTexture(texFName.c_str()); me.Texture1 = Driver->getTexture(me.Texture1FileName.c_str());
texCount++; texCount++;
} }
GetMainMap = true; GetMainMap = true;
me.MaterialType = video::EMT_SOLID; me.MaterialType = video::EMT_SOLID;
} }
else else
...@@ -408,56 +394,22 @@ for (u32 p=0; p<nToRead; p++) ...@@ -408,56 +394,22 @@ for (u32 p=0; p<nToRead; p++)
} }
// override materials types from they names // override materials types from they names
if (!strcmp(me.Header.Name, "AlphaChannel-"))
if (me.Header.Name[0] =='A' &&
me.Header.Name[1] =='l' &&
me.Header.Name[2] =='p' &&
me.Header.Name[3] =='h' &&
me.Header.Name[4] =='a' &&
me.Header.Name[5] =='C' &&
me.Header.Name[6] =='h' &&
me.Header.Name[7] =='a' &&
me.Header.Name[8] =='n' &&
me.Header.Name[9] =='n' &&
me.Header.Name[10]=='e' &&
me.Header.Name[11]=='l' &&
me.Header.Name[12]=='-'
)
{
me.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; me.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
}
else else
if (me.Header.Name[0] =='S' && if (!strcmp(me.Header.Name, "SphereMap-"))
me.Header.Name[1] =='p' &&
me.Header.Name[2] =='h' &&
me.Header.Name[3] =='e' &&
me.Header.Name[4] =='r' &&
me.Header.Name[5] =='e' &&
me.Header.Name[6] =='M' &&
me.Header.Name[7] =='a' &&
me.Header.Name[8] =='p' &&
me.Header.Name[9] =='-'
)
{
me.MaterialType = video::EMT_SPHERE_MAP; me.MaterialType = video::EMT_SPHERE_MAP;
}
MaterialEntry.push_back(me); MaterialEntry.push_back(me);
} }
// loading meshes // loading meshes
//sprintf(ch, " Loaded: materials (%d), textures (%d), lightmaps (%d).", matCount, texCount, ligCount);
// os::Printer::log(ch, ELL_INFORMATION);
if (Mesh) if (Mesh)
Mesh->drop(); Mesh->drop();
Mesh = new SMesh(); Mesh = new SMesh();
//sprintf(ch, "Loading meshes (%d to go) ...", sceneHeader.MeshCount);
//os::Printer::log(ch, ELL_INFORMATION);
if (id!=MY_MESH_LIST_ID) if (id!=MY_MESH_LIST_ID)
{ {
os::Printer::log("Can not find MY_MESH_LIST_ID, loading failed!", ELL_ERROR); os::Printer::log("Can not find MY_MESH_LIST_ID, loading failed!", ELL_ERROR);
...@@ -466,19 +418,19 @@ for (u32 p=0; p<nToRead; p++) ...@@ -466,19 +418,19 @@ for (u32 p=0; p<nToRead; p++)
file->read(&id, sizeof(id)); file->read(&id, sizeof(id));
for (s32 mesh_id=0; mesh_id<sceneHeader.MeshCount; mesh_id++) for (s32 mesh_id=0; mesh_id<sceneHeader.MeshCount; mesh_id++)
{ {
// Warning!!! In some cases MY3D exporter uncorrectly calculates // Warning!!! In some cases MY3D exporter uncorrectly calculates
// MeshCount (it's a problem, has to be solved) thats why // MeshCount (it's a problem, has to be solved) thats why
// i added this code line // i added this code line
if (id!=MY_MESH_HEADER_ID) if (id!=MY_MESH_HEADER_ID)
break; break;
if (id!=MY_MESH_HEADER_ID) if (id!=MY_MESH_HEADER_ID)
{ {
os::Printer::log("Can not find MY_MESH_HEADER_ID, loading failed!", ELL_ERROR); os::Printer::log("Can not find MY_MESH_HEADER_ID, loading failed!", ELL_ERROR);
return 0; return 0;
} }
SMyMeshHeader meshHeader; SMyMeshHeader meshHeader;
file->read(&meshHeader, sizeof(SMyMeshHeader)); file->read(&meshHeader, sizeof(SMyMeshHeader));
...@@ -502,7 +454,7 @@ for (u32 p=0; p<nToRead; p++) ...@@ -502,7 +454,7 @@ for (u32 p=0; p<nToRead; p++)
file->read(&vertsNum, sizeof(vertsNum)); file->read(&vertsNum, sizeof(vertsNum));
Vertex.reallocate(vertsNum); Vertex.reallocate(vertsNum);
file->read(Vertex.pointer(), sizeof(SMyVertex)*vertsNum); file->read(Vertex.pointer(), sizeof(SMyVertex)*vertsNum);
Vertex.set_used(vertsNum); Vertex.set_used(vertsNum);
// faces // faces
file->read(&id, sizeof(id)); file->read(&id, sizeof(id));
...@@ -515,16 +467,16 @@ for (u32 p=0; p<nToRead; p++) ...@@ -515,16 +467,16 @@ for (u32 p=0; p<nToRead; p++)
file->read(&facesNum, sizeof(facesNum)); file->read(&facesNum, sizeof(facesNum));
Face.reallocate(facesNum); Face.reallocate(facesNum);
file->read(Face.pointer(), sizeof(SMyFace)*facesNum); file->read(Face.pointer(), sizeof(SMyFace)*facesNum);
Face.set_used(facesNum); Face.set_used(facesNum);
// reading texture channels // reading texture channels
for (s32 tex=0; tex<(s32)meshHeader.TChannelCnt; tex++) for (s32 tex=0; tex<(s32)meshHeader.TChannelCnt; tex++)
{ {
// Max 2 texture channels allowed (but in format .my3d can be more) // Max 2 texture channels allowed (but in format .my3d can be more)
s32 tVertsNum=0, tFacesNum=0; s32 tVertsNum=0, tFacesNum=0;
// reading texture coords // reading texture coords
file->read(&id, sizeof(id)); file->read(&id, sizeof(id));
if (id!=MY_TVERTS_ID) if (id!=MY_TVERTS_ID)
{ msg="Can not find MY_TVERTS_ID ("; { msg="Can not find MY_TVERTS_ID (";
...@@ -829,9 +781,9 @@ for (u32 p=0; p<nToRead; p++) ...@@ -829,9 +781,9 @@ for (u32 p=0; p<nToRead; p++)
// creating mesh // creating mesh
for (m=0; m<(s32)MeshBufferEntry.size(); m++) for (u32 num=0; num<MeshBufferEntry.size(); ++num)
{ {
SMeshBufferLightMap* buffer = MeshBufferEntry[m].MeshBuffer; SMeshBufferLightMap* buffer = MeshBufferEntry[num].MeshBuffer;
if (!buffer) if (!buffer)
continue; continue;
...@@ -861,33 +813,29 @@ for (u32 p=0; p<nToRead; p++) ...@@ -861,33 +813,29 @@ for (u32 p=0; p<nToRead; p++)
Mesh->drop(); Mesh->drop();
Mesh = 0; Mesh = 0;
//msg="3D data successfully loaded from ";
//msg.append(file_name);
//os::Printer::log(msg.c_str(), ELL_INFORMATION);
return am; return am;
} }
CMY3DMeshFileLoader::SMyMaterialEntry* CMY3DMeshFileLoader::getMaterialEntryByIndex(u32 matInd) CMY3DMeshFileLoader::SMyMaterialEntry* CMY3DMeshFileLoader::getMaterialEntryByIndex(u32 matInd)
{ {
for (int m=0; m<(s32)MaterialEntry.size(); m++) for (u32 m=0; m<MaterialEntry.size(); ++m)
if (MaterialEntry[m].Header.Index == matInd) if (MaterialEntry[m].Header.Index == matInd)
return &MaterialEntry[m]; return &MaterialEntry[m];
return NULL; return 0;
} }
SMeshBufferLightMap* CMY3DMeshFileLoader::getMeshBufferByMaterialIndex(u32 matInd) SMeshBufferLightMap* CMY3DMeshFileLoader::getMeshBufferByMaterialIndex(u32 matInd)
{ {
for (int m=0; m<(s32)MeshBufferEntry.size(); m++) for (u32 m=0; m<MeshBufferEntry.size(); ++m)
{ {
if (MeshBufferEntry[m].MaterialIndex == (s32)matInd) if (MeshBufferEntry[m].MaterialIndex == (s32)matInd)
return MeshBufferEntry[m].MeshBuffer; return MeshBufferEntry[m].MeshBuffer;
} }
return NULL; return 0;
} }
......
source/Irrlicht/CTerrainSceneNode.h
View file @ 40abacae
...@@ -204,20 +204,23 @@ namespace scene ...@@ -204,20 +204,23 @@ namespace scene
//! work best with your new terrain size. //! work best with your new terrain size.
virtual bool overrideLODDistance( s32 LOD, f64 newDistance ); virtual bool overrideLODDistance( s32 LOD, f64 newDistance );
//! Scales the base texture, similar to makePlanarTextureMapping //! Scales the two textures
virtual void scaleTexture(f32 scale = 1.0f, f32 scale2=0.0f ); virtual void scaleTexture(f32 scale = 1.0f, f32 scale2 = 0.0f);
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const { return ESNT_TERRAIN; } virtual ESCENE_NODE_TYPE getType() const {return ESNT_TERRAIN;}
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0); virtual void serializeAttributes(io::IAttributes* out,
io::SAttributeReadWriteOptions* options=0);
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0); virtual void deserializeAttributes(io::IAttributes* in,
io::SAttributeReadWriteOptions* options=0);
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent, ISceneManager* newManager); virtual ISceneNode* clone(ISceneNode* newParent,
ISceneManager* newManager);
private: private:
......
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