minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-01 15:50:27 +02:00
Code Issues Projects Releases Wiki Activity

Delete lots of unused features (#48)

Browse Source
This commit is contained in:
hecks
2021-07-23 16:23:44 +02:00
committed by GitHub
parent dc2246dae7
commit 4ab3de3bab
1103 changed files with 41 additions and 216490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
source/Irrlicht/CXMeshFileLoader.cpp
View File

@ -7,7 +7,6 @@
#ifdef _IRR_COMPILE_WITH_X_LOADER_
#include "CXMeshFileLoader.h"
#include "CMeshTextureLoader.h"
#include "os.h"
#include "fast_atof.h"
@ -36,8 +35,6 @@ CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem*
#ifdef _DEBUG
setDebugName("CXMeshFileLoader");
#endif
TextureLoader = new CMeshTextureLoader( FileSystem, SceneManager->getVideoDriver() );
}
@ -58,9 +55,6 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(io::IReadFile* file)
if (!file)
return 0;
if ( getMeshTextureLoader() )
getMeshTextureLoader()->setMeshFile(file);
#ifdef _XREADER_DEBUG
u32 time = os::Timer::getRealTime();
#endif
@ -525,14 +519,6 @@ bool CXMeshFileLoader::parseDataObject()
return parseDataObjectAnimationTicksPerSecond();
}
else
if (objectName == "Material")
{
// template materials now available thanks to joeWright
TemplateMaterials.push_back(SXTemplateMaterial());
TemplateMaterials.getLast().Name = getNextToken();
return parseDataObjectMaterial(TemplateMaterials.getLast().Material);
}
else
if (objectName == "}")
{
os::Printer::log("} found in dataObject", ELL_WARNING);
@ -1475,13 +1461,6 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
getNextToken(); // skip }
}
else
if (objectName == "Material")
{
mesh.Materials.push_back(video::SMaterial());
if (!parseDataObjectMaterial(mesh.Materials.getLast()))
return false;
}
else
if (objectName == ";")
{
// ignore
@ -1497,87 +1476,6 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
}
bool CXMeshFileLoader::parseDataObjectMaterial(video::SMaterial& material)
{
#ifdef _XREADER_DEBUG
os::Printer::log("CXFileReader: Reading mesh material", ELL_DEBUG);
#endif
if (!readHeadOfDataObject())
{
os::Printer::log("No opening brace in Mesh Material found in .x file", ELL_WARNING);
os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
return false;
}
// read RGBA
readRGBA(material.DiffuseColor); checkForOneFollowingSemicolons();
// read power
material.Shininess = readFloat();
// read specular
readRGB(material.SpecularColor); checkForOneFollowingSemicolons();
// read emissive
readRGB(material.EmissiveColor); checkForOneFollowingSemicolons();
// read other data objects
int textureLayer=0;
while(true)
{
core::stringc objectName = getNextToken();
if (objectName.size() == 0)
{
os::Printer::log("Unexpected ending found in Mesh Material in .x file.", ELL_WARNING);
os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
return false;
}
else
if (objectName == "}")
{
break; // material finished
}
else
if (objectName.equals_ignore_case("TextureFilename"))
{
// some exporters write "TextureFileName" instead.
core::stringc TextureFileName;
if (!parseDataObjectTextureFilename(TextureFileName))
return false;
material.setTexture( textureLayer, getMeshTextureLoader() ? getMeshTextureLoader()->getTexture(TextureFileName) : NULL );
++textureLayer;
if (textureLayer==2)
material.MaterialType=video::EMT_LIGHTMAP;
}
else
if (objectName.equals_ignore_case("NormalmapFilename"))
{
// some exporters write "NormalmapFileName" instead.
core::stringc TextureFileName;
if (!parseDataObjectTextureFilename(TextureFileName))
return false;
material.setTexture( 1, getMeshTextureLoader() ? getMeshTextureLoader()->getTexture(TextureFileName) : NULL );
if (textureLayer==1)
++textureLayer;
}
else
{
os::Printer::log("Unknown data object in material in .x file", objectName.c_str(), ELL_WARNING);
if (!parseUnknownDataObject())
return false;
}
}
return true;
}
bool CXMeshFileLoader::parseDataObjectAnimationSet()
{
#ifdef _XREADER_DEBUG