plane000 61d34d7aac On the fly shader switching

2018-09-17 20:19:59 +01:00

..

headers

resolved git conflict

2018-09-17 17:41:47 +01:00

display.cpp

On the fly shader switching

2018-09-17 20:19:59 +01:00

display.h

i think i broke somthing

2018-09-17 12:38:09 +01:00

main.cpp

On the fly shader switching

2018-09-17 20:19:59 +01:00

mesh.cpp

resolved git conflict

2018-09-17 17:41:47 +01:00

mesh.h

resolved git conflict

2018-09-17 17:41:47 +01:00

mesh.h~HEAD

Merge branch 'master' of https://github.com/plane000/crumpet-engine

2018-09-17 17:40:41 +01:00

OpenGL.vcxproj

On the fly shader switching

2018-09-17 20:19:59 +01:00

OpenGL.vcxproj.filters

resolved git conflict

2018-09-17 17:41:47 +01:00

shader.cpp

Colour mapping on meshes working

2018-09-17 13:43:26 +01:00

shader.h

i think i broke somthing

2018-09-17 12:38:09 +01:00

stb_image.c

Shader loading and applying working

2018-09-17 15:49:19 +01:00

stb_image.h

resolved git conflict

2018-09-17 17:41:47 +01:00

texture.cpp

resolved git conflict

2018-09-17 17:41:47 +01:00

texture.h

i think i broke somthing

2018-09-17 12:38:09 +01:00