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

8900428d

Commit 8900428d authored 6 years ago by JonShard

Downloads
- Plain Diff

Merge branch 'dev' of prod3.imt.hig.no:overkill-studios/imt2531-assignment2 into dev

parents 618c0b38 aed8dba4

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

assets/models/cube.yml 2 additions, 2 deletions

assets/models/cube.yml
include/overkill/Model.hpp 6 additions, 11 deletions

include/overkill/Model.hpp
include/overkill/ModelSystem.hpp 7 additions, 2 deletions

include/overkill/ModelSystem.hpp
include/overkill/Parser.hpp 3 additions, 2 deletions

include/overkill/Parser.hpp
include/overkill/Renderer.hpp 4 additions, 0 deletions

include/overkill/Renderer.hpp
include/overkill/Util.hpp 3 additions, 1 deletion

include/overkill/Util.hpp
src/Model.cpp 0 additions, 25 deletions

src/Model.cpp
src/ModelSystem.cpp 121 additions, 113 deletions

src/ModelSystem.cpp
src/Parser.cpp 99 additions, 6 deletions

src/Parser.cpp
src/Renderer.cpp 16 additions, 0 deletions

src/Renderer.cpp
src/Util.cpp 12 additions, 0 deletions

src/Util.cpp
src/Watcher.cpp 4 additions, 0 deletions

src/Watcher.cpp
src/main.cpp 7 additions, 16 deletions

src/main.cpp

with 284 additions and 178 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