Skip to content

Commit

Permalink
Quick compilation error fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
UX3D-nopper committed Nov 22, 2020
1 parent c11e5ac commit d8f3626
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
23 changes: 13 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
glTF 2.0 Sample Viewer
======================
Khronos glTF 2.0 Sample Viewer
==============================

[![](assets/images/BoomBox.jpg)](http://gltf.ux3d.io/)

This is the official [Khronos](https://www.khronos.org/) [glTF 2.0](https://www.khronos.org/gltf/) sample viewer using [WebGL](https://www.khronos.org/webgl/): [glTF 2.0 Sample Viewer](http://gltf.ux3d.io/)
This is the official [Khronos](https://www.khronos.org/) [glTF 2.0](https://www.khronos.org/gltf/) Sample Viewer using [WebGL](https://www.khronos.org/webgl/): [glTF 2.0 Sample Viewer](http://gltf.ux3d.io/)


**Table of Contents**
Expand All @@ -24,26 +24,29 @@ This is the official [Khronos](https://www.khronos.org/) [glTF 2.0](https://www.
Version
-------

Pre-release
Development for PBR next phase one

Credits
-------

Developed by [UX3D](https://www.ux3d.io/) and based on the former [glTF-WebGL-PBR](https://github.com/KhronosGroup/glTF-Sample-Viewer/tree/glTF-WebGL-PBR) project. Supported by the [Khronos Group](https://www.khronos.org/) and [Facebook](https://www.facebook.com/) for animations, skinning and morphing.
Refactored and developed by [UX3D](https://www.ux3d.io/). Supported by the [Khronos Group](https://www.khronos.org/) and by [Google](https://www.google.com/) for the glTF Draco mesh compression import.
Original code based on the former [glTF-WebGL-PBR](https://github.com/KhronosGroup/glTF-Sample-Viewer/tree/glTF-WebGL-PBR) project. Previously supported by [Facebook](https://www.facebook.com/) for animations, skinning and morphing.

Features
========

- [x] glTF 2.0
- [ ] [KHR_draco_mesh_compression](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression)
- [x] [KHR_lights_punctual](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual)
- [x] [KHR_materials_pbrSpecularGlossiness](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
- [x] [KHR_materials_clearcoat](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_clearcoat)
- [x] [KHR_materials_pbrSpecularGlossiness](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
- [x] [KHR_materials_sheen](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_sheen)
- [x] [KHR_materials_transmission](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_transmission)
- [x] [KHR_materials_unlit](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit)
- [ ] [KHR_materials_variants](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_variants)
- [ ] [KHR_texture_basisu](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_texture_basisu)
- [x] [KHR_texture_transform](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_texture_transform)

Experimental
- [x] [KHR_materials_ior](https://github.com/KhronosGroup/glTF/pull/1718)
- [x] [KHR_materials_transmission](https://github.com/KhronosGroup/glTF/pull/1698)
- [ ] KHR_xmp_ld

Viewer
======
Expand Down
2 changes: 1 addition & 1 deletion src/shaders/pbr.frag
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ MaterialInfo getClearCoatInfo(MaterialInfo info, NormalInfo normalInfo, float f0
{
info.clearcoatFactor = u_ClearcoatFactor;
info.clearcoatRoughness = u_ClearcoatRoughnessFactor;
info.clearcoatF0 = f0_ior;
info.clearcoatF0 = vec3(f0_ior);
info.clearcoatF90 = vec3(1.0);

#ifdef HAS_CLEARCOAT_TEXTURE_MAP
Expand Down

0 comments on commit d8f3626

Please sign in to comment.