-
Notifications
You must be signed in to change notification settings - Fork 12
PBR extension: anisotropy #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
alemuntoni
wants to merge
29
commits into
cnr-isti-vclab:main
Choose a base branch
from
dlupo2:pbr-ext-anisotropy
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 13 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
1b2d599
[render] add anisotropy tests
dlupo2 176be37
[render] add anisotropy data loading
dlupo2 21efe93
[render] add anisotropy ibl implementation
dlupo2 b4b8f92
[render] add anisotropy implementation for analytical lights
dlupo2 1744d51
Merge remote-tracking branch 'vclibMuntoni/dynamic_texture_stage' int…
dlupo2 3b1b872
[assets] add carbon fibre example
dlupo2 e85dd33
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 53de00a
[render] remove AnisotropyDiscs and AnisotropySpheres gltf examples
alemuntoni a968d52
[render] fixes
alemuntoni 0df2d3f
[render] fix
alemuntoni 28c816b
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 1bc488e
[render] restore viewer lights on pbr settings
alemuntoni d7beb79
Merge branch 'main' into pr/alemuntoni/32
alemuntoni f518f9c
[render] fix typo in GLTFExamples
malomo 55bc230
[render] moved clampedDot to the top, and used in anisotropic pbr
malomo cacaf0b
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 1ff7024
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 627d54b
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 1b964db
Merge branch 'main' into pr/alemuntoni/32
alemuntoni a35db32
Merge branch 'main' into pr/alemuntoni/32
alemuntoni ca39e2a
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 6c2f4ce
[render] Add 2x2 downsampling for normal map mip generation in setTex…
alemuntoni b7ca637
Merge branch 'main' into pr/alemuntoni/32
alemuntoni d0acd5b
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 659fa3e
[render] add anisotropy to pbr tests
alemuntoni 3dd2d8e
Merge branch 'main' into pr/alemuntoni/32
alemuntoni a9fad72
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 128d80c
Merge branch 'main' into pr/alemuntoni/32
alemuntoni 51c81c1
Merge branch 'main' into pr/alemuntoni/32
alemuntoni File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file added
BIN
+24.7 KB
assets/example_meshes/gltf/AnisotropyRotationTest/AnisoDonutLabels.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added
BIN
+99 Bytes
assets/example_meshes/gltf/AnisotropyRotationTest/AnisoRotation10_Linear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+99 Bytes
assets/example_meshes/gltf/AnisotropyRotationTest/AnisoRotation30_Linear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
772 changes: 772 additions & 0 deletions
772
assets/example_meshes/gltf/AnisotropyRotationTest/AnisotropyRotationTest.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file added
BIN
+7.98 KB
assets/example_meshes/gltf/AnisotropyRotationTest/GridWithMarkers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+478 KB
assets/example_meshes/gltf/AnisotropyRotationTest/GridWithMarkers_30deg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+169 Bytes
assets/example_meshes/gltf/AnisotropyRotationTest/Heights_1d_Normals_v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
181 changes: 181 additions & 0 deletions
181
assets/example_meshes/gltf/CarbonFibre/CarbonFibre.gltf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| { | ||
| "asset": { | ||
| "version": "2.0", | ||
| "generator": "3ds Max, Max2Babylon, Visual Studio Code, glTF Tools", | ||
| "copyright": "(C) 2023, Wayfair LLC. CC-BY 4.0 International https://creativecommons.org/licenses/by/4.0/. Model and textures created by Eric Chadwick." | ||
| }, | ||
| "scene": 0, | ||
| "scenes": [ | ||
| { | ||
| "nodes": [ | ||
| 0 | ||
| ] | ||
| } | ||
| ], | ||
| "nodes": [ | ||
| { | ||
| "mesh": 0, | ||
| "translation": [ | ||
| 0.0, | ||
| 0.5, | ||
| 0.0 | ||
| ], | ||
| "name": "CarbonFibre" | ||
| } | ||
| ], | ||
| "meshes": [ | ||
| { | ||
| "primitives": [ | ||
| { | ||
| "attributes": { | ||
| "POSITION": 1, | ||
| "NORMAL": 2, | ||
| "TEXCOORD_0": 3 | ||
| }, | ||
| "indices": 0, | ||
| "material": 0 | ||
| } | ||
| ], | ||
| "name": "CarbonFibre" | ||
| } | ||
| ], | ||
| "accessors": [ | ||
| { | ||
| "bufferView": 0, | ||
| "componentType": 5123, | ||
| "count": 11904, | ||
| "type": "SCALAR", | ||
| "name": "accessorIndices" | ||
| }, | ||
| { | ||
| "bufferView": 1, | ||
| "componentType": 5126, | ||
| "count": 2129, | ||
| "max": [ | ||
| 0.5, | ||
| 0.5, | ||
| 0.5 | ||
| ], | ||
| "min": [ | ||
| -0.5, | ||
| -0.5, | ||
| -0.5 | ||
| ], | ||
| "type": "VEC3", | ||
| "name": "accessorPositions" | ||
| }, | ||
| { | ||
| "bufferView": 1, | ||
| "byteOffset": 25548, | ||
| "componentType": 5126, | ||
| "count": 2129, | ||
| "type": "VEC3", | ||
| "name": "accessorNormals" | ||
| }, | ||
| { | ||
| "bufferView": 2, | ||
| "componentType": 5126, | ||
| "count": 2129, | ||
| "type": "VEC2", | ||
| "name": "accessorUVs" | ||
| } | ||
| ], | ||
| "bufferViews": [ | ||
| { | ||
| "buffer": 0, | ||
| "byteLength": 23808, | ||
| "name": "bufferViewScalar", | ||
| "target": 34963 | ||
| }, | ||
| { | ||
| "buffer": 0, | ||
| "byteOffset": 23808, | ||
| "byteLength": 51096, | ||
| "byteStride": 12, | ||
| "name": "bufferViewFloatVec3", | ||
| "target": 34962 | ||
| }, | ||
| { | ||
| "buffer": 0, | ||
| "byteOffset": 74904, | ||
| "byteLength": 17032, | ||
| "byteStride": 8, | ||
| "name": "bufferViewFloatVec2", | ||
| "target": 34962 | ||
| } | ||
| ], | ||
| "buffers": [ | ||
| { | ||
| "uri": "CarbonFibre.bin", | ||
| "byteLength": 91936 | ||
| } | ||
| ], | ||
| "extensionsUsed": [ | ||
| "KHR_materials_anisotropy" | ||
| ], | ||
| "images": [ | ||
| { | ||
| "uri": "CarbonFibre_occlusion.png" | ||
| }, | ||
| { | ||
| "uri": "CarbonFibre_normal.png" | ||
| }, | ||
| { | ||
| "uri": "CarbonFibre_anisotropy.png" | ||
| } | ||
| ], | ||
| "textures": [ | ||
| { | ||
| "name": "CarbonFibre_occlusion.png", | ||
| "sampler": 0, | ||
| "source": 0 | ||
| }, | ||
| { | ||
| "name": "CarbonFibre_normal.png", | ||
| "sampler": 0, | ||
| "source": 1 | ||
| }, | ||
| { | ||
| "name": "CarbonFibre_anisotropy.png", | ||
| "sampler": 0, | ||
| "source": 2 | ||
| } | ||
| ], | ||
| "materials": [ | ||
| { | ||
| "name": "CarbonFibre", | ||
| "pbrMetallicRoughness": { | ||
| "baseColorFactor": [ | ||
| 0.009, | ||
| 0.009, | ||
| 0.009, | ||
| 1.0 | ||
| ], | ||
| "metallicFactor": 0, | ||
| "roughnessFactor": 0.4 | ||
| }, | ||
| "normalTexture": { | ||
| "index": 1, | ||
| "scale": 2 | ||
| }, | ||
| "occlusionTexture": { | ||
| "index": 0 | ||
| }, | ||
| "extensions": { | ||
| "KHR_materials_anisotropy": { | ||
| "anisotropyStrength": 0.5, | ||
| "anisotropyRotation": 0, | ||
| "anisotropyTexture": { | ||
| "index": 2 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "samplers": [ | ||
| { | ||
| "magFilter": 9729, | ||
| "minFilter": 9987 | ||
| } | ||
| ] | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.