-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Support for BENTLEY_materials_line_style glTF Extension #13110
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
danielzhong
wants to merge
41
commits into
main
Choose a base branch
from
DanielZ/BENTLEY_materials_line_style
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 all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
859a058
implmented
danielzhong 6bb6228
update
danielzhong b935277
Update packages/engine/Source/Scene/GltfLoader.js
danielzhong ca8380f
Merge branch 'main' into daniel/edge_visibility_material
danielzhong 072e65f
upload example glb
danielzhong d30ad47
upload example glb
danielzhong 5d4770e
test
danielzhong bb9f62f
test
danielzhong d4db1ea
Merge branch 'main' into daniel/edge_visibility_material
danielzhong 11d6b15
unit tests
danielzhong 6d381de
fix errors
danielzhong a72903f
test
danielzhong a2de2ca
test
danielzhong e5678b1
test
danielzhong 65b28c9
fix
danielzhong 4563c06
fix
danielzhong 9866b2f
Merge branch 'main' into daniel/edge_visibility_material
danielzhong 47d7b05
fix
danielzhong 26b586e
test glb fix
danielzhong b11655e
test glb fix
danielzhong 6c71ebc
support BENTLEY_materials_point_style
markschlosseratbentley 0432ac5
Merge branch 'main' into markschlosser/BENTLEY_materials_point_style
markschlosseratbentley 7b2920c
CHANGES.md
markschlosseratbentley ada5813
unit test
markschlosseratbentley 200d086
use unsigned short indices so CI can work if OES_element_index_uint i…
markschlosseratbentley 24025b5
make the sandcastle example be dev
markschlosseratbentley 9ebb71b
make the sandcastle example be dev
markschlosseratbentley e3e4ab0
Remove Showcases label
markschlosseratbentley e71db4d
Merge branch 'main' into daniel/edge_visibility_material
danielzhong 4337642
Merge branch 'markschlosser/BENTLEY_materials_point_style' into Danie…
danielzhong 769c0b1
Merge branch 'daniel/edge_visibility_material' into DanielZ/BENTLEY_m…
danielzhong a725bbb
save
danielzhong 22eeaf4
Unit Test
danielzhong dc42552
CHANGES.md
danielzhong a009c4b
fix
danielzhong 94841b4
fix
danielzhong 0d24fc7
Sandcastle example
danielzhong d449a7b
fix gltf
danielzhong 718b423
Fix silhoutteNormal decoding bugs
danielzhong fe13f48
Fix silhoutteNormal using Cesium API
danielzhong 8db3e57
Fix unit tests
danielzhong 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
339 changes: 339 additions & 0 deletions
339
Apps/SampleData/models/StyledLines/BENTLEY_materials_line_style.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
222 changes: 222 additions & 0 deletions
222
Apps/SampleData/models/StyledPoints/points-r5-g8-b14-y10.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,222 @@ | ||
| { | ||
| "asset": { | ||
| "version": "2.0" | ||
| }, | ||
| "extensionsUsed": [ | ||
| "BENTLEY_materials_point_style" | ||
| ], | ||
| "accessors": [ | ||
| { | ||
| "bufferView": 0, | ||
| "byteOffset": 0, | ||
| "componentType": 5126, | ||
| "count": 4, | ||
| "type": "VEC3", | ||
| "max": [ | ||
| 5.0, | ||
| 5.0, | ||
| 5.0 | ||
| ], | ||
| "min": [ | ||
| -5.0, | ||
| -5.0, | ||
| -5.0 | ||
| ] | ||
| }, | ||
| { | ||
| "bufferView": 1, | ||
| "byteOffset": 0, | ||
| "componentType": 5123, | ||
| "count": 1, | ||
| "type": "SCALAR", | ||
| "max": [ | ||
| 0 | ||
| ], | ||
| "min": [ | ||
| 0 | ||
| ] | ||
| }, | ||
| { | ||
| "bufferView": 1, | ||
| "byteOffset": 4, | ||
| "componentType": 5123, | ||
| "count": 1, | ||
| "type": "SCALAR", | ||
| "max": [ | ||
| 1 | ||
| ], | ||
| "min": [ | ||
| 1 | ||
| ] | ||
| }, | ||
| { | ||
| "bufferView": 1, | ||
| "byteOffset": 8, | ||
| "componentType": 5123, | ||
| "count": 1, | ||
| "type": "SCALAR", | ||
| "max": [ | ||
| 2 | ||
| ], | ||
| "min": [ | ||
| 2 | ||
| ] | ||
| }, | ||
| { | ||
| "bufferView": 1, | ||
| "byteOffset": 12, | ||
| "componentType": 5123, | ||
| "count": 1, | ||
| "type": "SCALAR", | ||
| "max": [ | ||
| 3 | ||
| ], | ||
| "min": [ | ||
| 3 | ||
| ] | ||
| } | ||
| ], | ||
| "buffers": [ | ||
| { | ||
| "byteLength": 64, | ||
| "uri": "data:application/octet-stream;base64,AACgwAAAoMAAAKDAAACgQAAAoMAAAKDAAAAAAAAAoEAAAKDAAAAAAAAAAAAAAKBAAAAAAAEAAAACAAAAAwAAAA==" | ||
| } | ||
| ], | ||
| "bufferViews": [ | ||
| { | ||
| "buffer": 0, | ||
| "byteOffset": 0, | ||
| "byteLength": 48, | ||
| "target": 34962 | ||
| }, | ||
| { | ||
| "buffer": 0, | ||
| "byteOffset": 48, | ||
| "byteLength": 16, | ||
| "target": 34963 | ||
| } | ||
| ], | ||
| "materials": [ | ||
| { | ||
| "name": "Red", | ||
| "pbrMetallicRoughness": { | ||
| "baseColorFactor": [ | ||
| 1.0, | ||
| 0.0, | ||
| 0.0, | ||
| 1.0 | ||
| ], | ||
| "metallicFactor": 0.0 | ||
| }, | ||
| "extensions": { | ||
| "BENTLEY_materials_point_style": { | ||
| "diameter": 5.0 | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "name": "Green", | ||
| "pbrMetallicRoughness": { | ||
| "baseColorFactor": [ | ||
| 0.0, | ||
| 1.0, | ||
| 0.0, | ||
| 1.0 | ||
| ], | ||
| "metallicFactor": 0.0 | ||
| }, | ||
| "extensions": { | ||
| "BENTLEY_materials_point_style": { | ||
| "diameter": 8.0 | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "name": "Blue", | ||
| "pbrMetallicRoughness": { | ||
| "baseColorFactor": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ], | ||
| "metallicFactor": 0.0 | ||
| }, | ||
| "extensions": { | ||
| "BENTLEY_materials_point_style": { | ||
| "diameter": 14.0 | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "name": "Yellow", | ||
| "pbrMetallicRoughness": { | ||
| "baseColorFactor": [ | ||
| 1.0, | ||
| 1.0, | ||
| 0.0, | ||
| 1.0 | ||
| ], | ||
| "metallicFactor": 0.0 | ||
| }, | ||
| "extensions": { | ||
| "BENTLEY_materials_point_style": { | ||
| "diameter": 10.0 | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "meshes": [ | ||
| { | ||
| "name": "PointCloud", | ||
| "primitives": [ | ||
| { | ||
| "mode": 0, | ||
| "material": 0, | ||
| "indices": 1, | ||
| "attributes": { | ||
| "POSITION": 0 | ||
| } | ||
| }, | ||
| { | ||
| "mode": 0, | ||
| "material": 1, | ||
| "indices": 2, | ||
| "attributes": { | ||
| "POSITION": 0 | ||
| } | ||
| }, | ||
| { | ||
| "mode": 0, | ||
| "material": 2, | ||
| "indices": 3, | ||
| "attributes": { | ||
| "POSITION": 0 | ||
| } | ||
| }, | ||
| { | ||
| "mode": 0, | ||
| "material": 3, | ||
| "indices": 4, | ||
| "attributes": { | ||
| "POSITION": 0 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "nodes": [ | ||
| { | ||
| "name": "PointCloudNode", | ||
| "mesh": 0 | ||
| } | ||
| ], | ||
| "scenes": [ | ||
| { | ||
| "nodes": [ | ||
| 0 | ||
| ] | ||
| } | ||
| ], | ||
| "scene": 0 | ||
| } |
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
Binary file added
BIN
+2.14 KB
Specs/Data/Models/glTF-2.0/EdgeVisibility/glTF-Binary/EdgeVisibilityLineString.glb
Binary file not shown.
Binary file added
BIN
+11.5 KB
Specs/Data/Models/glTF-2.0/EdgeVisibility/glTF-Binary/EdgeVisibilityMaterial.glb
Binary file not shown.
339 changes: 339 additions & 0 deletions
339
Specs/Data/Models/glTF-2.0/StyledLines/BENTLEY_materials_line_style.gltf
Large diffs are not rendered by default.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Validation error: "VALUE_NOT_IN_RANGE | Value 1 is out of range. | /bufferViews/5/byteStride"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed. Thanks