浏览代码

Merge pull request #6211 from makc/buffer-geometry-loader-fix

BGL.parse fix
Mr.doob 10 年之前
父节点
当前提交
26b71211cc
共有 3 个文件被更改,包括 7 次插入4 次删除
  1. 3 0
      examples/models/json/pressure.json
  2. 3 3
      src/loaders/BufferGeometryLoader.js
  3. 1 1
      src/loaders/ObjectLoader.js

文件差异内容过多而无法显示
+ 3 - 0
examples/models/json/pressure.json


+ 3 - 3
src/loaders/BufferGeometryLoader.js

@@ -36,7 +36,7 @@ THREE.BufferGeometryLoader.prototype = {
 
 
 		var geometry = new THREE.BufferGeometry();
 		var geometry = new THREE.BufferGeometry();
 
 
-		var attributes = json.attributes;
+		var attributes = json.data.attributes;
 
 
 		for ( var key in attributes ) {
 		for ( var key in attributes ) {
 
 
@@ -47,7 +47,7 @@ THREE.BufferGeometryLoader.prototype = {
 
 
 		}
 		}
 
 
-		var offsets = json.offsets;
+		var offsets = json.data.offsets;
 
 
 		if ( offsets !== undefined ) {
 		if ( offsets !== undefined ) {
 
 
@@ -55,7 +55,7 @@ THREE.BufferGeometryLoader.prototype = {
 
 
 		}
 		}
 
 
-		var boundingSphere = json.boundingSphere;
+		var boundingSphere = json.data.boundingSphere;
 
 
 		if ( boundingSphere !== undefined ) {
 		if ( boundingSphere !== undefined ) {
 
 

+ 1 - 1
src/loaders/ObjectLoader.js

@@ -183,7 +183,7 @@ THREE.ObjectLoader.prototype = {
 
 
 					case 'BufferGeometry':
 					case 'BufferGeometry':
 
 
-						geometry = bufferGeometryLoader.parse( data.data );
+						geometry = bufferGeometryLoader.parse( data );
 
 
 						break;
 						break;
 
 

部分文件因为文件数量过多而无法显示