Commit 25b9ca70 authored by Håkon Berg Borhaug's avatar Håkon Berg Borhaug
Browse files

Misc.

parent f1c92b3b
......@@ -5,7 +5,7 @@
#include "../include/VertexBufferLayout.h"
#include "../include/IndexBuffer.h"
#include "../include/Shader.h"
#include "../include/Texture.h""
#include "../include/Texture.h"
#include <windows.h>
#include <GL/freeglut.h>
......@@ -75,6 +75,6 @@ private:
VertexBufferLayout layout;
IndexBuffer ibo = IndexBuffer(indices_, IND_ARRAY_SIZE);
Shader shader = Shader("../resources/shaders/Vertex.shader", "../resources/shaders/Fragment.shader");
Texture texture = Texture("../resources/color.jpg");
};
......@@ -350,7 +350,7 @@ void Character::setUpHBTextures()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
int width, height, nrChannels;
unsigned char *data = stbi_load("C:/dev/uni/DTE-3609_VR_graphics_animation/start_code/resources/HP.jpg", &width, &height, &nrChannels, 0);
unsigned char *data = stbi_load("../resources/textures/HP.jpg", &width, &height, &nrChannels, 0);
if (data)
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
......
......@@ -100,7 +100,7 @@ void Snow::setUpTexture() {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
int width, height, nrChannels;
unsigned char *data = stbi_load("C:/dev/uni/DTE-3609_VR_graphics_animation/start_code/resources/snowflake.jpg", &width, &height, &nrChannels, 0);
unsigned char *data = stbi_load("../resources/textures/snowflake.jpg", &width, &height, &nrChannels, 0);
if (data)
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment