Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix error when updating component type for accessors #418

Merged
merged 2 commits into from
Aug 20, 2018
Merged

Fix error when updating component type for accessors #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce0050
Fix error when updating component type for accessors
ggetz Aug 20, 2018
5098158
Update CHANGES.md
ggetz Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
Change Log
==========

### 2.0.0 2018-08-14
### 2.0.1 - ????

* Fixed a bug where the buffer `byteOffset` was not set properly when updating 1.0 accessor types to 2.0 allowed values. [#418](https://github.com/AnalyticalGraphicsInc/gltf-pipeline/pull/418)

### 2.0.0 - 2018-08-14

* Breaking changes
* Project updated to process glTF 2.0 models. Any glTF 1.0 models will be upgraded to glTF 2.0 automatically and use the `KHR_techniques_webgl` and `KHR_blend` extensions.
Expand Down Expand Up @@ -72,7 +76,7 @@ Change Log
* Change Cesium `Geometry`'s and `VertexFormat`'s `binormal` attribute to bitangent.
* Fixed a bug in `combinePrimitives` where combining primitives can overflow uint16 for the resulting indices. [#230](https://github.com/AnalyticalGraphicsInc/gltf-pipeline/issues/230)
* Made `generateNormals` stage optional and added `smoothNormals` option for generating smooth normals if the model does not have normals. [#240](https://github.com/AnalyticalGraphicsInc/gltf-pipeline/pull/240)
* `updateVersion` stage for upgrades the glTF version of an asset from `1.0` to `2.0`. [#223](https://github.com/AnalyticalGraphicsInc/gltf-pipeline/pull/223)
* `updateVersion` stage for upgrades the glTF version of an asset from `1.0` to `2.0`. [#223](https://github.com/AnalyticalGraphicsInc/gltf-pipeline/pull/223)
* All pipeline stages now operate on glTF `2.0` assets.

### 0.1.0-alpha10 - 2017-01-10
Expand Down
1 change: 1 addition & 0 deletions lib/updateAccessorComponentTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ function convertType(gltf, accessor, updatedComponentType) {
var newBuffer = new Uint8Array(typedArray.buffer);
accessor.bufferView = addBuffer(gltf, newBuffer);
accessor.componentType = updatedComponentType;
accessor.byteOffset = 0;
}
4 changes: 4 additions & 0 deletions specs/lib/updateAccessorComponentTypeSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ describe('updateAccessorComponentTypes', function() {
}, {
bufferView: 1,
componentType: WebGLConstants.FLOAT,
byteOffset: 12,
count: 24,
type: 'VEC4'
}, {
Expand Down Expand Up @@ -87,6 +88,7 @@ describe('updateAccessorComponentTypes', function() {

expect(gltf.accessors[1].componentType).toBe(WebGLConstants.UNSIGNED_SHORT);
expect(gltf.accessors[1].bufferView).toBe(4);
expect(gltf.accessors[1].byteOffset).toBe(0);
expect(gltf.bufferViews[4].buffer).toBe(2);
expect(gltf.bufferViews[4].byteLength).toBe(192);

Expand Down Expand Up @@ -125,6 +127,7 @@ describe('updateAccessorComponentTypes', function() {
}, {
bufferView: 1,
componentType: WebGLConstants.BYTE,
byteOffset: 12,
count: 24,
type: 'VEC4'
}, {
Expand Down Expand Up @@ -162,6 +165,7 @@ describe('updateAccessorComponentTypes', function() {

expect(gltf.accessors[1].componentType).toBe(WebGLConstants.UNSIGNED_BYTE);
expect(gltf.accessors[1].bufferView).toBe(3);
expect(gltf.accessors[1].byteOffset).toBe(0);
expect(gltf.bufferViews[3].buffer).toBe(1);
expect(gltf.bufferViews[3].byteLength).toBe(96);

Expand Down