Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
7c83499f
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，发现更多精彩内容 >>
提交
7c83499f
编写于
7月 17, 2017
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
8528cf43
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
182 addition
and
164 deletion
+182
-164
build/three.js
build/three.js
+52
-43
build/three.min.js
build/three.min.js
+78
-78
build/three.module.js
build/three.module.js
+52
-43
未找到文件。
build/three.js
浏览文件 @
7c83499f
...
...
@@ -13411,6 +13411,10 @@
} );
/**
* @author mrdoob / http://mrdoob.com/
*/
function arrayMax( array ) {
if ( array.length === 0 ) return - Infinity;
...
...
@@ -19376,69 +19380,83 @@
}
if (
( blending !== CustomBlending ) && ( blending !== currentBlending || premultipliedAlpha !== currentPremultipledAlpha )
) {
if (
blending !== CustomBlending
) {
if ( blending
=== AdditiveBlending
) {
if ( blending
!== currentBlending || premultipliedAlpha !== currentPremultipledAlpha
) {
if ( premultipliedAlpha
) {
switch ( blending
) {
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE, gl.ONE, gl.ONE );
case AdditiveBlending:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquation(
gl.FUNC_ADD );
gl.blendFunc( gl.SRC_ALPHA
, gl.ONE );
gl.blendEquationSeparate( gl.FUNC_ADD,
gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE, gl.ONE
, gl.ONE );
}
} else {
} else if ( blending === SubtractiveBlending ) {
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.SRC_ALPHA, gl.ONE );
if ( premultipliedAlpha ) {
}
break;
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ONE_MINUS_SRC_ALPHA );
case SubtractiveBlending:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquation(
gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.ONE_MINUS_SRC_COLOR
);
gl.blendEquationSeparate( gl.FUNC_ADD,
gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ONE_MINUS_SRC_ALPHA
);
}
} else {
} else if ( blending === MultiplyBlending ) {
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.ONE_MINUS_SRC_COLOR );
if ( premultipliedAlpha ) {
}
break;
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.SRC_COLOR, gl.ZERO, gl.SRC_ALPHA );
case MultiplyBlending:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquation(
gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.SRC_COLOR
);
gl.blendEquationSeparate( gl.FUNC_ADD,
gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.SRC_COLOR, gl.ZERO, gl.SRC_ALPHA
);
}
} else {
} else {
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.SRC_COLOR );
if ( premultipliedAlpha ) {
}
break;
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
default:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
} else {
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
}
}
}
}
currentBlendEquation = null;
currentBlendSrc = null;
currentBlendDst = null;
currentBlendEquationAlpha = null;
currentBlendSrcAlpha = null;
currentBlendDstAlpha = null;
if ( blending === CustomBlending )
{
} else
{
blendEquationAlpha = blendEquationAlpha || blendEquation;
blendSrcAlpha = blendSrcAlpha || blendSrc;
...
...
@@ -19464,15 +19482,6 @@
}
} else {
currentBlendEquation = null;
currentBlendSrc = null;
currentBlendDst = null;
currentBlendEquationAlpha = null;
currentBlendSrcAlpha = null;
currentBlendDstAlpha = null;
}
currentBlending = blending;
...
...
build/three.min.js
浏览文件 @
7c83499f
此差异已折叠。
点击以展开。
build/three.module.js
浏览文件 @
7c83499f
...
...
@@ -13405,6 +13405,10 @@ Object.assign( DirectGeometry.prototype, {
} );
/**
* @author mrdoob / http://mrdoob.com/
*/
function arrayMax( array ) {
if ( array.length === 0 ) return - Infinity;
...
...
@@ -19370,69 +19374,83 @@ function WebGLState( gl, extensions, paramThreeToGL ) {
}
if (
( blending !== CustomBlending ) && ( blending !== currentBlending || premultipliedAlpha !== currentPremultipledAlpha )
) {
if (
blending !== CustomBlending
) {
if ( blending
=== AdditiveBlending
) {
if ( blending
!== currentBlending || premultipliedAlpha !== currentPremultipledAlpha
) {
if ( premultipliedAlpha
) {
switch ( blending
) {
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE, gl.ONE, gl.ONE );
case AdditiveBlending:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquation(
gl.FUNC_ADD );
gl.blendFunc( gl.SRC_ALPHA
, gl.ONE );
gl.blendEquationSeparate( gl.FUNC_ADD,
gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE, gl.ONE
, gl.ONE );
}
} else {
} else if ( blending === SubtractiveBlending ) {
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.SRC_ALPHA, gl.ONE );
if ( premultipliedAlpha ) {
}
break;
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ONE_MINUS_SRC_ALPHA );
case SubtractiveBlending:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquation(
gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.ONE_MINUS_SRC_COLOR
);
gl.blendEquationSeparate( gl.FUNC_ADD,
gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ONE_MINUS_SRC_ALPHA
);
}
} else {
} else if ( blending === MultiplyBlending ) {
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.ONE_MINUS_SRC_COLOR );
if ( premultipliedAlpha ) {
}
break;
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.SRC_COLOR, gl.ZERO, gl.SRC_ALPHA );
case MultiplyBlending:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquation(
gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.SRC_COLOR
);
gl.blendEquationSeparate( gl.FUNC_ADD,
gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ZERO, gl.SRC_COLOR, gl.ZERO, gl.SRC_ALPHA
);
}
} else {
} else {
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.SRC_COLOR );
if ( premultipliedAlpha ) {
}
break;
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
default:
} else
{
if ( premultipliedAlpha )
{
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
} else {
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
}
}
}
}
currentBlendEquation = null;
currentBlendSrc = null;
currentBlendDst = null;
currentBlendEquationAlpha = null;
currentBlendSrcAlpha = null;
currentBlendDstAlpha = null;
if ( blending === CustomBlending )
{
} else
{
blendEquationAlpha = blendEquationAlpha || blendEquation;
blendSrcAlpha = blendSrcAlpha || blendSrc;
...
...
@@ -19458,15 +19476,6 @@ function WebGLState( gl, extensions, paramThreeToGL ) {
}
} else {
currentBlendEquation = null;
currentBlendSrc = null;
currentBlendDst = null;
currentBlendEquationAlpha = null;
currentBlendSrcAlpha = null;
currentBlendDstAlpha = null;
}
currentBlending = blending;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑！
取消
想要评论请
注册
或
登录
