Created a crate model in glb and obj format to use in the tests, then finished the model test.
This commit is contained in:
parent
c6a7c42a4e
commit
2431cf8c97
9 changed files with 125 additions and 51 deletions
|
|
@ -209,7 +209,7 @@ Config setup() {
|
|||
.shader={"shaders/14-vert.glsl", "shaders/14-frag.glsl"},
|
||||
.lightShader={"shaders/14-vert.glsl", "shaders/14-lightsource.frag.glsl"},
|
||||
.models={
|
||||
{"assets/popcorn_model_a.glb"}
|
||||
{"assets", "crate.obj"}
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -226,7 +226,7 @@ void draw_popcorn(Config& config, size_t model_i, size_t model_pos, glm::mat4& p
|
|||
|
||||
config.shader.setMat4("model", model);
|
||||
|
||||
config.models[model_i].Draw(config.shader);
|
||||
config.models[model_i].draw(config.shader);
|
||||
}
|
||||
|
||||
void render(GLFWwindow* window, Config& config) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue