Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
f802fc13
T
three.js
项目概览
车家大少爷
/
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,体验更适合开发者的 AI 搜索 >>
提交
f802fc13
编写于
11月 13, 2015
作者:
W
WestLangley
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MeshStandardMaterial: remove reflectivity, reflectivityMap
上级
e7f881b2
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
5 addition
and
33 deletion
+5
-33
src/materials/MeshStandardMaterial.js
src/materials/MeshStandardMaterial.js
+0
-9
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+0
-7
src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl
...nderers/shaders/ShaderChunk/lights_standard_fragment.glsl
+1
-1
src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl
src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl
+1
-1
src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl
src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl
+1
-1
src/renderers/shaders/ShaderChunk/uv_vertex.glsl
src/renderers/shaders/ShaderChunk/uv_vertex.glsl
+1
-1
src/renderers/shaders/ShaderLib.js
src/renderers/shaders/ShaderLib.js
+0
-3
src/renderers/shaders/UniformsLib.js
src/renderers/shaders/UniformsLib.js
+0
-6
src/renderers/webgl/WebGLProgram.js
src/renderers/webgl/WebGLProgram.js
+0
-2
src/renderers/webgl/WebGLPrograms.js
src/renderers/webgl/WebGLPrograms.js
+1
-2
未找到文件。
src/materials/MeshStandardMaterial.js
浏览文件 @
f802fc13
...
...
@@ -4,7 +4,6 @@
* parameters = {
* color: <hex>,
* roughness: <float>,
* reflectivity: <float>,
* metalness: <float>,
* emissive: <hex>,
...
...
@@ -32,8 +31,6 @@
*
* roughnessMap: new THREE.Texture( <Image> ),
*
* reflectivityMap: new THREE.Texture( <Image> ),
*
* metalnessMap: new THREE.Texture( <Image> ),
*
* alphaMap: new THREE.Texture( <Image> ),
...
...
@@ -69,7 +66,6 @@ THREE.MeshStandardMaterial = function ( parameters ) {
this
.
color
=
new
THREE
.
Color
(
0xffffff
);
// diffuse
this
.
roughness
=
0.5
;
this
.
reflectivity
=
1
;
this
.
metalness
=
0
;
this
.
emissive
=
new
THREE
.
Color
(
0x000000
);
...
...
@@ -96,8 +92,6 @@ THREE.MeshStandardMaterial = function ( parameters ) {
this
.
roughnessMap
=
null
;
this
.
reflectivityMap
=
null
;
this
.
metalnessMap
=
null
;
this
.
alphaMap
=
null
;
...
...
@@ -135,7 +129,6 @@ THREE.MeshStandardMaterial.prototype.copy = function ( source ) {
this
.
color
.
copy
(
source
.
color
);
this
.
roughness
=
source
.
roughness
;
this
.
reflectivity
=
source
.
reflectivity
;
this
.
metalness
=
source
.
metalness
;
this
.
emissive
.
copy
(
source
.
emissive
);
...
...
@@ -162,8 +155,6 @@ THREE.MeshStandardMaterial.prototype.copy = function ( source ) {
this
.
roughnessMap
=
source
.
roughnessMap
;
this
.
reflectivityMap
=
source
.
reflectivityMap
;
this
.
metalnessMap
=
source
.
metalnessMap
;
this
.
alphaMap
=
source
.
alphaMap
;
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
f802fc13
...
...
@@ -2042,7 +2042,6 @@ THREE.WebGLRenderer = function ( parameters ) {
function
refreshUniformsStandard
(
uniforms
,
material
)
{
uniforms
.
roughness
.
value
=
material
.
roughness
;
//uniforms.reflectivity.value = material.reflectivity; // part of uniforms common
uniforms
.
metalness
.
value
=
material
.
metalness
;
if
(
material
.
roughnessMap
)
{
...
...
@@ -2051,12 +2050,6 @@ THREE.WebGLRenderer = function ( parameters ) {
}
if
(
material
.
reflectivityMap
)
{
uniforms
.
reflectivityMap
.
value
=
material
.
reflectivityMap
;
}
if
(
material
.
metalnessMap
)
{
uniforms
.
metalnessMap
.
value
=
material
.
metalnessMap
;
...
...
src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl
浏览文件 @
f802fc13
PhysicalMaterial
material
;
material
.
diffuseColor
=
diffuseColor
.
rgb
*
(
1
.
0
-
metalnessFactor
);
material
.
specularRoughness
=
roughnessFactor
*
0
.
5
+
0
.
5
;
// disney's remapping of [ 0, 1 ] roughness to [ 0.5, 1 ]
material
.
specularColor
=
mix
(
vec3
(
0
.
0
8
)
*
reflectivity
,
diffuseColor
.
rgb
,
metalnessFactor
);
material
.
specularColor
=
mix
(
vec3
(
0
.
0
4
)
,
diffuseColor
.
rgb
,
metalnessFactor
);
src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl
浏览文件 @
f802fc13
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_
REFLECTIVITYMAP ) || defined( USE_
METALNESSMAP )
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )
varying
vec2
vUv
;
...
...
src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl
浏览文件 @
f802fc13
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_
REFLECTIVITYMAP ) || defined( USE_
METALNESSMAP )
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )
varying
vec2
vUv
;
uniform
vec4
offsetRepeat
;
...
...
src/renderers/shaders/ShaderChunk/uv_vertex.glsl
浏览文件 @
f802fc13
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_
REFLECTIVITYMAP ) || defined( USE_
METALNESSMAP )
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )
vUv
=
uv
*
offsetRepeat
.
zw
+
offsetRepeat
.
xy
;
...
...
src/renderers/shaders/ShaderLib.js
浏览文件 @
f802fc13
...
...
@@ -421,7 +421,6 @@ THREE.ShaderLib = {
THREE
.
UniformsLib
[
"
normalmap
"
],
THREE
.
UniformsLib
[
"
displacementmap
"
],
THREE
.
UniformsLib
[
"
roughnessmap
"
],
THREE
.
UniformsLib
[
"
reflectivitymap
"
],
THREE
.
UniformsLib
[
"
metalnessmap
"
],
THREE
.
UniformsLib
[
"
fog
"
],
THREE
.
UniformsLib
[
"
lights
"
],
...
...
@@ -535,7 +534,6 @@ THREE.ShaderLib = {
THREE
.
ShaderChunk
[
"
bumpmap_pars_fragment
"
],
THREE
.
ShaderChunk
[
"
normalmap_pars_fragment
"
],
THREE
.
ShaderChunk
[
"
roughnessmap_pars_fragment
"
],
//THREE.ShaderChunk[ "reflectivitymap_pars_fragment" ],
THREE
.
ShaderChunk
[
"
metalnessmap_pars_fragment
"
],
THREE
.
ShaderChunk
[
"
logdepthbuf_pars_fragment
"
],
...
...
@@ -552,7 +550,6 @@ THREE.ShaderLib = {
THREE
.
ShaderChunk
[
"
alphatest_fragment
"
],
THREE
.
ShaderChunk
[
"
specularmap_fragment
"
],
THREE
.
ShaderChunk
[
"
roughnessmap_fragment
"
],
//THREE.ShaderChunk[ "reflectivitymap_fragment" ],
THREE
.
ShaderChunk
[
"
metalnessmap_fragment
"
],
THREE
.
ShaderChunk
[
"
normal_fragment
"
],
THREE
.
ShaderChunk
[
"
emissivemap_fragment
"
],
...
...
src/renderers/shaders/UniformsLib.js
浏览文件 @
f802fc13
...
...
@@ -70,12 +70,6 @@ THREE.UniformsLib = {
},
reflectivitymap
:
{
"
reflectivityMap
"
:
{
type
:
"
t
"
,
value
:
null
}
},
metalnessmap
:
{
"
metalnessMap
"
:
{
type
:
"
t
"
,
value
:
null
}
...
...
src/renderers/webgl/WebGLProgram.js
浏览文件 @
f802fc13
...
...
@@ -265,7 +265,6 @@ THREE.WebGLProgram = ( function () {
parameters
.
displacementMap
&&
parameters
.
supportsVertexTextures
?
'
#define USE_DISPLACEMENTMAP
'
:
''
,
parameters
.
specularMap
?
'
#define USE_SPECULARMAP
'
:
''
,
parameters
.
roughnessMap
?
'
#define USE_ROUGHNESSMAP
'
:
''
,
parameters
.
reflectivityMap
?
'
#define USE_REFLECTIVITYMAP
'
:
''
,
parameters
.
metalnessMap
?
'
#define USE_METALNESSMAP
'
:
''
,
parameters
.
alphaMap
?
'
#define USE_ALPHAMAP
'
:
''
,
parameters
.
vertexColors
?
'
#define USE_COLOR
'
:
''
,
...
...
@@ -384,7 +383,6 @@ THREE.WebGLProgram = ( function () {
parameters
.
normalMap
?
'
#define USE_NORMALMAP
'
:
''
,
parameters
.
specularMap
?
'
#define USE_SPECULARMAP
'
:
''
,
parameters
.
roughnessMap
?
'
#define USE_ROUGHNESSMAP
'
:
''
,
parameters
.
reflectivityMap
?
'
#define USE_REFLECTIVITYMAP
'
:
''
,
parameters
.
metalnessMap
?
'
#define USE_METALNESSMAP
'
:
''
,
parameters
.
alphaMap
?
'
#define USE_ALPHAMAP
'
:
''
,
parameters
.
vertexColors
?
'
#define USE_COLOR
'
:
''
,
...
...
src/renderers/webgl/WebGLPrograms.js
浏览文件 @
f802fc13
...
...
@@ -17,7 +17,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
var
parameterNames
=
[
"
precision
"
,
"
supportsVertexTextures
"
,
"
map
"
,
"
envMap
"
,
"
envMapMode
"
,
"
lightMap
"
,
"
aoMap
"
,
"
emissiveMap
"
,
"
bumpMap
"
,
"
normalMap
"
,
"
displacementMap
"
,
"
specularMap
"
,
"
roughnessMap
"
,
"
reflectivityMap
"
,
"
metalnessMap
"
,
"
roughnessMap
"
,
"
metalnessMap
"
,
"
alphaMap
"
,
"
combine
"
,
"
vertexColors
"
,
"
fog
"
,
"
useFog
"
,
"
fogExp
"
,
"
flatShading
"
,
"
sizeAttenuation
"
,
"
logarithmicDepthBuffer
"
,
"
skinning
"
,
"
maxBones
"
,
"
useVertexTexture
"
,
"
morphTargets
"
,
"
morphNormals
"
,
...
...
@@ -105,7 +105,6 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
normalMap
:
!!
material
.
normalMap
,
displacementMap
:
!!
material
.
displacementMap
,
roughnessMap
:
!!
material
.
roughnessMap
,
reflectivityMap
:
!!
material
.
reflectivityMap
,
metalnessMap
:
!!
material
.
metalnessMap
,
specularMap
:
!!
material
.
specularMap
,
alphaMap
:
!!
material
.
alphaMap
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录