diff --git a/build/ComponentManager.o b/build/ComponentManager.o deleted file mode 100644 index 1ce2b9b..0000000 Binary files a/build/ComponentManager.o and /dev/null differ diff --git a/build/Engine.o b/build/Engine.o deleted file mode 100644 index 713c26d..0000000 Binary files a/build/Engine.o and /dev/null differ diff --git a/build/EngineMain.o b/build/EngineMain.o deleted file mode 100644 index b978b60..0000000 Binary files a/build/EngineMain.o and /dev/null differ diff --git a/build/EntityManager.o b/build/EntityManager.o deleted file mode 100644 index e3b7ff0..0000000 Binary files a/build/EntityManager.o and /dev/null differ diff --git a/build/Event.o b/build/Event.o deleted file mode 100644 index 1258ebf..0000000 Binary files a/build/Event.o and /dev/null differ diff --git a/build/GraphicAPI/Opengl.o b/build/GraphicAPI/Opengl.o deleted file mode 100644 index eb66fa1..0000000 Binary files a/build/GraphicAPI/Opengl.o and /dev/null differ diff --git a/build/GraphicAPI/Vulkan.o b/build/GraphicAPI/Vulkan.o deleted file mode 100644 index f743bba..0000000 Binary files a/build/GraphicAPI/Vulkan.o and /dev/null differ diff --git a/build/JsonParser.o b/build/JsonParser.o deleted file mode 100644 index 61546db..0000000 Binary files a/build/JsonParser.o and /dev/null differ diff --git a/build/MeshManager.o b/build/MeshManager.o deleted file mode 100644 index 6e59564..0000000 Binary files a/build/MeshManager.o and /dev/null differ diff --git a/build/ShaderProgram.o b/build/ShaderProgram.o deleted file mode 100644 index b37ca5f..0000000 Binary files a/build/ShaderProgram.o and /dev/null differ diff --git a/build/SoundEngineFactory.o b/build/SoundEngineFactory.o deleted file mode 100644 index dc8ed14..0000000 Binary files a/build/SoundEngineFactory.o and /dev/null differ diff --git a/build/SystemManager.o b/build/SystemManager.o deleted file mode 100644 index 13db97b..0000000 Binary files a/build/SystemManager.o and /dev/null differ diff --git a/build/Systems/AnimationSystem.o b/build/Systems/AnimationSystem.o deleted file mode 100644 index 8ea4417..0000000 Binary files a/build/Systems/AnimationSystem.o and /dev/null differ diff --git a/build/Systems/CameraSystem.o b/build/Systems/CameraSystem.o deleted file mode 100644 index 9a0f488..0000000 Binary files a/build/Systems/CameraSystem.o and /dev/null differ diff --git a/build/Systems/CollisionSystem.o b/build/Systems/CollisionSystem.o deleted file mode 100644 index 65ea1b1..0000000 Binary files a/build/Systems/CollisionSystem.o and /dev/null differ diff --git a/build/Systems/GUISystem.o b/build/Systems/GUISystem.o deleted file mode 100644 index b40b01c..0000000 Binary files a/build/Systems/GUISystem.o and /dev/null differ diff --git a/build/Systems/MovementSystem.o b/build/Systems/MovementSystem.o deleted file mode 100644 index e7fc9eb..0000000 Binary files a/build/Systems/MovementSystem.o and /dev/null differ diff --git a/build/Systems/PhysicsSystem.o b/build/Systems/PhysicsSystem.o deleted file mode 100644 index 4a22157..0000000 Binary files a/build/Systems/PhysicsSystem.o and /dev/null differ diff --git a/build/Systems/ProjectileSystem.o b/build/Systems/ProjectileSystem.o deleted file mode 100644 index 4cf73c6..0000000 Binary files a/build/Systems/ProjectileSystem.o and /dev/null differ diff --git a/build/TextureManager.o b/build/TextureManager.o deleted file mode 100644 index d66b214..0000000 Binary files a/build/TextureManager.o and /dev/null differ diff --git a/build/TimerCreator.o b/build/TimerCreator.o deleted file mode 100644 index bebcd9e..0000000 Binary files a/build/TimerCreator.o and /dev/null differ diff --git a/build/UnixApi/ChronoX.o b/build/UnixApi/ChronoX.o deleted file mode 100644 index 9eb7d81..0000000 Binary files a/build/UnixApi/ChronoX.o and /dev/null differ diff --git a/build/UnixApi/SoundEngineAlsa.o b/build/UnixApi/SoundEngineAlsa.o deleted file mode 100644 index 71a5e8d..0000000 Binary files a/build/UnixApi/SoundEngineAlsa.o and /dev/null differ diff --git a/build/UnixApi/WindowXCBOpengl.o b/build/UnixApi/WindowXCBOpengl.o deleted file mode 100644 index e1d8eeb..0000000 Binary files a/build/UnixApi/WindowXCBOpengl.o and /dev/null differ diff --git a/build/UnixApi/WindowXCBVulkan.o b/build/UnixApi/WindowXCBVulkan.o deleted file mode 100644 index 07c65b3..0000000 Binary files a/build/UnixApi/WindowXCBVulkan.o and /dev/null differ diff --git a/build/UnixApi/WindowXOpengl.o b/build/UnixApi/WindowXOpengl.o deleted file mode 100644 index 92c587e..0000000 Binary files a/build/UnixApi/WindowXOpengl.o and /dev/null differ diff --git a/build/UnixApi/WindowXVulkan.o b/build/UnixApi/WindowXVulkan.o deleted file mode 100644 index 2227968..0000000 Binary files a/build/UnixApi/WindowXVulkan.o and /dev/null differ diff --git a/build/WavefrontObjParser.o b/build/WavefrontObjParser.o deleted file mode 100644 index c8ffec7..0000000 Binary files a/build/WavefrontObjParser.o and /dev/null differ diff --git a/build/linGame b/build/linGame deleted file mode 100755 index dc103da..0000000 Binary files a/build/linGame and /dev/null differ diff --git a/src/WavefrontObjParser.cpp b/src/WavefrontObjParser.cpp index d282b60..aa5cd67 100644 --- a/src/WavefrontObjParser.cpp +++ b/src/WavefrontObjParser.cpp @@ -87,32 +87,50 @@ namespace GLVM::core } } - GLVM::core::vector> CWaveFrontObjParser::Split(const char* _pWaveFrontObjFileData, const char _separator, const char _exitSymbol, unsigned int& _uiCounter) { - GLVM::core::vector> wordsContainer; - unsigned int outerIndex = 0; - wordsContainer.Push({}); - - for(;;++_uiCounter) { - if (_pWaveFrontObjFileData[_uiCounter] == '#') { - while(_pWaveFrontObjFileData[_uiCounter] != '\n') { - ++_uiCounter; - } - continue; - } - if (_pWaveFrontObjFileData[_uiCounter] == _separator) { - wordsContainer[outerIndex].Push('\0'); - wordsContainer.Push({}); - ++outerIndex; - continue; - } - if (_pWaveFrontObjFileData[_uiCounter] == _exitSymbol) { + GLVM::core::vector> CWaveFrontObjParser::Split(const char* _pWaveFrontObjFileData, const char _separator, const char _exitSymbol, unsigned int& _uiCounter) { + GLVM::core::vector> wordsContainer; + unsigned int outerIndex = 0; + wordsContainer.Push({}); + + GLVM::core::vector currentWord; + + while (_pWaveFrontObjFileData[_uiCounter] != '\0') { + if (_pWaveFrontObjFileData[_uiCounter] == '#') { + while (_pWaveFrontObjFileData[_uiCounter] != '\n') { ++_uiCounter; - wordsContainer[outerIndex].Push('\0'); - return wordsContainer; } - wordsContainer[outerIndex].Push(_pWaveFrontObjFileData[_uiCounter]); + continue; } + + if (_pWaveFrontObjFileData[_uiCounter] == _separator) { + currentWord.Push('\0'); + + wordsContainer[outerIndex] = currentWord; + + currentWord = {}; + + wordsContainer.Push(currentWord); + ++outerIndex; + continue; + } + + if (_pWaveFrontObjFileData[_uiCounter] == _exitSymbol) { + currentWord.Push('\0'); + + wordsContainer[outerIndex] = currentWord; + + ++_uiCounter; + break; + } + + currentWord.Push(_pWaveFrontObjFileData[_uiCounter]); + ++_uiCounter; } + + wordsContainer[outerIndex] = currentWord; + + return wordsContainer; +} SVertex CWaveFrontObjParser::ParseVertices(GLVM::core::vector> _wordsContainer) { SVertex vertex;