|
@@ -354,7 +354,7 @@
|
|
var mouse = new THREE.Vector2();
|
|
var mouse = new THREE.Vector2();
|
|
var scale = 1.03;
|
|
var scale = 1.03;
|
|
|
|
|
|
- var loader = new THREE.JSONLoader();
|
|
|
|
|
|
+ var loader = new THREE.BufferGeometryLoader();
|
|
|
|
|
|
//create buffer for reading a single pixel
|
|
//create buffer for reading a single pixel
|
|
var pixelBuffer = new Uint8Array( 4 );
|
|
var pixelBuffer = new Uint8Array( 4 );
|
|
@@ -500,8 +500,9 @@
|
|
clean();
|
|
clean();
|
|
|
|
|
|
// make instances
|
|
// make instances
|
|
- loader.load( 'models/json/suzanne_geometry.json', function ( geo ) {
|
|
|
|
|
|
+ loader.load( 'models/json/suzanne_buffergeometry.json', function ( geo ) {
|
|
|
|
|
|
|
|
+ geo = geo.toNonIndexed();
|
|
geo.computeBoundingBox();
|
|
geo.computeBoundingBox();
|
|
geo.boundingBox.getSize( geometrySize );
|
|
geo.boundingBox.getSize( geometrySize );
|
|
geometryList.push( geo );
|
|
geometryList.push( geo );
|
|
@@ -740,14 +741,11 @@
|
|
|
|
|
|
// geometry
|
|
// geometry
|
|
|
|
|
|
- var bgeo = new THREE.BufferGeometry().fromGeometry( geo );
|
|
|
|
- geometryList.push( bgeo );
|
|
|
|
-
|
|
|
|
var mgeo = new THREE.BufferGeometry();
|
|
var mgeo = new THREE.BufferGeometry();
|
|
geometryList.push( mgeo );
|
|
geometryList.push( mgeo );
|
|
|
|
|
|
- var pos = bgeo.attributes.position;
|
|
|
|
- var posLen = bgeo.attributes.position.count * 3;
|
|
|
|
|
|
+ var pos = geo.attributes.position;
|
|
|
|
+ var posLen = geo.attributes.position.count * 3;
|
|
var vertices = new THREE.BufferAttribute(
|
|
var vertices = new THREE.BufferAttribute(
|
|
new Float32Array( instanceCount * posLen ), 3
|
|
new Float32Array( instanceCount * posLen ), 3
|
|
);
|
|
);
|
|
@@ -846,13 +844,10 @@
|
|
|
|
|
|
// geometry
|
|
// geometry
|
|
|
|
|
|
- var bgeo = new THREE.BufferGeometry().fromGeometry( geo );
|
|
|
|
- geometryList.push( bgeo );
|
|
|
|
-
|
|
|
|
var igeo = new THREE.InstancedBufferGeometry();
|
|
var igeo = new THREE.InstancedBufferGeometry();
|
|
geometryList.push( igeo );
|
|
geometryList.push( igeo );
|
|
|
|
|
|
- var vertices = bgeo.attributes.position.clone();
|
|
|
|
|
|
+ var vertices = geo.attributes.position.clone();
|
|
igeo.addAttribute( 'position', vertices );
|
|
igeo.addAttribute( 'position', vertices );
|
|
|
|
|
|
// var matrices = new THREE.InstancedBufferAttribute(
|
|
// var matrices = new THREE.InstancedBufferAttribute(
|