mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-14 03:09:08 +00:00
Cleanup
This commit is contained in:
parent
f1ed27595d
commit
e8cb200f07
1 changed files with 18 additions and 7 deletions
|
@ -17,6 +17,7 @@
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "export_nel.h"
|
#include "export_nel.h"
|
||||||
#include "../tile_utility/tile_utility.h"
|
#include "../tile_utility/tile_utility.h"
|
||||||
|
#include "nel/misc/path.h"
|
||||||
#include "nel/3d/texture_file.h"
|
#include "nel/3d/texture_file.h"
|
||||||
#include "nel/3d/texture_multi_file.h"
|
#include "nel/3d/texture_multi_file.h"
|
||||||
#include "nel/3d/texture_cube.h"
|
#include "nel/3d/texture_cube.h"
|
||||||
|
@ -1139,9 +1140,9 @@ int CExportNel::getVertMapChannel (Texmap& texmap, Matrix3& channelMatrix, TimeV
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the absolute or relative path from a texture filename
|
// get the absolute or relative path from a texture filename
|
||||||
static std::string ConvertTexFileName(const char *src, bool _AbsolutePath)
|
static std::string ConvertTexFileName(const std::string &path, bool _AbsolutePath)
|
||||||
{
|
{
|
||||||
// File name, maxlen 256 under windows
|
/*// File name, maxlen 256 under windows
|
||||||
char sFileName[512];
|
char sFileName[512];
|
||||||
strcpy (sFileName, src);
|
strcpy (sFileName, src);
|
||||||
|
|
||||||
|
@ -1156,7 +1157,15 @@ static std::string ConvertTexFileName(const char *src, bool _AbsolutePath)
|
||||||
// Make the final path
|
// Make the final path
|
||||||
_makepath (sFileName, NULL, NULL, sName, sExt);
|
_makepath (sFileName, NULL, NULL, sName, sExt);
|
||||||
}
|
}
|
||||||
return std::string(sFileName);
|
return std::string(sFileName);*/
|
||||||
|
if (_AbsolutePath)
|
||||||
|
{
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return NLMISC::CFile::getFilename(path);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build a NeL texture corresponding with a max Texmap.
|
// Build a NeL texture corresponding with a max Texmap.
|
||||||
|
@ -1243,7 +1252,7 @@ ITexture* CExportNel::buildATexture (Texmap& texmap, CMaterialDesc &remap3dsTexC
|
||||||
if (l == 1 && !fileName[0].empty())
|
if (l == 1 && !fileName[0].empty())
|
||||||
{
|
{
|
||||||
srcTex = new CTextureFile;
|
srcTex = new CTextureFile;
|
||||||
static_cast<CTextureFile *>(srcTex)->setFileName (ConvertTexFileName(fileName[0].c_str(), _AbsolutePath));
|
static_cast<CTextureFile *>(srcTex)->setFileName (ConvertTexFileName(fileName[0], _AbsolutePath));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1253,7 +1262,8 @@ ITexture* CExportNel::buildATexture (Texmap& texmap, CMaterialDesc &remap3dsTexC
|
||||||
if (!fileName[k].empty())
|
if (!fileName[k].empty())
|
||||||
{
|
{
|
||||||
/// set the name of the texture after converting it
|
/// set the name of the texture after converting it
|
||||||
static_cast<CTextureMultiFile *>(srcTex)->setFileName(k, ConvertTexFileName(fileName[k].c_str(), _AbsolutePath).c_str());
|
std::string convertMultiTex = ConvertTexFileName(fileName[k], _AbsolutePath);
|
||||||
|
static_cast<CTextureMultiFile *>(srcTex)->setFileName(k, convertMultiTex.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1261,7 +1271,8 @@ ITexture* CExportNel::buildATexture (Texmap& texmap, CMaterialDesc &remap3dsTexC
|
||||||
else // standard texture
|
else // standard texture
|
||||||
{
|
{
|
||||||
srcTex = new CTextureFile;
|
srcTex = new CTextureFile;
|
||||||
static_cast<CTextureFile *>(srcTex)->setFileName (ConvertTexFileName(pBitmap->GetMapName(), _AbsolutePath));
|
std::string mapName = pBitmap->GetMapName();
|
||||||
|
static_cast<CTextureFile *>(srcTex)->setFileName (ConvertTexFileName(mapName, _AbsolutePath));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2) Use this texture 'as it', or duplicate it to create the faces of a cube map
|
// 2) Use this texture 'as it', or duplicate it to create the faces of a cube map
|
||||||
|
@ -1361,7 +1372,7 @@ NL3D::CTextureCube *CExportNel::buildTextureCubeFromReflectRefract(Texmap &texma
|
||||||
CTextureFile *pT = new CTextureFile();
|
CTextureFile *pT = new CTextureFile();
|
||||||
|
|
||||||
// Set the file name
|
// Set the file name
|
||||||
pT->setFileName(ConvertTexFileName(names[i].c_str(), _AbsolutePath));
|
pT->setFileName(ConvertTexFileName(names[i], _AbsolutePath));
|
||||||
|
|
||||||
// Set the texture
|
// Set the texture
|
||||||
pTextureCube->setTexture(tfNewOrder[i], pT);
|
pTextureCube->setTexture(tfNewOrder[i], pT);
|
||||||
|
|
Loading…
Reference in a new issue