Added debug data strings to most classes

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1340 dfc29bdd-3216-0410-991c-e03cc46cb475
master
bitplane 2008-04-29 20:54:12 +00:00
parent f15aa6b053
commit f51d8bf3f0
49 changed files with 219 additions and 7 deletions

View File

@ -110,6 +110,11 @@ C3DSMeshFileLoader::C3DSMeshFileLoader(ISceneManager* smgr, io::IFileSystem* fs)
: SceneManager(smgr), FileSystem(fs), Vertices(0), Indices(0), SmoothingGroups(0), TCoords(0), : SceneManager(smgr), FileSystem(fs), Vertices(0), Indices(0), SmoothingGroups(0), TCoords(0),
CountVertices(0), CountFaces(0), CountTCoords(0), Mesh(0) CountVertices(0), CountFaces(0), CountTCoords(0), Mesh(0)
{ {
#ifdef _DEBUG
setDebugName("C3DSMeshFileLoader");
#endif
TransformationMatrix.makeIdentity(); TransformationMatrix.makeIdentity();
if (FileSystem) if (FileSystem)
FileSystem->grab(); FileSystem->grab();

View File

@ -18,6 +18,11 @@ CBSPMeshFileLoader::CBSPMeshFileLoader(scene::ISceneManager* smgr,
io::IFileSystem* fs) io::IFileSystem* fs)
: FileSystem(fs), SceneManager(smgr) : FileSystem(fs), SceneManager(smgr)
{ {
#ifdef _DEBUG
setDebugName("CBSPMeshFileLoader");
#endif
if (FileSystem) if (FileSystem)
FileSystem->grab(); FileSystem->grab();
} }

View File

@ -18,6 +18,10 @@ CBoneSceneNode::CBoneSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
: IBoneSceneNode(parent, mgr, id), BoneIndex(boneIndex), BoneName(boneName), : IBoneSceneNode(parent, mgr, id), BoneIndex(boneIndex), BoneName(boneName),
AnimationMode(EBAM_AUTOMATIC), SkinningSpace(EBSS_LOCAL) AnimationMode(EBAM_AUTOMATIC), SkinningSpace(EBSS_LOCAL)
{ {
#ifdef _DEBUG
setDebugName("CBoneSceneNode");
#endif
} }

View File

@ -360,6 +360,10 @@ namespace scene
CCSMLoader::CCSMLoader(scene::ISceneManager* manager, io::IFileSystem* fs) CCSMLoader::CCSMLoader(scene::ISceneManager* manager, io::IFileSystem* fs)
: FileSystem(fs), SceneManager(manager) : FileSystem(fs), SceneManager(manager)
{ {
#ifdef _DEBUG
setDebugName("CCSMLoader");
#endif
} }
CCSMLoader::~CCSMLoader() CCSMLoader::~CCSMLoader()

View File

@ -271,7 +271,9 @@ CColladaFileLoader::CColladaFileLoader(scene::ISceneManager* smgr,
: SceneManager(smgr), FileSystem(fs), DummyMesh(0), : SceneManager(smgr), FileSystem(fs), DummyMesh(0),
FirstLoadedMesh(0), LoadedMeshCount(0), CreateInstances(false) FirstLoadedMesh(0), LoadedMeshCount(0), CreateInstances(false)
{ {
#ifdef _DEBUG
setDebugName("CColladaFileLoader");
#endif
} }

View File

@ -20,6 +20,11 @@ CColladaMeshWriter::CColladaMeshWriter(video::IVideoDriver* driver,
io::IFileSystem* fs) io::IFileSystem* fs)
: FileSystem(fs), VideoDriver(driver), Writer(0) : FileSystem(fs), VideoDriver(driver), Writer(0)
{ {
#ifdef _DEBUG
setDebugName("CColladaMeshWriter");
#endif
if (VideoDriver) if (VideoDriver)
VideoDriver->grab(); VideoDriver->grab();

View File

@ -115,6 +115,11 @@ namespace video
: CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial), : CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial),
CompiledShaders(true) CompiledShaders(true)
{ {
#ifdef _DEBUG
setDebugName("CD3D8NormalMapRenderer");
#endif
// set this as callback. We could have done this in // set this as callback. We could have done this in
// the initialization list, but some compilers don't like it. // the initialization list, but some compilers don't like it.

View File

@ -149,6 +149,11 @@ namespace video
: CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial), : CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial),
CompiledShaders(true), CurrentScale(0.0f) CompiledShaders(true), CurrentScale(0.0f)
{ {
#ifdef _DEBUG
setDebugName("CD3D8ParallaxMapRenderer");
#endif
// set this as callback. We could have done this in // set this as callback. We could have done this in
// the initialization list, but some compilers don't like it. // the initialization list, but some compilers don't like it.

View File

@ -31,6 +31,11 @@ CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3dde
: pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial), : pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData) VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
{ {
#ifdef _DEBUG
setDebugName("CD3D8ShaderMaterialRenderer");
#endif
if (BaseMaterial) if (BaseMaterial)
BaseMaterial->grab(); BaseMaterial->grab();

View File

@ -37,6 +37,11 @@ CD3D9HLSLMaterialRenderer::CD3D9HLSLMaterialRenderer(IDirect3DDevice9* d3ddev,
: CD3D9ShaderMaterialRenderer(d3ddev, driver, callback, baseMaterial, userData), : CD3D9ShaderMaterialRenderer(d3ddev, driver, callback, baseMaterial, userData),
VSConstantsTable(0), PSConstantsTable(0) VSConstantsTable(0), PSConstantsTable(0)
{ {
#ifdef _DEBUG
setDebugName("CD3D9HLSLMaterialRenderer");
#endif
outMaterialTypeNr = -1; outMaterialTypeNr = -1;
// now create shaders // now create shaders

View File

@ -168,6 +168,11 @@ namespace video
s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial) s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
: CD3D9ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial) : CD3D9ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial)
{ {
#ifdef _DEBUG
setDebugName("CD3D9NormalMapRenderer");
#endif
// set this as callback. We could have done this in // set this as callback. We could have done this in
// the initialization list, but some compilers don't like it. // the initialization list, but some compilers don't like it.

View File

@ -227,6 +227,11 @@ namespace video
: CD3D9ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial), : CD3D9ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial),
CurrentScale(0.0f) CurrentScale(0.0f)
{ {
#ifdef _DEBUG
setDebugName("CD3D9ParallaxMapRenderer");
#endif
// set this as callback. We could have done this in // set this as callback. We could have done this in
// the initialization list, but some compilers don't like it. // the initialization list, but some compilers don't like it.

View File

@ -29,6 +29,11 @@ CD3D9ShaderMaterialRenderer::CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3dde
: pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial), : pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData) VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
{ {
#ifdef _DEBUG
setDebugName("CD3D9ShaderMaterialRenderer");
#endif
if (BaseMaterial) if (BaseMaterial)
BaseMaterial->grab(); BaseMaterial->grab();
@ -50,6 +55,11 @@ CD3D9ShaderMaterialRenderer::CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3dde
: pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial), : pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData) VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
{ {
#ifdef _DEBUG
setDebugName("CD3D9ShaderMaterialRenderer");
#endif
if (BaseMaterial) if (BaseMaterial)
BaseMaterial->grab(); BaseMaterial->grab();

View File

@ -35,6 +35,11 @@ namespace gui
CDefaultGUIElementFactory::CDefaultGUIElementFactory(IGUIEnvironment* env) CDefaultGUIElementFactory::CDefaultGUIElementFactory(IGUIEnvironment* env)
: Environment(env) : Environment(env)
{ {
#ifdef _DEBUG
setDebugName("CDefaultGUIElementFactory");
#endif
// don't grab the gui environment here to prevent cyclic references // don't grab the gui environment here to prevent cyclic references
} }

View File

@ -33,6 +33,10 @@ const c8* const SceneNodeAnimatorTypeNames[] =
CDefaultSceneNodeAnimatorFactory::CDefaultSceneNodeAnimatorFactory(ISceneManager* mgr, gui::ICursorControl* crs) CDefaultSceneNodeAnimatorFactory::CDefaultSceneNodeAnimatorFactory(ISceneManager* mgr, gui::ICursorControl* crs)
: Manager(mgr), CursorControl(crs) : Manager(mgr), CursorControl(crs)
{ {
#ifdef _DEBUG
setDebugName("CDefaultSceneNodeAnimatorFactory");
#endif
// don't grab the scene manager here to prevent cyclic references // don't grab the scene manager here to prevent cyclic references
if (CursorControl) if (CursorControl)
CursorControl->grab(); CursorControl->grab();

View File

@ -23,6 +23,11 @@ namespace scene
CDefaultSceneNodeFactory::CDefaultSceneNodeFactory(ISceneManager* mgr) CDefaultSceneNodeFactory::CDefaultSceneNodeFactory(ISceneManager* mgr)
: Manager(mgr) : Manager(mgr)
{ {
#ifdef _DEBUG
setDebugName("CDefaultSceneNodeFactory");
#endif
// don't grab the scene manager here to prevent cyclic references // don't grab the scene manager here to prevent cyclic references
SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CUBE, "cube")); SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CUBE, "cube"));

View File

@ -26,6 +26,11 @@ CIrrMeshFileLoader::CIrrMeshFileLoader(scene::ISceneManager* smgr,
io::IFileSystem* fs) io::IFileSystem* fs)
: SceneManager(smgr), FileSystem(fs) : SceneManager(smgr), FileSystem(fs)
{ {
#ifdef _DEBUG
setDebugName("CIrrMeshFileLoader");
#endif
} }

View File

@ -15,6 +15,10 @@ CIrrMeshWriter::CIrrMeshWriter(video::IVideoDriver* driver,
io::IFileSystem* fs) io::IFileSystem* fs)
: FileSystem(fs), VideoDriver(driver), Writer(0) : FileSystem(fs), VideoDriver(driver), Writer(0)
{ {
#ifdef _DEBUG
setDebugName("CIrrMeshWriter");
#endif
if (VideoDriver) if (VideoDriver)
VideoDriver->grab(); VideoDriver->grab();

View File

@ -95,6 +95,10 @@ CLMTSMeshFileLoader::CLMTSMeshFileLoader(io::IFileSystem* fs, video::IVideoDrive
: Textures(0), Subsets(0), Triangles(0), : Textures(0), Subsets(0), Triangles(0),
Parameters(parameters), Driver(driver), FileSystem(fs) Parameters(parameters), Driver(driver), FileSystem(fs)
{ {
#ifdef _DEBUG
setDebugName("CLMTSMeshFileLoader");
#endif
if (Driver) if (Driver)
Driver->grab(); Driver->grab();

View File

@ -111,6 +111,9 @@ CLWOMeshFileLoader::CLWOMeshFileLoader(scene::ISceneManager* smgr,
io::IFileSystem* fs) io::IFileSystem* fs)
: SceneManager(smgr), FileSystem(fs), File(0), Mesh(0) : SceneManager(smgr), FileSystem(fs), File(0), Mesh(0)
{ {
#ifdef _DEBUG
setDebugName("CLWOMeshFileLoader");
#endif
} }

View File

@ -10,6 +10,9 @@ namespace irr
CLogger::CLogger(IEventReceiver* r) CLogger::CLogger(IEventReceiver* r)
: LogLevel(ELL_INFORMATION), Receiver(r) : LogLevel(ELL_INFORMATION), Receiver(r)
{ {
#ifdef _DEBUG
setDebugName("CLogger");
#endif
} }
//! Returns the current set log level. //! Returns the current set log level.

View File

@ -16,6 +16,11 @@ namespace scene
//! Constructor //! Constructor
CMD2MeshFileLoader::CMD2MeshFileLoader() CMD2MeshFileLoader::CMD2MeshFileLoader()
{ {
#ifdef _DEBUG
setDebugName("CMD2MeshFileLoader");
#endif
} }

View File

@ -113,6 +113,9 @@ struct SGroup
CMS3DMeshFileLoader::CMS3DMeshFileLoader(video::IVideoDriver *driver) CMS3DMeshFileLoader::CMS3DMeshFileLoader(video::IVideoDriver *driver)
: Driver(driver), AnimatedMesh(0) : Driver(driver), AnimatedMesh(0)
{ {
#ifdef _DEBUG
setDebugName("CMS3DMeshFileLoader");
#endif
} }

View File

@ -35,6 +35,11 @@ CMY3DMeshFileLoader::CMY3DMeshFileLoader(
io::IFileSystem* fs, video::IVideoDriver* driver, ISceneManager *scmgr) io::IFileSystem* fs, video::IVideoDriver* driver, ISceneManager *scmgr)
: Mesh(0), Driver(driver), FileSystem(fs), SceneManager(scmgr) : Mesh(0), Driver(driver), FileSystem(fs), SceneManager(scmgr)
{ {
#ifdef _DEBUG
setDebugName("CMY3DMeshFileLoader");
#endif
if (Driver) if (Driver)
Driver->grab(); Driver->grab();

View File

@ -15,7 +15,7 @@ CMemoryReadFile::CMemoryReadFile(void* memory, long len, const c8* fileName, boo
: Buffer(memory), Len(len), Pos(0), deleteMemoryWhenDropped(d) : Buffer(memory), Len(len), Pos(0), deleteMemoryWhenDropped(d)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CReadFile"); setDebugName("CMemoryReadFile");
#endif #endif
Filename = fileName; Filename = fileName;

View File

@ -23,7 +23,11 @@ namespace irr
// constructor // constructor
COSOperator::COSOperator(const c8* osVersion) : OperatingSystem(osVersion) COSOperator::COSOperator(const c8* osVersion) : OperatingSystem(osVersion)
{ } {
#ifdef _DEBUG
setDebugName("COSOperator");
#endif
}
//! returns the current operating system version as string. //! returns the current operating system version as string.

View File

@ -48,6 +48,11 @@ const u16 COGRE_SUBMESH_TEXTURE_ALIAS= 0x4200;
COgreMeshFileLoader::COgreMeshFileLoader(IMeshManipulator* manip,io::IFileSystem* fs, video::IVideoDriver* driver) COgreMeshFileLoader::COgreMeshFileLoader(IMeshManipulator* manip,io::IFileSystem* fs, video::IVideoDriver* driver)
: FileSystem(fs), Driver(driver), SwapEndian(false), Mesh(0), Manipulator(manip), NumUV(0) : FileSystem(fs), Driver(driver), SwapEndian(false), Mesh(0), Manipulator(manip), NumUV(0)
{ {
#ifdef _DEBUG
setDebugName("COgreMeshFileLoader");
#endif
if (FileSystem) if (FileSystem)
FileSystem->grab(); FileSystem->grab();

View File

@ -177,6 +177,11 @@ COpenGLNormalMapRenderer::COpenGLNormalMapRenderer(video::COpenGLDriver* driver,
s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial) s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
: COpenGLShaderMaterialRenderer(driver, 0, baseMaterial), CompiledShaders(true) : COpenGLShaderMaterialRenderer(driver, 0, baseMaterial), CompiledShaders(true)
{ {
#ifdef _DEBUG
setDebugName("COpenGLNormalMapRenderer");
#endif
// set this as callback. We could have done this in // set this as callback. We could have done this in
// the initialization list, but some compilers don't like it. // the initialization list, but some compilers don't like it.

View File

@ -211,6 +211,11 @@ COpenGLParallaxMapRenderer::COpenGLParallaxMapRenderer(video::COpenGLDriver* dri
s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial) s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
: COpenGLShaderMaterialRenderer(driver, 0, baseMaterial), CompiledShaders(true) : COpenGLShaderMaterialRenderer(driver, 0, baseMaterial), CompiledShaders(true)
{ {
#ifdef _DEBUG
setDebugName("COpenGLParallaxMapRenderer");
#endif
// set this as callback. We could have done this in // set this as callback. We could have done this in
// the initialization list, but some compilers don't like it. // the initialization list, but some compilers don't like it.

View File

@ -41,6 +41,11 @@ COpenGLSLMaterialRenderer::COpenGLSLMaterialRenderer(video::COpenGLDriver* drive
: Driver(driver), CallBack(callback), BaseMaterial(baseMaterial), : Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
Program(0), UserData(userData) Program(0), UserData(userData)
{ {
#ifdef _DEBUG
setDebugName("COpenGLSLMaterialRenderer");
#endif
//entry points must always be main, and the compile target isn't selectable //entry points must always be main, and the compile target isn't selectable
//it is fine to ignore what has been asked for, as the compiler should spot anything wrong //it is fine to ignore what has been asked for, as the compiler should spot anything wrong
//just check that GLSL is available //just check that GLSL is available

View File

@ -25,6 +25,11 @@ COpenGLShaderMaterialRenderer::COpenGLShaderMaterialRenderer(video::COpenGLDrive
: Driver(driver), CallBack(callback), BaseMaterial(baseMaterial), : Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
VertexShader(0), PixelShader(0), UserData(userData) VertexShader(0), PixelShader(0), UserData(userData)
{ {
#ifdef _DEBUG
setDebugName("COpenGLShaderMaterialRenderer");
#endif
if (BaseMaterial) if (BaseMaterial)
BaseMaterial->grab(); BaseMaterial->grab();

View File

@ -28,6 +28,11 @@ CParticleAnimatedMeshSceneNodeEmitter::CParticleAnimatedMeshSceneNodeEmitter(
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees) Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
{ {
#ifdef _DEBUG
setDebugName("CParticleAnimatedMeshSceneNodeEmitter");
#endif
AnimatedMesh = node->getMesh(); AnimatedMesh = node->getMesh();
BaseMesh = AnimatedMesh->getMesh(0); BaseMesh = AnimatedMesh->getMesh(0);

View File

@ -16,6 +16,9 @@ CParticleAttractionAffector::CParticleAttractionAffector(
: Point(point), Speed(speed), AffectX(affectX), AffectY(affectY), : Point(point), Speed(speed), AffectX(affectX), AffectY(affectY),
AffectZ(affectZ), Attract(attract), LastTime(0) AffectZ(affectZ), Attract(attract), LastTime(0)
{ {
#ifdef _DEBUG
setDebugName("CParticleAttractionAffector");
#endif
} }

View File

@ -25,6 +25,9 @@ CParticleBoxEmitter::CParticleBoxEmitter(
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0),
MaxAngleDegrees(maxAngleDegrees) MaxAngleDegrees(maxAngleDegrees)
{ {
#ifdef _DEBUG
setDebugName("CParticleBoxEmitter");
#endif
} }

View File

@ -25,6 +25,10 @@ CParticleCylinderEmitter::CParticleCylinderEmitter(
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0),
MaxAngleDegrees(maxAngleDegrees) MaxAngleDegrees(maxAngleDegrees)
{ {
#ifdef _DEBUG
setDebugName("CParticleCylinderEmitter");
#endif
} }

View File

@ -16,6 +16,11 @@ CParticleFadeOutAffector::CParticleFadeOutAffector(
const video::SColor& targetColor, u32 fadeOutTime) const video::SColor& targetColor, u32 fadeOutTime)
: IParticleFadeOutAffector(), TargetColor(targetColor) : IParticleFadeOutAffector(), TargetColor(targetColor)
{ {
#ifdef _DEBUG
setDebugName("CParticleFadeOutAffector");
#endif
FadeOutTime = fadeOutTime ? static_cast<f32>(fadeOutTime) : 1.0f; FadeOutTime = fadeOutTime ? static_cast<f32>(fadeOutTime) : 1.0f;
} }

View File

@ -16,6 +16,9 @@ CParticleGravityAffector::CParticleGravityAffector(
const core::vector3df& gravity, u32 timeForceLost) const core::vector3df& gravity, u32 timeForceLost)
: IParticleGravityAffector(), TimeForceLost(static_cast<f32>(timeForceLost)), Gravity(gravity) : IParticleGravityAffector(), TimeForceLost(static_cast<f32>(timeForceLost)), Gravity(gravity)
{ {
#ifdef _DEBUG
setDebugName("CParticleGravityAffector");
#endif
} }

View File

@ -28,6 +28,11 @@ CParticleMeshEmitter::CParticleMeshEmitter(
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees) Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
{ {
#ifdef _DEBUG
setDebugName("CParticleMeshEmitter");
#endif
MBCount = Mesh->getMeshBufferCount(); MBCount = Mesh->getMeshBufferCount();
for( u32 i = 0; i < MBCount; ++i ) for( u32 i = 0; i < MBCount; ++i )
{ {

View File

@ -23,7 +23,9 @@ CParticlePointEmitter::CParticlePointEmitter(
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
MaxAngleDegrees(maxAngleDegrees), Time(0), Emitted(0) MaxAngleDegrees(maxAngleDegrees), Time(0), Emitted(0)
{ {
#ifdef _DEBUG
setDebugName("CParticlePointEmitter");
#endif
} }

View File

@ -23,6 +23,9 @@ CParticleRingEmitter::CParticleRingEmitter(
MaxStartColor(maxStartColor), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), MaxStartColor(maxStartColor), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees) Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
{ {
#ifdef _DEBUG
setDebugName("CParticleRingEmitter");
#endif
} }

View File

@ -13,6 +13,9 @@ namespace scene
CParticleRotationAffector::CParticleRotationAffector( const core::vector3df& speed, const core::vector3df& pivotPoint ) CParticleRotationAffector::CParticleRotationAffector( const core::vector3df& speed, const core::vector3df& pivotPoint )
: PivotPoint(pivotPoint), Speed(speed), LastTime(0) : PivotPoint(pivotPoint), Speed(speed), LastTime(0)
{ {
#ifdef _DEBUG
setDebugName("CParticleRotationAffector");
#endif
} }

View File

@ -25,6 +25,11 @@ CParticleSphereEmitter::CParticleSphereEmitter(
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0),
MaxAngleDegrees(maxAngleDegrees) MaxAngleDegrees(maxAngleDegrees)
{ {
#ifdef _DEBUG
setDebugName("CParticleSphereEmitter");
#endif
} }

View File

@ -23,6 +23,10 @@ namespace scene
CSTLMeshWriter::CSTLMeshWriter(scene::ISceneManager* smgr) CSTLMeshWriter::CSTLMeshWriter(scene::ISceneManager* smgr)
: SceneManager(smgr) : SceneManager(smgr)
{ {
#ifdef _DEBUG
setDebugName("CSTLMeshWriter");
#endif
if (SceneManager) if (SceneManager)
SceneManager->grab(); SceneManager->grab();
} }

View File

@ -265,9 +265,6 @@ CSceneManager::~CSceneManager()
{ {
clearDeletionList(); clearDeletionList();
if (Driver)
Driver->drop();
if (FileSystem) if (FileSystem)
FileSystem->drop(); FileSystem->drop();
@ -290,6 +287,7 @@ CSceneManager::~CSceneManager()
if (ActiveCamera) if (ActiveCamera)
ActiveCamera->drop(); ActiveCamera->drop();
ActiveCamera = 0;
if (MeshCache) if (MeshCache)
MeshCache->drop(); MeshCache->drop();
@ -299,6 +297,14 @@ CSceneManager::~CSceneManager()
for (i=0; i<SceneNodeAnimatorFactoryList.size(); ++i) for (i=0; i<SceneNodeAnimatorFactoryList.size(); ++i)
SceneNodeAnimatorFactoryList[i]->drop(); SceneNodeAnimatorFactoryList[i]->drop();
// remove all nodes and animators before dropping the driver
// as render targets may be destroyed twice
removeAll();
removeAnimators();
if (Driver)
Driver->drop();
} }

View File

@ -24,6 +24,11 @@ CSceneNodeAnimatorCollisionResponse::CSceneNodeAnimatorCollisionResponse(
World(world), Object(object), SceneManager(scenemanager), World(world), Object(object), SceneManager(scenemanager),
SlidingSpeed(slidingSpeed), Falling(false) SlidingSpeed(slidingSpeed), Falling(false)
{ {
#ifdef _DEBUG
setDebugName("CSceneNodeAnimatorCollisionResponse");
#endif
if (World) if (World)
World->grab(); World->grab();

View File

@ -22,6 +22,11 @@ IImageWriter* createImageWriterBMP();
CSoftwareTexture2::CSoftwareTexture2(IImage* image, const char* name, bool generateMipLevels, bool isRenderTarget) CSoftwareTexture2::CSoftwareTexture2(IImage* image, const char* name, bool generateMipLevels, bool isRenderTarget)
: ITexture(name), MipMapLOD(0), HasMipMaps(generateMipLevels), IsRenderTarget(isRenderTarget) : ITexture(name), MipMapLOD(0), HasMipMaps(generateMipLevels), IsRenderTarget(isRenderTarget)
{ {
#ifdef _DEBUG
setDebugName("CSoftwareTexture2");
#endif
#ifndef SOFTWARE_DRIVER_2_MIPMAPPING #ifndef SOFTWARE_DRIVER_2_MIPMAPPING
HasMipMaps = false; HasMipMaps = false;
#endif #endif

View File

@ -12,6 +12,10 @@ namespace video
//! constructor //! constructor
CVideoModeList::CVideoModeList() CVideoModeList::CVideoModeList()
{ {
#ifdef _DEBUG
setDebugName("CVideoModeList");
#endif
Desktop.depth = 0; Desktop.depth = 0;
Desktop.size = core::dimension2d<s32>(0,0); Desktop.size = core::dimension2d<s32>(0,0);
} }

View File

@ -17,6 +17,10 @@ namespace io
CXMLWriter::CXMLWriter(IWriteFile* file) CXMLWriter::CXMLWriter(IWriteFile* file)
: File(file), Tabs(0), TextWrittenLast(false) : File(file), Tabs(0), TextWrittenLast(false)
{ {
#ifdef _DEBUG
setDebugName("CXMLWriter");
#endif
if (File) if (File)
File->grab(); File->grab();
} }

View File

@ -32,6 +32,9 @@ CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem*
MinorVersion(0), BinaryFormat(false), BinaryNumCount(0), Buffer(0), MinorVersion(0), BinaryFormat(false), BinaryNumCount(0), Buffer(0),
P(0), End(0), FloatSize(0), CurFrame(0) P(0), End(0), FloatSize(0), CurFrame(0)
{ {
#ifdef _DEBUG
setDebugName("CXMeshFileLoader");
#endif
} }