Merge branch 'develop' of github.com:syoyo/tinyobjloader into develop

This commit is contained in:
Syoyo Fujita
2016-05-12 19:38:48 +09:00
6 changed files with 79 additions and 3 deletions

View File

@@ -9,6 +9,7 @@
#include <limits>
#include <cmath>
#include <cassert>
#include <algorithm>
#include <GL/glew.h>
@@ -20,6 +21,7 @@
#include <GLFW/glfw3.h>
#define TINYOBJLOADER_IMPLEMENTATION
#include "../../tiny_obj_loader.h"
#include "trackball.h"
@@ -203,7 +205,7 @@ void reshapeFunc(GLFWwindow* window, int w, int h)
glViewport(0, 0, w, h);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(45.0, (float)w / (float)h, 0.1f, 1000.0f);
gluPerspective(45.0, (float)w / (float)h, 0.01f, 100.0f);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();