Skip to content

Commit

Permalink
Merge pull request #295 from Smithsonian/rc-43
Browse files Browse the repository at this point in the history
Rc 43
  • Loading branch information
gjcope authored Jul 26, 2024
2 parents d1bfa26 + 138e794 commit ebbda0b
Show file tree
Hide file tree
Showing 218 changed files with 26,258 additions and 4,825 deletions.
18 changes: 0 additions & 18 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
[submodule "libs/ff-core"]
path = libs/ff-core
url = https://github.com/Smithsonian/ff-core
[submodule "libs/ff-browser"]
path = libs/ff-browser
url = https://github.com/Smithsonian/ff-browser
[submodule "libs/ff-three"]
path = libs/ff-three
url = https://github.com/Smithsonian/ff-three
[submodule "libs/ff-ui"]
path = libs/ff-ui
url = https://github.com/Smithsonian/ff-ui
[submodule "libs/ff-graph"]
path = libs/ff-graph
url = https://github.com/Smithsonian/ff-graph
[submodule "libs/ff-scene"]
path = libs/ff-scene
url = https://github.com/Smithsonian/ff-scene
[submodule "docs/public"]
path = docs/public
url = https://github.com/Smithsonian/dpo-voyager
Expand Down
46 changes: 46 additions & 0 deletions assets/js/basis/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Basis Universal GPU Texture Compression

Basis Universal is a "[supercompressed](http://gamma.cs.unc.edu/GST/gst.pdf)"
GPU texture and texture video compression system that outputs a highly
compressed intermediate file format (.basis) that can be quickly transcoded to
a wide variety of GPU texture compression formats.

[GitHub](https://github.com/BinomialLLC/basis_universal)

## Transcoders

Basis Universal texture data may be used in two different file formats:
`.basis` and `.ktx2`, where `ktx2` is a standardized wrapper around basis texture data.

For further documentation about the Basis compressor and transcoder, refer to
the [Basis GitHub repository](https://github.com/BinomialLLC/basis_universal).

The folder contains two files required for transcoding `.basis` or `.ktx2` textures:

* `basis_transcoder.js` — JavaScript wrapper for the WebAssembly transcoder.
* `basis_transcoder.wasm` — WebAssembly transcoder.

Both are dependencies of `KTX2Loader`:

```js
const ktx2Loader = new KTX2Loader();
ktx2Loader.setTranscoderPath( 'examples/jsm/libs/basis/' );
ktx2Loader.detectSupport( renderer );
ktx2Loader.load( 'diffuse.ktx2', function ( texture ) {

const material = new THREE.MeshStandardMaterial( { map: texture } );

}, function () {

console.log( 'onProgress' );

}, function ( e ) {

console.error( e );

} );
```

## License

[Apache License 2.0](https://github.com/BinomialLLC/basis_universal/blob/master/LICENSE)
21 changes: 21 additions & 0 deletions assets/js/basis/basis_transcoder.js

Large diffs are not rendered by default.

Binary file added assets/js/basis/basis_transcoder.wasm
Binary file not shown.
16 changes: 0 additions & 16 deletions libs/fetch.sh

This file was deleted.

1 change: 0 additions & 1 deletion libs/ff-browser
Submodule ff-browser deleted from 159a6e
14 changes: 14 additions & 0 deletions libs/ff-browser/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Copyright 2021 [Frame Factory GmbH](https://framefactory.ch), [Ralph Wiedemeier](https://about.me/ralphw)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3 changes: 3 additions & 0 deletions libs/ff-browser/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# FF Browser Typescript Foundation Library

Copyright 2021 [Frame Factory GmbH](https://framefactory.ch), [Ralph Wiedemeier](https://about.me/ralphw)
Loading

0 comments on commit ebbda0b

Please sign in to comment.