Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

imt2531-assignment2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

bc363172

Commit bc363172 authored 6 years ago by Jonas Johan Solsvik

Downloads
- Patches
- Plain Diff

Loading textures from TextureSystem and not from constructor

* If texture loading fails, use default texture.

parent 7cf02217

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

assets/shaders/subsurfaceScatter.glsl 1 addition, 1 deletion

assets/shaders/subsurfaceScatter.glsl
include/overkill/Texture.hpp 3 additions, 6 deletions

include/overkill/Texture.hpp
include/overkill/TextureSystem.hpp 1 addition, 0 deletions

include/overkill/TextureSystem.hpp
include/overkill/gl_caller.hpp 4 additions, 2 deletions

include/overkill/gl_caller.hpp
src/ShaderIntrospector.cpp 0 additions, 2 deletions

src/ShaderIntrospector.cpp
src/Texture.cpp 0 additions, 26 deletions

src/Texture.cpp
src/TextureSystem.cpp 63 additions, 2 deletions

src/TextureSystem.cpp
src/gl_caller.cpp 12 additions, 0 deletions

src/gl_caller.cpp

with 84 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment