-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
Gltf 2.0 #5641
Merged
Merged
Gltf 2.0 #5641
Changes from 1 commit
Commits
Show all changes
140 commits
Select commit
Hold shift + click to select a range
97c1a0d
Update CHANGES.md
pjcozzi 2471b03
Update CHANGES.md
pjcozzi a8afa5e
Added support for normalized accessors
lasalvavida 2170ac5
Modified Box-Color to use normalized property
lasalvavida 20cef47
Clarified normalized in test
lasalvavida e4f4240
SCISSOR_TEST is no longer required in glTF 1.0.1
lasalvavida 34b63c1
Merge pull request #4247 from lasalvavida/gltf-1.0.1-normalized
pjcozzi b20e8c4
Merge branch 'gltf-1.0.1' of github.com:AnalyticalGraphicsInc/cesium …
lasalvavida ad83614
Merge pull request #4248 from lasalvavida/gltf-1.0.1-remove-scissor-test
pjcozzi 246a848
Added uint32 indices support for glTF 1.0.1
lasalvavida b4fd22a
Fix jsHint error
lasalvavida c143152
Test glTF for required extensions.
emackey 9d8f635
Merge pull request #4371 from AnalyticalGraphicsInc/required-extensio…
pjcozzi ff84031
Merge branch 'master' of https://github.com/lasalvavida/cesium into g…
lasalvavida b9f304c
Merge branch 'gltf-1.0.1' of https://github.com/lasalvavida/cesium in…
lasalvavida 12b18cb
Made suggested changes
lasalvavida 8383f57
Merge pull request #4636 from lasalvavida/gltf-1.0.1
lilleyse 07f9f44
Merge branch 'gltf-1.0.1' of https://github.com/AnalyticalGraphicsInc…
lasalvavida 48aa89d
Check for _elementIndexUint before testing
lasalvavida 95e541e
Merge pull request #4249 from lasalvavida/gltf-1.0.1-uint32-indices
pjcozzi 47f3631
Added initial pipeline build
lasalvavida 3355a84
Merge branch 'gltf-1.0.1' of https://github.com/AnalyticalGraphicsInc…
lasalvavida 56cea8c
Added amdifyed pipeline files
lasalvavida ee2fca2
Some of the model changes (not done yet)
lasalvavida 9d4fbde
Checkpoint: Geometry only models render
8c0c7e4
Fixed promise code
92a9696
Fixed textures and skinning
lasalvavida 2d337b4
Removed getBinaryAccessor
lasalvavida e6aafe4
Enabled gltf-1.1
lasalvavida cf05283
Removed gltfDefaults from ThirdParty
lasalvavida 80c9786
Reverting model changes
5901bde
Switch workspaces
860d56f
Fixed skeleton hierarchy issues
ebb29ca
Merge branch 'master' of https://github.com/AnalyticalGraphicsInc/ces…
lasalvavida b70b357
addDefaults and processModelMaterialsCommon post-updateVersion
lasalvavida d959f46
Merge branch 'master' of github.com:AnalyticalGraphicsInc/cesium into…
a7ec3c8
Pulled latest changes from gltf-pipeline
8135029
Create runtimeNodes from skeleton nodes even if they aren't part of
c912f87
Update from small pipeline changes
4c0054b
RemovePipelineExtras
6ec4ed8
Last pull of changes from gltf-pipeline
cad8794
A few test fixes
b4a4b16
Added back some lost 1.0.1 changes and fixes for tests
lasalvavida 5ed44c3
Update from pipeline changes
298a203
Merge branch 'master' of github.com:AnalyticalGraphicsInc/cesium into…
b1e7f89
A few fixes from the merge
c9c20a6
Added missing pipeline files
29149db
Fix most failing tests, still a few left
b6a1d9d
A few more fixed tests
lasalvavida b99554d
Added KHR_technique_webgl to supported extensions
39514ee
Updated GltfPipeline built files
a69ffd1
Merge branch 'gltf-1.1' of github.com:lasalvavida/cesium into gltf-1.1
2d6aac6
Fix all failing tests
99ad146
Merge branch 'master' of github.com:AnalyticalGraphicsInc/cesium into…
fec6a0b
Added new Bing Maps API key
moneimne 878ba35
Began porting pbr shader from gltf-1.1 to 2.0. Reading baseColor from…
moneimne 7e80149
Fixes to reading textures from glTF 2.0. Shaders now use textures for…
moneimne daa974c
Added additional material attributes without scale factors or normal …
moneimne f6307d5
Added check to make sure standardDerivatives is supported
moneimne 9abcc68
Added capabilities to read tangent data and doubleSided parameters. A…
moneimne de9563b
Added czm_cubeMap and more test models
moneimne 543b3e5
Set up framework for creating the BRDF LUT. Shader not compiling yet.
moneimne e010cbe
Finished computing BRDF LUT and hooked it up as an automatic uniform
moneimne b78fb0e
Fixed brdfLUT lookup and doubleSided normal flip. Updated damagedHelm…
moneimne 3525ec0
Added clear blue skybox and updated metalRough textures to conform to…
moneimne e2cab40
Added horizon as environment map
moneimne 8b829f8
Merge remote-tracking branch 'origin/master' into gltf-2.0
emackey 1a76302
Merge remote-tracking branch 'moneimne/gltf-2.0' into gltf-1.99
emackey 52b0a9a
Delete file that was supposed to be ignored.
emackey f4115d3
Cleanup errors
emackey 01ebf75
Merge pull request #1 from emackey/gltf-1.99
moneimne a26e072
Updated glTF pipeline build and added some default functionality that…
moneimne d4c90c6
Added rest of glTF 2.0 samples
moneimne 4664d52
Can now read models with vec4 baseColor and joints. Still need to add…
moneimne 74480a8
Added animation to vertex shader, but entire model is moving based on…
moneimne 1dd1339
Finished implementing skeletal animations
moneimne b8d0642
Can read morph data from accessors. Shaders used fixed weights for now
moneimne a9df1e6
Initial morph target implementation finished
moneimne 0eb4d68
Removed print statement
moneimne 531408c
Updated shader math to support perceptual roughness changes
moneimne fc4bc50
Added fake LOD change that looks a little better for specular irradiance
moneimne 991efd9
Removed extraneous functions from processPbrMetallicRoughness that ar…
moneimne 720fedd
Cleaned up generateTechnique comments and ordering
moneimne d8cc327
Updated models
moneimne 8b01cfa
Merge branch 'master' into gltf-2.0
moneimne 38f36ab
Resolved merge conflicts
moneimne 18ba7c0
Fixed eslint errors
moneimne 2edfe41
Updated parseTextures function
moneimne 93a9f96
Model specs pass many more tests now
moneimne d28da9d
Fixed test case for moving byteStrides from accessors to bufferViews
moneimne 5f4d86c
Added new gltf-pipeline build
moneimne b472302
Fixed material updates that should not change values to arrays
moneimne daaaaf6
Updated gltf-pipeline to fix tests from changes
moneimne 5d10c5c
Added optimizeForCesium input
moneimne b6e2556
Merge branch 'master' into gltf-2.0
lilleyse c1e63cd
Fix deprecation warning
lilleyse 1596185
Properly loading materialsCommon models with textures
moneimne 817c659
Merge branch 'gltf-2.0' of github.com:moneimne/cesium into gltf-2.0
moneimne 1d4598c
moveByteStrideToBufferView now handles accessors with byteStride of 0
moneimne 182cafe
Added ambient color to models for testing purposes
moneimne 79dad91
Fixed inferBufferViewTargets to include morph targets
moneimne 50cf9cb
Fixed CRN and KTX
lilleyse 09307af
Fixed morph target to handle generic number of targets and doubled su…
moneimne bc2a37b
Merge branch 'gltf-2.0' of github.com:moneimne/cesium into gltf-2.0
moneimne 7731c77
Fix for loading glb v2
lilleyse 8b542e6
Fixed transparency in materialsCommon
moneimne 63991bf
Merge branch 'gltf-2.0' of github.com:moneimne/cesium into gltf-2.0
moneimne 255f236
Fix RTC and Batch Ids for b3dms using KHR_materials_common
lilleyse 0a51bcf
Added alphaMode implementation to shaders
moneimne 8bb50eb
Merge branch 'gltf-2.0' of github.com:moneimne/cesium into gltf-2.0
moneimne 6db39c5
Remove .slice and .fill occurences so IE works
lilleyse 61b53e9
Style fix from eslint
moneimne 4a4dbc1
Merge branch 'gltf-2.0' of github.com:moneimne/cesium into gltf-2.0
moneimne e828f02
Removed print statement
moneimne e2fca85
Fix for cmpt tiles and some simplification
lilleyse 90fdc47
Deleted output/output.gltf
lilleyse 613c403
Wrote test cases for 2.0 and added weights/skinning fix
moneimne 9c04df0
Removed old GLTF_SPEC comments
lilleyse 8387389
Added procedural environment changes from glTF pipeline PR
moneimne 9f73909
Removed old GLTF_SPEC comments
lilleyse 516e7b2
Added procedural environment changes from glTF pipeline PR
moneimne b0186b6
Rounded out tests and added test models
lilleyse f8f432c
Updated per PR reviews
moneimne 9c2f5d1
Iniital merge conflict fixes. Tests fail.
moneimne 611b5c7
Made fixes to destroy
moneimne b61b5a8
Updated CHANGES.md and LICENSE.md
moneimne 2a7e727
Fixes for a variety of tilesets
lilleyse 1e0ecef
Fix LICENSE.md spacing
lilleyse 40a1c04
Small fixes throughout
lilleyse ccd55dd
Fix tests and Sandcastle
lilleyse e006283
Merge branch 'master' into gltf-2.0
lilleyse 516d18c
Added sandcastle demo for PBR
moneimne 67ea9ad
Some Sandcastle demo cleanup
lilleyse 97fc4ec
Removed gltfDefaults.js
lilleyse 1ec3181
Fixed interleaved models and added test
lilleyse f73cb3c
Fix ClassificationPrimitive working on b3dm/i3dm
lilleyse 8610991
Fix skeleton and joint issues in updateVersion
lilleyse 40835a6
Use scene.skyBox instead of copy of default starmap.
emackey 14abad1
Fix some issues with LICENSE.md
emackey 7996f7c
Fix failing tests when running with webgl stub
lilleyse 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
Added horizon as environment map
- Loading branch information
commit e2cab40bc43baaacb63850fddffc98fca64e615d
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -43,6 +43,7 @@ define([ | |
'../Renderer/PassState', | ||
'../Renderer/PixelDatatype', | ||
'../Renderer/RenderState', | ||
'../Renderer/Sampler', | ||
'../Renderer/ShaderProgram', | ||
'../Renderer/ShaderSource', | ||
'../Renderer/Texture', | ||
|
@@ -120,6 +121,7 @@ define([ | |
PassState, | ||
PixelDatatype, | ||
RenderState, | ||
Sampler, | ||
ShaderProgram, | ||
ShaderSource, | ||
Texture, | ||
|
@@ -625,17 +627,18 @@ define([ | |
this._cubeMap = context.defaultCubeMap; | ||
var that = this; | ||
// buildModuleURL | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is this comment? |
||
var texturePath = buildModuleUrl('Assets/Textures/BlueSkyBox/'); | ||
var texturePath = buildModuleUrl('Assets/Textures/Horizon/'); | ||
var paths = { | ||
positiveX : texturePath + 'PositiveX.png', | ||
negativeX : texturePath + 'NegativeX.png', | ||
negativeX : texturePath + 'PositiveX.png', | ||
positiveY : texturePath + 'NegativeY.png', | ||
negativeY : texturePath + 'PositiveY.png', | ||
positiveZ : texturePath + 'PositiveZ.png', | ||
negativeZ : texturePath + 'NegativeZ.png' | ||
positiveZ : texturePath + 'PositiveX.png', | ||
negativeZ : texturePath + 'PositiveX.png' | ||
}; | ||
loadCubeMap(context, paths).then(function(cubeMap) { | ||
that._cubeMap = cubeMap; | ||
cubeMap.sampler = new Sampler(); | ||
}); | ||
|
||
this._terrainExaggeration = defaultValue(options.terrainExaggeration, 1.0); | ||
|
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.
This is all going away, right?
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.
The cube map stuff will stay because we are now using the star map instead of the horizon gradient. It is also going to be renamed from cubeMap to environmentMap for clarity.
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.
OK