-
- Downloads
Removed nlohmann-json as a submodule. It's now being grabbed through the fx-gltf submodule.
Added the libktx library as a dependency for the project.
LibKTX is now used as back-end for loading KTX files in AssetManager-system.
Made significant work on texture loading. Still WIP, but uncompressed textures are now supported.
Made signifant work on Renderer::TextureDocument and AssetManager::TextureDocument structures.
Moved functions for tying together AssetManager and Renderer into it's own header and source file.
Modified the mesh shader to support a diffuse texture.
Signed-off-by:
Nils Petter Skålerud <np_skalerud@hotmail.com>
Showing
- .gitmodules 2 additions, 6 deletions.gitmodules
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- Data/Shaders/Mesh/Mesh.frag 5 additions, 1 deletionData/Shaders/Mesh/Mesh.frag
- external/CMakeLists.txt 36 additions, 6 deletionsexternal/CMakeLists.txt
- external/KTX-Software-master/BUILDING.md 409 additions, 0 deletionsexternal/KTX-Software-master/BUILDING.md
- external/KTX-Software-master/CODE_OF_CONDUCT.md 1 addition, 0 deletionsexternal/KTX-Software-master/CODE_OF_CONDUCT.md
- external/KTX-Software-master/CONTRIBUTING.md 12 additions, 0 deletionsexternal/KTX-Software-master/CONTRIBUTING.md
- external/KTX-Software-master/LICENSE.md 228 additions, 0 deletionsexternal/KTX-Software-master/LICENSE.md
- external/KTX-Software-master/NOTICE.md 1 addition, 0 deletionsexternal/KTX-Software-master/NOTICE.md
- external/KTX-Software-master/README.md 72 additions, 0 deletionsexternal/KTX-Software-master/README.md
- external/KTX-Software-master/include/ktx.h 845 additions, 0 deletionsexternal/KTX-Software-master/include/ktx.h
- external/KTX-Software-master/lib/checkheader.c 172 additions, 0 deletionsexternal/KTX-Software-master/lib/checkheader.c
- external/KTX-Software-master/lib/errstr.c 70 additions, 0 deletionsexternal/KTX-Software-master/lib/errstr.c
- external/KTX-Software-master/lib/etcdec.cxx 1845 additions, 0 deletionsexternal/KTX-Software-master/lib/etcdec.cxx
- external/KTX-Software-master/lib/etcunpack.cxx 288 additions, 0 deletionsexternal/KTX-Software-master/lib/etcunpack.cxx
- external/KTX-Software-master/lib/filestream.c 324 additions, 0 deletionsexternal/KTX-Software-master/lib/filestream.c
- external/KTX-Software-master/lib/filestream.h 39 additions, 0 deletionsexternal/KTX-Software-master/lib/filestream.h
- external/KTX-Software-master/lib/gl_format.h 2456 additions, 0 deletionsexternal/KTX-Software-master/lib/gl_format.h
- external/KTX-Software-master/lib/gl_funcptrs.h 69 additions, 0 deletionsexternal/KTX-Software-master/lib/gl_funcptrs.h
- external/KTX-Software-master/lib/gles1_funcptrs.h 68 additions, 0 deletionsexternal/KTX-Software-master/lib/gles1_funcptrs.h
Loading
Please register or sign in to comment