Maybe707 · noobcpp2 · Mar 16, 2024 · Mar 17, 2024
diff --git a/build/ComponentManager.o b/build/ComponentManager.o
diff --git a/build/Engine.o b/build/Engine.o
diff --git a/build/EngineMain.o b/build/EngineMain.o
diff --git a/build/EntityManager.o b/build/EntityManager.o
diff --git a/build/Event.o b/build/Event.o
diff --git a/build/GraphicAPI/Opengl.o b/build/GraphicAPI/Opengl.o
diff --git a/build/GraphicAPI/Vulkan.o b/build/GraphicAPI/Vulkan.o
diff --git a/build/JsonParser.o b/build/JsonParser.o
diff --git a/build/MeshManager.o b/build/MeshManager.o
diff --git a/build/ShaderProgram.o b/build/ShaderProgram.o
diff --git a/build/SoundEngineFactory.o b/build/SoundEngineFactory.o
diff --git a/build/SystemManager.o b/build/SystemManager.o
diff --git a/build/Systems/AnimationSystem.o b/build/Systems/AnimationSystem.o
diff --git a/build/Systems/CameraSystem.o b/build/Systems/CameraSystem.o
diff --git a/build/Systems/CollisionSystem.o b/build/Systems/CollisionSystem.o
diff --git a/build/Systems/GUISystem.o b/build/Systems/GUISystem.o
diff --git a/build/Systems/MovementSystem.o b/build/Systems/MovementSystem.o
diff --git a/build/Systems/PhysicsSystem.o b/build/Systems/PhysicsSystem.o
diff --git a/build/Systems/ProjectileSystem.o b/build/Systems/ProjectileSystem.o
diff --git a/build/TextureManager.o b/build/TextureManager.o
diff --git a/build/TimerCreator.o b/build/TimerCreator.o
diff --git a/build/UnixApi/ChronoX.o b/build/UnixApi/ChronoX.o
diff --git a/build/UnixApi/SoundEngineAlsa.o b/build/UnixApi/SoundEngineAlsa.o
diff --git a/build/UnixApi/WindowXCBOpengl.o b/build/UnixApi/WindowXCBOpengl.o
diff --git a/build/UnixApi/WindowXCBVulkan.o b/build/UnixApi/WindowXCBVulkan.o
diff --git a/build/UnixApi/WindowXOpengl.o b/build/UnixApi/WindowXOpengl.o
diff --git a/build/UnixApi/WindowXVulkan.o b/build/UnixApi/WindowXVulkan.o
diff --git a/build/WavefrontObjParser.o b/build/WavefrontObjParser.o
diff --git a/build/linGame b/build/linGame
diff --git a/src/WavefrontObjParser.cpp b/src/WavefrontObjParser.cpp
@@ -87,32 +87,50 @@ namespace GLVM::core
         }
     }
 
-    GLVM::core::vector<vector<char>> CWaveFrontObjParser::Split(const char* _pWaveFrontObjFileData, const char _separator, const char _exitSymbol, unsigned int& _uiCounter) {
-        GLVM::core::vector<vector<char>> 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<GLVM::core::vector<char>> CWaveFrontObjParser::Split(const char* _pWaveFrontObjFileData, const char _separator, const char _exitSymbol, unsigned int& _uiCounter) {
+    GLVM::core::vector<GLVM::core::vector<char>> wordsContainer;
+    unsigned int outerIndex = 0;
+    wordsContainer.Push({});
+
+    GLVM::core::vector<char> 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<vector<char>> _wordsContainer) {
         SVertex vertex;