Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
755a2284
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,发现更多精彩内容 >>
提交
755a2284
编写于
3月 04, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
23dadbe3
变更
2
展开全部
显示空白变更内容
内联
并排
Showing
2 changed file
with
332 addition
and
382 deletion
+332
-382
build/three.js
build/three.js
+187
-237
build/three.min.js
build/three.min.js
+145
-145
未找到文件。
build/three.js
浏览文件 @
755a2284
...
...
@@ -26510,21 +26510,10 @@ THREE.WebGLRenderer = function ( parameters ) {
}
function loadUniform
sGeneric ( uniforms
) {
function loadUniform
( uniform, type, location, value
) {
var texture, textureUnit;
for ( var j = 0, jl = uniforms.length; j < jl; j ++ ) {
var uniform = uniforms[ j ][ 0 ];
// needsUpdate property is not added to all uniforms.
if ( uniform.needsUpdate === false ) continue;
var type = uniform.type;
var value = uniform.value;
var location = uniforms[ j ][ 1 ];
if ( type === '1i' ) {
_gl.uniform1i( location, value );
...
...
@@ -26613,93 +26602,37 @@ THREE.WebGLRenderer = function ( parameters ) {
// single THREE.Color
_gl.uniform3f( location, value.r, value.g, value.b );
/*
} else if ( type === 's' ) {
// TODO: Optimize this
for ( var propertyName in uniform.properties ) {
var property = uniform.properties[ propertyName ];
var locationProperty = location[ propertyName ];
var valueProperty = value[ propertyName ];
type = property.type;
var properties = uniform.properties;
if ( type === 'i'
) {
for ( var name in properties
) {
_gl.uniform1i( locationProperty, valueProperty );
var property = properties[ name ];
var locationProperty = location[ name ];
var valueProperty = value[ name ];
} else if ( type === 'f' ) {
_gl.uniform1f( locationProperty, valueProperty );
} else if ( type === 'v2' ) {
_gl.uniform2f( locationProperty, valueProperty.x, valueProperty.y );
} else if ( type === 'v3' ) {
_gl.uniform3f( locationProperty, valueProperty.x, valueProperty.y, valueProperty.z );
} else if ( type === 'v4' ) {
_gl.uniform4f( locationProperty, valueProperty.x, valueProperty.y, valueProperty.z, valueProperty.w );
} else if ( type === 'c' ) {
_gl.uniform3f( locationProperty, valueProperty.r, valueProperty.g, valueProperty.b );
}
loadUniform( property, property.type, locationProperty, valueProperty );
}
*/
} else if ( type === 'sa' ) {
// TODO: Optimize this
for ( var i = 0; i < value.length; i ++ ) {
for ( var propertyName in uniform.properties ) {
var properties = uniform.properties;
var property = uniform.properties[ propertyName ];
var locationProperty = location[ i ][ propertyName ];
var valueProperty = value[ i ][ propertyName ];
for ( var i = 0, l = value.length; i < l; i ++ ) {
type = property.type;
for ( var name in properties ) {
if ( type === 'i' ) {
var property = properties[ name ];
var locationProperty = location[ i ][ name ];
var valueProperty = value[ i ][ name ];
_gl.uniform1i( locationProperty, valueProperty );
} else if ( type === 'f' ) {
_gl.uniform1f( locationProperty, valueProperty );
} else if ( type === 'v2' ) {
_gl.uniform2f( locationProperty, valueProperty.x, valueProperty.y );
} else if ( type === 'v3' ) {
_gl.uniform3f( locationProperty, valueProperty.x, valueProperty.y, valueProperty.z );
} else if ( type === 'v4' ) {
_gl.uniform4f( locationProperty, valueProperty.x, valueProperty.y, valueProperty.z, valueProperty.w );
} else if ( type === 'c' ) {
_gl.uniform3f( locationProperty, valueProperty.r, valueProperty.g, valueProperty.b );
} else if ( type === 'm4' ) {
_gl.uniformMatrix4fv( locationProperty, false, valueProperty.elements );
}
loadUniform( property, property.type, locationProperty, valueProperty );
}
...
...
@@ -26845,7 +26778,7 @@ THREE.WebGLRenderer = function ( parameters ) {
_gl.uniform1i( location, textureUnit );
if ( ! texture ) continue
;
if ( ! texture ) return
;
if ( texture instanceof THREE.CubeTexture ||
( Array.isArray( texture.image ) && texture.image.length === 6 ) ) {
...
...
@@ -26924,6 +26857,23 @@ THREE.WebGLRenderer = function ( parameters ) {
}
function loadUniformsGeneric( uniforms ) {
for ( var i = 0, l = uniforms.length; i < l; i ++ ) {
var uniform = uniforms[ i ][ 0 ];
// needsUpdate property is not added to all uniforms.
if ( uniform.needsUpdate === false ) continue;
var type = uniform.type;
var location = uniforms[ i ][ 1 ];
var value = uniform.value;
loadUniform( uniform, type, location, value );
}
}
function setupLights ( lights, camera ) {
...
...
build/three.min.js
浏览文件 @
755a2284
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录