kotovalexarian/matabstrix
Archived
1
0
Fork 0
Code Activity

Remove Cube model

Browse source
This commit is contained in:
Meoweg 2015-11-07 11:59:20 +00:00
parent 4f80eefda3
commit 0b05138b33
2 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
data/models/cube.obj
View file

@ -1,29 +0,0 @@
# Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org
v 1.000000 1.000000 -1.000000
v 1.000000 -1.000000 -1.000000
v -1.000000 -1.000000 -1.000000
v -1.000000 1.000000 -1.000000
v 1.000000 0.999999 1.000000
v 0.999999 -1.000001 1.000000
v -1.000000 -1.000000 1.000000
v -1.000000 1.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 0.000000 1.000000
vn 1.000000 -0.000000 -0.000000
vn -0.000000 -1.000000 -0.000000
vn -1.000000 0.000000 -0.000000
vn 0.000000 1.000000 0.000000
s off
f 2//1 3//1 4//1
f 8//2 7//2 6//2
f 1//3 5//3 6//3
f 2//4 6//4 7//4
f 7//5 8//5 4//5
f 1//6 4//6 8//6
f 1//1 2//1 4//1
f 5//2 8//2 6//2
f 2//3 1//3 6//3
f 3//4 2//4 7//4
f 3//5 7//5 4//5
f 5//6 1//6 8//6

10
main.cpp
View file

@ -99,12 +99,10 @@ static bool keys[GLFW_KEY_LAST];
static float pos_x = 0, pos_y = -4;
static float delta_z = 0, delta_x = 0;
static Model *cube;
static Model *suzanne;
static Model *teapot;
static Model *bunny;
static Object *cube1;
static Object *suzanne1;
static Object *teapot1;
static Object *bunny1;
@ -138,15 +136,10 @@ int main()
mvp_id = program.get_uniform_location("mvp");
cube = new Model("/data/models/cube.obj");
suzanne = new Model("/data/models/suzanne.obj");
teapot = new Model("/data/models/teapot.obj");
bunny = new Model("/data/models/bunny.obj");
cube1 = new Object(*cube);
cube1->position.x = 2.5;
cube1->position.y = -4.0;
suzanne1 = new Object(*suzanne);
suzanne1->position.y = 2;
suzanne1->position.z = 2;
@ -422,9 +415,6 @@ void iterate()
glm::mat4 mvp = projection * view * model;
glBindTexture(GL_TEXTURE_2D, 0);
cube1->draw(mvp);
suzanne_tex->use();
suzanne1->draw(mvp);