Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/FlorianFe/vox-viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Fechner authored and Florian Fechner committed Nov 3, 2019
2 parents 25b66cb + ffc995e commit b1f138c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@

uses [\<model-viewer\>](https://github.com/GoogleWebComponents/model-viewer) and acts like it, but takes .vox files
which are exported by [Magicka Voxel](https://ephtracy.github.io/) as source instead of GLTF files. It also uses
[voxel-triangulation.js](https://github.com/FlorianFe/voxel-triangulation.js) to build a mesh out of the voxel model and [vox-reader.js](https://github.com/FlorianFe/vox-reader.js) to parse vox files.
[voxel-triangulation.js](https://github.com/FlorianFe/voxel-triangulation.js) to build a mesh out of the voxel model and [vox-reader.js](https://github.com/FlorianFe/vox-reader.js) to parse vox files.

## 🖼 Preview

![screenshot](https://raw.githubusercontent.com/FlorianFe/vox-viewer/master/img/screenshot.png)

## 👀 Demo

You can see a live demo [here](https://florianfe.github.io/vox-viewer/demo/)
6 changes: 3 additions & 3 deletions external/model-viewer/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

The content of this folder modifies the [<model-viewer>]() webcomponent by Google LLC
which is licensed under the [Apache License 2.0]().
The content of this folder modifies the [\<model-viewer\>](https://github.com/GoogleWebComponents/model-viewer) webcomponent by Google LLC
which is licensed under the [Apache License 2.0](https://github.com/GoogleWebComponents/model-viewer/blob/master/LICENSE).

The modification does the following things:

- it removes the tone mapping
- it changes the gamma correction
- it changes the light in the scene
- it changes the light in the scene

0 comments on commit b1f138c

Please sign in to comment.