OpenGL
/
05
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Добавил tinyOBJloader

This commit is contained in:
Ковалев Роман Евгеньевич 2022-11-14 19:53:33 +03:00
parent 635422c699
commit 9c387cd701
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/c_cpp_properties.json vendored
View File

@ -7,7 +7,8 @@
"${workspaceFolder}/../dependencies/GLFW/include", "${workspaceFolder}/../dependencies/GLFW/include",
"${workspaceFolder}/../dependencies/glad/include", "${workspaceFolder}/../dependencies/glad/include",
"${workspaceFolder}/../dependencies/glm", "${workspaceFolder}/../dependencies/glm",
"${workspaceFolder}/../dependencies/stb" "${workspaceFolder}/../dependencies/stb",
"${workspaceFolder}/../dependencies/tinyobjloader"
], ],
"compilerPath": "C:/MinGW/bin/g++.exe", "compilerPath": "C:/MinGW/bin/g++.exe",
"cStandard": "c11", "cStandard": "c11",

1
Makefile
View File

@ -25,6 +25,7 @@ CFLAGS += -I../dependencies/GLFW/include
CFLAGS += -I../dependencies/glad/include CFLAGS += -I../dependencies/glad/include
CFLAGS += -I../dependencies/glm CFLAGS += -I../dependencies/glm
CFLAGS += -I../dependencies/stb CFLAGS += -I../dependencies/stb
CFLAGS += -I../dependencies/tinyobjloader
# Опции линкера # Опции линкера
LDFLAGS += --std=c++11 LDFLAGS += --std=c++11

2
src/Model.cpp
View File

@ -332,7 +332,7 @@ void Model::load_texCoords(glm::vec2* texCoords, GLuint count)
texCoords_vbo.load(texCoords, sizeof(glm::vec2)*count); texCoords_vbo.load(texCoords, sizeof(glm::vec2)*count);
texCoords_attrib_config(); texCoords_attrib_config();
} }
// Ограничение диапазона из буфера индексов // Ограничение диапазона из буфера индексов
void Model::set_index_range(size_t first_byteOffset, size_t count) void Model::set_index_range(size_t first_byteOffset, size_t count)
{ {