clean up code

This commit is contained in:
Anakin
2016-11-12 12:05:03 +01:00
parent 2524971d19
commit b4bd314450
7 changed files with 19 additions and 47 deletions

View File

@@ -1,17 +1,14 @@
#include <gl\glew.h>
#include <gl\glfw3.h>
#include <Windows.h>
#include "OpenGLController.h"
#include "callback.h"
#include <glm\gtc\matrix_transform.hpp>
#include "shader.hpp"
#include "Texture.h"
#include <iostream>
#include <Windows.h>
#include <string>
#include <glm\gtc\matrix_transform.hpp>
#define VERTEX_SHADER "Shader/TextureShader.vert"
#define FRAGMENT_SHADER "Shader/TextureShader.frag"
#define MAX_MODEL_COUNT 1000
/////////////////////////////////////////////////////////////////////////
// public constructor/destructor
@@ -282,7 +279,7 @@ void OpenGLController::updateScene()
int instanceOffset(0);
for (int modelIndex = 0; modelIndex < vModels.size(); modelIndex++)
for (unsigned int modelIndex = 0; modelIndex < vModels.size(); modelIndex++)
{
// give texture to the shader
glTexImage2D(GL_TEXTURE_2D,