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

85006250

Commit 85006250 authored 6 years ago by Jonas Johan Solsvik

Downloads
- Patches
- Plain Diff

Loading/parsing material from file

parent 5dc7c18a

No related branches found

No related tags found

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 2 deletions

CMakeLists.txt
CMakeSettings.json 2 additions, 24 deletions

CMakeSettings.json
include/overkill/Config.hpp 17 additions, 0 deletions

include/overkill/Config.hpp
include/overkill/Material.hpp 5 additions, 1 deletion

include/overkill/Material.hpp
include/overkill/Parser.hpp 3 additions, 0 deletions

include/overkill/Parser.hpp
include/overkill/TextureSystem.hpp 1 addition, 1 deletion

include/overkill/TextureSystem.hpp
include/overkill/texture.hpp 3 additions, 4 deletions

include/overkill/texture.hpp
src/Init.cpp 3 additions, 0 deletions

src/Init.cpp
src/Material.cpp 29 additions, 27 deletions

src/Material.cpp
src/MaterialSystem.cpp 13 additions, 2 deletions

src/MaterialSystem.cpp
src/Parser.cpp 12 additions, 13 deletions

src/Parser.cpp
src/TextureSystem.cpp 20 additions, 7 deletions

src/TextureSystem.cpp
src/Util.cpp 1 addition, 3 deletions

src/Util.cpp
src/main.cpp 3 additions, 1 deletion

src/main.cpp
src/texture.cpp 6 additions, 5 deletions

src/texture.cpp

with 120 additions and 90 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