Добавил tinyOBJloader
This commit is contained in:
parent
635422c699
commit
9c387cd701
|
@ -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",
|
||||
|
|
1
Makefile
1
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
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue