Commits · light · Overkill Studios / imt2531-assignment2 · GitLab

Snippets Groups Projects

Apr 23, 2018
- resolved conflicts and made sure that everything works · 2ca8e748
  Jonas Johan Solsvik authored 6 years ago
  
  2ca8e748
- Multiple lights implemented, restructured indexing for blockLayouts for the uniformbuffer · f6359348
  Halvor Smedås authored 6 years ago
  
  f6359348
- discovering files - textures, shaders, materials, models · 9ba1fac5
  Jonas Johan Solsvik authored 6 years ago
  
  9ba1fac5
- borked - new file test-discovery.cpp · 2dd4ccb1
  Jonas Johan Solsvik authored 6 years ago
  
  2dd4ccb1
- moved blender/ - delete files · 4bb72719
  Jonas Johan Solsvik authored 6 years ago
  
  4bb72719
- moved blender/ to /tools · 6cb29dec
  Jonas Johan Solsvik authored 6 years ago
  
  6cb29dec
- .gitignore - whitelisting assets we want to keep. ignoreing all other assets · 0c49c6ba
  Jonas Johan Solsvik authored 6 years ago
  
  0c49c6ba
- a bunch of small changes · 84c3bbed
  Jonas Johan Solsvik authored 6 years ago
  
  84c3bbed
- .gitignore - update · 47097b31
  Jonas Johan Solsvik authored 6 years ago
  
  47097b31
- deleted file · a5e41519
  Jonas Johan Solsvik authored 6 years ago
  
  a5e41519
- blender/ - new folder with exporter and default blender template · ebbe46ea
  Jonas Johan Solsvik authored 6 years ago
  
  ebbe46ea
- assets/ - adding new assets · 350a4ef0
  Jonas Johan Solsvik authored 6 years ago
  
  350a4ef0
- more lightstuff, somethings wrong with light 2 · 3272efcc
  Halvor authored 6 years ago
  
  3272efcc
- more light stuff done, almost multilight support · 19a866ed
  Halvor authored 6 years ago
  
  19a866ed
Apr 22, 2018
- Uniform buffers working · 37852955
  Halvor authored 6 years ago
  
  37852955
Apr 20, 2018
- committing work to switch computer · abaa8a5a
  Halvor Smedås authored 6 years ago
  
  abaa8a5a
Apr 18, 2018
- Added uniformblock buffers · b3cd01e3
  Halvor Smedås authored 6 years ago
  
  b3cd01e3
- Warning hunt + print out max gl constants · 896fb797
  Jonas Johan Solsvik authored 6 years ago
  
  896fb797
- Resolved merge conflict with dev branch · a7651be7
  Jonas Johan Solsvik authored 6 years ago
  
  a7651be7
- .gitignore - big assets teapot · 936ff0d8
  Jonas Johan Solsvik authored 6 years ago
  
  936ff0d8
- blender-export - single mesh with vertex, normal. No uv coordinates and vertexcolor. · 9d663d23
  Jonas Johan Solsvik authored 6 years ago
  
  9d663d23
- default material and shader · b0b42a04
  Jonas Johan Solsvik authored 6 years ago
  
  b0b42a04
- Changed vertex specification to use only floats for normals and uv. · 8b874cba
  Jonas Johan Solsvik authored 6 years ago
  
  8b874cba
Apr 17, 2018
- Fixed EntityModels not rotating correctly, now uses deltatime. · c4ed39b6
  JonShard authored 6 years ago
  
  c4ed39b6
- Fixed the camera some mode. Third time's the charm. · e5e33747
  JonShard authored 6 years ago
  
  e5e33747
- Added getter & setter for scale in EntityModel. · 08ff1cee
  JonShard authored 6 years ago
  
  08ff1cee
- Fixed camera rotating on modelspace instead of worldspace. · 39a49e24
  JonShard authored 6 years ago
  
  39a49e24
- Fixed camera resetting position too early. · 18df73ed
  JonShard authored 6 years ago
  
  18df73ed
- reference.md - template discussion · e4e659ec
  Jonas Johan Solsvik authored 6 years ago
  
  e4e659ec
- namechange base.shader --> base.glsl. · 5b931007
  Jonas Johan Solsvik authored 6 years ago
  
  * defualt shader and material added * Drawing with two different shaders during two concecutive draw calls. * Still not able to draw cube from blender
  5b931007
- Merge branch 'dev' of prod3.imt.hig.no:overkill-studios/imt2531-assignment2 into dev · 374b9787
  JonShard authored 6 years ago
  
  374b9787
- Cleaned up main a little bit. · b2053586
  JonShard authored 6 years ago
  
  b2053586
- loading file exported from blender · 25610b31
  Jonas Johan Solsvik authored 6 years ago
  
  25610b31
- Worked on Entity model, can now be drawn. Issue with rotation not working. · 35c1ac5c
  JonShard authored 6 years ago
  
  35c1ac5c
- blender-export/export.py - new file · afb21c2d
  Jonas Johan Solsvik authored 6 years ago
  
  afb21c2d
- docs/references.md · 26673df4
  Jonas Johan Solsvik authored 6 years ago
  
  26673df4
- simple transform type, next: use it for light positioning · 866262a9
  Halvor authored 6 years ago
  
  866262a9
- started work on a more generic lit shader type · d8ed0693
  Halvor authored 6 years ago
  
  d8ed0693
- ModelSystem - hotloading of models · b1ed3f27
  Jonas Johan Solsvik authored 6 years ago
  
  b1ed3f27
- pulled in shader reloading from dev · 05335fda
  Halvor authored 6 years ago
  
  05335fda