Skip to content

Commit

Permalink
Merge pull request #8 from cinnabar-engine/feature/simple-meshfile
Browse files Browse the repository at this point in the history
Feature/simple meshfile
  • Loading branch information
SArpnt authored Jul 21, 2021
2 parents 7310ebe + 248d106 commit fd927f3
Show file tree
Hide file tree
Showing 21 changed files with 6,672 additions and 915 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ Pull requests are welcome. For major changes, please open an issue first to disc
- [x] Materials
- [x] Render System
- [x] Multiple Objects rendering at the same time
- [ ] Mesh Importing
- [x] Mesh Importing
- [x] Full UV mapping support
- [x] Full vertex color support
- [ ] Multi-texture materials
- [ ] Normals
- [x] Normals
- [ ] Normal maps
- [ ] Matcaps (SArpnt will do this)
- [x] Matcaps (SArpnt will do this)
- [ ] Simple object classes (combine assets and automatically manage render commands)
- [ ] Depth manipulation
- [ ] Skybox
Expand Down
12 changes: 0 additions & 12 deletions res/meshes/blob.mtl

This file was deleted.

Loading

0 comments on commit fd927f3

Please sign in to comment.