未验证 提交 e8a311bb 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #15156 from WestLangley/dev-instanced_buffer_attr

Accommodate change in signature of InstancedBufferAttribute constructor
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
} }
geometry.addAttribute( 'translate', new THREE.InstancedBufferAttribute( translateArray, 3, 1 ) ); geometry.addAttribute( 'translate', new THREE.InstancedBufferAttribute( translateArray, 3 ) );
material = new THREE.RawShaderMaterial( { material = new THREE.RawShaderMaterial( {
uniforms: { uniforms: {
......
...@@ -857,19 +857,19 @@ ...@@ -857,19 +857,19 @@
igeo.addAttribute( 'position', vertices ); igeo.addAttribute( 'position', vertices );
// var matrices = new THREE.InstancedBufferAttribute( // var matrices = new THREE.InstancedBufferAttribute(
// new Float32Array( instanceCount * 16 ), 16, 1 // new Float32Array( instanceCount * 16 ), 16
// ); // );
var mcol0 = new THREE.InstancedBufferAttribute( var mcol0 = new THREE.InstancedBufferAttribute(
new Float32Array( instanceCount * 3 ), 3, 1 new Float32Array( instanceCount * 3 ), 3
); );
var mcol1 = new THREE.InstancedBufferAttribute( var mcol1 = new THREE.InstancedBufferAttribute(
new Float32Array( instanceCount * 3 ), 3, 1 new Float32Array( instanceCount * 3 ), 3
); );
var mcol2 = new THREE.InstancedBufferAttribute( var mcol2 = new THREE.InstancedBufferAttribute(
new Float32Array( instanceCount * 3 ), 3, 1 new Float32Array( instanceCount * 3 ), 3
); );
var mcol3 = new THREE.InstancedBufferAttribute( var mcol3 = new THREE.InstancedBufferAttribute(
new Float32Array( instanceCount * 3 ), 3, 1 new Float32Array( instanceCount * 3 ), 3
); );
var matrix = new THREE.Matrix4(); var matrix = new THREE.Matrix4();
var me = matrix.elements; var me = matrix.elements;
...@@ -899,7 +899,7 @@ ...@@ -899,7 +899,7 @@
}; };
var colors = new THREE.InstancedBufferAttribute( var colors = new THREE.InstancedBufferAttribute(
new Float32Array( instanceCount * 3 ), 3, 1 new Float32Array( instanceCount * 3 ), 3
); );
for ( var i = 0, ul = colors.count; i < ul; i ++ ) { for ( var i = 0, ul = colors.count; i < ul; i ++ ) {
...@@ -910,7 +910,7 @@ ...@@ -910,7 +910,7 @@
var col = new THREE.Color(); var col = new THREE.Color();
var pickingColors = new THREE.InstancedBufferAttribute( var pickingColors = new THREE.InstancedBufferAttribute(
new Float32Array( instanceCount * 3 ), 3, 1 new Float32Array( instanceCount * 3 ), 3
); );
for ( var i = 0, ul = pickingColors.count; i < ul; i ++ ) { for ( var i = 0, ul = pickingColors.count; i < ul; i ++ ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册