From 3d07245ab9aa0735df640be3fcbaf2a056d91a13 Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Wed, 29 Nov 2023 04:28:20 -0500 Subject: [PATCH] Tear out mesh writers Totally unused in Minetest --- include/EMeshWriterEnums.h | 50 ---------------------------- include/IMeshWriter.h | 55 ------------------------------- include/ISceneManager.h | 6 ---- include/irrlicht.h | 2 -- source/Irrlicht/CSceneManager.cpp | 7 ---- source/Irrlicht/CSceneManager.h | 3 -- 6 files changed, 123 deletions(-) delete mode 100644 include/EMeshWriterEnums.h delete mode 100644 include/IMeshWriter.h diff --git a/include/EMeshWriterEnums.h b/include/EMeshWriterEnums.h deleted file mode 100644 index 52e477ff..00000000 --- a/include/EMeshWriterEnums.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __E_MESH_WRITER_ENUMS_H_INCLUDED__ -#define __E_MESH_WRITER_ENUMS_H_INCLUDED__ - -#include "irrTypes.h" - -namespace irr -{ -namespace scene -{ - - //! An enumeration for all supported types of built-in mesh writers - /** A scene mesh writers is represented by a four character code - such as 'irrm' or 'coll' instead of simple numbers, to avoid - name clashes with external mesh writers.*/ - enum EMESH_WRITER_TYPE - { - //! B3D mesh writer, for static .b3d files - // EMWT_B3D = MAKE_IRR_ID('b', '3', 'd', 0) - }; - - - //! flags configuring mesh writing - enum E_MESH_WRITER_FLAGS - { - //! no writer flags - EMWF_NONE = 0, - - //! write lightmap textures out if possible - //! Currently not used by any Irrlicht mesh-writer - // (Note: User meshwriters can still use it) - EMWF_WRITE_LIGHTMAPS = 0x1, - - //! write in a way that consumes less disk space - // (Note: Mainly there for user meshwriters) - EMWF_WRITE_COMPRESSED = 0x2, - - //! write in binary format rather than text - EMWF_WRITE_BINARY = 0x4 - }; - -} // end namespace scene -} // end namespace irr - - -#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__ - diff --git a/include/IMeshWriter.h b/include/IMeshWriter.h deleted file mode 100644 index 8e98d965..00000000 --- a/include/IMeshWriter.h +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#pragma once -#include "IReferenceCounted.h" -#include "EMeshWriterEnums.h" - -namespace irr -{ -namespace io -{ - class IWriteFile; -} // end namespace io - -namespace scene -{ - class IMesh; - - //! Interface for writing meshes - class IMeshWriter : public virtual IReferenceCounted - { - public: - - //! Destructor - virtual ~IMeshWriter() {} - - //! Get the type of the mesh writer - /** For own implementations, use MAKE_IRR_ID as shown in the - EMESH_WRITER_TYPE enumeration to return your own unique mesh - type id. - \return Type of the mesh writer. */ - virtual EMESH_WRITER_TYPE getType() const = 0; - - //! Write a static mesh. - /** \param file File handle to write the mesh to. - \param mesh Pointer to mesh to be written. - \param flags Optional flags to set properties of the writer. - \return True if successful */ - virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, - s32 flags=EMWF_NONE) = 0; - - // Writes an animated mesh - // for future use, only b3d writer is able to write animated meshes currently and that was implemented using the writeMesh above. - /* \return Returns true if successful */ - //virtual bool writeAnimatedMesh(io::IWriteFile* file, - // scene::IAnimatedMesh* mesh, - // s32 flags=EMWF_NONE) = 0; - }; - - -} // end namespace -} // end namespace - - diff --git a/include/ISceneManager.h b/include/ISceneManager.h index 83bff381..798757c6 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -13,7 +13,6 @@ #include "dimension2d.h" #include "SColor.h" #include "ESceneNodeTypes.h" -#include "EMeshWriterEnums.h" #include "SceneParameters.h" #include "ISkinnedMesh.h" @@ -109,7 +108,6 @@ namespace scene class IMeshLoader; class IMeshManipulator; class IMeshSceneNode; - class IMeshWriter; class ISceneNode; class ISceneNodeFactory; @@ -433,10 +431,6 @@ namespace scene See IReferenceCounted::drop() for more information. */ virtual ISceneManager* createNewSceneManager(bool cloneContent=false) = 0; - //! Get a mesh writer implementation if available - /** Note: You need to drop() the pointer after use again, see IReferenceCounted::drop() - for details. */ - virtual IMeshWriter* createMeshWriter(EMESH_WRITER_TYPE type) = 0; //! Get a skinned mesh, which is not available as header-only code /** Note: You need to drop() the pointer after use again, see IReferenceCounted::drop() diff --git a/include/irrlicht.h b/include/irrlicht.h index ef9eb0d3..94119b8f 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -42,7 +42,6 @@ #include "EHardwareBufferFlags.h" #include "EMaterialProps.h" #include "EMaterialTypes.h" -#include "EMeshWriterEnums.h" #include "ESceneNodeTypes.h" #include "fast_atof.h" #include "IAnimatedMesh.h" @@ -88,7 +87,6 @@ #include "IMeshLoader.h" #include "IMeshManipulator.h" #include "IMeshSceneNode.h" -#include "IMeshWriter.h" #include "IOSOperator.h" #include "IReadFile.h" #include "IReferenceCounted.h" diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp index 7663f763..b1147d40 100644 --- a/source/Irrlicht/CSceneManager.cpp +++ b/source/Irrlicht/CSceneManager.cpp @@ -862,13 +862,6 @@ ISkinnedMesh* CSceneManager::createSkinnedMesh() return new CSkinnedMesh(); } -//! Returns a mesh writer implementation if available -IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type) -{ - return 0; -} - - // creates a scenemanager ISceneManager* createSceneManager(video::IVideoDriver* driver, gui::ICursorControl* cursorcontrol) { diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h index 51cc6f90..db13bed9 100644 --- a/source/Irrlicht/CSceneManager.h +++ b/source/Irrlicht/CSceneManager.h @@ -168,9 +168,6 @@ namespace scene //! Returns type of the scene node ESCENE_NODE_TYPE getType() const override { return ESNT_SCENE_MANAGER; } - //! Returns a mesh writer implementation if available - IMeshWriter* createMeshWriter(EMESH_WRITER_TYPE type) override; - //! Get a skinned mesh, which is not available as header-only code ISkinnedMesh* createSkinnedMesh() override;