Skip to content

Commit

Permalink
Removed vestigial byteStride references
Browse files Browse the repository at this point in the history
  • Loading branch information
lasalvavida committed Mar 21, 2017
1 parent 684c272 commit d426433
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 28 deletions.
2 changes: 0 additions & 2 deletions specs/lib/RemoveUnusedPropertiesSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,6 @@ describe('RemoveUnusedProperties', function() {
{
bufferView: 1,
byteOffset: 0,
byteStride: 0,
componentType: 5123,
count: 36,
type: 'SCALAR'
Expand Down Expand Up @@ -589,7 +588,6 @@ describe('RemoveUnusedProperties', function() {
{
bufferView: 0,
byteOffset: 0,
byteStride: 0,
componentType: 5123,
count: 36,
type: 'SCALAR'
Expand Down
7 changes: 0 additions & 7 deletions specs/lib/combineNodesSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,23 +215,20 @@ describe('combineNodes', function() {
{
bufferView : 0,
byteOffset : 0,
byteStride : 0,
componentType : WebGLConstants.FLOAT,
count : positions.length / 3,
type : "VEC3"
},
{
bufferView : 0,
byteOffset : normalsBuffer.length,
byteStride : 0,
componentType : WebGLConstants.FLOAT,
count : normals.length / 3,
type : "VEC3"
},
{
bufferView : 1,
byteOffset : 0,
byteStride : 0,
componentType : WebGLConstants.UNSIGNED_SHORT,
count : indices.length,
type : "SCALAR"
Expand Down Expand Up @@ -337,31 +334,27 @@ describe('combineNodes', function() {
{
bufferView : 0,
byteOffset : 0,
byteStride : 0,
componentType : WebGLConstants.FLOAT,
count : positions.length / 3,
type : "VEC3"
},
{
bufferView : 0,
byteOffset : normalsBuffer.length,
byteStride : 0,
componentType : WebGLConstants.FLOAT,
count : normals.length / 3,
type : "VEC3"
},
{
bufferView : 1,
byteOffset : 0,
byteStride : 0,
componentType : WebGLConstants.UNSIGNED_SHORT,
count : indices.length,
type : "SCALAR"
},
{
bufferView: 1,
byteOffset: indicesBuffer.length,
byteStride: 0,
componentType: WebGLConstants.UNSIGNED_SHORT,
count: overlappedIndices.length,
type: "SCALAR"
Expand Down
1 change: 0 additions & 1 deletion specs/lib/findAccessorMinMaxSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ describe('findAccessorMinMax', function() {
var gltfBufferView = gltf.bufferViews.bufferView;
gltfBufferView.byteLength = source.length;
var gltfAccessor = gltf.accessors.accessor;
gltfAccessor.byteStride = 0;

var minMax = findAccessorMinMax(gltf, gltfAccessor);
expect(minMax.min).toEqual(expectMin);
Expand Down
10 changes: 1 addition & 9 deletions specs/lib/mergeDuplicateVerticesSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,18 @@ describe('mergeDuplicateVertices', function() {
{
bufferView : 0,
byteOffset : 0,
byteStride : 0,
componentType : 5126,
count : 5,
type : 'VEC3'
}, {
bufferView : 1,
byteOffset : 0,
byteStride : 0,
componentType : 5123,
count : 5,
type : 'VEC2'
}, {
bufferView : 2,
bufferView : 2,
byteOffset : 0,
byteStride : 0,
componentType : 5123,
count : 9,
type : 'SCALAR'
Expand Down Expand Up @@ -114,35 +111,30 @@ describe('mergeDuplicateVertices', function() {
{
bufferView : 0,
byteOffset : 0,
byteStride : 0,
componentType : 5126,
count : 5,
type : 'VEC3'
}, {
bufferView : 1,
byteOffset : 0,
byteStride : 0,
componentType : 5126,
count : 5,
type : 'VEC3'
}, {
bufferView : 2,
byteOffset : 0,
byteStride : 0,
componentType : 5123,
count : 5,
type : 'VEC2'
}, {
bufferView : 3,
byteOffset : 0,
byteStride : 0,
componentType : 5123,
count : 5,
type : 'VEC2'
}, {
bufferView : 4,
byteOffset : 0,
byteStride : 0,
componentType : 5123,
count : 9,
type : 'SCALAR'
Expand Down
4 changes: 0 additions & 4 deletions specs/lib/octEncodeNormalsSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ describe('octEncodeNormals', function() {
accessors : [
{
byteOffset : 0,
byteStride : 0,
bufferView : 0,
componentType : WebGLConstants.FLOAT,
count : 3,
Expand Down Expand Up @@ -133,7 +132,6 @@ describe('octEncodeNormals', function() {
var gltf = {
accessors : [{
byteOffset : 0,
byteStride : 0,
bufferView : 0,
componentType : WebGLConstants.FLOAT,
count : 3,
Expand All @@ -146,7 +144,6 @@ describe('octEncodeNormals', function() {
type : 'VEC3'
}, {
byteOffset : 0,
byteStride : 0,
bufferView : 0,
componentType : WebGLConstants.FLOAT,
count : 3,
Expand All @@ -159,7 +156,6 @@ describe('octEncodeNormals', function() {
type : 'VEC3'
},{
byteOffset : 0,
byteStride : 0,
bufferView : 0,
componentType : WebGLConstants.FLOAT,
count : 3,
Expand Down
4 changes: 1 addition & 3 deletions specs/lib/quantizeAttributesSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ describe('quantizeAttributes', function() {
// Interleaved accessors in bufferView_0
bufferView : 0,
byteOffset : 0,
byteStride : 18,
componentType : 5126,
count : 3,
min : [-1.0, -1.0, -1.0],
Expand All @@ -22,7 +21,6 @@ describe('quantizeAttributes', function() {
}, {
bufferView : 0,
byteOffset : 12,
byteStride : 18,
componentType : 5123,
count : 3,
min : [-1.0, -1.0, -1.0],
Expand All @@ -32,7 +30,6 @@ describe('quantizeAttributes', function() {
// Block accessors in bufferView_1
bufferView : 1,
byteOffset : 0,
byteStride : 12,
componentType : 5126,
count : 3,
min : [-1.0, -1.0, -1.0],
Expand Down Expand Up @@ -83,6 +80,7 @@ describe('quantizeAttributes', function() {
buffer : 0,
byteLength : 48,
byteOffset : 0,
byteStride : 18,
target : 34962
},
{
Expand Down
1 change: 0 additions & 1 deletion specs/lib/uninterleaveAndPackBuffersSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ describe('uninterleaveAndPackBuffers', function() {
{
bufferView : 1,
byteOffset : 0,
byteStride : 12,
componentType : 5126,
count : 3,
type : 'VEC3'
Expand Down
1 change: 0 additions & 1 deletion specs/lib/updateVersionSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ describe('updateVersion', function() {
accessors: {
accessor: {
byteOffset: 0,
byteStride: 0,
bufferView: 'bufferView',
componentType: WebGLConstants.SHORT,
count: 6,
Expand Down

0 comments on commit d426433

Please sign in to comment.