Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
affbb2b8
T
three.js
项目概览
Ablesons
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
affbb2b8
编写于
3月 30, 2017
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
a1d29701
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
323 addition
and
247 deletion
+323
-247
build/three.js
build/three.js
+46
-8
build/three.min.js
build/three.min.js
+231
-231
build/three.module.js
build/three.module.js
+46
-8
未找到文件。
build/three.js
浏览文件 @
affbb2b8
...
@@ -11002,27 +11002,43 @@
...
@@ -11002,27 +11002,43 @@
//
//
if ( this.geometry !== undefined
) {
function serialise( library, element
) {
if (
meta.geometries[ this.geometry
.uuid ] === undefined ) {
if (
library[ element
.uuid ] === undefined ) {
meta.geometries[ this.geometry.uuid ] = this.geometry
.toJSON( meta );
library[ element.uuid ] = element
.toJSON( meta );
}
}
object.geometry = this.geometry.uuid;
return element.uuid;
}
if ( this.geometry !== undefined ) {
object.geometry = serialise( meta.geometries, this.geometry );
}
}
if ( this.material !== undefined ) {
if ( this.material !== undefined ) {
if (
meta.materials[ this.material.uuid ] === undefined
) {
if (
Array.isArray( this.material )
) {
meta.materials[ this.material.uuid ] = this.material.toJSON( meta )
;
var uuids = []
;
}
for ( var i = 0, l = this.material.length; i < l; i ++ ) {
uuids.push( serialise( meta.materials, this.material[ i ] ) );
object.material = this.material.uuid;
}
object.material = uuids;
} else {
object.material = serialise( meta.materials, this.material );
}
}
}
...
@@ -33762,6 +33778,28 @@
...
@@ -33762,6 +33778,28 @@
if ( name === undefined ) return undefined;
if ( name === undefined ) return undefined;
if ( Array.isArray( name ) ) {
var array = [];
for ( var i = 0, l = name.length; i < l; i ++ ) {
var uuid = name[ i ];
if ( materials[ uuid ] === undefined ) {
console.warn( 'THREE.ObjectLoader: Undefined material', uuid );
}
array.push( materials[ uuid ] );
}
return array;
}
if ( materials[ name ] === undefined ) {
if ( materials[ name ] === undefined ) {
console.warn( 'THREE.ObjectLoader: Undefined material', name );
console.warn( 'THREE.ObjectLoader: Undefined material', name );
...
...
build/three.min.js
浏览文件 @
affbb2b8
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
build/three.module.js
浏览文件 @
affbb2b8
...
@@ -10996,27 +10996,43 @@ Object.assign( Object3D.prototype, EventDispatcher.prototype, {
...
@@ -10996,27 +10996,43 @@ Object.assign( Object3D.prototype, EventDispatcher.prototype, {
//
//
if ( this.geometry !== undefined
) {
function serialise( library, element
) {
if (
meta.geometries[ this.geometry
.uuid ] === undefined ) {
if (
library[ element
.uuid ] === undefined ) {
meta.geometries[ this.geometry.uuid ] = this.geometry
.toJSON( meta );
library[ element.uuid ] = element
.toJSON( meta );
}
}
object.geometry = this.geometry.uuid;
return element.uuid;
}
if ( this.geometry !== undefined ) {
object.geometry = serialise( meta.geometries, this.geometry );
}
}
if ( this.material !== undefined ) {
if ( this.material !== undefined ) {
if (
meta.materials[ this.material.uuid ] === undefined
) {
if (
Array.isArray( this.material )
) {
meta.materials[ this.material.uuid ] = this.material.toJSON( meta )
;
var uuids = []
;
}
for ( var i = 0, l = this.material.length; i < l; i ++ ) {
uuids.push( serialise( meta.materials, this.material[ i ] ) );
object.material = this.material.uuid;
}
object.material = uuids;
} else {
object.material = serialise( meta.materials, this.material );
}
}
}
...
@@ -33756,6 +33772,28 @@ Object.assign( ObjectLoader.prototype, {
...
@@ -33756,6 +33772,28 @@ Object.assign( ObjectLoader.prototype, {
if ( name === undefined ) return undefined;
if ( name === undefined ) return undefined;
if ( Array.isArray( name ) ) {
var array = [];
for ( var i = 0, l = name.length; i < l; i ++ ) {
var uuid = name[ i ];
if ( materials[ uuid ] === undefined ) {
console.warn( 'THREE.ObjectLoader: Undefined material', uuid );
}
array.push( materials[ uuid ] );
}
return array;
}
if ( materials[ name ] === undefined ) {
if ( materials[ name ] === undefined ) {
console.warn( 'THREE.ObjectLoader: Undefined material', name );
console.warn( 'THREE.ObjectLoader: Undefined material', name );
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录