Skip to content

Commit e8a311b

Browse files
authored
Merge pull request #15156 from WestLangley/dev-instanced_buffer_attr
Accommodate change in signature of InstancedBufferAttribute constructor
2 parents e5d8de0 + b20e186 commit e8a311b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

examples/webgl_buffergeometry_instancing_billboards.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158

159159
}
160160

161-
geometry.addAttribute( 'translate', new THREE.InstancedBufferAttribute( translateArray, 3, 1 ) );
161+
geometry.addAttribute( 'translate', new THREE.InstancedBufferAttribute( translateArray, 3 ) );
162162

163163
material = new THREE.RawShaderMaterial( {
164164
uniforms: {

examples/webgl_interactive_instances_gpu.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -857,19 +857,19 @@
857857
igeo.addAttribute( 'position', vertices );
858858

859859
// var matrices = new THREE.InstancedBufferAttribute(
860-
// new Float32Array( instanceCount * 16 ), 16, 1
860+
// new Float32Array( instanceCount * 16 ), 16
861861
// );
862862
var mcol0 = new THREE.InstancedBufferAttribute(
863-
new Float32Array( instanceCount * 3 ), 3, 1
863+
new Float32Array( instanceCount * 3 ), 3
864864
);
865865
var mcol1 = new THREE.InstancedBufferAttribute(
866-
new Float32Array( instanceCount * 3 ), 3, 1
866+
new Float32Array( instanceCount * 3 ), 3
867867
);
868868
var mcol2 = new THREE.InstancedBufferAttribute(
869-
new Float32Array( instanceCount * 3 ), 3, 1
869+
new Float32Array( instanceCount * 3 ), 3
870870
);
871871
var mcol3 = new THREE.InstancedBufferAttribute(
872-
new Float32Array( instanceCount * 3 ), 3, 1
872+
new Float32Array( instanceCount * 3 ), 3
873873
);
874874
var matrix = new THREE.Matrix4();
875875
var me = matrix.elements;
@@ -899,7 +899,7 @@
899899

900900
};
901901
var colors = new THREE.InstancedBufferAttribute(
902-
new Float32Array( instanceCount * 3 ), 3, 1
902+
new Float32Array( instanceCount * 3 ), 3
903903
);
904904
for ( var i = 0, ul = colors.count; i < ul; i ++ ) {
905905

@@ -910,7 +910,7 @@
910910

911911
var col = new THREE.Color();
912912
var pickingColors = new THREE.InstancedBufferAttribute(
913-
new Float32Array( instanceCount * 3 ), 3, 1
913+
new Float32Array( instanceCount * 3 ), 3
914914
);
915915
for ( var i = 0, ul = pickingColors.count; i < ul; i ++ ) {
916916

0 commit comments

Comments
 (0)