Remove CSM support
This commit is contained in:
parent
43b1542dc9
commit
008f2d3422
@ -93,7 +93,6 @@ source/Irrlicht/CQuake3ShaderSceneNode.cpp
|
||||
source/Irrlicht/CWADReader.cpp
|
||||
source/Irrlicht/CParticleAttractionAffector.cpp
|
||||
source/Irrlicht/CMeshSceneNode.cpp
|
||||
source/Irrlicht/CCSMLoader.cpp
|
||||
source/Irrlicht/COBJMeshWriter.cpp
|
||||
source/Irrlicht/CGUIScrollBar.cpp
|
||||
source/Irrlicht/CAttributes.cpp
|
||||
@ -247,7 +246,6 @@ source/Irrlicht/CAnimatedMeshSceneNode.h
|
||||
source/Irrlicht/CGUIStaticText.h
|
||||
source/Irrlicht/wglext.h
|
||||
source/Irrlicht/CTimer.h
|
||||
source/Irrlicht/CCSMLoader.h
|
||||
source/Irrlicht/CWADReader.h
|
||||
source/Irrlicht/CSceneNodeAnimatorCameraFPS.h
|
||||
source/Irrlicht/CParticleFadeOutAffector.h
|
||||
|
@ -317,11 +317,6 @@ B3D, MS3D or X meshes */
|
||||
#ifdef NO_IRR_COMPILE_WITH_MD3_LOADER_
|
||||
#undef _IRR_COMPILE_WITH_MD3_LOADER_
|
||||
#endif
|
||||
//! Define _IRR_COMPILE_WITH_CSM_LOADER_ if you want to load Cartography Shop files
|
||||
#define _IRR_COMPILE_WITH_CSM_LOADER_
|
||||
#ifdef NO_IRR_COMPILE_WITH_CSM_LOADER_
|
||||
#undef _IRR_COMPILE_WITH_CSM_LOADER_
|
||||
#endif
|
||||
//! Define _IRR_COMPILE_WITH_BSP_LOADER_ if you want to load Quake 3 BSP files
|
||||
#define _IRR_COMPILE_WITH_BSP_LOADER_
|
||||
#ifdef NO_IRR_COMPILE_WITH_BSP_LOADER_
|
||||
|
@ -1,872 +0,0 @@
|
||||
// Copyright (C) 2002-2012 Nikolaus Gebhardt
|
||||
// This file is part of the "Irrlicht Engine".
|
||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
//
|
||||
// This file was written by Saurav Mohapatra and modified by Nikolaus Gebhardt.
|
||||
// See CCSMLoader.h for details.
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_CSM_LOADER_
|
||||
|
||||
#include "CCSMLoader.h"
|
||||
#include "os.h"
|
||||
#include "IFileSystem.h"
|
||||
#include "IReadFile.h"
|
||||
#include "ISceneManager.h"
|
||||
#include "IAttributes.h"
|
||||
#include "SMesh.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "SAnimatedMesh.h"
|
||||
#include "SMeshBufferLightMap.h"
|
||||
|
||||
#ifdef _DEBUG
|
||||
#define _IRR_DEBUG_CSM_LOADER_
|
||||
#endif
|
||||
|
||||
namespace irr
|
||||
{
|
||||
namespace scene
|
||||
{
|
||||
//
|
||||
// the CSM data types
|
||||
//
|
||||
struct color_rgb_t
|
||||
{
|
||||
s32 red;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
|
||||
color_rgb_t() : red(0), green(0), blue(0) {}
|
||||
void clear() { red=0; green=0; blue=0; }
|
||||
video::SColor toSColor() const { return video::SColor(255, red, green, blue); }
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// A Binary File Reader
|
||||
//
|
||||
struct BinaryFileReader
|
||||
{
|
||||
BinaryFileReader(io::IReadFile* pFile) : file(pFile) { }
|
||||
|
||||
s32 readBuffer(void* buffer, s32 len)
|
||||
{
|
||||
return file->read(buffer,len);
|
||||
}
|
||||
|
||||
s32 readLong();
|
||||
f32 readFloat();
|
||||
|
||||
void readString(core::stringc &str);
|
||||
void readVec3f(core::vector3df* v);
|
||||
void readVec2f(core::vector2df* v);
|
||||
void readColorRGB(color_rgb_t* color);
|
||||
|
||||
io::IReadFile *file;
|
||||
};
|
||||
|
||||
//
|
||||
// The file header
|
||||
//
|
||||
class Header
|
||||
{
|
||||
public:
|
||||
|
||||
enum E_CSM_VERSION
|
||||
{
|
||||
VERSION_4 = 4,
|
||||
VERSION_4_1 = 5
|
||||
};
|
||||
|
||||
Header(){ clear(); }
|
||||
|
||||
s32 getVersion() const { return version; }
|
||||
void clear(){ version = 0; }
|
||||
void load(BinaryFileReader* pReader)
|
||||
{
|
||||
version = pReader->readLong();
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
s32 version;
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// The groups
|
||||
//
|
||||
class Group
|
||||
{
|
||||
public:
|
||||
|
||||
Group(){ clear(); }
|
||||
~Group(){ clear(); }
|
||||
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
|
||||
s32 getFlags() const { return flags; }
|
||||
s32 getParentGroupID() const { return parentGroup; }
|
||||
const core::stringc& getProperties() const { return props; }
|
||||
video::SColor getColor() const { return color.toSColor(); }
|
||||
|
||||
private:
|
||||
|
||||
s32 flags;
|
||||
s32 parentGroup;
|
||||
core::stringc props;
|
||||
color_rgb_t color;
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// The visgroups
|
||||
//
|
||||
class VisGroup
|
||||
{
|
||||
public:
|
||||
|
||||
VisGroup(){ clear(); }
|
||||
~VisGroup(){ clear(); }
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
|
||||
s32 getFlags() const{ return flags; }
|
||||
const core::stringc& getName() const{ return name; }
|
||||
video::SColor getColor() const{ return color.toSColor(); }
|
||||
|
||||
private:
|
||||
|
||||
core::stringc name;
|
||||
s32 flags;
|
||||
color_rgb_t color;
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// Lightmaps
|
||||
//
|
||||
class LightMap
|
||||
{
|
||||
public:
|
||||
|
||||
LightMap() : pixelData(0){ clear(); }
|
||||
~LightMap(){ clear(); }
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
s32 getWidth() const{ return width; }
|
||||
s32 getHeight() const{ return height; }
|
||||
s32* getPixelData() const{ return pixelData; }
|
||||
|
||||
private:
|
||||
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32* pixelData;
|
||||
};
|
||||
|
||||
struct Triangle
|
||||
{
|
||||
s32 a,b,c;
|
||||
};
|
||||
|
||||
|
||||
struct Line
|
||||
{
|
||||
s32 a,b;
|
||||
};
|
||||
|
||||
|
||||
class Vertex
|
||||
{
|
||||
public:
|
||||
|
||||
Vertex(){ clear(); }
|
||||
~Vertex(){ clear(); }
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
|
||||
const core::vector3df& getPosition() const { return position; }
|
||||
const core::vector3df& getNormal() const { return normal; }
|
||||
video::SColor getColor() const { return color.toSColor(); }
|
||||
const core::vector3df& getTextureCoordinates() const { return texCoords; }
|
||||
const core::vector3df& getLightMapCoordinates() const { return lmapCoords; }
|
||||
|
||||
private:
|
||||
|
||||
core::vector3df position;
|
||||
core::vector3df normal;
|
||||
color_rgb_t color;
|
||||
core::vector3df texCoords;
|
||||
core::vector3df lmapCoords;
|
||||
};
|
||||
|
||||
|
||||
class Surface
|
||||
{
|
||||
public:
|
||||
|
||||
Surface() { clear(); }
|
||||
~Surface(){ clear(); }
|
||||
|
||||
void clear();
|
||||
void load(BinaryFileReader *pReader);
|
||||
|
||||
s32 getFlags() const{ return flags; }
|
||||
const core::stringc& getTextureName() const{ return textureName; }
|
||||
s32 getLightMapId() const{ return lightMapId; }
|
||||
const core::vector2df* getUVOffset() const{ return &uvOffset; }
|
||||
const core::vector2df* getUVScale() const{ return &uvScale; }
|
||||
f32 getUVRotation() const{ return uvRotation; }
|
||||
|
||||
u32 getVertexCount() const{ return vertices.size(); }
|
||||
const Vertex& getVertexAt(const s32 index) const{ return vertices[index]; }
|
||||
|
||||
u32 getTriangleCount() const{ return triangles.size(); }
|
||||
const Triangle& getTriangleAt(const s32 index) const{ return triangles[index]; }
|
||||
|
||||
private:
|
||||
|
||||
s32 flags;
|
||||
core::stringc textureName;
|
||||
s32 lightMapId;
|
||||
core::vector2df uvOffset;
|
||||
core::vector2df uvScale;
|
||||
f32 uvRotation;
|
||||
core::array<Vertex> vertices;
|
||||
core::array<Triangle> triangles;
|
||||
core::array<Line> lines;
|
||||
};
|
||||
|
||||
class Mesh
|
||||
{
|
||||
public:
|
||||
|
||||
Mesh(){ clear(); }
|
||||
~Mesh(){ clear(); }
|
||||
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader, bool bReadVisGroups);
|
||||
|
||||
s32 getFlags() const { return flags; }
|
||||
s32 getGroupID() const { return groupId; }
|
||||
const core::stringc& getProperties() const { return props; }
|
||||
video::SColor getColor() const { return color.toSColor(); }
|
||||
const core::vector3df* getPosition() const { return &position; }
|
||||
s32 getVisgroupID() const { return visgroupId; }
|
||||
s32 getSurfaceCount() const { return surfaces.size(); }
|
||||
const Surface* getSurfaceAt(const s32 index) const { return surfaces[index]; }
|
||||
|
||||
private:
|
||||
|
||||
s32 flags;
|
||||
s32 groupId;
|
||||
core::stringc props;
|
||||
color_rgb_t color;
|
||||
core::vector3df position;
|
||||
s32 visgroupId;
|
||||
|
||||
core::array<Surface*> surfaces;
|
||||
};
|
||||
|
||||
class Entity
|
||||
{
|
||||
public:
|
||||
|
||||
Entity() { clear(); }
|
||||
~Entity() { clear(); }
|
||||
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
s32 getVisgroupID() const { return visgroupId; }
|
||||
s32 getGroupID() const { return groupId; }
|
||||
const core::stringc& getProperties() const { return props; }
|
||||
const core::vector3df* getPosition() const { return &position; }
|
||||
|
||||
private:
|
||||
|
||||
s32 visgroupId;
|
||||
s32 groupId;
|
||||
core::stringc props;
|
||||
core::vector3df position;
|
||||
};
|
||||
|
||||
|
||||
class CameraData
|
||||
{
|
||||
public:
|
||||
|
||||
CameraData(){ clear(); }
|
||||
~CameraData(){ clear(); }
|
||||
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
|
||||
const core::vector3df* getPosition(){ return &position; }
|
||||
f32 getPitch(){ return pitch; }
|
||||
f32 getYaw(){ return yaw; }
|
||||
|
||||
private:
|
||||
|
||||
core::vector3df position;
|
||||
f32 pitch;
|
||||
f32 yaw;
|
||||
};
|
||||
|
||||
//
|
||||
// A CSM File
|
||||
//
|
||||
class CSMFile
|
||||
{
|
||||
public:
|
||||
|
||||
CSMFile(){ clear(); }
|
||||
~CSMFile(){ clear(); }
|
||||
void clear();
|
||||
void load(BinaryFileReader* pReader);
|
||||
|
||||
const Header* getHeader() const{ return &header; }
|
||||
|
||||
u32 getGroupCount() const{ return groups.size(); }
|
||||
const Group* getGroupAt(const s32 index) const{ return groups[index]; }
|
||||
|
||||
u32 getVisGroupCount() const{ return visgroups.size(); }
|
||||
const VisGroup* getVisGroupAt(const s32 index) const{ return visgroups[index]; }
|
||||
|
||||
u32 getLightMapCount() const{ return lightmaps.size(); }
|
||||
const LightMap* getLightMapAt(const s32 index) const { return lightmaps[index]; }
|
||||
|
||||
u32 getMeshCount() const{ return meshes.size(); }
|
||||
const Mesh* getMeshAt(const s32 index) const{ return meshes[index]; }
|
||||
|
||||
u32 getEntityCount() const{ return entities.size(); }
|
||||
const Entity* getEntityAt(const s32 index) const{ return entities[index]; }
|
||||
|
||||
const CameraData* getCameraData() const{ return &cameraData; }
|
||||
|
||||
private:
|
||||
|
||||
Header header;
|
||||
core::array<Group*> groups;
|
||||
core::array<VisGroup*> visgroups;
|
||||
core::array<LightMap*> lightmaps;
|
||||
core::array<Mesh*> meshes;
|
||||
core::array<Entity*> entities;
|
||||
CameraData cameraData;
|
||||
};
|
||||
|
||||
CCSMLoader::CCSMLoader(scene::ISceneManager* manager, io::IFileSystem* fs)
|
||||
: FileSystem(fs), SceneManager(manager)
|
||||
{
|
||||
|
||||
#ifdef _DEBUG
|
||||
setDebugName("CCSMLoader");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
//! returns true if the file maybe is able to be loaded by this class
|
||||
//! based on the file extension (e.g. ".bsp")
|
||||
bool CCSMLoader::isALoadableFileExtension(const io::path& filename) const
|
||||
{
|
||||
return core::hasFileExtension ( filename, "csm" );
|
||||
}
|
||||
|
||||
|
||||
//! creates/loads an animated mesh from the file.
|
||||
IAnimatedMesh* CCSMLoader::createMesh(io::IReadFile* file)
|
||||
{
|
||||
scene::IMesh* m = createCSMMesh(file);
|
||||
|
||||
if (!m)
|
||||
return 0;
|
||||
|
||||
SAnimatedMesh* am = new SAnimatedMesh();
|
||||
am->Type = EAMT_CSM;
|
||||
am->addMesh(m);
|
||||
m->drop();
|
||||
|
||||
am->recalculateBoundingBox();
|
||||
return am;
|
||||
}
|
||||
|
||||
scene::IMesh* CCSMLoader::createCSMMesh(io::IReadFile* file)
|
||||
{
|
||||
if (!file)
|
||||
return 0;
|
||||
|
||||
BinaryFileReader reader(file);
|
||||
CSMFile csmFile;
|
||||
csmFile.load(&reader);
|
||||
|
||||
return createIrrlichtMesh(&csmFile,
|
||||
SceneManager->getParameters()->getAttributeAsString(CSM_TEXTURE_PATH),
|
||||
file->getFileName());
|
||||
}
|
||||
|
||||
|
||||
scene::IMesh* CCSMLoader::createIrrlichtMesh(const CSMFile* csmFile,
|
||||
const core::stringc& textureRoot, const io::path& lmprefix)
|
||||
{
|
||||
scene::SMesh *pMesh = new scene::SMesh();
|
||||
video::IVideoDriver* driver = SceneManager->getVideoDriver();
|
||||
|
||||
for(u32 l = 0; l<csmFile->getLightMapCount(); l++)
|
||||
{
|
||||
const LightMap* lmap = csmFile->getLightMapAt(l);
|
||||
|
||||
io::path lmapName = lmprefix;
|
||||
lmapName += "LMAP_";
|
||||
lmapName += io::path(l+1);
|
||||
os::Printer::log("CCSMLoader loading light map", lmapName.c_str());
|
||||
|
||||
video::IImage* lmapImg = driver->createImageFromData(
|
||||
video::ECF_A8R8G8B8,
|
||||
core::dimension2d<u32>(lmap->getWidth(),lmap->getHeight()),
|
||||
lmap->getPixelData());
|
||||
|
||||
driver->addTexture(lmapName.c_str(), lmapImg);
|
||||
lmapImg->drop();
|
||||
}
|
||||
|
||||
for(u32 m = 0; m<csmFile->getMeshCount(); m++)
|
||||
{
|
||||
const Mesh* mshPtr = csmFile->getMeshAt(m);
|
||||
|
||||
for(s32 s = 0; s < mshPtr->getSurfaceCount(); s++)
|
||||
{
|
||||
const Surface* surface = mshPtr->getSurfaceAt(s);
|
||||
|
||||
core::stringc texName;
|
||||
if (textureRoot.size())
|
||||
{
|
||||
texName += textureRoot;
|
||||
texName += "/";
|
||||
}
|
||||
texName+= surface->getTextureName();
|
||||
|
||||
video::ITexture* texture = 0;
|
||||
if (texName.size())
|
||||
{
|
||||
if (FileSystem->existFile(texName))
|
||||
texture = driver->getTexture(texName);
|
||||
else if (FileSystem->existFile(surface->getTextureName()))
|
||||
texture = driver->getTexture(surface->getTextureName());
|
||||
else if (FileSystem->existFile(FileSystem->getFileBasename(surface->getTextureName())))
|
||||
texture = driver->getTexture(FileSystem->getFileBasename(surface->getTextureName()));
|
||||
else if (FileSystem->existFile(FileSystem->getFileDir(lmprefix)+"/"+surface->getTextureName()))
|
||||
texture = driver->getTexture(FileSystem->getFileDir(lmprefix)+"/"+surface->getTextureName());
|
||||
else
|
||||
texture = driver->getTexture(FileSystem->getFileDir(lmprefix)+"/"+FileSystem->getFileBasename(surface->getTextureName()));
|
||||
}
|
||||
|
||||
//material
|
||||
io::path lmapName = lmprefix;
|
||||
lmapName += "LMAP_";
|
||||
lmapName += io::path(surface->getLightMapId());
|
||||
|
||||
scene::SMeshBufferLightMap *buffer = new scene::SMeshBufferLightMap();
|
||||
buffer->Material.setTexture(0, texture);
|
||||
if (surface->getLightMapId())
|
||||
{
|
||||
buffer->Material.setTexture(1, driver->getTexture(lmapName));
|
||||
buffer->Material.Lighting = false;
|
||||
buffer->Material.MaterialType = video::EMT_LIGHTMAP_ADD;
|
||||
}
|
||||
|
||||
buffer->Vertices.reallocate(surface->getVertexCount());
|
||||
for(u32 v = 0; v < surface->getVertexCount(); ++v)
|
||||
{
|
||||
const Vertex& vtxPtr = surface->getVertexAt(v);
|
||||
video::S3DVertex2TCoords vtx;
|
||||
vtx.Pos = vtxPtr.getPosition();
|
||||
vtx.Normal = vtxPtr.getPosition();
|
||||
vtx.Color=vtxPtr.getColor();
|
||||
vtx.TCoords.set(vtxPtr.getTextureCoordinates().X, 1.f-vtxPtr.getTextureCoordinates().Y);
|
||||
vtx.TCoords2.set(vtxPtr.getLightMapCoordinates().X, 1.f-vtxPtr.getLightMapCoordinates().Y);
|
||||
|
||||
buffer->Vertices.push_back(vtx);
|
||||
}
|
||||
|
||||
buffer->Indices.reallocate(surface->getTriangleCount()*3);
|
||||
for(u32 t = 0; t < surface->getTriangleCount(); ++t)
|
||||
{
|
||||
const Triangle& tri = surface->getTriangleAt(t);
|
||||
buffer->Indices.push_back(tri.c);
|
||||
buffer->Indices.push_back(tri.b);
|
||||
buffer->Indices.push_back(tri.a);
|
||||
}
|
||||
|
||||
buffer->recalculateBoundingBox();
|
||||
pMesh->addMeshBuffer(buffer);
|
||||
buffer->drop();
|
||||
}
|
||||
}
|
||||
|
||||
pMesh->recalculateBoundingBox();
|
||||
return pMesh;
|
||||
}
|
||||
|
||||
void Group::clear()
|
||||
{
|
||||
color.clear();
|
||||
flags = 0;
|
||||
parentGroup = 0;
|
||||
props = "";
|
||||
}
|
||||
|
||||
void Group::load(BinaryFileReader* pReader)
|
||||
{
|
||||
flags = pReader->readLong();
|
||||
parentGroup = pReader->readLong();
|
||||
pReader->readString(props);
|
||||
pReader->readColorRGB(&color);
|
||||
}
|
||||
|
||||
void VisGroup::clear()
|
||||
{
|
||||
color.clear();
|
||||
flags = 0;
|
||||
name = "";
|
||||
}
|
||||
|
||||
void VisGroup::load(BinaryFileReader* pReader)
|
||||
{
|
||||
pReader->readString(name);
|
||||
flags = pReader->readLong();
|
||||
pReader->readColorRGB(&color);
|
||||
}
|
||||
|
||||
void LightMap::clear()
|
||||
{
|
||||
delete[] pixelData;
|
||||
pixelData = 0;
|
||||
width = height = 0;
|
||||
}
|
||||
|
||||
void LightMap::load(BinaryFileReader* pReader)
|
||||
{
|
||||
width = pReader->readLong();
|
||||
height = pReader->readLong();
|
||||
pixelData = new s32[width * height];
|
||||
pReader->readBuffer(pixelData, width * height * sizeof(s32));
|
||||
}
|
||||
|
||||
void Mesh::clear()
|
||||
{
|
||||
flags = 0;
|
||||
groupId = 0;
|
||||
visgroupId = 0;
|
||||
props = "";
|
||||
color.clear();
|
||||
position.set(0,0,0);
|
||||
|
||||
for(u32 s = 0; s < surfaces.size(); s++)
|
||||
{
|
||||
delete surfaces[s];
|
||||
}
|
||||
surfaces.clear();
|
||||
}
|
||||
|
||||
void Mesh::load(BinaryFileReader* pReader, bool bReadVisGroups)
|
||||
{
|
||||
flags = pReader->readLong();
|
||||
groupId = pReader->readLong();
|
||||
pReader->readString(props);
|
||||
pReader->readColorRGB(&color);
|
||||
pReader->readVec3f(&position);
|
||||
if(bReadVisGroups)
|
||||
visgroupId = pReader->readLong();
|
||||
else
|
||||
visgroupId = 0;
|
||||
|
||||
s32 count = pReader->readLong();
|
||||
|
||||
for(s32 i = 0; i < count; i++)
|
||||
{
|
||||
Surface* surf = new Surface();
|
||||
surf->load(pReader);
|
||||
surfaces.push_back(surf);
|
||||
}
|
||||
}
|
||||
|
||||
void Surface::clear()
|
||||
{
|
||||
flags = 0;
|
||||
lightMapId = 0;
|
||||
textureName = "";
|
||||
uvOffset.set(0.0f,0.0f);
|
||||
uvScale.set(0.0f,0.0f);
|
||||
uvRotation = 0.0f;
|
||||
triangles.clear();
|
||||
lines.clear();
|
||||
vertices.clear();
|
||||
}
|
||||
|
||||
void Surface::load(BinaryFileReader* pReader)
|
||||
{
|
||||
flags = pReader->readLong();
|
||||
pReader->readString(textureName);
|
||||
textureName.replace('\\', '/');
|
||||
|
||||
lightMapId = pReader->readLong();
|
||||
pReader->readVec2f(&uvOffset);
|
||||
pReader->readVec2f(&uvScale);
|
||||
uvRotation = pReader->readFloat();
|
||||
s32 vtxCount = pReader->readLong();
|
||||
s32 triCount = pReader->readLong();
|
||||
s32 lineCount = pReader->readLong();
|
||||
|
||||
for(s32 v = 0; v < vtxCount; v++)
|
||||
{
|
||||
vertices.push_back(Vertex());
|
||||
vertices.getLast().load(pReader);
|
||||
}
|
||||
|
||||
for(s32 t = 0; t < triCount; t++)
|
||||
{
|
||||
Triangle tri;
|
||||
pReader->readBuffer(&tri, sizeof(tri));
|
||||
triangles.push_back(tri);
|
||||
}
|
||||
|
||||
for(s32 l = 0; l < lineCount; l++)
|
||||
{
|
||||
Line line;
|
||||
pReader->readBuffer(&line,sizeof(line));
|
||||
lines.push_back(line);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Vertex::clear()
|
||||
{
|
||||
position.set(0,0,0);
|
||||
normal.set(0,0,0);
|
||||
color.clear();
|
||||
texCoords.set(0,0,0);
|
||||
lmapCoords.set(0,0,0);
|
||||
}
|
||||
|
||||
void Vertex::load(BinaryFileReader* pReader)
|
||||
{
|
||||
pReader->readVec3f(&position);
|
||||
pReader->readVec3f(&normal);
|
||||
pReader->readColorRGB(&color);
|
||||
pReader->readVec3f(&texCoords);
|
||||
pReader->readVec3f(&lmapCoords);
|
||||
}
|
||||
|
||||
void Entity::clear()
|
||||
{
|
||||
visgroupId = groupId = 0;
|
||||
props = "";
|
||||
position.set(0,0,0);
|
||||
}
|
||||
|
||||
void Entity::load(BinaryFileReader* pReader)
|
||||
{
|
||||
visgroupId = pReader->readLong();
|
||||
groupId = pReader->readLong();
|
||||
pReader->readString(props);
|
||||
pReader->readVec3f(&position);
|
||||
}
|
||||
|
||||
void CameraData::clear()
|
||||
{
|
||||
position.set(0,0,0);
|
||||
pitch = 0;
|
||||
yaw = 0;
|
||||
}
|
||||
|
||||
void CameraData::load(BinaryFileReader* pReader)
|
||||
{
|
||||
pReader->readVec3f(&position);
|
||||
pitch = pReader->readFloat();
|
||||
yaw = pReader->readFloat();
|
||||
}
|
||||
|
||||
void CSMFile::clear()
|
||||
{
|
||||
header.clear();
|
||||
cameraData.clear();
|
||||
|
||||
u32 x =0;
|
||||
for( x= 0; x < groups.size(); x++)
|
||||
delete groups[x];
|
||||
|
||||
groups.clear();
|
||||
|
||||
for(x= 0; x < visgroups.size(); x++)
|
||||
delete visgroups[x];
|
||||
|
||||
visgroups.clear();
|
||||
|
||||
for(x= 0; x < lightmaps.size(); x++)
|
||||
delete lightmaps[x];
|
||||
|
||||
lightmaps.clear();
|
||||
|
||||
for(x= 0; x < meshes.size(); x++)
|
||||
delete meshes[x];
|
||||
|
||||
meshes.clear();
|
||||
|
||||
for(x= 0; x < entities.size(); x++)
|
||||
delete entities[x];
|
||||
|
||||
entities.clear();
|
||||
}
|
||||
|
||||
void CSMFile::load(BinaryFileReader* pReader)
|
||||
{
|
||||
clear();
|
||||
|
||||
header.load(pReader);
|
||||
|
||||
//groups
|
||||
{
|
||||
const s32 count = pReader->readLong();
|
||||
#ifdef _IRR_DEBUG_CSM_LOADER_
|
||||
os::Printer::log("CSM Version", core::stringc(header.getVersion()).c_str());
|
||||
os::Printer::log("Loading groups. Count", core::stringc(count));
|
||||
#endif
|
||||
|
||||
groups.reallocate(count);
|
||||
for (s32 i = 0; i < count; i++)
|
||||
{
|
||||
Group* grp = new Group();
|
||||
grp->load(pReader);
|
||||
groups.push_back(grp);
|
||||
}
|
||||
}
|
||||
const bool bHasVGroups = (header.getVersion() == Header::VERSION_4_1);
|
||||
|
||||
if (bHasVGroups)
|
||||
{
|
||||
//visgroups
|
||||
const s32 count = pReader->readLong();
|
||||
#ifdef _IRR_DEBUG_CSM_LOADER_
|
||||
os::Printer::log("Loading visgroups. Count", core::stringc(count));
|
||||
#endif
|
||||
|
||||
visgroups.reallocate(count);
|
||||
for (s32 i = 0; i < count; i++)
|
||||
{
|
||||
VisGroup* grp = new VisGroup();
|
||||
grp->load(pReader);
|
||||
visgroups.push_back(grp);
|
||||
}
|
||||
}
|
||||
|
||||
//lightmaps
|
||||
{
|
||||
const s32 count = pReader->readLong();
|
||||
#ifdef _IRR_DEBUG_CSM_LOADER_
|
||||
os::Printer::log("Loading lightmaps. Count", core::stringc(count));
|
||||
#endif
|
||||
|
||||
lightmaps.reallocate(count);
|
||||
for(s32 i = 0; i < count; i++)
|
||||
{
|
||||
LightMap* lm = new LightMap();
|
||||
lm->load(pReader);
|
||||
lightmaps.push_back(lm);
|
||||
}
|
||||
}
|
||||
|
||||
//meshes
|
||||
{
|
||||
const s32 count = pReader->readLong();
|
||||
#ifdef _IRR_DEBUG_CSM_LOADER_
|
||||
os::Printer::log("Loading meshes. Count", core::stringc(count));
|
||||
#endif
|
||||
|
||||
meshes.reallocate(count);
|
||||
for(s32 i = 0; i < count; i++)
|
||||
{
|
||||
Mesh* mesh = new Mesh();
|
||||
mesh->load(pReader,bHasVGroups);
|
||||
meshes.push_back(mesh);
|
||||
}
|
||||
}
|
||||
|
||||
//entities
|
||||
{
|
||||
const s32 count = pReader->readLong();
|
||||
#ifdef _IRR_DEBUG_CSM_LOADER_
|
||||
os::Printer::log("Loading entitites. Count", core::stringc(count));
|
||||
#endif
|
||||
|
||||
entities.reallocate(count);
|
||||
for(s32 i = 0; i < count; i++)
|
||||
{
|
||||
Entity* ent = new Entity();
|
||||
ent->load(pReader);
|
||||
entities.push_back(ent);
|
||||
}
|
||||
}
|
||||
|
||||
//camera data
|
||||
#ifdef _IRR_DEBUG_CSM_LOADER_
|
||||
os::Printer::log("Loading camera data.");
|
||||
#endif
|
||||
cameraData.load(pReader);
|
||||
}
|
||||
|
||||
s32 BinaryFileReader::readLong()
|
||||
{
|
||||
int ret = 0;
|
||||
readBuffer(&ret,sizeof(int));
|
||||
#ifdef __BIG_ENDIAN__
|
||||
ret = os::Byteswap::byteswap(ret);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
f32 BinaryFileReader::readFloat()
|
||||
{
|
||||
float ret = 0;
|
||||
readBuffer(&ret,sizeof(float));
|
||||
#ifdef __BIG_ENDIAN__
|
||||
ret = os::Byteswap::byteswap(ret);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
void BinaryFileReader::readString(core::stringc &str)
|
||||
{
|
||||
str = "";
|
||||
c8 c;
|
||||
readBuffer(&c,sizeof(char));
|
||||
while(c != 0)
|
||||
{
|
||||
str += c;
|
||||
readBuffer(&c,sizeof(char));
|
||||
}
|
||||
}
|
||||
|
||||
void BinaryFileReader::readVec3f(core::vector3df* v)
|
||||
{
|
||||
v->X = readFloat();
|
||||
v->Y = readFloat();
|
||||
v->Z = readFloat();
|
||||
}
|
||||
|
||||
void BinaryFileReader::readVec2f(core::vector2df* v)
|
||||
{
|
||||
v->X = readFloat();
|
||||
v->Y = readFloat();
|
||||
}
|
||||
|
||||
void BinaryFileReader::readColorRGB(color_rgb_t* color)
|
||||
{
|
||||
readBuffer(color,sizeof(color_rgb_t));
|
||||
}
|
||||
|
||||
} // end namespace
|
||||
} // end namespace
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_CSM_LOADER_
|
@ -1,82 +0,0 @@
|
||||
// Copyright (C) 2002-2012 Nikolaus Gebhardt
|
||||
// This file is part of the "Irrlicht Engine".
|
||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
//
|
||||
// This Loader has been originally written by Saurav Mohapatra. I (Nikolaus Gebhardt)
|
||||
// modified some minor things and integrated it into Irrlicht 0.9. Thanks a lot
|
||||
// to Saurav Mohapatra for his work on this and that he gave me his permission to
|
||||
// add it into Irrlicht.
|
||||
// I did some changes to Saurav Mohapatra's loader, so I'm writing this down here:
|
||||
// - Replaced all dependencies to STL and stdio with irr:: methods/constructs.
|
||||
// - Moved everything into namespace irr::scene
|
||||
// - Replaced logging with Irrlicht's internal logger.
|
||||
// - Removed dependency to IrrlichtDevice
|
||||
// - Moved all internal structures into CCSMLoader.cpp
|
||||
// - Made the texture root parameter dependent on a ISceneManager string parameter
|
||||
// - removed exceptions
|
||||
// - Implemented CCCSMLoader as IMeshLoader
|
||||
// - Fixed some problems with memory leaks
|
||||
// - Fixed bounding box calculation
|
||||
//
|
||||
// The original readme of this file looks like this:
|
||||
//
|
||||
// This component provides a loader for the Cartography shop 4.x .csm maps for Irrlicht Engine.
|
||||
// This is a part of the M_TRIX Project.
|
||||
// This is licensed under the ZLib/LibPNG license
|
||||
// The IrrCSM library is written by Saurav Mohapatra.
|
||||
//
|
||||
// Features
|
||||
//
|
||||
// The IrrCSM library features the following capabilities
|
||||
//
|
||||
// * Loads the .csm 4.0 and 4.1 files transparently
|
||||
// * Presents the loaded file as irr::scene::IAnimatedMesh for easy creation of IOctreeSceneNode
|
||||
// * Loads the textures given the correct texture root. hence map and textures can be in separate directories
|
||||
//
|
||||
// For more informations go to http://www.geocities.com/standard_template/irrcsm/downloads.html
|
||||
|
||||
#ifndef __CSM_LOADER_H_INCLUDED__
|
||||
#define __CSM_LOADER_H_INCLUDED__
|
||||
|
||||
#include "irrArray.h"
|
||||
#include "IMesh.h"
|
||||
#include "irrString.h"
|
||||
#include "IFileSystem.h"
|
||||
#include "IMeshLoader.h"
|
||||
|
||||
namespace irr
|
||||
{
|
||||
namespace scene
|
||||
{
|
||||
class CSMFile;
|
||||
class ISceneManager;
|
||||
|
||||
class CCSMLoader : public scene::IMeshLoader
|
||||
{
|
||||
public:
|
||||
|
||||
CCSMLoader(ISceneManager* manager, io::IFileSystem* fs);
|
||||
|
||||
//! returns true if the file maybe is able to be loaded by this class
|
||||
//! based on the file extension (e.g. ".bsp")
|
||||
virtual bool isALoadableFileExtension(const io::path& filename) const;
|
||||
|
||||
//! creates/loads an animated mesh from the file.
|
||||
virtual IAnimatedMesh* createMesh(io::IReadFile* file);
|
||||
|
||||
private:
|
||||
|
||||
scene::IMesh* createCSMMesh(io::IReadFile* file);
|
||||
|
||||
scene::IMesh* createIrrlichtMesh(const CSMFile* csmFile,
|
||||
const core::stringc& textureRoot, const io::path& lmprefix);
|
||||
|
||||
io::IFileSystem* FileSystem;
|
||||
scene::ISceneManager* SceneManager;
|
||||
};
|
||||
|
||||
} // end namespace
|
||||
} // end namespace
|
||||
|
||||
#endif
|
||||
|
@ -52,10 +52,6 @@
|
||||
#include "CXMeshFileLoader.h"
|
||||
#endif
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_CSM_LOADER_
|
||||
#include "CCSMLoader.h"
|
||||
#endif
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_LMTS_LOADER_
|
||||
#include "CLMTSMeshFileLoader.h"
|
||||
#endif
|
||||
@ -216,12 +212,6 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
|
||||
#ifdef _IRR_COMPILE_WITH_STL_LOADER_
|
||||
MeshLoaderList.push_back(new CSTLMeshFileLoader());
|
||||
#endif
|
||||
#ifdef _IRR_COMPILE_WITH_CSM_LOADER_
|
||||
MeshLoaderList.push_back(new CCSMLoader(this, FileSystem));
|
||||
#endif
|
||||
#ifdef _IRR_COMPILE_WITH_LMTS_LOADER_
|
||||
MeshLoaderList.push_back(new CLMTSMeshFileLoader(FileSystem, Driver, &Parameters));
|
||||
#endif
|
||||
#ifdef _IRR_COMPILE_WITH_MY3D_LOADER_
|
||||
MeshLoaderList.push_back(new CMY3DMeshFileLoader(this, FileSystem));
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user