Commit Graph

37 Commits

Author SHA1 Message Date
Carl Woffenden
c04d24dd12 Generated file is now basisu_transcoder.cpp
Renamed the generated file to be the same as the non-amalgamated file, updating the script (and docs) accordinly. Added an example of generated amalgamated header and source.
2019-10-01 15:56:59 +02:00
Carl Woffenden
a5c36a5291 -x included error if used
The -x include files error if used (saying they were excluded). Changed the trancoder to surround the BC7 mode 6 include with guards.
2019-09-30 15:15:13 +02:00
Carl Woffenden
51c21d1c6b Revert "Revert "Brought up-to-date with transcoder changes""
This reverts commit ff531b2467.
2019-09-28 09:26:01 +02:00
Carl Woffenden
ff531b2467 Revert "Brought up-to-date with transcoder changes"
This reverts commit 30a7c208d9.
2019-09-28 09:19:09 +02:00
Carl Woffenden
04156859e4 Revert "Merge branch 'single-file-transcoder' of https://github.com/cwoffenden/basis_universal into single-file-transcoder"
This reverts commit 41c34d1a87, reversing
changes made to 30a7c208d9.
2019-09-28 09:19:05 +02:00
Carl Woffenden
f5fd92b1d2 Revert "Undid the git merge mess"
This reverts commit 6b0f37ddcc.
2019-09-28 09:18:52 +02:00
Carl Woffenden
6b0f37ddcc Undid the git merge mess 2019-09-28 08:17:16 +02:00
Carl Woffenden
41c34d1a87 Merge branch 'single-file-transcoder' of https://github.com/cwoffenden/basis_universal into single-file-transcoder 2019-09-28 08:09:01 +02:00
Carl Woffenden
30a7c208d9 Brought up-to-date with transcoder changes
Transcoder changes meant: compiling the example as C++11 (not emcc's default), and changing the enums to the new enum classes.
2019-09-28 08:03:26 +02:00
Carl Woffenden
5c77348a8a Added exclude option, improved example
Added -x option to the script to exclude files, then used it to exclude the large BC7 mode 6 tables. Added mipmap transcoding to the example for completeness.
2019-09-28 07:04:29 +02:00
Carl Woffenden
e51d78ade0 WIP (added sources with mipmaps)
Mipmaps levels not yet extracted.
2019-09-28 07:04:29 +02:00
Carl Woffenden
e8507ef065 Minor docs, minor size tweaks
Clarified this is C++ source and not header-only. Added Android build options and excluded BC7 mode 6.
2019-09-28 07:04:29 +02:00
Carl Woffenden
cd05206205 Fixed standalone compilation warnings
Fixed -Wno-pragma-once-outside-header requirement (removing 'pragma once' in combiner script). Minor docs.
2019-09-28 07:04:29 +02:00
Carl Woffenden
e3c100578c Don't add EAC to the demo if not building with EAC 2019-09-28 07:04:29 +02:00
Carl Woffenden
9399434cfb Minor: corrected figures 2019-09-28 07:04:29 +02:00
Carl Woffenden
f8b0bfe92c Minor: moved note 2019-09-28 07:04:29 +02:00
Carl Woffenden
6c4d877710 ASTC support (and improved demo)
Exposed the ASTC transcoder. Improved the Emscripten example and tested on ASTC and ETC hardware. Workaround for usused functions and consts when disabling various transcode options.
2019-09-28 07:04:29 +02:00
Carl Woffenden
80271e2cff Working demo
Demo transcodes to various formats (tested only PVRTC, S3TC and uncompressed for now). Added docs.
2019-09-28 07:04:29 +02:00
Carl Woffenden
9dd6068dd3 Work-in-progress
Embedded .basis files with and without alpha. Started adding support to draw both types, as well as ETC. Fixed broken WebGL canvas.
2019-09-28 07:04:29 +02:00
Carl Woffenden
c002331b37 Added RGBA example 2019-09-28 07:04:29 +02:00
Carl Woffenden
bd8feea6d9 Initial commit
Added combine script.  Created initial Emscripten example.
2019-09-28 07:04:29 +02:00
Carl Woffenden
0499e57499 Added exclude option, improved example
Added -x option to the script to exclude files, then used it to exclude the large BC7 mode 6 tables. Added mipmap transcoding to the example for completeness.
2019-09-27 11:46:00 +02:00
Carl Woffenden
3e6a742818 WIP (added sources with mipmaps)
Mipmaps levels not yet extracted.
2019-09-26 18:45:39 +02:00
Carl Woffenden
fd6b7117e4 Minor docs, minor size tweaks
Clarified this is C++ source and not header-only. Added Android build options and excluded BC7 mode 6.
2019-09-26 03:42:01 +02:00
Carl Woffenden
8bf626bb53 Fixed standalone compilation warnings
Fixed -Wno-pragma-once-outside-header requirement (removing 'pragma once' in combiner script). Minor docs.
2019-09-25 20:42:33 +02:00
Carl Woffenden
4a401d9ec9 Don't add EAC to the demo if not building with EAC 2019-09-25 17:40:59 +02:00
Carl Woffenden
04c8144710 Minor: corrected figures 2019-09-25 17:34:58 +02:00
Carl Woffenden
813b382bc8 Minor: moved note 2019-09-25 17:20:46 +02:00
Carl Woffenden
7d65ba367a ASTC support (and improved demo)
Exposed the ASTC transcoder. Improved the Emscripten example and tested on ASTC and ETC hardware. Workaround for usused functions and consts when disabling various transcode options.
2019-09-25 17:15:49 +02:00
Carl Woffenden
85c81f1871 Working demo
Demo transcodes to various formats (tested only PVRTC, S3TC and uncompressed for now). Added docs.
2019-09-24 18:43:15 +02:00
Carl Woffenden
91b8d85473 Work-in-progress
Embedded .basis files with and without alpha. Started adding support to draw both types, as well as ETC. Fixed broken WebGL canvas.
2019-09-20 23:04:03 -04:00
Carl Woffenden
3174fd6764 Added RGBA example 2019-09-21 03:14:49 +02:00
Carl Woffenden
9482b1ba9d Initial commit
Added combine script.  Created initial Emscripten example.
2019-09-20 15:00:02 -04:00
Carl Woffenden
79d043092f Added flush after updating DIB contents 2019-06-10 08:50:52 +02:00
Carl Woffenden
b1c5642c8d Fix for dimensions that aren't a multiple of four
Grows the preview size to the nearest 4x4 to match the block size used.
2019-06-09 21:17:01 +02:00
Carl Woffenden
7121deeef7 Preview image now local 2019-06-09 11:48:37 +02:00
Carl Woffenden
37a9dc3da3 Initial working Windows preview
Creates previews from Basis files. Rough but creates thumbnails and preview pane views from the first images nearest mipmap.
2019-06-08 18:49:08 +02:00