Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
3a015465
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,发现更多精彩内容 >>
提交
3a015465
编写于
9月 07, 2018
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
598155b4
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
283 addition
and
252 deletion
+283
-252
build/three.js
build/three.js
+19
-4
build/three.min.js
build/three.min.js
+245
-244
build/three.module.js
build/three.module.js
+19
-4
未找到文件。
build/three.js
浏览文件 @
3a015465
...
...
@@ -1928,6 +1928,8 @@
Object.assign( Quaternion, {
isQuaternion: true,
slerp: function ( qa, qb, qm, t ) {
return qm.copy( qa ).slerp( qb, t );
...
...
@@ -12787,6 +12789,9 @@
data.envMap = this.envMap.toJSON( meta ).uuid;
data.reflectivity = this.reflectivity; // Scale behind envMap
if ( this.combine !== undefined ) data.combine = this.combine;
if ( this.envMapIntensity !== undefined ) data.envMapIntensity = this.envMapIntensity;
}
if ( this.gradientMap && this.gradientMap.isTexture ) {
...
...
@@ -15635,14 +15640,22 @@
* @author Artur Trzesiok
*/
function Texture3D( data, width, height, depth
, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy, encoding
) {
function Texture3D( data, width, height, depth ) {
Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding );
// We're going to add .setXXX() methods for setting properties later.
// Users can still set in Texture3D directly.
//
// var texture = new THREE.Texture3D( data, width, height, depth );
// texture.anisotropy = 16;
//
// See #14839
Texture.call( this, null );
this.image = { data: data, width: width, height: height, depth: depth };
this.magFilter =
magFilter !== undefined ? magFilter :
NearestFilter;
this.minFilter =
minFilter !== undefined ? minFilter :
NearestFilter;
this.magFilter = NearestFilter;
this.minFilter = NearestFilter;
this.generateMipmaps = false;
this.flipY = false;
...
...
@@ -37155,6 +37168,7 @@
if ( json.fog !== undefined ) material.fog = json.fog;
if ( json.flatShading !== undefined ) material.flatShading = json.flatShading;
if ( json.blending !== undefined ) material.blending = json.blending;
if ( json.combine !== undefined ) material.combine = json.combine;
if ( json.side !== undefined ) material.side = json.side;
if ( json.opacity !== undefined ) material.opacity = json.opacity;
if ( json.transparent !== undefined ) material.transparent = json.transparent;
...
...
@@ -37288,6 +37302,7 @@
if ( json.specularMap !== undefined ) material.specularMap = getTexture( json.specularMap );
if ( json.envMap !== undefined ) material.envMap = getTexture( json.envMap );
if ( json.envMapIntensity !== undefined ) material.envMapIntensity = json.envMapIntensity;
if ( json.reflectivity !== undefined ) material.reflectivity = json.reflectivity;
build/three.min.js
浏览文件 @
3a015465
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
build/three.module.js
浏览文件 @
3a015465
...
...
@@ -1922,6 +1922,8 @@ function Quaternion( x, y, z, w ) {
Object.assign( Quaternion, {
isQuaternion: true,
slerp: function ( qa, qb, qm, t ) {
return qm.copy( qa ).slerp( qb, t );
...
...
@@ -12781,6 +12783,9 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
data.envMap = this.envMap.toJSON( meta ).uuid;
data.reflectivity = this.reflectivity; // Scale behind envMap
if ( this.combine !== undefined ) data.combine = this.combine;
if ( this.envMapIntensity !== undefined ) data.envMapIntensity = this.envMapIntensity;
}
if ( this.gradientMap && this.gradientMap.isTexture ) {
...
...
@@ -15629,14 +15634,22 @@ Object.defineProperty( CubeTexture.prototype, 'images', {
* @author Artur Trzesiok
*/
function Texture3D( data, width, height, depth
, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy, encoding
) {
function Texture3D( data, width, height, depth ) {
Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding );
// We're going to add .setXXX() methods for setting properties later.
// Users can still set in Texture3D directly.
//
// var texture = new THREE.Texture3D( data, width, height, depth );
// texture.anisotropy = 16;
//
// See #14839
Texture.call( this, null );
this.image = { data: data, width: width, height: height, depth: depth };
this.magFilter =
magFilter !== undefined ? magFilter :
NearestFilter;
this.minFilter =
minFilter !== undefined ? minFilter :
NearestFilter;
this.magFilter = NearestFilter;
this.minFilter = NearestFilter;
this.generateMipmaps = false;
this.flipY = false;
...
...
@@ -37149,6 +37162,7 @@ Object.assign( MaterialLoader.prototype, {
if ( json.fog !== undefined ) material.fog = json.fog;
if ( json.flatShading !== undefined ) material.flatShading = json.flatShading;
if ( json.blending !== undefined ) material.blending = json.blending;
if ( json.combine !== undefined ) material.combine = json.combine;
if ( json.side !== undefined ) material.side = json.side;
if ( json.opacity !== undefined ) material.opacity = json.opacity;
if ( json.transparent !== undefined ) material.transparent = json.transparent;
...
...
@@ -37282,6 +37296,7 @@ Object.assign( MaterialLoader.prototype, {
if ( json.specularMap !== undefined ) material.specularMap = getTexture( json.specularMap );
if ( json.envMap !== undefined ) material.envMap = getTexture( json.envMap );
if ( json.envMapIntensity !== undefined ) material.envMapIntensity = json.envMapIntensity;
if ( json.reflectivity !== undefined ) material.reflectivity = json.reflectivity;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录