Skip to content

D
deprecated-irrlicht-mac
Commit 95280da0 authored by hybrid's avatar hybrid
Browse files
Options

Added compiler switches for image loaders and writers. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@997 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 565c5bfe
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 40 deletions
include/IrrCompileConfig.h
View file @ 95280da0
......@@ -265,6 +265,36 @@ B3D, MS3D or X meshes */
//! Define _IRR_COMPILE_WITH_STL_WRITER_ if you want to write .stl files
#define _IRR_COMPILE_WITH_STL_WRITER_
//! Define _IRR_COMPILE_WITH_BMP_LOADER_ if you want to load .bmp files
#define _IRR_COMPILE_WITH_BMP_LOADER_
//! Define _IRR_COMPILE_WITH_JPG_LOADER_ if you want to load .jpg files
#define _IRR_COMPILE_WITH_JPG_LOADER_
//! Define _IRR_COMPILE_WITH_PCX_LOADER_ if you want to load .pcx files
#define _IRR_COMPILE_WITH_PCX_LOADER_
//! Define _IRR_COMPILE_WITH_PNG_LOADER_ if you want to load .png files
#define _IRR_COMPILE_WITH_PNG_LOADER_
//! Define _IRR_COMPILE_WITH_PPM_LOADER_ if you want to load .ppm/.pgm/.pbm files
#define _IRR_COMPILE_WITH_PPM_LOADER_
//! Define _IRR_COMPILE_WITH_PSD_LOADER_ if you want to load .psd files
#define _IRR_COMPILE_WITH_PSD_LOADER_
//! Define _IRR_COMPILE_WITH_TGA_LOADER_ if you want to load .tga files
#define _IRR_COMPILE_WITH_TGA_LOADER_
//! Define _IRR_COMPILE_WITH_BMP_WRITER_ if you want to write .bmp files
#define _IRR_COMPILE_WITH_BMP_WRITER_
//! Define _IRR_COMPILE_WITH_JPG_WRITER_ if you want to write .jpg files
#define _IRR_COMPILE_WITH_JPG_WRITER_
//! Define _IRR_COMPILE_WITH_PCX_WRITER_ if you want to write .pcx files
#define _IRR_COMPILE_WITH_PCX_WRITER_
//! Define _IRR_COMPILE_WITH_PNG_WRITER_ if you want to write .png files
#define _IRR_COMPILE_WITH_PNG_WRITER_
//! Define _IRR_COMPILE_WITH_PPM_WRITER_ if you want to write .ppm files
#define _IRR_COMPILE_WITH_PPM_WRITER_
//! Define _IRR_COMPILE_WITH_PSD_WRITER_ if you want to write .psd files
#define _IRR_COMPILE_WITH_PSD_WRITER_
//! Define _IRR_COMPILE_WITH_TGA_WRITER_ if you want to write .tga files
#define _IRR_COMPILE_WITH_TGA_WRITER_
//! Set FPU settings
/** Irrlicht should use approximate float and integer fpu techniques
precision will be lower but speed higher. currently X86 only
......
source/Irrlicht/CImageLoaderBMP.cpp
View file @ 95280da0
......@@ -3,6 +3,9 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageLoaderBMP.h"
#ifdef _IRR_COMPILE_WITH_BMP_LOADER_
#include "IReadFile.h"
#include "SColor.h"
#include "CColorConverter.h"
......@@ -360,3 +363,5 @@ IImageLoader* createImageLoaderBMP()
} // end namespace video
} // end namespace irr
#endif
source/Irrlicht/CImageLoaderBMP.h
View file @ 95280da0
......@@ -5,6 +5,10 @@
#ifndef __C_IMAGE_LOADER_BMP_H_INCLUDED__
#define __C_IMAGE_LOADER_BMP_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_BMP_LOADER_
#include "IImageLoader.h"
......@@ -102,4 +106,5 @@ private:
#endif
#endif
source/Irrlicht/CImageLoaderJPG.cpp
View file @ 95280da0
......@@ -3,6 +3,9 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageLoaderJPG.h"
#ifdef _IRR_COMPILE_WITH_JPG_LOADER_
#include "IReadFile.h"
#include "CImage.h"
#include "os.h"
......@@ -253,3 +256,5 @@ IImageLoader* createImageLoaderJPG()
} // end namespace video
} // end namespace irr
#endif
source/Irrlicht/CImageLoaderJPG.h
View file @ 95280da0
......@@ -5,10 +5,12 @@
#ifndef __C_IMAGE_LOADER_JPG_H_INCLUDED__
#define __C_IMAGE_LOADER_JPG_H_INCLUDED__
#include "IImageLoader.h"
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_JPG_LOADER_
#include "IImageLoader.h"
#include "IrrCompileConfig.h"
#include <stdio.h> // required for jpeglib.h
#ifdef _IRR_COMPILE_WITH_LIBJPEG_
extern "C" {
......@@ -107,4 +109,5 @@ private:
#endif
#endif
source/Irrlicht/CImageLoaderPCX.cpp
View file @ 95280da0
......@@ -3,6 +3,9 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageLoaderPCX.h"
#ifdef _IRR_COMPILE_WITH_PCX_LOADER_
#include "IReadFile.h"
#include "SColor.h"
#include "CColorConverter.h"
......@@ -180,3 +183,6 @@ IImageLoader* createImageLoaderPCX()
} // end namespace video
} // end namespace irr
#endif
source/Irrlicht/CImageLoaderPCX.h
View file @ 95280da0
......@@ -5,6 +5,10 @@
#ifndef __C_IMAGE_LOADER_PCX_H_INCLUDED__
#define __C_IMAGE_LOADER_PCX_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PCX_LOADER_
#include "IImageLoader.h"
namespace irr
......@@ -83,6 +87,6 @@ public:
} // end namespace video
} // end namespace irr
#endif
#endif
source/Irrlicht/CImageLoaderPNG.cpp
View file @ 95280da0
......@@ -2,7 +2,9 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "IrrCompileConfig.h"
#include "CImageLoaderPNG.h"
#ifdef _IRR_COMPILE_WITH_PNG_LOADER_
#ifdef _IRR_COMPILE_WITH_LIBPNG_
#ifndef _IRR_USE_NON_SYSTEM_LIB_PNG_
......@@ -12,7 +14,6 @@
#endif // _IRR_USE_NON_SYSTEM_LIB_PNG_
#endif // _IRR_COMPILE_WITH_LIBPNG_
#include "CImageLoaderPNG.h"
#include "CImage.h"
#include "CReadFile.h"
#include "os.h"
......@@ -45,15 +46,6 @@ void PNGAPI user_read_data_fcn(png_structp png_ptr, png_bytep data, png_size_t l
}
#endif // _IRR_COMPILE_WITH_LIBPNG_
CImageLoaderPng::CImageLoaderPng()
{
// do something?
}
CImageLoaderPng::~CImageLoaderPng()
{
// do something?
}
//! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga")
......@@ -276,3 +268,5 @@ IImageLoader* createImageLoaderPNG()
}// end namespace irr
}//end namespace video
#endif
source/Irrlicht/CImageLoaderPNG.h
View file @ 95280da0
......@@ -9,6 +9,10 @@
#ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__
#define __C_IMAGE_LOADER_PNG_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PNG_LOADER_
#include "IImageLoader.h"
namespace irr
......@@ -21,12 +25,6 @@ class CImageLoaderPng : public IImageLoader
{
public:
//! constructor
CImageLoaderPng();
//! destructor
virtual ~CImageLoaderPng();
//! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".png")
virtual bool isALoadableFileExtension(const c8* fileName) const;
......@@ -43,3 +41,5 @@ public:
} // end namespace irr
#endif
#endif
source/Irrlicht/CImageLoaderPPM.cpp
View file @ 95280da0
......@@ -3,6 +3,9 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageLoaderPPM.h"
#ifdef _IRR_COMPILE_WITH_PPM_LOADER_
#include "IReadFile.h"
#include "CColorConverter.h"
#include "CImage.h"
......@@ -270,3 +273,5 @@ IImageLoader* createImageLoaderPPM()
} // end namespace video
} // end namespace irr
#endif
source/Irrlicht/CImageLoaderPPM.h
View file @ 95280da0
......@@ -5,6 +5,10 @@
#ifndef __C_IMAGE_LOADER_PPM_H_INCLUDED__
#define __C_IMAGE_LOADER_PPM_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PPM_LOADER_
#include "IImageLoader.h"
#include "irrString.h"
......@@ -16,7 +20,7 @@ namespace video
/*!
Surface Loader for Windows bitmaps
Surface Loader for SUN Pixmaps
*/
class CImageLoaderPPM : public IImageLoader
{
......@@ -47,4 +51,5 @@ private:
#endif
#endif
source/Irrlicht/CImageLoaderPSD.cpp
View file @ 95280da0
......@@ -3,6 +3,9 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageLoaderPSD.h"
#ifdef _IRR_COMPILE_WITH_PSD_LOADER_
#include "IReadFile.h"
#include "os.h"
#include "CImage.h"
......@@ -368,3 +371,5 @@ IImageLoader* createImageLoaderPSD()
} // end namespace video
} // end namespace irr
#endif
source/Irrlicht/CImageLoaderPSD.h
View file @ 95280da0
......@@ -5,6 +5,10 @@
#ifndef __C_IMAGE_LOADER_PSD_H_INCLUDED__
#define __C_IMAGE_LOADER_PSD_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PSD_LOADER_
#include "IImageLoader.h"
namespace irr
......@@ -75,6 +79,6 @@ private:
} // end namespace video
} // end namespace irr
#endif
#endif
source/Irrlicht/CImageLoaderTGA.cpp
View file @ 95280da0
......@@ -3,6 +3,9 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageLoaderTGA.h"
#ifdef _IRR_COMPILE_WITH_TGA_LOADER_
#include "IReadFile.h"
#include "os.h"
#include "CColorConverter.h"
......@@ -191,3 +194,5 @@ IImageLoader* createImageLoaderTGA()
} // end namespace video
} // end namespace irr
#endif
source/Irrlicht/CImageLoaderTGA.h
View file @ 95280da0
......@@ -5,6 +5,10 @@
#ifndef __C_IMAGE_LOADER_TGA_H_INCLUDED__
#define __C_IMAGE_LOADER_TGA_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_TGA_LOADER_
#include "IImageLoader.h"
......@@ -83,4 +87,5 @@ private:
} // end namespace irr
#endif
#endif
source/Irrlicht/CImageWriterBMP.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterBMP.h"
#ifdef _IRR_COMPILE_WITH_BMP_WRITER_
#include "CImageLoaderBMP.h"
#include "IWriteFile.h"
#include "CColorConverter.h"
......@@ -125,3 +131,6 @@ bool CImageWriterBMP::writeImage(io::IWriteFile* file, IImage* image, u32 param)
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterBMP.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_BMP_H_INCLUDED__
#define _C_IMAGE_WRITER_BMP_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_BMP_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -24,5 +32,6 @@ public:
} // namespace video
} // namespace irr
#endif
#endif // _C_IMAGE_WRITER_BMP_H_INCLUDED__
source/Irrlicht/CImageWriterJPG.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterJPG.h"
#ifdef _IRR_COMPILE_WITH_JPG_WRITER_
#include "CColorConverter.h"
#include "IWriteFile.h"
#include "CImage.h"
#include "CColorConverter.h"
#include "irrString.h"
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_LIBJPEG_
#include <stdio.h> // required for jpeglib.h
extern "C"
......@@ -227,3 +232,5 @@ bool CImageWriterJPG::writeImage(io::IWriteFile *file, IImage *input,u32 quality
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterJPG.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_JPG_H_INCLUDED__
#define _C_IMAGE_WRITER_JPG_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_JPG_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -25,4 +33,5 @@ public:
}
#endif // _C_IMAGE_WRITER_JPG_H_INCLUDED__
#endif
source/Irrlicht/CImageWriterPCX.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterPCX.h"
#ifdef _IRR_COMPILE_WITH_PCX_WRITER_
#include "CImageLoaderPCX.h"
#include "IWriteFile.h"
#include "os.h" // for logging
......@@ -36,3 +42,5 @@ bool CImageWriterPCX::writeImage(io::IWriteFile *file, IImage *image,u32 param)
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterPCX.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_PCX_H_INCLUDED__
#define _C_IMAGE_WRITER_PCX_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PCX_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -24,5 +32,6 @@ public:
} // namespace video
} // namespace irr
#endif
#endif // _C_IMAGE_WRITER_PCX_H_INCLUDED__
source/Irrlicht/CImageWriterPNG.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterPNG.h"
#ifdef _IRR_COMPILE_WITH_PNG_WRITER_
#include "CImageLoaderPNG.h"
#include "CColorConverter.h"
#include "IWriteFile.h"
#include "irrString.h"
#include "os.h" // for logging
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_LIBPNG_
#ifndef _IRR_USE_NON_SYSTEM_LIB_PNG_
#include <png.h> // use system lib png
......@@ -198,3 +203,6 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterPNG.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_PNG_H_INCLUDED__
#define _C_IMAGE_WRITER_PNG_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PNG_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -25,3 +33,5 @@ public:
} // namespace irr
#endif // _C_IMAGE_WRITER_PNG_H_INCLUDED__
#endif
source/Irrlicht/CImageWriterPPM.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterPPM.h"
#ifdef _IRR_COMPILE_WITH_PPM_WRITER_
#include "IWriteFile.h"
#include "IImage.h"
#include "dimension2d.h"
......@@ -66,3 +72,6 @@ bool CImageWriterPPM::writeImage(io::IWriteFile *file, IImage *image,u32 param)
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterPPM.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_PPM_H_INCLUDED__
#define _C_IMAGE_WRITER_PPM_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PPM_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -25,4 +33,5 @@ public:
} // namespace irr
#endif // _C_IMAGE_WRITER_PPM_H_INCLUDED__
#endif
source/Irrlicht/CImageWriterPSD.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterPSD.h"
#ifdef _IRR_COMPILE_WITH_PSD_WRITER_
#include "CImageLoaderPSD.h"
#include "IWriteFile.h"
#include "os.h" // for logging
......@@ -35,3 +41,6 @@ bool CImageWriterPSD::writeImage(io::IWriteFile *file, IImage *image,u32 param)
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterPSD.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_PSD_H_INCLUDED__
#define _C_IMAGE_WRITER_PSD_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PSD_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -25,3 +33,5 @@ public:
} // namespace irr
#endif // _I_IMAGE_WRITER_PSD_H_INCLUDED__
#endif
source/Irrlicht/CImageWriterTGA.cpp
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "CImageWriterTGA.h"
#ifdef _IRR_COMPILE_WITH_TGA_WRITER_
#include "CImageLoaderTGA.h"
#include "IWriteFile.h"
#include "CColorConverter.h"
......@@ -132,3 +138,6 @@ bool CImageWriterTGA::writeImage(io::IWriteFile *file, IImage *image,u32 param)
} // namespace video
} // namespace irr
#endif
source/Irrlicht/CImageWriterTGA.h
View file @ 95280da0
// Copyright (C) 2002-2007 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef _C_IMAGE_WRITER_TGA_H_INCLUDED__
#define _C_IMAGE_WRITER_TGA_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_TGA_WRITER_
#include "IImageWriter.h"
namespace irr
......@@ -25,3 +33,5 @@ public:
} // namespace irr
#endif // _C_IMAGE_WRITER_TGA_H_INCLUDED__
#endif
source/Irrlicht/CNullDriver.cpp
View file @ 95280da0
......@@ -84,21 +84,49 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& scre
// create surface loader
#ifdef _IRR_COMPILE_WITH_BMP_LOADER_
SurfaceLoader.push_back(video::createImageLoaderBMP());
#endif
#ifdef _IRR_COMPILE_WITH_JPG_LOADER_
SurfaceLoader.push_back(video::createImageLoaderJPG());
#endif
#ifdef _IRR_COMPILE_WITH_TGA_LOADER_
SurfaceLoader.push_back(video::createImageLoaderTGA());
#endif
#ifdef _IRR_COMPILE_WITH_PSD_LOADER_
SurfaceLoader.push_back(video::createImageLoaderPSD());
#endif
#ifdef _IRR_COMPILE_WITH_PCX_LOADER_
SurfaceLoader.push_back(video::createImageLoaderPCX());
#endif
#ifdef _IRR_COMPILE_WITH_PNG_LOADER_
SurfaceLoader.push_back(video::createImageLoaderPNG());
#endif
#ifdef _IRR_COMPILE_WITH_PPM_LOADER_
SurfaceLoader.push_back(video::createImageLoaderPPM());
#endif
#ifdef _IRR_COMPILE_WITH_BMP_WRITER_
SurfaceWriter.push_back(video::createImageWriterBMP());
#endif
#ifdef _IRR_COMPILE_WITH_JPG_WRITER_
SurfaceWriter.push_back(video::createImageWriterJPG());
#endif
#ifdef _IRR_COMPILE_WITH_TGA_WRITER_
SurfaceWriter.push_back(video::createImageWriterTGA());
#endif
#ifdef _IRR_COMPILE_WITH_PSD_WRITER_
SurfaceWriter.push_back(video::createImageWriterPSD());
#endif
#ifdef _IRR_COMPILE_WITH_PCX_WRITER_
SurfaceWriter.push_back(video::createImageWriterPCX());
#endif
#ifdef _IRR_COMPILE_WITH_PNG_WRITER_
SurfaceWriter.push_back(video::createImageWriterPNG());
#endif
#ifdef _IRR_COMPILE_WITH_PPM_WRITER_
SurfaceWriter.push_back(video::createImageWriterPPM());
#endif
// set ExposedData to 0
memset(&ExposedData, 0, sizeof(ExposedData));
......
source/Irrlicht/COctTreeTriangleSelector.cpp
View file @ 95280da0
......@@ -13,15 +13,14 @@ namespace scene
{
//! constructor
COctTreeTriangleSelector::COctTreeTriangleSelector(IMesh* mesh, ISceneNode* node,
s32 minimalPolysPerNode)
: CTriangleSelector(mesh, node), Root(0), NodeCount(0),
MinimalPolysPerNode(minimalPolysPerNode)
COctTreeTriangleSelector::COctTreeTriangleSelector(IMesh* mesh,
ISceneNode* node, s32 minimalPolysPerNode)
: CTriangleSelector(mesh, node), Root(0), NodeCount(0),
MinimalPolysPerNode(minimalPolysPerNode)
{
#ifdef _DEBUG
setDebugName("COctTreeTriangleSelector");
#endif
if (!Triangles.empty())
{
......@@ -41,7 +40,6 @@ COctTreeTriangleSelector::COctTreeTriangleSelector(IMesh* mesh, ISceneNode* node
}
//! destructor
COctTreeTriangleSelector::~COctTreeTriangleSelector()
{
......@@ -49,7 +47,6 @@ COctTreeTriangleSelector::~COctTreeTriangleSelector()
}
void COctTreeTriangleSelector::constructOctTree(SOctTreeNode* node)
{
++NodeCount;
......@@ -57,15 +54,15 @@ void COctTreeTriangleSelector::constructOctTree(SOctTreeNode* node)
node->Box.reset(node->Triangles[0].pointA);
// get bounding box
s32 cnt = node->Triangles.size();
for (s32 i=0; i<cnt; ++i)
const u32 cnt = node->Triangles.size();
for (u32 i=0; i<cnt; ++i)
{
node->Box.addInternalPoint(node->Triangles[i].pointA);
node->Box.addInternalPoint(node->Triangles[i].pointB);
node->Box.addInternalPoint(node->Triangles[i].pointC);
}
core::vector3df middle = node->Box.getCenter();
const core::vector3df& middle = node->Box.getCenter();
core::vector3df edges[8];
node->Box.getEdges(edges);
......@@ -114,9 +111,9 @@ void COctTreeTriangleSelector::constructOctTree(SOctTreeNode* node)
//! Gets all triangles which lie within a specific bounding box.
void COctTreeTriangleSelector::getTriangles(core::triangle3df* triangles,
s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box,
const core::matrix4* transform) const
s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box,
const core::matrix4* transform) const
{
core::matrix4 mat;
core::aabbox3d<f32> invbox = box;
......@@ -131,7 +128,7 @@ void COctTreeTriangleSelector::getTriangles(core::triangle3df* triangles,
mat.makeIdentity();
if (transform)
mat = (*transform);
mat = *transform;
if (SceneNode)
mat *= SceneNode->getAbsoluteTransformation();
......@@ -178,8 +175,8 @@ void COctTreeTriangleSelector::getTrianglesFromOctTree(
//! Gets all triangles which have or may have contact with a 3d line.
void COctTreeTriangleSelector::getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform) const
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform) const
{
core::aabbox3d<f32> box(line.start);
box.addInternalPoint(line.end);
......
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