texture in, not correctly wrapped
Merge branch 'master' into texture
Merge branch 'master' into texture
seg fault
Merge branch 'texture' of github.com:Ethanmn/CPE476Final into texture
Merge branch 'master' into texture
lame warnings removed
Merge branch 'master' into texture
using the right texture
better spacing
previous changes
fixed texture.h
seg faulting on Katelyn's mac
seg fault was due to bounding rectangle and model_view
seg fault was due to bounding rectangle and model_view
now with sun shader
Merge branch 'master' of github.com:ethanmn/CPE476Final
Merge branch 'master' into texture
texture merged with master, now adding lighting to texture
textures now have lighting applied