From b85584c8e1618acc72d3796abdd20e94f40f4809 Mon Sep 17 00:00:00 2001 From: irrlicht Date: Fri, 7 Sep 2007 06:11:47 +0000 Subject: [PATCH] renamed IUnknown to IReferenceCounted git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@916 dfc29bdd-3216-0410-991c-e03cc46cb475 --- changes.txt | 2 + include/IAnimatedMeshMD3.h | 6 +- include/IAnimatedMeshSceneNode.h | 4 +- include/IAttributeExchangingObject.h | 4 +- include/IAttributes.h | 4 +- include/ICursorControl.h | 4 +- include/IFileList.h | 4 +- include/IFileSystem.h | 26 +++---- include/IGPUProgrammingServices.h | 2 +- include/IGUIElementFactory.h | 4 +- include/IGUIEnvironment.h | 46 +++++------ include/IGUIFont.h | 4 +- include/IGUISpriteBank.h | 4 +- include/IImage.h | 4 +- include/IImageLoader.h | 4 +- include/IImageWriter.h | 4 +- include/ILogger.h | 4 +- include/IMaterialRenderer.h | 4 +- include/IMaterialRendererServices.h | 2 +- include/IMesh.h | 4 +- include/IMeshBuffer.h | 4 +- include/IMeshCache.h | 4 +- include/IMeshLoader.h | 6 +- include/IMeshManipulator.h | 8 +- include/IOSOperator.h | 4 +- include/IParticleSystemSceneNode.h | 22 +++--- include/IQ3Shader.h | 4 +- include/IReadFile.h | 4 +- include/{IUnknown.h => IReferenceCounted.h} | 20 ++--- include/ISceneCollisionManager.h | 4 +- include/ISceneManager.h | 76 +++++++++---------- include/ISceneNode.h | 2 +- include/ISceneNodeAnimator.h | 4 +- include/ISceneNodeAnimatorFactory.h | 8 +- include/ISceneNodeFactory.h | 4 +- include/ISceneUserDataSerializer.h | 2 +- include/IShaderConstantSetCallBack.h | 4 +- include/ITexture.h | 4 +- include/ITimer.h | 4 +- include/ITriangleSelector.h | 4 +- include/IVideoDriver.h | 18 ++--- include/IVideoModeList.h | 4 +- include/IWriteFile.h | 4 +- include/IXMLReader.h | 10 +-- include/IXMLWriter.h | 4 +- include/IrrlichtDevice.h | 4 +- include/irrXML.h | 4 +- include/irrlicht.h | 2 +- source/Irrlicht/C3DSMeshFileLoader.cpp | 2 +- source/Irrlicht/C3DSMeshFileLoader.h | 2 +- source/Irrlicht/CAttributes.h | 2 +- source/Irrlicht/CB3DMeshFileLoader.cpp | 2 +- source/Irrlicht/CB3DMeshFileLoader.h | 2 +- source/Irrlicht/CBSPMeshFileLoader.cpp | 2 +- source/Irrlicht/CBSPMeshFileLoader.h | 2 +- source/Irrlicht/CColladaFileLoader.cpp | 2 +- source/Irrlicht/CColladaFileLoader.h | 4 +- source/Irrlicht/CDMFLoader.cpp | 4 +- source/Irrlicht/CDMFLoader.h | 2 +- .../CDefaultSceneNodeAnimatorFactory.h | 4 +- source/Irrlicht/CGUIEnvironment.cpp | 2 +- source/Irrlicht/CGUIEnvironment.h | 2 +- source/Irrlicht/CMD2MeshFileLoader.cpp | 2 +- source/Irrlicht/CMD2MeshFileLoader.h | 2 +- source/Irrlicht/CMD3MeshFileLoader.h | 2 +- source/Irrlicht/CMS3DMeshFileLoader.cpp | 2 +- source/Irrlicht/CMS3DMeshFileLoader.h | 2 +- source/Irrlicht/CMeshManipulator.h | 2 +- source/Irrlicht/COBJMeshFileLoader.cpp | 2 +- source/Irrlicht/COBJMeshFileLoader.h | 2 +- source/Irrlicht/COCTLoader.cpp | 4 +- source/Irrlicht/COCTLoader.h | 2 +- source/Irrlicht/COgreMeshFileLoader.cpp | 2 +- source/Irrlicht/COgreMeshFileLoader.h | 2 +- source/Irrlicht/CPakReader.h | 4 +- source/Irrlicht/CQ3LevelMesh.cpp | 2 +- source/Irrlicht/CXMLReader.cpp | 4 +- source/Irrlicht/CXMeshFileLoader.cpp | 2 +- source/Irrlicht/CXMeshFileLoader.h | 2 +- source/Irrlicht/CZipReader.h | 4 +- source/Irrlicht/IBurningShader.h | 4 +- source/Irrlicht/IDepthBuffer.h | 4 +- source/Irrlicht/ITriangleRenderer.h | 4 +- source/Irrlicht/IZBuffer.h | 4 +- source/Irrlicht/Irrlicht7.1.vcproj | 3 - tools/IrrFontTool/newFontTool/CFontTool.h | 2 +- 86 files changed, 240 insertions(+), 241 deletions(-) rename include/{IUnknown.h => IReferenceCounted.h} (88%) diff --git a/changes.txt b/changes.txt index 7954dc6b..843c8656 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,7 @@ Changes in version 1.4 (... 2007) + - the base class for nearly all Irrlicht classes has been renamed from IUnknown to IReferenceCounted + - fixed the keyboard autorepeat difference betwenn Linux and Windows. Thanks to denton we now have only KeyPressed events on both systems in case of autorepeat. - Added several new particle emitters and affectors from IrrSpintz. Also some new getter and setter methods were added. diff --git a/include/IAnimatedMeshMD3.h b/include/IAnimatedMeshMD3.h index 7450acef..f20bf848 100644 --- a/include/IAnimatedMeshMD3.h +++ b/include/IAnimatedMeshMD3.h @@ -145,7 +145,7 @@ namespace scene #undef PACK_STRUCT //! Holding Frame Data for a Mesh - struct SMD3MeshBuffer : public IUnknown + struct SMD3MeshBuffer : public IReferenceCounted { SMD3MeshHeader MeshHeader; @@ -197,7 +197,7 @@ namespace scene }; // holds a assoziative list of named quaternions - struct SMD3QuaterionTagList : public virtual IUnknown + struct SMD3QuaterionTagList : public virtual IReferenceCounted { SMD3QuaterionTag* get ( const core::stringc& name ) { @@ -224,7 +224,7 @@ namespace scene //! Holding Frames Buffers and Tag Infos - struct SMD3Mesh: public IUnknown + struct SMD3Mesh: public IReferenceCounted { ~SMD3Mesh() { diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h index daef4160..2109f029 100644 --- a/include/IAnimatedMeshSceneNode.h +++ b/include/IAnimatedMeshSceneNode.h @@ -22,7 +22,7 @@ namespace scene IAnimatedMeshSceneNode::setAnimationEndCallback to be able to be notified if an animation playback has ended. **/ - class IAnimationEndCallBack : public virtual IUnknown + class IAnimationEndCallBack : public virtual IReferenceCounted { public: @@ -81,7 +81,7 @@ namespace scene //! \param infinity: Value used by the shadow volume algorithm to scale the //! shadow volume. //! \return Returns pointer to the created shadow scene node. - //! This pointer should not be dropped. See IUnknown::drop() for more information. + //! This pointer should not be dropped. See IReferenceCounted::drop() for more information. virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(s32 id=-1, bool zfailmethod=true, f32 infinity=10000.0f) = 0; diff --git a/include/IAttributeExchangingObject.h b/include/IAttributeExchangingObject.h index 8fc8025c..5c0958a6 100644 --- a/include/IAttributeExchangingObject.h +++ b/include/IAttributeExchangingObject.h @@ -5,7 +5,7 @@ #ifndef __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__ #define __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr @@ -48,7 +48,7 @@ struct SAttributeReadWriteOptions //! An object which is able to serialize and deserialize its attributes into an attributes object -class IAttributeExchangingObject : public virtual IUnknown +class IAttributeExchangingObject : public virtual IReferenceCounted { public: diff --git a/include/IAttributes.h b/include/IAttributes.h index 0d5353eb..6f1dbf14 100644 --- a/include/IAttributes.h +++ b/include/IAttributes.h @@ -5,7 +5,7 @@ #ifndef __I_ATTRIBUTES_H_INCLUDED__ #define __I_ATTRIBUTES_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SColor.h" #include "vector3d.h" #include "vector2d.h" @@ -117,7 +117,7 @@ enum E_ATTRIBUTE_TYPE }; //! Provides a generic interface for attributes and their values and the possiblity to serialize them -class IAttributes : public virtual IUnknown +class IAttributes : public virtual IReferenceCounted { public: diff --git a/include/ICursorControl.h b/include/ICursorControl.h index 06b5bc0a..146d2ca1 100644 --- a/include/ICursorControl.h +++ b/include/ICursorControl.h @@ -5,7 +5,7 @@ #ifndef __I_CURSOR_CONTROL_H_INCLUDED__ #define __I_CURSOR_CONTROL_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "position2d.h" #include "rect.h" @@ -15,7 +15,7 @@ namespace gui { //! Interface to manipulate the mouse cursor. - class ICursorControl : public virtual IUnknown + class ICursorControl : public virtual IReferenceCounted { public: diff --git a/include/IFileList.h b/include/IFileList.h index e8a54873..90d29a83 100644 --- a/include/IFileList.h +++ b/include/IFileList.h @@ -5,7 +5,7 @@ #ifndef __I_FILE_LIST_H_INCLUDED__ #define __I_FILE_LIST_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -13,7 +13,7 @@ namespace io { //! The Filelist lists all files in a directory. -class IFileList : public virtual IUnknown +class IFileList : public virtual IReferenceCounted { public: diff --git a/include/IFileSystem.h b/include/IFileSystem.h index a0889d2f..cbdc8499 100644 --- a/include/IFileSystem.h +++ b/include/IFileSystem.h @@ -5,7 +5,7 @@ #ifndef __I_FILE_SYSTEM_H_INCLUDED__ #define __I_FILE_SYSTEM_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IXMLReader.h" #include "irrString.h" @@ -31,7 +31,7 @@ class IAttributes; could be in a .zip-Archive or as file on disk, using the IFileSystem makes no difference to this. */ -class IFileSystem : public virtual IUnknown +class IFileSystem : public virtual IReferenceCounted { public: @@ -42,7 +42,7 @@ public: /** \param filename: Name of file to open. \return Returns a pointer to the created file interface. The returned pointer should be dropped when no longer needed. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IReadFile* createAndOpenFile(const c8* filename) = 0; //! Creates an IReadFile interface for accessing memory like a file. @@ -54,7 +54,7 @@ public: along with the IReadFile when it is dropped. \return Returns a pointer to the created file interface. The returned pointer should be dropped when no longer needed. - See IUnknown::drop() for more information. + See IReferenceCounted::drop() for more information. */ virtual IReadFile* createMemoryReadFile(void* memory, s32 len, const c8* fileName, bool deleteMemoryWhenDropped=false) = 0; @@ -65,7 +65,7 @@ public: \return Returns a pointer to the created file interface. 0 is returned, if the file could not created or opened for writing. The returned pointer should be dropped when no longer needed. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IWriteFile* createAndWriteFile(const c8* filename, bool append=false) = 0; //! Adds an zip archive to the file system. @@ -122,7 +122,7 @@ public: //! Creates a list of files and directories in the current working directory and returns it. /** \return a Pointer to the created IFileList is returned. After the list has been used it has to be deleted using its IFileList::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IFileList* createFileList() = 0; //! Determinates if a file exists and would be able to be opened. @@ -136,7 +136,7 @@ public: \return 0, if file could not be opened, otherwise a pointer to the created IXMLReader is returned. After use, the reader has to be deleted using its IXMLReader::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IXMLReader* createXMLReader(const c8* filename) = 0; //! Creates a XML Reader from a file which returns all parsed strings as wide characters (wchar_t*). @@ -145,7 +145,7 @@ public: \return 0, if file could not be opened, otherwise a pointer to the created IXMLReader is returned. After use, the reader has to be deleted using its IXMLReader::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IXMLReader* createXMLReader(IReadFile* file) = 0; //! Creates a XML Reader from a file which returns all parsed strings as ASCII/UTF-8 characters (char*). @@ -154,7 +154,7 @@ public: \return 0, if file could not be opened, otherwise a pointer to the created IXMLReader is returned. After use, the reader has to be deleted using its IXMLReaderUTF8::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IXMLReaderUTF8* createXMLReaderUTF8(const c8* filename) = 0; //! Creates a XML Reader from a file which returns all parsed strings as ASCII/UTF-8 characters (char*). @@ -163,21 +163,21 @@ public: \return 0, if file could not be opened, otherwise a pointer to the created IXMLReader is returned. After use, the reader has to be deleted using its IXMLReaderUTF8::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IXMLReaderUTF8* createXMLReaderUTF8(IReadFile* file) = 0; //! Creates a XML Writer from a file. /** \return 0, if file could not be opened, otherwise a pointer to the created IXMLWriter is returned. After use, the reader has to be deleted using its IXMLWriter::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IXMLWriter* createXMLWriter(const c8* filename) = 0; //! Creates a XML Writer from a file. /** \return 0, if file could not be opened, otherwise a pointer to the created IXMLWriter is returned. After use, the reader has to be deleted using its IXMLWriter::drop() method. - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IXMLWriter* createXMLWriter(IWriteFile* file) = 0; //! Creates a new empty collection of attributes, usable for serialization and more. @@ -185,7 +185,7 @@ public: Can be null to prevent automatic texture loading by attributes. \return Returns a pointer to the created object. If you no longer need the object, you should call IAttributes::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IAttributes* createEmptyAttributes(video::IVideoDriver* driver=0) = 0; }; diff --git a/include/IGPUProgrammingServices.h b/include/IGPUProgrammingServices.h index 8b4cfba0..0f863243 100644 --- a/include/IGPUProgrammingServices.h +++ b/include/IGPUProgrammingServices.h @@ -5,7 +5,7 @@ #ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ #define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SMaterial.h" namespace irr diff --git a/include/IGUIElementFactory.h b/include/IGUIElementFactory.h index aeb1efca..2143628c 100644 --- a/include/IGUIElementFactory.h +++ b/include/IGUIElementFactory.h @@ -5,7 +5,7 @@ #ifndef __I_GUI_ELEMENT_FACTORY_H_INCLUDED__ #define __I_GUI_ELEMENT_FACTORY_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "EGUIElementTypes.h" namespace irr @@ -24,7 +24,7 @@ namespace gui increase the reference counter of the environment. This is not necessary because the it will grab() the factory anyway, and otherwise cyclic references will be created. */ - class IGUIElementFactory : public virtual IUnknown + class IGUIElementFactory : public virtual IReferenceCounted { public: diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h index da635a29..b1e253b0 100644 --- a/include/IGUIEnvironment.h +++ b/include/IGUIEnvironment.h @@ -5,7 +5,7 @@ #ifndef __I_GUI_ENVIRONMENT_H_INCLUDED__ #define __I_GUI_ENVIRONMENT_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IGUISkin.h" #include "rect.h" #include "EMessageBoxFlags.h" @@ -57,7 +57,7 @@ class IGUIWindow; class IGUIElementFactory; //! GUI Environment. Used as factory and manager of all other GUI elements. -class IGUIEnvironment : public virtual IUnknown +class IGUIEnvironment : public virtual IReferenceCounted { public: @@ -127,14 +127,14 @@ public: /** Use setSkin() to set the created skin. \return Returns a pointer to the created skin. If you no longer need the image, you should call IGUISkin::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type) = 0; //! Returns pointer to the font with the specified file name. /** Loads the font if it was not loaded before. Returns 0 if the font could not be loaded. \return returns a pointer to the font. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIFont* getFont(const c8* filename) = 0; //! Returns the default built-in font. @@ -144,7 +144,7 @@ public: /** Loads the bank if it was not loaded before. Returns 0 if it could not be loaded. \return returns a pointer to the sprite bank. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUISpriteBank* getSpriteBank(const c8* filename) = 0; //! adds an empty sprite bank to the manager @@ -154,13 +154,13 @@ public: /** This is the first gui element, parent of all other gui elements. You'll never need to use this method, unless you are not creating your own gui elements, trying to add them to the gui elements without a parent. - The returned pointer should not be dropped. See IUnknown::drop() for more information. */ + The returned pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIElement* getRootGUIElement() = 0; //! Adds an button element. /** \return Returns a pointer to the created button. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIButton* addButton(const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, const wchar_t* tooltiptext = 0) = 0; @@ -170,7 +170,7 @@ public: until this messagebox is removed. \return Returns a pointer to the created window. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIWindow* addWindow(const core::rect& rectangle, bool modal = false, const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1) = 0; @@ -178,7 +178,7 @@ public: //! able to recieve input until its last child is removed, it then deletes its self. /** \return Returns a pointer to the created window. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIElement* addModalScreen(IGUIElement* parent) = 0; //! Adds a message box. @@ -194,14 +194,14 @@ public: \param id: Id with which the gui element can be identified. \return Returns a pointer to the created message box. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIWindow* addMessageBox(const wchar_t* caption, const wchar_t* text=0, bool modal = true, s32 flags = EMBF_OK, IGUIElement* parent=0, s32 id=-1) = 0; //! Adds a scrollbar. /** \return Returns a pointer to the created scrollbar. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1) = 0; @@ -213,7 +213,7 @@ public: to draw itself. \return Returns a pointer to the created image element. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIImage* addImage(video::ITexture* image, core::position2d pos, bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0; @@ -221,28 +221,28 @@ public: /** Use IGUIImage::setImage later to set the image to be displayed. \return Returns a pointer to the created image element. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIImage* addImage(const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0; //! Adds a checkbox element. /** \return Returns a pointer to the created check box. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUICheckBox* addCheckBox(bool checked, const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0; //! Adds a list box element. /** \return Returns a pointer to the created list box. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIListBox* addListBox(const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) = 0; //! Adds an mesh viewer. Not 100% implemented yet. /** \return Returns a pointer to the created mesh viewer. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIMeshViewer* addMeshViewer(const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0; //! Adds a file open dialog. @@ -251,7 +251,7 @@ public: until this messagebox is removed. \return Returns a pointer to the created file open dialog. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0, bool modal=true, IGUIElement* parent=0, s32 id=-1) = 0; @@ -261,7 +261,7 @@ public: until this messagebox is removed. \return Returns a pointer to the created file open dialog. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0, bool modal=true, IGUIElement* parent=0, s32 id=-1) = 0; @@ -276,7 +276,7 @@ public: \param fillBackground specifies if the background will be filled. Default: false. \return Returns a pointer to the created static text. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect& rectangle, bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1, bool fillBackground = false) = 0; @@ -293,7 +293,7 @@ public: \param id is a s32 to identify the edit box. \return Returns a pointer to the created edit box. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect& rectangle, bool border=true, IGUIElement* parent=0, s32 id=-1) = 0; @@ -305,7 +305,7 @@ public: \param id is a s32 to identify the spin box. \return Returns a pointer to the created spin box. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect& rectangle, IGUIElement* parent=0, s32 id=-1) = 0; @@ -316,7 +316,7 @@ public: \param id: A s32 to identify the text. \return Returns a pointer to the created in-out-fader. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUIInOutFader* addInOutFader(const core::rect* rectangle=0, IGUIElement* parent=0, s32 id=-1) = 0; //! Adds a tab control to the environment. @@ -328,7 +328,7 @@ public: \param id is a s32 to identify the tab control. \return Returns a pointer to the created tab control element. Returns 0 if an error occured. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IGUITabControl* addTabControl(const core::rect& rectangle, IGUIElement* parent=0, bool fillbackground=false, bool border=true, s32 id=-1) = 0; diff --git a/include/IGUIFont.h b/include/IGUIFont.h index 5392c4f6..5b1c1170 100644 --- a/include/IGUIFont.h +++ b/include/IGUIFont.h @@ -5,7 +5,7 @@ #ifndef __I_GUI_FONT_H_INCLUDED__ #define __I_GUI_FONT_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SColor.h" #include "rect.h" @@ -35,7 +35,7 @@ enum EGUI_FONT_TYPE }; //! Font interface. -class IGUIFont : public virtual IUnknown +class IGUIFont : public virtual IReferenceCounted { public: diff --git a/include/IGUISpriteBank.h b/include/IGUISpriteBank.h index 0b741747..79852b2e 100644 --- a/include/IGUISpriteBank.h +++ b/include/IGUISpriteBank.h @@ -2,7 +2,7 @@ #ifndef __I_GUI_SPRITE_BANK_H_INCLUDED__ #define __I_GUI_SPRITE_BANK_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "irrArray.h" #include "SColor.h" #include "rect.h" @@ -33,7 +33,7 @@ struct SGUISprite //! Sprite bank interface. -class IGUISpriteBank : public virtual IUnknown +class IGUISpriteBank : public virtual IReferenceCounted { public: diff --git a/include/IImage.h b/include/IImage.h index 923095e3..89dbc3fe 100644 --- a/include/IImage.h +++ b/include/IImage.h @@ -5,7 +5,7 @@ #ifndef __I_IMAGE_H_INCLUDED__ #define __I_IMAGE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "position2d.h" #include "SColor.h" @@ -39,7 +39,7 @@ enum ECOLOR_FORMAT /** Image loaders create these images from files. IVideoDrivers convert these images into their (hardware) textures. */ -class IImage : public virtual IUnknown +class IImage : public virtual IReferenceCounted { public: diff --git a/include/IImageLoader.h b/include/IImageLoader.h index 6c0ebc06..baa8d9ef 100644 --- a/include/IImageLoader.h +++ b/include/IImageLoader.h @@ -5,7 +5,7 @@ #ifndef __I_SURFACE_LOADER_H_INCLUDED__ #define __I_SURFACE_LOADER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IImage.h" namespace irr @@ -22,7 +22,7 @@ namespace video currently unsupported file formats (e.g .gif), then implement this and add your new Surface loader with IVideoDriver::addExternalImageLoader() to the engine. */ -class IImageLoader : public virtual IUnknown +class IImageLoader : public virtual IReferenceCounted { public: diff --git a/include/IImageWriter.h b/include/IImageWriter.h index 90a2ff3d..e5fd2564 100644 --- a/include/IImageWriter.h +++ b/include/IImageWriter.h @@ -1,7 +1,7 @@ #ifndef _I_IMAGE_WRITER_H_INCLUDED__ #define _I_IMAGE_WRITER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -16,7 +16,7 @@ namespace video //! Interface for writing software image data. -class IImageWriter : public IUnknown +class IImageWriter : public IReferenceCounted { public: //! constructor diff --git a/include/ILogger.h b/include/ILogger.h index 8a160bea..8d86f94f 100644 --- a/include/ILogger.h +++ b/include/ILogger.h @@ -5,7 +5,7 @@ #ifndef __I_LOGGER_H_INCLUDED__ #define __I_LOGGER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -28,7 +28,7 @@ enum ELOG_LEVEL //! Interface for logging messages, warnings and errors -class ILogger : public virtual IUnknown +class ILogger : public virtual IReferenceCounted { public: diff --git a/include/IMaterialRenderer.h b/include/IMaterialRenderer.h index 089bde18..87229ffb 100644 --- a/include/IMaterialRenderer.h +++ b/include/IMaterialRenderer.h @@ -5,7 +5,7 @@ #ifndef __I_MATERIAL_RENDERER_H_INCLUDED__ #define __I_MATERIAL_RENDERER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SMaterial.h" #include "S3DVertex.h" @@ -21,7 +21,7 @@ class IMaterialRendererServices; /** Refer to IVideoDriver::addMaterialRenderer() for more informations on how to extend the engine with new materials. */ -class IMaterialRenderer : public virtual IUnknown +class IMaterialRenderer : public virtual IReferenceCounted { public: diff --git a/include/IMaterialRendererServices.h b/include/IMaterialRendererServices.h index c9f81625..f561a538 100644 --- a/include/IMaterialRendererServices.h +++ b/include/IMaterialRendererServices.h @@ -5,7 +5,7 @@ #ifndef __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ #define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SMaterial.h" #include "S3DVertex.h" diff --git a/include/IMesh.h b/include/IMesh.h index 65a2640b..cfb0da97 100644 --- a/include/IMesh.h +++ b/include/IMesh.h @@ -5,7 +5,7 @@ #ifndef __I_MESH_H_INCLUDED__ #define __I_MESH_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SMaterial.h" namespace irr @@ -18,7 +18,7 @@ namespace scene /** An IMesh is nothing more than a collection of some mesh buffers (IMeshBuffer). SMesh is a simple implementation of an IMesh. */ - class IMesh : public virtual IUnknown + class IMesh : public virtual IReferenceCounted { public: diff --git a/include/IMeshBuffer.h b/include/IMeshBuffer.h index ec3a4912..7dbfc2a4 100644 --- a/include/IMeshBuffer.h +++ b/include/IMeshBuffer.h @@ -5,7 +5,7 @@ #ifndef __I_MESH_BUFFER_H_INCLUDED__ #define __I_MESH_BUFFER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "SMaterial.h" #include "aabbox3d.h" #include "S3DVertex.h" @@ -55,7 +55,7 @@ enum E_PRIMITIVE_TYPE //! Struct for holding a mesh with a single material /** SMeshBuffer is a simple implementation of a MeshBuffer. */ - class IMeshBuffer : public virtual IUnknown + class IMeshBuffer : public virtual IReferenceCounted { public: diff --git a/include/IMeshCache.h b/include/IMeshCache.h index 26ebaffc..d5204838 100644 --- a/include/IMeshCache.h +++ b/include/IMeshCache.h @@ -5,7 +5,7 @@ #ifndef __I_MESH_CACHE_H_INCLUDED__ #define __I_MESH_CACHE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "irrString.h" namespace irr @@ -24,7 +24,7 @@ namespace scene this interface, it is possible to manually add new loaded meshes (if ISceneManager::getMesh() is not sufficient), to remove them and to iterate through already loaded meshes. */ - class IMeshCache : public virtual IUnknown + class IMeshCache : public virtual IReferenceCounted { public: diff --git a/include/IMeshLoader.h b/include/IMeshLoader.h index b81abd7a..5048cf2c 100644 --- a/include/IMeshLoader.h +++ b/include/IMeshLoader.h @@ -5,7 +5,7 @@ #ifndef __I_MESH_LOADER_H_INCLUDED__ #define __I_MESH_LOADER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -22,7 +22,7 @@ namespace scene currently unsupported file formats (e.g .cob), then implement this and add your new Surface loader with ISceneManager::addExternalMeshLoader() to the engine. */ -class IMeshLoader : public virtual IUnknown +class IMeshLoader : public virtual IReferenceCounted { public: @@ -36,7 +36,7 @@ public: //! Creates/loads an animated mesh from the file. /** \return Pointer to the created mesh. Returns 0 if loading failed. If you no longer need the mesh, you should call IAnimatedMesh::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file) = 0; }; diff --git a/include/IMeshManipulator.h b/include/IMeshManipulator.h index d6724c2e..2d99992b 100644 --- a/include/IMeshManipulator.h +++ b/include/IMeshManipulator.h @@ -5,7 +5,7 @@ #ifndef __I_MESH_MANIPULATOR_H_INCLUDED__ #define __I_MESH_MANIPULATOR_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "vector3d.h" #include "aabbox3d.h" #include "matrix4.h" @@ -26,7 +26,7 @@ namespace scene with wrong imported or exported meshes quickly after loading. It is not intended for doing mesh modifications and/or animations during runtime. */ - class IMeshManipulator : public virtual IUnknown + class IMeshManipulator : public virtual IReferenceCounted { public: @@ -73,7 +73,7 @@ namespace scene \param mesh: Mesh to copy. \return Returns the cloned mesh. If you no longer need the cloned mesh, you should call SMesh::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual SMesh* createMeshCopy(IMesh* mesh) const = 0; @@ -90,7 +90,7 @@ namespace scene \param mesh: Input mesh \return Mesh consiting only of S3DVertexTangents vertices. If you no longer need the cloned mesh, you should call IMesh::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IMesh* createMeshWithTangents(IMesh* mesh) const = 0; //! Unweld vertices diff --git a/include/IOSOperator.h b/include/IOSOperator.h index 0c7103f3..b6837f5c 100644 --- a/include/IOSOperator.h +++ b/include/IOSOperator.h @@ -5,13 +5,13 @@ #ifndef __I_OS_OPERATOR_H_INCLUDED__ #define __I_OS_OPERATOR_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { //! The Operating system operator provides operation system specific methods and informations. -class IOSOperator : public virtual IUnknown +class IOSOperator : public virtual IReferenceCounted { public: diff --git a/include/IParticleSystemSceneNode.h b/include/IParticleSystemSceneNode.h index 2a08fa72..e3de6d2e 100644 --- a/include/IParticleSystemSceneNode.h +++ b/include/IParticleSystemSceneNode.h @@ -119,7 +119,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleAnimatedMeshSceneNodeEmitter* createAnimatedMeshSceneNodeEmitter( scene::IAnimatedMeshSceneNode* node, bool useNormalDirection = true, const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f), @@ -152,7 +152,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleBoxEmitter* createBoxEmitter( const core::aabbox3df& box = core::aabbox3df(-10,28,-10,10,30,10), const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f), @@ -186,7 +186,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleCylinderEmitter* createCylinderEmitter( const core::vector3df& center, f32 radius, const core::vector3df& normal, f32 length, @@ -230,7 +230,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleMeshEmitter* createMeshEmitter( scene::IMesh* mesh, bool useNormalDirection = true, const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f), @@ -262,7 +262,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticlePointEmitter* createPointEmitter( const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f), u32 minParticlesPerSecond = 5, @@ -297,7 +297,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleRingEmitter* createRingEmitter( const core::vector3df& center, f32 radius, f32 ringThickness, const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f), @@ -330,7 +330,7 @@ public: //! To set this emitter as new emitter of this particle system, //! just call setEmitter(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleSphereEmitter* createSphereEmitter( const core::vector3df& center, f32 radius, const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f), @@ -353,7 +353,7 @@ public: //! To add this affector as new affector of this particle system, //! just call addAffector(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleAttractionAffector* createAttractionAffector( const core::vector3df& point, f32 speed = 1.0f, bool attract = true, bool affectX = true, bool affectY = true, bool affectZ = true) = 0; @@ -371,7 +371,7 @@ public: //! To add this affector as new affector of this particle system, //! just call addAffector(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleFadeOutAffector* createFadeOutParticleAffector( const video::SColor& targetColor = video::SColor(0,0,0,0), u32 timeNeededToFadeOut = 1000) = 0; @@ -389,7 +389,7 @@ public: //! To add this affector as new affector of this particle system, //! just call addAffector(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleGravityAffector* createGravityAffector( const core::vector3df& gravity = core::vector3df(0.0f,-0.03f,0.0f), u32 timeForceLost = 1000) = 0; @@ -402,7 +402,7 @@ public: //! To add this affector as new affector of this particle system, //! just call addAffector(). Note that you'll have to drop() the //! returned pointer, after you don't need it any more, see - //! IUnknown::drop() for more informations. + //! IReferenceCounted::drop() for more informations. virtual IParticleRotationAffector* createRotationAffector( const core::vector3df& speed = core::vector3df(5.0f,5.0f,5.0f), const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) ) = 0; diff --git a/include/IQ3Shader.h b/include/IQ3Shader.h index 15781a67..7acd1337 100644 --- a/include/IQ3Shader.h +++ b/include/IQ3Shader.h @@ -432,7 +432,7 @@ namespace quake3 core::array < SVariable > Variable; }; - struct SVarGroupList: public IUnknown + struct SVarGroupList: public IReferenceCounted { SVarGroupList () {} virtual ~SVarGroupList () {} @@ -595,7 +595,7 @@ namespace quake3 /*! Manages various Quake3 Shader Styles */ - class IShaderManager : public irr::IUnknown + class IShaderManager : public irr::IReferenceCounted { }; diff --git a/include/IReadFile.h b/include/IReadFile.h index e79c8056..8c9e2bdc 100644 --- a/include/IReadFile.h +++ b/include/IReadFile.h @@ -5,7 +5,7 @@ #ifndef __I_READ_FILE_H_INCLUDED__ #define __I_READ_FILE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -13,7 +13,7 @@ namespace io { //! Interface providing read acess to a file. - class IReadFile : public virtual IUnknown + class IReadFile : public virtual IReferenceCounted { public: diff --git a/include/IUnknown.h b/include/IReferenceCounted.h similarity index 88% rename from include/IUnknown.h rename to include/IReferenceCounted.h index 3f79b7ad..f97b67b6 100644 --- a/include/IUnknown.h +++ b/include/IReferenceCounted.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_UNKNOWN_H_INCLUDED__ -#define __I_UNKNOWN_H_INCLUDED__ +#ifndef __I_IREFERENCE_COUNTED_H_INCLUDED__ +#define __I_IREFERENCE_COUNTED_H_INCLUDED__ #include "irrTypes.h" @@ -14,7 +14,7 @@ namespace irr /** This class provides reference counting through the methods grab() and drop(). It also is able to store a debug string for every instance of an object. Most objects of the Irrlicht - Engine are derived from IUnknown, and so they are reference counted. + Engine are derived from IReferenceCounted, and so they are reference counted. When you create an object in the Irrlicht engine, calling a method which starts with 'create', an object is created, and you get a pointer @@ -38,18 +38,18 @@ namespace irr the name of the method does not start with 'create'. The texture is stored somewhere by the driver. */ - class IUnknown + class IReferenceCounted { public: //! Constructor. - IUnknown() + IReferenceCounted() : ReferenceCounter(1), DebugName(0) { } //! Destructor. - virtual ~IUnknown() + virtual ~IReferenceCounted() { } @@ -57,9 +57,9 @@ namespace irr //! Someone who calls grab() to an object, should later also call //! drop() to it. If an object never gets as much drop() as grab() //! calls, it will never be destroyed. - //! The IUnknown class provides a basic reference counting mechanism + //! The IReferenceCounted class provides a basic reference counting mechanism //! with its methods grab() and drop(). Most objects of the Irrlicht - //! Engine are derived from IUnknown, and so they are reference counted. + //! Engine are derived from IReferenceCounted, and so they are reference counted. //! //! When you create an object in the Irrlicht engine, calling a method //! which starts with 'create', an object is created, and you get a pointer @@ -85,9 +85,9 @@ namespace irr //! Drops the object. Decrements the reference counter by one. //! Returns true, if the object was deleted. - //! The IUnknown class provides a basic reference counting mechanism + //! The IReferenceCounted class provides a basic reference counting mechanism //! with its methods grab() and drop(). Most objects of the Irrlicht - //! Engine are derived from IUnknown, and so they are reference counted. + //! Engine are derived from IReferenceCounted, and so they are reference counted. //! //! When you create an object in the Irrlicht engine, calling a method //! which starts with 'create', an object is created, and you get a pointer diff --git a/include/ISceneCollisionManager.h b/include/ISceneCollisionManager.h index 7e7c0d48..f7c4e97b 100644 --- a/include/ISceneCollisionManager.h +++ b/include/ISceneCollisionManager.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ #define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "vector3d.h" #include "triangle3d.h" #include "position2d.h" @@ -22,7 +22,7 @@ namespace scene class ITriangleSelector; //! The Scene Collision Manager provides methods for performing collision tests and picking on scene nodes. - class ISceneCollisionManager : public virtual IUnknown + class ISceneCollisionManager : public virtual IReferenceCounted { public: diff --git a/include/ISceneManager.h b/include/ISceneManager.h index a4a05ea1..a8468697 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_MANAGER_H_INCLUDED__ #define __I_SCENE_MANAGER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "irrArray.h" #include "vector3d.h" #include "dimension2d.h" @@ -144,7 +144,7 @@ namespace scene at getMesh() to find out what formats are supported. And if these formats are not enough use addExternalMeshLoader() to add new formats to the engine. */ - class ISceneManager : public virtual IUnknown + class ISceneManager : public virtual IReferenceCounted { public: @@ -297,7 +297,7 @@ namespace scene * \param filename: Filename of the mesh to load. * \return Returns NULL if failed and the pointer to the mesh if * successful. - * This pointer should not be dropped. See IUnknown::drop() for more information. + * This pointer should not be dropped. See IReferenceCounted::drop() for more information. **/ virtual IAnimatedMesh* getMesh(const c8* filename) = 0; @@ -309,12 +309,12 @@ namespace scene //! Returns the video driver. /** \return Returns pointer to the video Driver. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual video::IVideoDriver* getVideoDriver() = 0; //! Returns the active GUIEnvironment /** \return Returns pointer to the GUIEnvironment - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual gui::IGUIEnvironment* getGUIEnvironment() = 0; //! Adds a test scene node for test purposes to the scene. @@ -327,7 +327,7 @@ namespace scene \param rotation: Initital rotation of the scene node. \param scale: Initial scale of the scene node. \return Returns pointer to the created test scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addCubeSceneNode(f32 size=10.0f, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), @@ -344,7 +344,7 @@ namespace scene \param rotation: Initital rotation of the scene node. \param scale: Initial scale of the scene node. \return Returns pointer to the created test scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addSphereSceneNode(f32 radius=5.0f, s32 polyCount=16, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), @@ -360,7 +360,7 @@ namespace scene \param scale: Initial scale of the scene node. \param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed. \return Returns pointer to the created scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IAnimatedMeshSceneNode* addAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), @@ -377,7 +377,7 @@ namespace scene \param scale: Initial scale of the scene node. \param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed. \return Returns pointer to the created scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IMeshSceneNode* addMeshSceneNode(IMesh* mesh, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), @@ -398,7 +398,7 @@ namespace scene \param rotation: Initital rotation of the scene node. \param scale: Initial scale of the scene node. \return Returns pointer to the created scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addWaterSurfaceSceneNode(IMesh* mesh, f32 waveHeight=2.0f, f32 waveSpeed=300.0f, f32 waveLength=10.0f, ISceneNode* parent=0, s32 id=-1, @@ -419,7 +419,7 @@ namespace scene smaller nodes. \param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed. \return Returns the pointer to the OctTree if successful, otherwise 0. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addOctTreeSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, s32 id=-1, s32 minimalPolysPerNode=256, bool alsoAddIfMeshPointerZero=false) = 0; @@ -435,7 +435,7 @@ namespace scene smaller nodes. \param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed. \return Returns the pointer to the octtree if successful, otherwise 0. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addOctTreeSceneNode(IMesh* mesh, ISceneNode* parent=0, s32 id=-1, s32 minimalPolysPerNode=256, bool alsoAddIfMeshPointerZero=false) = 0; @@ -449,7 +449,7 @@ namespace scene the camera will move too. \param id: id of the camera. This id can be used to identify the camera. \return Returns pointer to interface to camera if successful, otherwise 0. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ICameraSceneNode* addCameraSceneNode(ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& lookat = core::vector3df(0,0,100), s32 id=-1) = 0; @@ -463,7 +463,7 @@ namespace scene \param translationSpeed: TranslationSpeed of the camera. \param id: id of the camera. This id can be used to identify the camera. \return Returns a pointer to the interface of the camera if successful, otherwise 0. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent = 0, f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f, f32 translationSpeed = 1500.0f, s32 id=-1) = 0; @@ -512,7 +512,7 @@ namespace scene is 'false', with which it is possible to fly around in space, if no gravity is there. \param jumpSpeed: Speed with which the camera is moved when jumping. \return Returns a pointer to the interface of the camera if successful, otherwise 0. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ICameraSceneNode* addCameraSceneNodeFPS(ISceneNode* parent = 0, f32 rotateSpeed = 100.0f, f32 moveSpeed = 500.0f, s32 id=-1, SKeyMap* keyMapArray=0, s32 keyMapSize=0, bool noVerticalMovement=false, @@ -530,7 +530,7 @@ namespace scene \param radius: Radius of the light. \param id: id of the node. This id can be used to identify the node. \return Returns pointer to the interface of the light if successful, otherwise NULL. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ILightSceneNode* addLightSceneNode(ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), video::SColorf color = video::SColorf(1.0f, 1.0f, 1.0f), @@ -549,7 +549,7 @@ namespace scene \param shade_top: vertex color top \param shade_down: vertex color down \return Returns pointer to the billboard if successful, otherwise NULL. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IBillboardSceneNode* addBillboardSceneNode(ISceneNode* parent = 0, const core::dimension2d& size = core::dimension2d(10.0f, 10.0f), const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1, @@ -569,7 +569,7 @@ namespace scene change how it is drawn. \param id: An id of the node. This id can be used to identify the node. \return Returns a pointer to the sky box if successful, otherwise NULL. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom, video::ITexture* left, video::ITexture* right, video::ITexture* front, video::ITexture* back, ISceneNode* parent = 0, s32 id=-1) = 0; @@ -587,7 +587,7 @@ namespace scene change how it is drawn. \param id: An id of the node. This id can be used to identify the node. \return Returns a pointer to the sky dome if successful, otherwise NULL. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addSkyDomeSceneNode(video::ITexture* texture, u32 horiRes, u32 vertRes, f64 texturePercentage, f64 spherePercentage, ISceneNode* parent = 0, s32 id=-1) = 0; @@ -604,7 +604,7 @@ namespace scene \param rotation: Initital rotation of the scene node. \param scale: Initial scale of the scene node. \return Returns pointer to the created scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IParticleSystemSceneNode* addParticleSystemSceneNode( bool withDefaultEmitter=true, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), @@ -656,7 +656,7 @@ namespace scene \param addAlsoIfHeightmapEmpty: Add terrain node even with empty heightmap. \return Returns pointer to the created scene node. Can be null if the terrain could not be created, for example because the heightmap could not be loaded. - The returned pointer should not be dropped. See IUnknown::drop() for more information. */ + The returned pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ITerrainSceneNode* addTerrainSceneNode( const c8* heightMapFileName, ISceneNode* parent=0, s32 id=-1, @@ -690,7 +690,7 @@ namespace scene \param addAlsoIfHeightmapEmpty: Add terrain node even with empty heightmap. \return Returns pointer to the created scene node. Can be null if the terrain could not be created, for example because the heightmap could not be loaded. - The returned pointer should not be dropped. See IUnknown::drop() for more information. */ + The returned pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ITerrainSceneNode* addTerrainSceneNode( io::IReadFile* heightMapFile, ISceneNode* parent=0, s32 id=-1, @@ -704,7 +704,7 @@ namespace scene //! Adds a quake3 scene node to the scene graph. /** A Quake3 Scene renders multiple meshes for a specific HighLanguage Shader (Quake3 Style ) \return Returns a pointer to the quake3 scene node if successful, otherwise NULL. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addQuake3SceneNode(IMeshBuffer* meshBuffer, const quake3::SShader * shader, ISceneNode* parent=0, s32 id=-1 ) = 0; @@ -714,7 +714,7 @@ namespace scene /** Can be used for doing advanced transformations or structuring the scene graph. \return Returns pointer to the created scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ISceneNode* addEmptySceneNode(ISceneNode* parent=0, s32 id=-1) = 0; //! Adds a dummy transformation scene node to the scene graph. @@ -723,7 +723,7 @@ namespace scene matrix as relative transformation, making it possible to insert any transformation anywhere into the scene graph. \return Returns pointer to the created scene node. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IDummyTransformationSceneNode* addDummyTransformationSceneNode( ISceneNode* parent=0, s32 id=-1) = 0; @@ -766,7 +766,7 @@ namespace scene \return Returns null if the creation failed. The reason could be that you specified some invalid parameters or that a mesh with that name already exists. If successful, a pointer to the mesh is returned. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IAnimatedMesh* addHillPlaneMesh(const c8* name, const core::dimension2d& tileSize, const core::dimension2d& tileCount, video::SMaterial* material = 0, f32 hillHeight = 0.0f, @@ -795,7 +795,7 @@ namespace scene \return Returns null if the creation failed. The reason could be that you specified some invalid parameters, that a mesh with that name already exists, or that a texture could not be found. If successful, a pointer to the mesh is returned. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual IAnimatedMesh* addTerrainMesh(const c8* meshname, video::IImage* texture, video::IImage* heightmap, const core::dimension2d& stretchSize = core::dimension2d(10.0f,10.0f), @@ -898,7 +898,7 @@ namespace scene \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() and the animator will animate it. If you no longer need the animator, you should call ISceneNodeAnimator::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneNodeAnimator* createRotationAnimator(const core::vector3df& rotationPerSecond) = 0; //! Creates a fly circle animator, which lets the attached scene node fly around a center. @@ -909,7 +909,7 @@ namespace scene \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() and the animator will animate it. If you no longer need the animator, you should call ISceneNodeAnimator::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneNodeAnimator* createFlyCircleAnimator(const core::vector3df& center, f32 radius, f32 speed=0.001f, const core::vector3df& direction= core::vector3df ( 0.f, 1.f, 0.f ) ) = 0; @@ -923,7 +923,7 @@ namespace scene \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() and the animator will animate it. If you no longer need the animator, you should call ISceneNodeAnimator::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneNodeAnimator* createFlyStraightAnimator(const core::vector3df& startPoint, const core::vector3df& endPoint, u32 timeForWay, bool loop=false) = 0; @@ -936,7 +936,7 @@ namespace scene \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() and the animator will animate it. If you no longer need the animator, you should call ISceneNodeAnimator::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneNodeAnimator* createTextureAnimator(const core::array& textures, s32 timePerFrame, bool loop=true) = 0; @@ -945,7 +945,7 @@ namespace scene \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() and the animator will animate it. If you no longer need the animator, you should call ISceneNodeAnimator::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneNodeAnimator* createDeleteAnimator(u32 timeMs) = 0; //! Creates a special scene node animator for doing automatic collision detection and response. @@ -976,7 +976,7 @@ namespace scene \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() and the animator will cause it to do collision detection and response. If you no longer need the animator, you should call ISceneNodeAnimator::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneNodeAnimatorCollisionResponse* createCollisionResponseAnimator( ITriangleSelector* world, ISceneNode* sceneNode, const core::vector3df& ellipsoidRadius = core::vector3df(30,60,30), @@ -1014,7 +1014,7 @@ namespace scene \param node: Scene node of which visibility and transformation is used. \return Returns the selector, or null if not successful. If you no longer need the selector, you should call ITriangleSelector::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ITriangleSelector* createTriangleSelector(IMesh* mesh, ISceneNode* node) = 0; //! Creates a simple dynamic ITriangleSelector, based on a axis aligned bounding box. @@ -1025,7 +1025,7 @@ namespace scene \param node: Scene node of which the bounding box, visibility and transformation is used. \return Returns the selector, or null if not successful. If you no longer need the selector, you should call ITriangleSelector::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ITriangleSelector* createTriangleSelectorFromBoundingBox(ISceneNode* node) = 0; //! Creates a Triangle Selector, optimized by an octtree. @@ -1050,7 +1050,7 @@ namespace scene smaller nodes. \return Returns the selector, or null if not successful. If you no longer need the selector, you should call ITriangleSelector::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ITriangleSelector* createOctTreeTriangleSelector(IMesh* mesh, ISceneNode* node, s32 minimalPolysPerNode=32) = 0; @@ -1061,7 +1061,7 @@ namespace scene collision tests can be done with different triangle soups in one pass. \return Returns the selector, or null if not successful. If you no longer need the selector, you should call ITriangleSelector::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IMetaTriangleSelector* createMetaTriangleSelector() = 0; //! Creates a triangle selector which can select triangles from a terrain scene node. @@ -1167,7 +1167,7 @@ namespace scene yourNewSceneManager->postEventFromUser(), and return true so that the original scene manager doesn't get the event. Otherwise, all input will go automaticly to the main scene manager. If you no longer need the new scene manager, you should call ISceneManager::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ISceneManager* createNewSceneManager(bool cloneContent=false) = 0; //! Saves the current scene into a file. diff --git a/include/ISceneNode.h b/include/ISceneNode.h index ac9fe7a1..1089329a 100644 --- a/include/ISceneNode.h +++ b/include/ISceneNode.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_NODE_H_INCLUDED__ #define __I_SCENE_NODE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "ESceneNodeTypes.h" #include "ECullingTypes.h" #include "EDebugSceneTypes.h" diff --git a/include/ISceneNodeAnimator.h b/include/ISceneNodeAnimator.h index 6334e40a..8b8e6ec5 100644 --- a/include/ISceneNodeAnimator.h +++ b/include/ISceneNodeAnimator.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_NODE_ANIMATOR_H_INCLUDED__ #define __I_SCENE_NODE_ANIMATOR_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "vector3d.h" #include "ESceneNodeAnimatorTypes.h" #include "IAttributeExchangingObject.h" @@ -39,7 +39,7 @@ namespace scene virtual void animateNode(ISceneNode* node, u32 timeMs) = 0; //! Creates a clone of this animator. - /** Please note that you will have to drop (IUnknown::drop()) + /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) { diff --git a/include/ISceneNodeAnimatorFactory.h b/include/ISceneNodeAnimatorFactory.h index 5a898588..7e39b28f 100644 --- a/include/ISceneNodeAnimatorFactory.h +++ b/include/ISceneNodeAnimatorFactory.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ #define __I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "ESceneNodeAnimatorTypes.h" namespace irr @@ -24,7 +24,7 @@ namespace scene scene node manager will grab() the factory anyway, and otherwise cyclic references will be created and the scene manager and all its nodes won't get deallocated. */ - class ISceneNodeAnimatorFactory : public virtual IUnknown + class ISceneNodeAnimatorFactory : public virtual IReferenceCounted { public: @@ -32,14 +32,14 @@ namespace scene /** \param type: Type of the scene node animator to add. \param target: Target scene node of the new animator. \return Returns pointer to the new scene node animator or null if not successful. You need to - drop this pointer after calling this, see IUnknown::drop() for details. */ + drop this pointer after calling this, see IReferenceCounted::drop() for details. */ virtual ISceneNodeAnimator* createSceneNodeAnimator(ESCENE_NODE_ANIMATOR_TYPE type, ISceneNode* target) = 0; //! creates a scene node animator based on its type name /** \param typeName: Type of the scene node animator to add. \param target: Target scene node of the new animator. \return Returns pointer to the new scene node animator or null if not successful. You need to - drop this pointer after calling this, see IUnknown::drop() for details. */ + drop this pointer after calling this, see IReferenceCounted::drop() for details. */ virtual ISceneNodeAnimator* createSceneNodeAnimator(const c8* typeName, ISceneNode* target) = 0; //! returns amount of scene node animator types this factory is able to create diff --git a/include/ISceneNodeFactory.h b/include/ISceneNodeFactory.h index faeee84f..894947be 100644 --- a/include/ISceneNodeFactory.h +++ b/include/ISceneNodeFactory.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_NODE_FACTORY_H_INCLUDED__ #define __I_SCENE_NODE_FACTORY_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "ESceneNodeTypes.h" namespace irr @@ -25,7 +25,7 @@ namespace scene scene node manager will grab() the factory anyway, and otherwise cyclic references will be created and the scene manager and all its nodes won't get deallocated. */ - class ISceneNodeFactory : public virtual IUnknown + class ISceneNodeFactory : public virtual IReferenceCounted { public: diff --git a/include/ISceneUserDataSerializer.h b/include/ISceneUserDataSerializer.h index 7e311fdb..468c2443 100644 --- a/include/ISceneUserDataSerializer.h +++ b/include/ISceneUserDataSerializer.h @@ -5,7 +5,7 @@ #ifndef __I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED__ #define __I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { diff --git a/include/IShaderConstantSetCallBack.h b/include/IShaderConstantSetCallBack.h index e11068fb..8fa741d7 100644 --- a/include/IShaderConstantSetCallBack.h +++ b/include/IShaderConstantSetCallBack.h @@ -5,7 +5,7 @@ #ifndef __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ #define __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -17,7 +17,7 @@ namespace video /** Implement this interface in an own class and pass a pointer to it to one of the methods in IGPUProgrammingServices when creating a shader. The OnSetConstants method will be called every frame now. */ -class IShaderConstantSetCallBack : public virtual IUnknown +class IShaderConstantSetCallBack : public virtual IReferenceCounted { public: diff --git a/include/ITexture.h b/include/ITexture.h index 1c238de8..ac485cd9 100644 --- a/include/ITexture.h +++ b/include/ITexture.h @@ -5,7 +5,7 @@ #ifndef __I_TEXTURE_H_INCLUDED__ #define __I_TEXTURE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IImage.h" #include "dimension2d.h" #include "EDriverTypes.h" @@ -94,7 +94,7 @@ inline E_TEXTURE_CREATION_FLAG getTextureFormatFromFlags(u32 flags) If you try to use a texture created by one device with an other device, the device will refuse to do that and write a warning or an error message to the output buffer. */ -class ITexture : public virtual IUnknown +class ITexture : public virtual IReferenceCounted { public: diff --git a/include/ITimer.h b/include/ITimer.h index 98cc269a..c159842a 100644 --- a/include/ITimer.h +++ b/include/ITimer.h @@ -5,13 +5,13 @@ #ifndef __I_TIMER_H_INCLUDED__ #define __I_TIMER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { //! Interface for getting and manipulating the virtual time -class ITimer : public virtual IUnknown +class ITimer : public virtual IReferenceCounted { public: diff --git a/include/ITriangleSelector.h b/include/ITriangleSelector.h index 63730f7c..40b68b6b 100644 --- a/include/ITriangleSelector.h +++ b/include/ITriangleSelector.h @@ -5,7 +5,7 @@ #ifndef __I_TRIANGLE_SELECTOR_H_INCLUDED__ #define __I_TRIANGLE_SELECTOR_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "triangle3d.h" #include "aabbox3d.h" #include "matrix4.h" @@ -23,7 +23,7 @@ namespace scene area between (1,1,1) and (10,10,10), you can get all triangles of the scene node in this area with the ITriangleSelector easily and check every triangle if it collided. */ -class ITriangleSelector : public virtual IUnknown +class ITriangleSelector : public virtual IReferenceCounted { public: diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index 5ec0dd47..f62043df 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -73,7 +73,7 @@ namespace video provides a lot of powerful classes and methods to make the programmers life easier. */ - class IVideoDriver : public virtual IUnknown + class IVideoDriver : public virtual IReferenceCounted { public: @@ -129,7 +129,7 @@ namespace video \param filename: Filename of the texture to be loaded. \return Returns a pointer to the texture or 0 if the texture could not be loaded. - This pointer should not be dropped. See IUnknown::drop() for more information.*/ + This pointer should not be dropped. See IReferenceCounted::drop() for more information.*/ virtual ITexture* getTexture(const c8* filename) = 0; //! Returns a pointer to a texture. @@ -140,7 +140,7 @@ namespace video \param file: Pointer to an already opened file. \return Returns a pointer to the texture or 0 if the texture could not be loaded. - This pointer should not be dropped. See IUnknown::drop() for more information.*/ + This pointer should not be dropped. See IReferenceCounted::drop() for more information.*/ virtual ITexture* getTexture(io::IReadFile* file) = 0; //! Returns a texture by index @@ -162,7 +162,7 @@ namespace video \param format: Desired color format of the texture. Please note that the driver may choose to create the texture in another color format. \return Returns a pointer to the newly created texture. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ITexture* addTexture(const core::dimension2d& size, const c8* name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0; @@ -171,7 +171,7 @@ namespace video will return this texture \param image: Image the texture is created from. \return Returns a pointer to the newly created Texture. - This pointer should not be dropped. See IUnknown::drop() for more information. */ + This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ virtual ITexture* addTexture(const c8* name, IImage* image) = 0; //! Creates a render target texture. @@ -181,7 +181,7 @@ namespace video screen buffer. \return Returns a pointer to the created texture or 0 if the texture could not be created. If you no longer need the image, you should call ITexture::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual ITexture* createRenderTargetTexture(const core::dimension2d& size, const c8* name = 0) = 0; //! Removes a texture from the texture cache and deletes it, freeing lot of memory. @@ -636,7 +636,7 @@ namespace video \param filename: Name of the file from which the image is created. \return Returns the created image. If you no longer need the image, you should call IImage::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IImage* createImageFromFile(const c8* filename) = 0; //! Creates a software image from a file. @@ -646,7 +646,7 @@ namespace video \param file: File from which the image is created. \return Returns the created image. If you no longer need the image, you should call IImage::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IImage* createImageFromFile(io::IReadFile* file) = 0; //! Writes the provided image to disk file @@ -671,7 +671,7 @@ namespace video \param deleteMemory: Whether the memory is deallocated upon destruction \return Returns the created image. If you no longer need the image, you should call IImage::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IImage* createImageFromData(ECOLOR_FORMAT format, const core::dimension2d& size, void *data, bool ownForeignMemory=false, diff --git a/include/IVideoModeList.h b/include/IVideoModeList.h index da6a1dda..d65a6f66 100644 --- a/include/IVideoModeList.h +++ b/include/IVideoModeList.h @@ -5,7 +5,7 @@ #ifndef __IRR_I_VIDEO_MODE_LIST_H_INCLUDED__ #define __IRR_I_VIDEO_MODE_LIST_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "dimension2d.h" namespace irr @@ -20,7 +20,7 @@ namespace video there is no need to start up an Irrlicht Device with EDT_DIRECT3D8, EDT_OPENGL or EDT_SOFTWARE: For this (and for lots of other reasons) the null device, EDT_NULL exists.*/ - class IVideoModeList : public virtual IUnknown + class IVideoModeList : public virtual IReferenceCounted { public: diff --git a/include/IWriteFile.h b/include/IWriteFile.h index 465f0fd9..86a9d5a5 100644 --- a/include/IWriteFile.h +++ b/include/IWriteFile.h @@ -5,7 +5,7 @@ #ifndef __I_WRITE_FILE_H_INCLUDED__ #define __I_WRITE_FILE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" namespace irr { @@ -13,7 +13,7 @@ namespace io { //! Interface providing write acess to a file. - class IWriteFile : public virtual IUnknown + class IWriteFile : public virtual IReferenceCounted { public: diff --git a/include/IXMLReader.h b/include/IXMLReader.h index 3d1edf9d..ca6ee2aa 100644 --- a/include/IXMLReader.h +++ b/include/IXMLReader.h @@ -5,24 +5,24 @@ #ifndef __I_XML_READER_H_INCLUDED__ #define __I_XML_READER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "irrXML.h" namespace irr { namespace io { - //! A xml reader for wide characters, derived from IUnknown. + //! A xml reader for wide characters, derived from IReferenceCounted. //! This XML Parser can read any type of text files from any source where irrlicht //! can read. Just call IFileSystem::createXMLReader(). //! For more informations on how to use the parser, see IIrrXMLReader - typedef IIrrXMLReader IXMLReader; + typedef IIrrXMLReader IXMLReader; - //! A xml reader for ASCII or UTF-8 characters, derived from IUnknown. + //! A xml reader for ASCII or UTF-8 characters, derived from IReferenceCounted. //! This XML Parser can read any type of text files from any source where irrlicht //! can read. Just call IFileSystem::createXMLReaderUTF8(). //! For more informations on how to use the parser, see IIrrXMLReader - typedef IIrrXMLReader IXMLReaderUTF8; + typedef IIrrXMLReader IXMLReaderUTF8; } // end namespace io } // end namespace irr diff --git a/include/IXMLWriter.h b/include/IXMLWriter.h index 790bf2cc..1c95f727 100644 --- a/include/IXMLWriter.h +++ b/include/IXMLWriter.h @@ -5,7 +5,7 @@ #ifndef __I_XML_WRITER_H_INCLUDED__ #define __I_XML_WRITER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "irrArray.h" #include "irrString.h" @@ -18,7 +18,7 @@ namespace io /** This XML Writer only writes UTF-16 xml files, because these are parsed faster than all other formats by IXMLReader. */ - class IXMLWriter : public virtual IUnknown + class IXMLWriter : public virtual IReferenceCounted { public: diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h index 3f0bc1ac..14d2c419 100644 --- a/include/IrrlichtDevice.h +++ b/include/IrrlichtDevice.h @@ -5,7 +5,7 @@ #ifndef __I_IRRLICHT_DEVICE_H_INCLUDED__ #define __I_IRRLICHT_DEVICE_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "dimension2d.h" #include "IVideoDriver.h" #include "EDriverTypes.h" @@ -36,7 +36,7 @@ namespace irr /** This is the most important class of the Irrlicht Engine. You can access everything in the engine if you have a pointer to an instance of this class. */ - class IrrlichtDevice : public virtual IUnknown + class IrrlichtDevice : public virtual IReferenceCounted { public: diff --git a/include/irrXML.h b/include/irrXML.h index f862c9d5..55eaaaf4 100644 --- a/include/irrXML.h +++ b/include/irrXML.h @@ -230,8 +230,8 @@ namespace io //! Empty class to be used as parent class for IrrXMLReader. /** If you need another class as base class for the xml reader, you can do this by creating the reader using for example new CXMLReaderImpl(yourcallback); - The Irrlicht Engine for example needs IUnknown as base class for every object to - let it automaticly reference countend, hence it replaces IXMLBase with IUnknown. + The Irrlicht Engine for example needs IReferenceCounted as base class for every object to + let it automaticly reference countend, hence it replaces IXMLBase with IReferenceCounted. See irrXML.cpp on how this can be done in detail. */ class IXMLBase { diff --git a/include/irrlicht.h b/include/irrlicht.h index 3235c55d..b8f01544 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -107,7 +107,7 @@ #include "ITerrainSceneNode.h" #include "ITextSceneNode.h" #include "ITexture.h" -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IVideoDriver.h" #include "IVideoModeList.h" #include "IWriteFile.h" diff --git a/source/Irrlicht/C3DSMeshFileLoader.cpp b/source/Irrlicht/C3DSMeshFileLoader.cpp index 9388ba3c..e0bec08d 100644 --- a/source/Irrlicht/C3DSMeshFileLoader.cpp +++ b/source/Irrlicht/C3DSMeshFileLoader.cpp @@ -145,7 +145,7 @@ bool C3DSMeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* C3DSMeshFileLoader::createMesh(io::IReadFile* file) { ChunkData data; diff --git a/source/Irrlicht/C3DSMeshFileLoader.h b/source/Irrlicht/C3DSMeshFileLoader.h index b726f506..8be52221 100644 --- a/source/Irrlicht/C3DSMeshFileLoader.h +++ b/source/Irrlicht/C3DSMeshFileLoader.h @@ -36,7 +36,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/CAttributes.h b/source/Irrlicht/CAttributes.h index 0843ee22..ee876774 100644 --- a/source/Irrlicht/CAttributes.h +++ b/source/Irrlicht/CAttributes.h @@ -654,7 +654,7 @@ protected: }; -class IAttribute : public virtual IUnknown +class IAttribute : public virtual IReferenceCounted { public: diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp index 4eb88b51..8735316f 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.cpp +++ b/source/Irrlicht/CB3DMeshFileLoader.cpp @@ -46,7 +46,7 @@ bool CB3DMeshFileLoader::isALoadableFileExtension(const c8* fileName) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* CB3DMeshFileLoader::createMesh(irr::io::IReadFile* f) { if (!f) diff --git a/source/Irrlicht/CB3DMeshFileLoader.h b/source/Irrlicht/CB3DMeshFileLoader.h index 711eb98f..d994ecff 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.h +++ b/source/Irrlicht/CB3DMeshFileLoader.h @@ -34,7 +34,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(io::IReadFile* file); private: diff --git a/source/Irrlicht/CBSPMeshFileLoader.cpp b/source/Irrlicht/CBSPMeshFileLoader.cpp index 8361843a..aa6d0cd5 100644 --- a/source/Irrlicht/CBSPMeshFileLoader.cpp +++ b/source/Irrlicht/CBSPMeshFileLoader.cpp @@ -47,7 +47,7 @@ bool CBSPMeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* CBSPMeshFileLoader::createMesh(irr::io::IReadFile* file) { // load quake 3 bsp diff --git a/source/Irrlicht/CBSPMeshFileLoader.h b/source/Irrlicht/CBSPMeshFileLoader.h index c3dd9b05..2e1d62e6 100644 --- a/source/Irrlicht/CBSPMeshFileLoader.h +++ b/source/Irrlicht/CBSPMeshFileLoader.h @@ -33,7 +33,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/CColladaFileLoader.cpp b/source/Irrlicht/CColladaFileLoader.cpp index f5f36b28..327489ed 100644 --- a/source/Irrlicht/CColladaFileLoader.cpp +++ b/source/Irrlicht/CColladaFileLoader.cpp @@ -215,7 +215,7 @@ bool CColladaFileLoader::isALoadableFileExtension(const c8* fileName) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* CColladaFileLoader::createMesh(irr::io::IReadFile* file) { io::IXMLReaderUTF8* reader = FileSystem->createXMLReaderUTF8(file); diff --git a/source/Irrlicht/CColladaFileLoader.h b/source/Irrlicht/CColladaFileLoader.h index fa46ee12..3a110797 100644 --- a/source/Irrlicht/CColladaFileLoader.h +++ b/source/Irrlicht/CColladaFileLoader.h @@ -161,7 +161,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: @@ -293,7 +293,7 @@ private: //! following class is for holding and createing instances of library objects, //! named prefabs in this loader. -class IColladaPrefab : public virtual IUnknown +class IColladaPrefab : public virtual IReferenceCounted { public: diff --git a/source/Irrlicht/CDMFLoader.cpp b/source/Irrlicht/CDMFLoader.cpp index 9bd340b2..61099b51 100644 --- a/source/Irrlicht/CDMFLoader.cpp +++ b/source/Irrlicht/CDMFLoader.cpp @@ -35,7 +35,7 @@ CDMFLoader::CDMFLoader(video::IVideoDriver* driver, ISceneManager* smgr) : Driver(driver) , SceneMgr(smgr) { #ifdef _DEBUG - IUnknown::setDebugName("CDMFLoader"); + IReferenceCounted::setDebugName("CDMFLoader"); #endif if (Driver) @@ -86,7 +86,7 @@ void CDMFLoader::GetFaceNormal( f32 a[3], //First point /**Creates/loads an animated mesh from the file. \return Pointer to the created mesh. Returns 0 if loading failed. If you no longer need the mesh, you should call IAnimatedMesh::drop(). - See IUnknown::drop() for more information.*/ + See IReferenceCounted::drop() for more information.*/ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file) { if (!file) diff --git a/source/Irrlicht/CDMFLoader.h b/source/Irrlicht/CDMFLoader.h index 19bb8490..ba7320db 100644 --- a/source/Irrlicht/CDMFLoader.h +++ b/source/Irrlicht/CDMFLoader.h @@ -62,7 +62,7 @@ namespace scene /** creates/loads an animated mesh from the file. \return Pointer to the created mesh. Returns 0 if loading failed. If you no longer need the mesh, you should call IAnimatedMesh::drop(). - See IUnknown::drop() for more information.*/ + See IReferenceCounted::drop() for more information.*/ virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); /** loads dynamic lights present in this scene. diff --git a/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h b/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h index bdb5fcd0..d31ee690 100644 --- a/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h +++ b/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h @@ -26,14 +26,14 @@ namespace scene /** \param type: Type of the scene node animator to add. \param target: Target scene node of the new animator. \return Returns pointer to the new scene node animator or null if not successful. You need to - drop this pointer after calling this, see IUnknown::drop() for details. */ + drop this pointer after calling this, see IReferenceCounted::drop() for details. */ virtual ISceneNodeAnimator* createSceneNodeAnimator(ESCENE_NODE_ANIMATOR_TYPE type, ISceneNode* target); //! creates a scene node animator based on its type name /** \param typeName: Type of the scene node animator to add. \param target: Target scene node of the new animator. \return Returns pointer to the new scene node animator or null if not successful. You need to - drop this pointer after calling this, see IUnknown::drop() for details. */ + drop this pointer after calling this, see IReferenceCounted::drop() for details. */ virtual ISceneNodeAnimator* createSceneNodeAnimator(const char* typeName, ISceneNode* target); //! returns amount of scene node animator types this factory is able to create diff --git a/source/Irrlicht/CGUIEnvironment.cpp b/source/Irrlicht/CGUIEnvironment.cpp index 11441b5b..0d7feff2 100644 --- a/source/Irrlicht/CGUIEnvironment.cpp +++ b/source/Irrlicht/CGUIEnvironment.cpp @@ -559,7 +559,7 @@ void CGUIEnvironment::setSkin(IGUISkin* skin) //! Creates a new GUI Skin based on a template. /** \return Returns a pointer to the created skin. If you no longer need the skin, you should call IGUISkin::drop(). -See IUnknown::drop() for more information. */ +See IReferenceCounted::drop() for more information. */ IGUISkin* CGUIEnvironment::createSkin(EGUI_SKIN_TYPE type) { IGUISkin* skin = new CGUISkin(type, Driver); diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h index 4d239672..9f27fd24 100644 --- a/source/Irrlicht/CGUIEnvironment.h +++ b/source/Irrlicht/CGUIEnvironment.h @@ -67,7 +67,7 @@ public: //! Creates a new GUI Skin based on a template. /** \return Returns a pointer to the created skin. If you no longer need the skin, you should call IGUISkin::drop(). - See IUnknown::drop() for more information. */ + See IReferenceCounted::drop() for more information. */ virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type); //! returns the font diff --git a/source/Irrlicht/CMD2MeshFileLoader.cpp b/source/Irrlicht/CMD2MeshFileLoader.cpp index 07c87de4..b02bd990 100644 --- a/source/Irrlicht/CMD2MeshFileLoader.cpp +++ b/source/Irrlicht/CMD2MeshFileLoader.cpp @@ -30,7 +30,7 @@ bool CMD2MeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* CMD2MeshFileLoader::createMesh(irr::io::IReadFile* file) { IAnimatedMesh* msh = new CAnimatedMeshMD2(); diff --git a/source/Irrlicht/CMD2MeshFileLoader.h b/source/Irrlicht/CMD2MeshFileLoader.h index a692e10f..ae27cbf2 100644 --- a/source/Irrlicht/CMD2MeshFileLoader.h +++ b/source/Irrlicht/CMD2MeshFileLoader.h @@ -27,7 +27,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); }; diff --git a/source/Irrlicht/CMD3MeshFileLoader.h b/source/Irrlicht/CMD3MeshFileLoader.h index c2c4f23d..7417c84e 100644 --- a/source/Irrlicht/CMD3MeshFileLoader.h +++ b/source/Irrlicht/CMD3MeshFileLoader.h @@ -34,7 +34,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/CMS3DMeshFileLoader.cpp b/source/Irrlicht/CMS3DMeshFileLoader.cpp index 9879cc85..0b66d6fd 100644 --- a/source/Irrlicht/CMS3DMeshFileLoader.cpp +++ b/source/Irrlicht/CMS3DMeshFileLoader.cpp @@ -115,7 +115,7 @@ bool CMS3DMeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* CMS3DMeshFileLoader::createMesh(irr::io::IReadFile* file) { if (!file) diff --git a/source/Irrlicht/CMS3DMeshFileLoader.h b/source/Irrlicht/CMS3DMeshFileLoader.h index 3e9b9ea8..99e0448f 100644 --- a/source/Irrlicht/CMS3DMeshFileLoader.h +++ b/source/Irrlicht/CMS3DMeshFileLoader.h @@ -29,7 +29,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/CMeshManipulator.h b/source/Irrlicht/CMeshManipulator.h index 7f9a99de..99692d9b 100644 --- a/source/Irrlicht/CMeshManipulator.h +++ b/source/Irrlicht/CMeshManipulator.h @@ -73,7 +73,7 @@ public: //! \param mesh: Input mesh //! \return Mesh consiting only of S3DVertexNormalMapped vertices. //! If you no longer need the cloned mesh, you should call IMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IMesh* createMeshWithTangents(IMesh* mesh) const; virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const; diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp index bb58a8e7..17af53b8 100644 --- a/source/Irrlicht/COBJMeshFileLoader.cpp +++ b/source/Irrlicht/COBJMeshFileLoader.cpp @@ -58,7 +58,7 @@ bool COBJMeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file) { const u32 filesize = file->getSize(); diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h index 115a8528..91ff8a8e 100644 --- a/source/Irrlicht/COBJMeshFileLoader.h +++ b/source/Irrlicht/COBJMeshFileLoader.h @@ -35,7 +35,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/COCTLoader.cpp b/source/Irrlicht/COCTLoader.cpp index 89f6c9b0..5b7335f3 100644 --- a/source/Irrlicht/COCTLoader.cpp +++ b/source/Irrlicht/COCTLoader.cpp @@ -29,7 +29,7 @@ COCTLoader::COCTLoader(video::IVideoDriver* driver) : Driver(driver) { #ifdef _DEBUG - IUnknown::setDebugName("COCTLoader"); + IReferenceCounted::setDebugName("COCTLoader"); #endif if (Driver) @@ -108,7 +108,7 @@ void COCTLoader::GetFaceNormal(f32 a[3], f32 b[3], f32 c[3], f32 out[3]) { //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* COCTLoader::createMesh(irr::io::IReadFile* file) { if (!file) diff --git a/source/Irrlicht/COCTLoader.h b/source/Irrlicht/COCTLoader.h index 354e06d3..284d4bc9 100644 --- a/source/Irrlicht/COCTLoader.h +++ b/source/Irrlicht/COCTLoader.h @@ -74,7 +74,7 @@ namespace scene //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/COgreMeshFileLoader.cpp b/source/Irrlicht/COgreMeshFileLoader.cpp index 1a7d17c5..dc90b38a 100644 --- a/source/Irrlicht/COgreMeshFileLoader.cpp +++ b/source/Irrlicht/COgreMeshFileLoader.cpp @@ -86,7 +86,7 @@ bool COgreMeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* COgreMeshFileLoader::createMesh(io::IReadFile* file) { s16 id; diff --git a/source/Irrlicht/COgreMeshFileLoader.h b/source/Irrlicht/COgreMeshFileLoader.h index be885033..166dd374 100644 --- a/source/Irrlicht/COgreMeshFileLoader.h +++ b/source/Irrlicht/COgreMeshFileLoader.h @@ -39,7 +39,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); private: diff --git a/source/Irrlicht/CPakReader.h b/source/Irrlicht/CPakReader.h index 4f040f50..184248cf 100644 --- a/source/Irrlicht/CPakReader.h +++ b/source/Irrlicht/CPakReader.h @@ -5,7 +5,7 @@ #ifndef __C_PAK_READER_H_INCLUDED__ #define __C_PAK_READER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IReadFile.h" #include "irrArray.h" #include "irrString.h" @@ -43,7 +43,7 @@ namespace io }; - class CPakReader : public IUnknown + class CPakReader : public IReferenceCounted { public: diff --git a/source/Irrlicht/CQ3LevelMesh.cpp b/source/Irrlicht/CQ3LevelMesh.cpp index 1195dbb2..4e1ed162 100644 --- a/source/Irrlicht/CQ3LevelMesh.cpp +++ b/source/Irrlicht/CQ3LevelMesh.cpp @@ -26,7 +26,7 @@ CQ3LevelMesh::CQ3LevelMesh(io::IFileSystem* fs, video::IVideoDriver* driver, sce MeshVerts(0), Brushes(0), Driver(driver), FileSystem(fs), SceneManager ( smgr ) { #ifdef _DEBUG - IUnknown::setDebugName("CQ3LevelMesh"); + IReferenceCounted::setDebugName("CQ3LevelMesh"); #endif s32 i; diff --git a/source/Irrlicht/CXMLReader.cpp b/source/Irrlicht/CXMLReader.cpp index 484f996e..a17983e6 100644 --- a/source/Irrlicht/CXMLReader.cpp +++ b/source/Irrlicht/CXMLReader.cpp @@ -54,7 +54,7 @@ namespace io if (!file) return 0; - return new CXMLReaderImpl(new CIrrXMLFileReadCallBack(file)); + return new CXMLReaderImpl(new CIrrXMLFileReadCallBack(file)); } //! Creates an instance of an UFT-8 or ASCII character xml parser. @@ -63,7 +63,7 @@ namespace io if (!file) return 0; - return new CXMLReaderImpl(new CIrrXMLFileReadCallBack(file)); + return new CXMLReaderImpl(new CIrrXMLFileReadCallBack(file)); } } // end namespace diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp index a7914ccc..940d03d2 100644 --- a/source/Irrlicht/CXMeshFileLoader.cpp +++ b/source/Irrlicht/CXMeshFileLoader.cpp @@ -39,7 +39,7 @@ bool CXMeshFileLoader::isALoadableFileExtension(const c8* filename) //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). -//! See IUnknown::drop() for more information. +//! See IReferenceCounted::drop() for more information. IAnimatedMesh* CXMeshFileLoader::createMesh(irr::io::IReadFile* f) { if (!f) diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h index cdac3aea..35bd81ba 100644 --- a/source/Irrlicht/CXMeshFileLoader.h +++ b/source/Irrlicht/CXMeshFileLoader.h @@ -35,7 +35,7 @@ public: //! creates/loads an animated mesh from the file. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). - //! See IUnknown::drop() for more information. + //! See IReferenceCounted::drop() for more information. virtual IAnimatedMesh* createMesh(irr::io::IReadFile* file); struct SXTemplateMaterial diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h index bc3df2cd..6b37e720 100644 --- a/source/Irrlicht/CZipReader.h +++ b/source/Irrlicht/CZipReader.h @@ -5,7 +5,7 @@ #ifndef __C_ZIP_READER_H_INCLUDED__ #define __C_ZIP_READER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IReadFile.h" #include "irrArray.h" #include "irrString.h" @@ -87,7 +87,7 @@ namespace io Doesn't decompress data, only reads the file and is able to open uncompressed entries. */ - class CZipReader : public virtual IUnknown + class CZipReader : public virtual IReferenceCounted { public: diff --git a/source/Irrlicht/IBurningShader.h b/source/Irrlicht/IBurningShader.h index 14149b7f..7cf80a16 100644 --- a/source/Irrlicht/IBurningShader.h +++ b/source/Irrlicht/IBurningShader.h @@ -6,7 +6,7 @@ #define __I_BURNING_SHADER_H_INCLUDED__ #include "SoftwareDriver2_compile_config.h" -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "irrMath.h" #include "IImage.h" #include "S2DVertex.h" @@ -58,7 +58,7 @@ namespace video ETR2_COUNT }; - class IBurningShader : public virtual IUnknown + class IBurningShader : public virtual IReferenceCounted { public: IBurningShader(IDepthBuffer* zbuffer); diff --git a/source/Irrlicht/IDepthBuffer.h b/source/Irrlicht/IDepthBuffer.h index 187ee612..20cf0f5d 100644 --- a/source/Irrlicht/IDepthBuffer.h +++ b/source/Irrlicht/IDepthBuffer.h @@ -5,7 +5,7 @@ #ifndef __I_Z2_BUFFER_H_INCLUDED__ #define __I_Z2_BUFFER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "dimension2d.h" #include "S4DVertex.h" @@ -13,7 +13,7 @@ namespace irr { namespace video { - class IDepthBuffer : public virtual IUnknown + class IDepthBuffer : public virtual IReferenceCounted { public: diff --git a/source/Irrlicht/ITriangleRenderer.h b/source/Irrlicht/ITriangleRenderer.h index 3c8f94b8..731ced51 100644 --- a/source/Irrlicht/ITriangleRenderer.h +++ b/source/Irrlicht/ITriangleRenderer.h @@ -5,7 +5,7 @@ #ifndef __I_TRIANGLE_RENDERER_H_INCLUDED__ #define __I_TRIANGLE_RENDERER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "IImage.h" #include "S2DVertex.h" #include "rect.h" @@ -31,7 +31,7 @@ namespace video ETR_COUNT }; - class ITriangleRenderer : public virtual IUnknown + class ITriangleRenderer : public virtual IReferenceCounted { public: diff --git a/source/Irrlicht/IZBuffer.h b/source/Irrlicht/IZBuffer.h index 87b6aa6d..2ea03cf4 100644 --- a/source/Irrlicht/IZBuffer.h +++ b/source/Irrlicht/IZBuffer.h @@ -5,7 +5,7 @@ #ifndef __I_Z_BUFFER_H_INCLUDED__ #define __I_Z_BUFFER_H_INCLUDED__ -#include "IUnknown.h" +#include "IReferenceCounted.h" #include "dimension2d.h" #include "S2DVertex.h" @@ -13,7 +13,7 @@ namespace irr { namespace video { - class IZBuffer : public virtual IUnknown + class IZBuffer : public virtual IReferenceCounted { public: diff --git a/source/Irrlicht/Irrlicht7.1.vcproj b/source/Irrlicht/Irrlicht7.1.vcproj index e7a81671..f7588d36 100644 --- a/source/Irrlicht/Irrlicht7.1.vcproj +++ b/source/Irrlicht/Irrlicht7.1.vcproj @@ -251,9 +251,6 @@ - - diff --git a/tools/IrrFontTool/newFontTool/CFontTool.h b/tools/IrrFontTool/newFontTool/CFontTool.h index 42c0da62..f2407fad 100644 --- a/tools/IrrFontTool/newFontTool/CFontTool.h +++ b/tools/IrrFontTool/newFontTool/CFontTool.h @@ -20,7 +20,7 @@ namespace irr { - class CFontTool : public irr::IUnknown + class CFontTool : public irr::IReferenceCounted { public: CFontTool(irr::IrrlichtDevice* device);