added a croissant model
This commit is contained in:
parent
1278395851
commit
32fd486cc3
6 changed files with 1324 additions and 4 deletions
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <iostream>
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
#define MAX_BONE_INFLUENCE 4
|
#define MAX_BONE_INFLUENCE 4
|
||||||
|
|
12
resources/models/croissant/source/croissant.mtl
Normal file
12
resources/models/croissant/source/croissant.mtl
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
# Blender 4.3.2 MTL File: 'None'
|
||||||
|
# www.blender.org
|
||||||
|
|
||||||
|
newmtl Material.001
|
||||||
|
Ns 250.000000
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.500000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
map_Kd ../textures/Texture.jpg
|
1307
resources/models/croissant/source/croissant.obj
Normal file
1307
resources/models/croissant/source/croissant.obj
Normal file
File diff suppressed because it is too large
Load diff
BIN
resources/models/croissant/textures/Texture.jpg
Normal file
BIN
resources/models/croissant/textures/Texture.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.5 MiB |
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
|
@ -59,10 +59,10 @@ int main()
|
||||||
|
|
||||||
glEnable(GL_DEPTH_TEST);
|
glEnable(GL_DEPTH_TEST);
|
||||||
|
|
||||||
stbi_set_flip_vertically_on_load(true);
|
//stbi_set_flip_vertically_on_load(true);
|
||||||
|
|
||||||
Shader ourShader("resources/shaders/shader.vs", "resources/shaders/shader.fs");
|
Shader ourShader("resources/shaders/shader.vs", "resources/shaders/shader.fs");
|
||||||
Model ourModel("resources/models/backpack/backpack.obj");
|
Model croissant("resources/models/croissant/source/croissant.obj");
|
||||||
|
|
||||||
glm::mat4 model = glm::mat4(1.0f);
|
glm::mat4 model = glm::mat4(1.0f);
|
||||||
model = glm::rotate(model, glm::radians(-55.0f), glm::vec3(1.0f, 0.0f, 0.0f));
|
model = glm::rotate(model, glm::radians(-55.0f), glm::vec3(1.0f, 0.0f, 0.0f));
|
||||||
|
@ -85,11 +85,11 @@ int main()
|
||||||
ourShader.setMat4("view", view);
|
ourShader.setMat4("view", view);
|
||||||
ourShader.setMat4("projection", projection);
|
ourShader.setMat4("projection", projection);
|
||||||
|
|
||||||
glm::mat4 model = glm::mat4(1.0f);
|
model = glm::mat4(1.0f);
|
||||||
model = glm::translate(model, glm::vec3(0.0f, 0.0f, 0.0f));
|
model = glm::translate(model, glm::vec3(0.0f, 0.0f, 0.0f));
|
||||||
model = glm::scale(model, glm::vec3(1.0f, 1.0f, 1.0f));
|
model = glm::scale(model, glm::vec3(1.0f, 1.0f, 1.0f));
|
||||||
ourShader.setMat4("model", model);
|
ourShader.setMat4("model", model);
|
||||||
ourModel.Draw(ourShader);
|
croissant.Draw(ourShader);
|
||||||
|
|
||||||
glfwSwapBuffers(window);
|
glfwSwapBuffers(window);
|
||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue