diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index bfe7476..04cf9c6 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -7,7 +7,8 @@ "${workspaceFolder}/../dependencies/GLFW/include", "${workspaceFolder}/../dependencies/glad/include", "${workspaceFolder}/../dependencies/glm", - "${workspaceFolder}/../dependencies/stb" + "${workspaceFolder}/../dependencies/stb", + "${workspaceFolder}/../dependencies/tinyobjloader" ], "compilerPath": "C:/MinGW/bin/g++.exe", "cStandard": "c11", diff --git a/Makefile b/Makefile index 50acdfb..c270acc 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ CFLAGS += -I../dependencies/GLFW/include CFLAGS += -I../dependencies/glad/include CFLAGS += -I../dependencies/glm CFLAGS += -I../dependencies/stb +CFLAGS += -I../dependencies/tinyobjloader # Опции линкера LDFLAGS += --std=c++11 diff --git a/src/Model.cpp b/src/Model.cpp index eec4ac8..aebe24f 100644 --- a/src/Model.cpp +++ b/src/Model.cpp @@ -332,7 +332,7 @@ void Model::load_texCoords(glm::vec2* texCoords, GLuint count) texCoords_vbo.load(texCoords, sizeof(glm::vec2)*count); texCoords_attrib_config(); } - + // Ограничение диапазона из буфера индексов void Model::set_index_range(size_t first_byteOffset, size_t count) {