Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
f697f1ca
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,发现更多精彩内容 >>
提交
f697f1ca
编写于
3月 10, 2019
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
WebGLRenderer: Remove .setTexture3D() and .setTexture2DArray().
上级
dbc2f0e9
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
31 addition
and
30 deletion
+31
-30
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+3
-15
src/renderers/webgl/WebGLProgram.d.ts
src/renderers/webgl/WebGLProgram.d.ts
+9
-1
src/renderers/webgl/WebGLProgram.js
src/renderers/webgl/WebGLProgram.js
+2
-2
src/renderers/webgl/WebGLPrograms.d.ts
src/renderers/webgl/WebGLPrograms.d.ts
+4
-1
src/renderers/webgl/WebGLPrograms.js
src/renderers/webgl/WebGLPrograms.js
+2
-2
src/renderers/webgl/WebGLUniforms.d.ts
src/renderers/webgl/WebGLUniforms.d.ts
+2
-1
src/renderers/webgl/WebGLUniforms.js
src/renderers/webgl/WebGLUniforms.js
+9
-8
未找到文件。
src/renderers/WebGLRenderer.js
浏览文件 @
f697f1ca
...
@@ -277,7 +277,7 @@ function WebGLRenderer( parameters ) {
...
@@ -277,7 +277,7 @@ function WebGLRenderer( parameters ) {
geometries
=
new
WebGLGeometries
(
_gl
,
attributes
,
info
);
geometries
=
new
WebGLGeometries
(
_gl
,
attributes
,
info
);
objects
=
new
WebGLObjects
(
geometries
,
info
);
objects
=
new
WebGLObjects
(
geometries
,
info
);
morphtargets
=
new
WebGLMorphtargets
(
_gl
);
morphtargets
=
new
WebGLMorphtargets
(
_gl
);
programCache
=
new
WebGLPrograms
(
_this
,
extensions
,
capabilities
);
programCache
=
new
WebGLPrograms
(
_this
,
extensions
,
capabilities
,
textures
);
renderLists
=
new
WebGLRenderLists
();
renderLists
=
new
WebGLRenderLists
();
renderStates
=
new
WebGLRenderStates
();
renderStates
=
new
WebGLRenderStates
();
...
@@ -1950,13 +1950,13 @@ function WebGLRenderer( parameters ) {
...
@@ -1950,13 +1950,13 @@ function WebGLRenderer( parameters ) {
if
(
m_uniforms
.
ltc_1
!==
undefined
)
m_uniforms
.
ltc_1
.
value
=
UniformsLib
.
LTC_1
;
if
(
m_uniforms
.
ltc_1
!==
undefined
)
m_uniforms
.
ltc_1
.
value
=
UniformsLib
.
LTC_1
;
if
(
m_uniforms
.
ltc_2
!==
undefined
)
m_uniforms
.
ltc_2
.
value
=
UniformsLib
.
LTC_2
;
if
(
m_uniforms
.
ltc_2
!==
undefined
)
m_uniforms
.
ltc_2
.
value
=
UniformsLib
.
LTC_2
;
WebGLUniforms
.
upload
(
_gl
,
materialProperties
.
uniformsList
,
m_uniforms
,
_this
);
WebGLUniforms
.
upload
(
_gl
,
materialProperties
.
uniformsList
,
m_uniforms
,
_this
,
textures
);
}
}
if
(
material
.
isShaderMaterial
&&
material
.
uniformsNeedUpdate
===
true
)
{
if
(
material
.
isShaderMaterial
&&
material
.
uniformsNeedUpdate
===
true
)
{
WebGLUniforms
.
upload
(
_gl
,
materialProperties
.
uniformsList
,
m_uniforms
,
_this
);
WebGLUniforms
.
upload
(
_gl
,
materialProperties
.
uniformsList
,
m_uniforms
,
_this
,
textures
);
material
.
uniformsNeedUpdate
=
false
;
material
.
uniformsNeedUpdate
=
false
;
}
}
...
@@ -2466,18 +2466,6 @@ function WebGLRenderer( parameters ) {
...
@@ -2466,18 +2466,6 @@ function WebGLRenderer( parameters ) {
}()
);
}()
);
this
.
setTexture2DArray
=
function
(
texture
,
slot
)
{
textures
.
setTexture2DArray
(
texture
,
slot
);
};
this
.
setTexture3D
=
function
(
texture
,
slot
)
{
textures
.
setTexture3D
(
texture
,
slot
);
};
this
.
setTexture
=
(
function
()
{
this
.
setTexture
=
(
function
()
{
var
warned
=
false
;
var
warned
=
false
;
...
...
src/renderers/webgl/WebGLProgram.d.ts
浏览文件 @
f697f1ca
import
{
WebGLRenderer
,
WebGLRendererParameters
}
from
'
./../WebGLRenderer
'
;
import
{
WebGLRenderer
,
WebGLRendererParameters
}
from
'
./../WebGLRenderer
'
;
import
{
ShaderMaterial
}
from
'
./../../materials/ShaderMaterial
'
;
import
{
ShaderMaterial
}
from
'
./../../materials/ShaderMaterial
'
;
import
{
WebGLShader
}
from
'
./WebGLShader
'
;
import
{
WebGLShader
}
from
'
./WebGLShader
'
;
import
{
WebGLCapabilities
}
from
'
./WebGLCapabilities
'
;
import
{
WebGLExtensions
}
from
'
./WebGLExtensions
'
;
import
{
WebGLShader
}
from
'
./WebGLShader
'
;
import
{
WebGLTextures
}
from
'
./WebGLTextures
'
;
import
{
WebGLUniforms
}
from
'
./WebGLUniforms
'
;
import
{
WebGLUniforms
}
from
'
./WebGLUniforms
'
;
export
class
WebGLProgram
{
export
class
WebGLProgram
{
constructor
(
constructor
(
renderer
:
WebGLRenderer
,
renderer
:
WebGLRenderer
,
extensions
:
WebGLExtensions
,
code
:
string
,
code
:
string
,
material
:
ShaderMaterial
,
material
:
ShaderMaterial
,
parameters
:
WebGLRendererParameters
shader
:
WebGLShader
,
parameters
:
WebGLRendererParameters
,
capabilities
:
WebGLCapabilities
,
textures
:
WebGLTextures
);
);
id
:
number
;
id
:
number
;
...
...
src/renderers/webgl/WebGLProgram.js
浏览文件 @
f697f1ca
...
@@ -206,7 +206,7 @@ function unrollLoops( string ) {
...
@@ -206,7 +206,7 @@ function unrollLoops( string ) {
}
}
function
WebGLProgram
(
renderer
,
extensions
,
code
,
material
,
shader
,
parameters
,
capabilities
)
{
function
WebGLProgram
(
renderer
,
extensions
,
code
,
material
,
shader
,
parameters
,
capabilities
,
textures
)
{
var
gl
=
renderer
.
context
;
var
gl
=
renderer
.
context
;
...
@@ -670,7 +670,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
...
@@ -670,7 +670,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
if
(
cachedUniforms
===
undefined
)
{
if
(
cachedUniforms
===
undefined
)
{
cachedUniforms
=
new
WebGLUniforms
(
gl
,
program
,
renderer
);
cachedUniforms
=
new
WebGLUniforms
(
gl
,
program
,
renderer
,
textures
);
}
}
...
...
src/renderers/webgl/WebGLPrograms.d.ts
浏览文件 @
f697f1ca
import
{
WebGLRenderer
}
from
'
./../WebGLRenderer
'
;
import
{
WebGLRenderer
}
from
'
./../WebGLRenderer
'
;
import
{
WebGLProgram
}
from
'
./WebGLProgram
'
;
import
{
WebGLProgram
}
from
'
./WebGLProgram
'
;
import
{
WebGLCapabilities
}
from
'
./WebGLCapabilities
'
;
import
{
WebGLExtensions
}
from
'
./WebGLExtensions
'
;
import
{
WebGLTextures
}
from
'
./WebGLTextures
'
;
import
{
ShaderMaterial
}
from
'
./../../materials/ShaderMaterial
'
;
import
{
ShaderMaterial
}
from
'
./../../materials/ShaderMaterial
'
;
export
class
WebGLPrograms
{
export
class
WebGLPrograms
{
constructor
(
renderer
:
WebGLRenderer
,
capabilities
:
any
);
constructor
(
renderer
:
WebGLRenderer
,
extensions
:
WebGLExtensions
,
capabilities
:
WebGLCapabilities
,
textures
:
WebGLTextures
);
programs
:
WebGLProgram
[];
programs
:
WebGLProgram
[];
...
...
src/renderers/webgl/WebGLPrograms.js
浏览文件 @
f697f1ca
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
import
{
BackSide
,
DoubleSide
,
CubeUVRefractionMapping
,
CubeUVReflectionMapping
,
GammaEncoding
,
LinearEncoding
,
ObjectSpaceNormalMap
}
from
'
../../constants.js
'
;
import
{
BackSide
,
DoubleSide
,
CubeUVRefractionMapping
,
CubeUVReflectionMapping
,
GammaEncoding
,
LinearEncoding
,
ObjectSpaceNormalMap
}
from
'
../../constants.js
'
;
import
{
WebGLProgram
}
from
'
./WebGLProgram.js
'
;
import
{
WebGLProgram
}
from
'
./WebGLProgram.js
'
;
function
WebGLPrograms
(
renderer
,
extensions
,
capabilities
)
{
function
WebGLPrograms
(
renderer
,
extensions
,
capabilities
,
textures
)
{
var
programs
=
[];
var
programs
=
[];
...
@@ -279,7 +279,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
...
@@ -279,7 +279,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
if
(
program
===
undefined
)
{
if
(
program
===
undefined
)
{
program
=
new
WebGLProgram
(
renderer
,
extensions
,
code
,
material
,
shader
,
parameters
,
capabilities
);
program
=
new
WebGLProgram
(
renderer
,
extensions
,
code
,
material
,
shader
,
parameters
,
capabilities
,
textures
);
programs
.
push
(
program
);
programs
.
push
(
program
);
}
}
...
...
src/renderers/webgl/WebGLUniforms.d.ts
浏览文件 @
f697f1ca
import
{
WebGLProgram
}
from
'
./WebGLProgram
'
;
import
{
WebGLProgram
}
from
'
./WebGLProgram
'
;
import
{
WebGLRenderer
}
from
'
./../WebGLRenderer
'
;
import
{
WebGLRenderer
}
from
'
./../WebGLRenderer
'
;
import
{
WebGLTextures
}
from
'
./WebGLTextures
'
;
export
class
WebGLUniforms
{
export
class
WebGLUniforms
{
constructor
(
gl
:
any
,
program
:
WebGLProgram
,
renderer
:
WebGLRenderer
);
constructor
(
gl
:
any
,
program
:
WebGLProgram
,
renderer
:
WebGLRenderer
,
textures
:
WebGLTextures
);
renderer
:
WebGLRenderer
;
renderer
:
WebGLRenderer
;
...
...
src/renderers/webgl/WebGLUniforms.js
浏览文件 @
f697f1ca
...
@@ -392,7 +392,7 @@ function setValueT1( gl, v, renderer ) {
...
@@ -392,7 +392,7 @@ function setValueT1( gl, v, renderer ) {
}
}
function
setValueT2DArray1
(
gl
,
v
,
renderer
)
{
function
setValueT2DArray1
(
gl
,
v
,
renderer
,
textures
)
{
var
cache
=
this
.
cache
;
var
cache
=
this
.
cache
;
var
unit
=
renderer
.
allocTextureUnit
();
var
unit
=
renderer
.
allocTextureUnit
();
...
@@ -404,11 +404,11 @@ function setValueT2DArray1( gl, v, renderer ) {
...
@@ -404,11 +404,11 @@ function setValueT2DArray1( gl, v, renderer ) {
}
}
renderer
.
setTexture2DArray
(
v
||
emptyTexture2dArray
,
unit
);
textures
.
setTexture2DArray
(
v
||
emptyTexture2dArray
,
unit
);
}
}
function
setValueT3D1
(
gl
,
v
,
renderer
)
{
function
setValueT3D1
(
gl
,
v
,
renderer
,
textures
)
{
var
cache
=
this
.
cache
;
var
cache
=
this
.
cache
;
var
unit
=
renderer
.
allocTextureUnit
();
var
unit
=
renderer
.
allocTextureUnit
();
...
@@ -420,7 +420,7 @@ function setValueT3D1( gl, v, renderer ) {
...
@@ -420,7 +420,7 @@ function setValueT3D1( gl, v, renderer ) {
}
}
renderer
.
setTexture3D
(
v
||
emptyTexture3d
,
unit
);
textures
.
setTexture3D
(
v
||
emptyTexture3d
,
unit
);
}
}
...
@@ -821,11 +821,12 @@ function parseUniform( activeInfo, addr, container ) {
...
@@ -821,11 +821,12 @@ function parseUniform( activeInfo, addr, container ) {
// Root Container
// Root Container
function
WebGLUniforms
(
gl
,
program
,
renderer
)
{
function
WebGLUniforms
(
gl
,
program
,
renderer
,
textures
)
{
UniformContainer
.
call
(
this
);
UniformContainer
.
call
(
this
);
this
.
renderer
=
renderer
;
this
.
renderer
=
renderer
;
this
.
textures
=
textures
;
var
n
=
gl
.
getProgramParameter
(
program
,
gl
.
ACTIVE_UNIFORMS
);
var
n
=
gl
.
getProgramParameter
(
program
,
gl
.
ACTIVE_UNIFORMS
);
...
@@ -844,7 +845,7 @@ WebGLUniforms.prototype.setValue = function ( gl, name, value ) {
...
@@ -844,7 +845,7 @@ WebGLUniforms.prototype.setValue = function ( gl, name, value ) {
var
u
=
this
.
map
[
name
];
var
u
=
this
.
map
[
name
];
if
(
u
!==
undefined
)
u
.
setValue
(
gl
,
value
,
this
.
renderer
);
if
(
u
!==
undefined
)
u
.
setValue
(
gl
,
value
,
this
.
renderer
,
this
.
textures
);
};
};
...
@@ -859,7 +860,7 @@ WebGLUniforms.prototype.setOptional = function ( gl, object, name ) {
...
@@ -859,7 +860,7 @@ WebGLUniforms.prototype.setOptional = function ( gl, object, name ) {
// Static interface
// Static interface
WebGLUniforms
.
upload
=
function
(
gl
,
seq
,
values
,
renderer
)
{
WebGLUniforms
.
upload
=
function
(
gl
,
seq
,
values
,
renderer
,
textures
)
{
for
(
var
i
=
0
,
n
=
seq
.
length
;
i
!==
n
;
++
i
)
{
for
(
var
i
=
0
,
n
=
seq
.
length
;
i
!==
n
;
++
i
)
{
...
@@ -869,7 +870,7 @@ WebGLUniforms.upload = function ( gl, seq, values, renderer ) {
...
@@ -869,7 +870,7 @@ WebGLUniforms.upload = function ( gl, seq, values, renderer ) {
if
(
v
.
needsUpdate
!==
false
)
{
if
(
v
.
needsUpdate
!==
false
)
{
// note: always updating when .needsUpdate is undefined
// note: always updating when .needsUpdate is undefined
u
.
setValue
(
gl
,
v
.
value
,
renderer
);
u
.
setValue
(
gl
,
v
.
value
,
renderer
,
textures
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录