diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2025-06-10 12:58:18 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2025-06-10 12:59:03 +0200 |
| commit | 488a2f7af2920295ada886f113a0d563dab79b8d (patch) | |
| tree | 60618a0947d45081caf6c5038cee9706e4af4ae0 /code/AssetLib/Obj/ObjFileParser.h | |
| parent | 647f94648c0ae24b9c6684383a9dbbc0e2fc23b7 (diff) | |
| parent | fb375dd8c0a032106a2122815fb18dffe0283721 (diff) | |
Merge tag 'v6.0.2' into qt6_assimpqt6_assimp
Change-Id: I70ab8ef899f760cfa3ef8406419ecdb976d6ffc3
Diffstat (limited to 'code/AssetLib/Obj/ObjFileParser.h')
| -rw-r--r-- | code/AssetLib/Obj/ObjFileParser.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/code/AssetLib/Obj/ObjFileParser.h b/code/AssetLib/Obj/ObjFileParser.h index f3e149838..7a0779bf2 100644 --- a/code/AssetLib/Obj/ObjFileParser.h +++ b/code/AssetLib/Obj/ObjFileParser.h @@ -55,18 +55,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { +// Forward declarations class ObjFileImporter; class IOSystem; class ProgressHandler; +// ------------------------------------------------------------------------------------------------ /// \class ObjFileParser /// \brief Parser for a obj waveform file +// ------------------------------------------------------------------------------------------------ class ASSIMP_API ObjFileParser { public: - static const size_t Buffersize = 4096; - typedef std::vector<char> DataArray; - typedef std::vector<char>::iterator DataArrayIt; - typedef std::vector<char>::const_iterator ConstDataArrayIt; + static constexpr size_t Buffersize = 4096; + using DataArray = std::vector<char>; + using DataArrayIt = std::vector<char>::iterator; + using ConstDataArrayIt = std::vector<char>::const_iterator; /// @brief The default constructor. ObjFileParser(); @@ -87,8 +90,6 @@ protected: void parseFile(IOStreamBuffer<char> &streamBuffer); /// Method to copy the new delimited word in the current line. void copyNextWord(char *pBuffer, size_t length); - /// Method to copy the new line. - // void copyNextLine(char *pBuffer, size_t length); /// Get the number of components in a line. size_t getNumComponentsInDataDefinition(); /// Stores the vector @@ -143,7 +144,8 @@ private: unsigned int m_uiLine; //! Helper buffer char m_buffer[Buffersize]; - const char *mEnd; + /// End of buffer + const char *mEnd; /// Pointer to IO system instance. IOSystem *m_pIO; //! Pointer to progress handler |