Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
8e5279ea
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,体验更适合开发者的 AI 搜索 >>
提交
8e5279ea
编写于
11月 02, 2016
作者:
T
Takahiro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename toonMap with gradientMap
上级
c6f7ce7e
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
33 addition
and
33 deletion
+33
-33
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+4
-4
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+2
-2
src/materials/Material.js
src/materials/Material.js
+3
-3
src/materials/MeshPhongMaterial.js
src/materials/MeshPhongMaterial.js
+4
-4
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+2
-2
src/renderers/shaders/ShaderChunk.js
src/renderers/shaders/ShaderChunk.js
+2
-2
src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl
...derers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl
+5
-5
src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl
...erers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl
+2
-2
src/renderers/shaders/ShaderLib.js
src/renderers/shaders/ShaderLib.js
+1
-1
src/renderers/shaders/ShaderLib/meshphong_frag.glsl
src/renderers/shaders/ShaderLib/meshphong_frag.glsl
+1
-1
src/renderers/shaders/UniformsLib.js
src/renderers/shaders/UniformsLib.js
+2
-2
src/renderers/webgl/WebGLProgram.js
src/renderers/webgl/WebGLProgram.js
+2
-2
src/renderers/webgl/WebGLPrograms.js
src/renderers/webgl/WebGLPrograms.js
+3
-3
未找到文件。
examples/js/loaders/MMDLoader.js
浏览文件 @
8e5279ea
...
...
@@ -2399,8 +2399,8 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
var
toonFileName
=
(
p2
.
toonIndex
===
-
1
)
?
'
toon00.bmp
'
:
model
.
toonTextures
[
p2
.
toonIndex
].
fileName
;
var
uuid
=
loadTexture
(
toonFileName
,
{
isToonTexture
:
true
,
defaultTexturePath
:
isDefaultToonTexture
(
toonFileName
)
}
);
m
.
toon
Map
=
getTexture
(
uuid
,
textures
);
m
.
toonMapDirection
Y
=
true
;
m
.
gradient
Map
=
getTexture
(
uuid
,
textures
);
m
.
gradientMapAxis
Y
=
true
;
}
else
{
...
...
@@ -2428,8 +2428,8 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
}
var
uuid
=
loadTexture
(
toonFileName
,
{
isToonTexture
:
true
,
defaultTexturePath
:
isDefaultToon
}
);
m
.
toon
Map
=
getTexture
(
uuid
,
textures
);
m
.
toonMapDirection
Y
=
true
;
m
.
gradient
Map
=
getTexture
(
uuid
,
textures
);
m
.
gradientMapAxis
Y
=
true
;
}
...
...
src/loaders/MaterialLoader.js
浏览文件 @
8e5279ea
...
...
@@ -140,8 +140,8 @@ Object.assign( MaterialLoader.prototype, {
if
(
json
.
aoMap
!==
undefined
)
material
.
aoMap
=
getTexture
(
json
.
aoMap
);
if
(
json
.
aoMapIntensity
!==
undefined
)
material
.
aoMapIntensity
=
json
.
aoMapIntensity
;
if
(
json
.
toonMap
!==
undefined
)
material
.
toonMap
=
getTexture
(
json
.
toon
Map
);
if
(
json
.
toonMapDirectionY
!==
undefined
)
material
.
toonMapDirectionY
=
json
.
toonMapDirection
Y
;
if
(
json
.
gradientMap
!==
undefined
)
material
.
gradientMap
=
getTexture
(
json
.
gradient
Map
);
if
(
json
.
gradientMapAxisY
!==
undefined
)
material
.
gradientMapAxisY
=
json
.
gradientMapAxis
Y
;
// MultiMaterial
...
...
src/materials/Material.js
浏览文件 @
8e5279ea
...
...
@@ -198,10 +198,10 @@ Material.prototype = {
}
if
(
this
.
toonMap
&&
this
.
toon
Map
.
isTexture
)
{
if
(
this
.
gradientMap
&&
this
.
gradient
Map
.
isTexture
)
{
data
.
toonMap
=
this
.
toon
Map
.
toJSON
(
meta
).
uuid
;
data
.
toonMapDirectionY
=
this
.
toonMapDirection
Y
;
data
.
gradientMap
=
this
.
gradient
Map
.
toJSON
(
meta
).
uuid
;
data
.
gradientMapAxisY
=
this
.
gradientMapAxis
Y
;
}
...
...
src/materials/MeshPhongMaterial.js
浏览文件 @
8e5279ea
...
...
@@ -44,8 +44,8 @@ import { Color } from '../math/Color';
* reflectivity: <float>,
* refractionRatio: <float>,
*
*
toon
Map: new THREE.Texture( <Image> ),
*
toonMapDirecton
Y: <bool>,
*
gradient
Map: new THREE.Texture( <Image> ),
*
gradientMapAxis
Y: <bool>,
*
* wireframe: <boolean>,
* wireframeLinewidth: <float>,
...
...
@@ -97,8 +97,8 @@ function MeshPhongMaterial( parameters ) {
this
.
reflectivity
=
1
;
this
.
refractionRatio
=
0.98
;
this
.
toon
Map
=
null
;
this
.
toonMapDirection
Y
=
false
;
this
.
gradient
Map
=
null
;
this
.
gradientMapAxis
Y
=
false
;
this
.
wireframe
=
false
;
this
.
wireframeLinewidth
=
1
;
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
8e5279ea
...
...
@@ -2183,9 +2183,9 @@ function WebGLRenderer( parameters ) {
}
if
(
material
.
toon
Map
)
{
if
(
material
.
gradient
Map
)
{
uniforms
.
toonMap
.
value
=
material
.
toon
Map
;
uniforms
.
gradientMap
.
value
=
material
.
gradient
Map
;
}
...
...
src/renderers/shaders/ShaderChunk.js
浏览文件 @
8e5279ea
...
...
@@ -30,6 +30,7 @@ import envmap_pars_vertex from './ShaderChunk/envmap_pars_vertex.glsl';
import
envmap_vertex
from
'
./ShaderChunk/envmap_vertex.glsl
'
;
import
fog_fragment
from
'
./ShaderChunk/fog_fragment.glsl
'
;
import
fog_pars_fragment
from
'
./ShaderChunk/fog_pars_fragment.glsl
'
;
import
gradientmap_pars_fragment
from
'
./ShaderChunk/gradientmap_pars_fragment.glsl
'
;
import
lightmap_fragment
from
'
./ShaderChunk/lightmap_fragment.glsl
'
;
import
lightmap_pars_fragment
from
'
./ShaderChunk/lightmap_pars_fragment.glsl
'
;
import
lights_lambert_vertex
from
'
./ShaderChunk/lights_lambert_vertex.glsl
'
;
...
...
@@ -72,7 +73,6 @@ import specularmap_fragment from './ShaderChunk/specularmap_fragment.glsl';
import
specularmap_pars_fragment
from
'
./ShaderChunk/specularmap_pars_fragment.glsl
'
;
import
tonemapping_fragment
from
'
./ShaderChunk/tonemapping_fragment.glsl
'
;
import
tonemapping_pars_fragment
from
'
./ShaderChunk/tonemapping_pars_fragment.glsl
'
;
import
toonmap_pars_fragment
from
'
./ShaderChunk/toonmap_pars_fragment.glsl
'
;
import
uv_pars_fragment
from
'
./ShaderChunk/uv_pars_fragment.glsl
'
;
import
uv_pars_vertex
from
'
./ShaderChunk/uv_pars_vertex.glsl
'
;
import
uv_vertex
from
'
./ShaderChunk/uv_vertex.glsl
'
;
...
...
@@ -139,6 +139,7 @@ export var ShaderChunk = {
envmap_vertex
:
envmap_vertex
,
fog_fragment
:
fog_fragment
,
fog_pars_fragment
:
fog_pars_fragment
,
gradientmap_pars_fragment
:
gradientmap_pars_fragment
,
lightmap_fragment
:
lightmap_fragment
,
lightmap_pars_fragment
:
lightmap_pars_fragment
,
lights_lambert_vertex
:
lights_lambert_vertex
,
...
...
@@ -181,7 +182,6 @@ export var ShaderChunk = {
specularmap_pars_fragment
:
specularmap_pars_fragment
,
tonemapping_fragment
:
tonemapping_fragment
,
tonemapping_pars_fragment
:
tonemapping_pars_fragment
,
toonmap_pars_fragment
:
toonmap_pars_fragment
,
uv_pars_fragment
:
uv_pars_fragment
,
uv_pars_vertex
:
uv_pars_vertex
,
uv_vertex
:
uv_vertex
,
...
...
src/renderers/shaders/ShaderChunk/
toon
map_pars_fragment.glsl
→
src/renderers/shaders/ShaderChunk/
gradient
map_pars_fragment.glsl
浏览文件 @
8e5279ea
#ifdef USE_
TOON
MAP
#ifdef USE_
GRADIENT
MAP
uniform
sampler2D
toon
Map
;
uniform
sampler2D
gradient
Map
;
vec3
get
Toon
Irradiance
(
vec3
normal
,
vec3
lightDirection
)
{
vec3
get
Gradient
Irradiance
(
vec3
normal
,
vec3
lightDirection
)
{
// dotNL will be from -1.0 to 1.0
float
dotNL
=
dot
(
normal
,
lightDirection
);
#ifdef
TOONMAP_DIRECTION
_Y
#ifdef
GRADIENTMAP_AXIS
_Y
vec2
coord
=
vec2
(
0
.
0
,
dotNL
*
0
.
5
+
0
.
5
);
...
...
@@ -17,7 +17,7 @@
#endif
return
texture2D
(
toon
Map
,
coord
).
rgb
;
return
texture2D
(
gradient
Map
,
coord
).
rgb
;
}
#endif
src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl
浏览文件 @
8e5279ea
...
...
@@ -18,9 +18,9 @@ struct BlinnPhongMaterial {
void
RE_Direct_BlinnPhong
(
const
in
IncidentLight
directLight
,
const
in
GeometricContext
geometry
,
const
in
BlinnPhongMaterial
material
,
inout
ReflectedLight
reflectedLight
)
{
#ifdef USE_
TOON
MAP
#ifdef USE_
GRADIENT
MAP
vec3
irradiance
=
get
Toon
Irradiance
(
geometry
.
normal
,
directLight
.
direction
)
*
directLight
.
color
;
vec3
irradiance
=
get
Gradient
Irradiance
(
geometry
.
normal
,
directLight
.
direction
)
*
directLight
.
color
;
#else
...
...
src/renderers/shaders/ShaderLib.js
浏览文件 @
8e5279ea
...
...
@@ -60,7 +60,7 @@ var ShaderLib = {
UniformsLib
.
bumpmap
,
UniformsLib
.
normalmap
,
UniformsLib
.
displacementmap
,
UniformsLib
.
toon
map
,
UniformsLib
.
gradient
map
,
UniformsLib
.
fog
,
UniformsLib
.
lights
,
...
...
src/renderers/shaders/ShaderLib/meshphong_frag.glsl
浏览文件 @
8e5279ea
...
...
@@ -17,7 +17,7 @@ uniform float opacity;
#include <lightmap_pars_fragment>
#include <emissivemap_pars_fragment>
#include <envmap_pars_fragment>
#include <
toon
map_pars_fragment>
#include <
gradient
map_pars_fragment>
#include <fog_pars_fragment>
#include <bsdfs>
#include <lights_pars>
...
...
src/renderers/shaders/UniformsLib.js
浏览文件 @
8e5279ea
...
...
@@ -80,9 +80,9 @@ var UniformsLib = {
},
toon
map
:
{
gradient
map
:
{
toon
Map
:
{
value
:
null
}
gradient
Map
:
{
value
:
null
}
},
...
...
src/renderers/webgl/WebGLProgram.js
浏览文件 @
8e5279ea
...
...
@@ -445,8 +445,8 @@ function WebGLProgram( renderer, code, material, parameters ) {
parameters
.
alphaMap
?
'
#define USE_ALPHAMAP
'
:
''
,
parameters
.
vertexColors
?
'
#define USE_COLOR
'
:
''
,
parameters
.
toonMap
?
'
#define USE_TOON
MAP
'
:
''
,
parameters
.
toonMapDirectionY
?
'
#define TOONMAP_DIRECTION
_Y
'
:
''
,
parameters
.
gradientMap
?
'
#define USE_GRADIENT
MAP
'
:
''
,
parameters
.
gradientMapAxisY
?
'
#define GRADIENTMAP_AXIS
_Y
'
:
''
,
parameters
.
flatShading
?
'
#define FLAT_SHADED
'
:
''
,
...
...
src/renderers/webgl/WebGLPrograms.js
浏览文件 @
8e5279ea
...
...
@@ -25,7 +25,7 @@ function WebGLPrograms( renderer, capabilities ) {
var
parameterNames
=
[
"
precision
"
,
"
supportsVertexTextures
"
,
"
map
"
,
"
mapEncoding
"
,
"
envMap
"
,
"
envMapMode
"
,
"
envMapEncoding
"
,
"
lightMap
"
,
"
aoMap
"
,
"
emissiveMap
"
,
"
emissiveMapEncoding
"
,
"
bumpMap
"
,
"
normalMap
"
,
"
displacementMap
"
,
"
specularMap
"
,
"
roughnessMap
"
,
"
metalnessMap
"
,
"
toon
Map
"
,
"
roughnessMap
"
,
"
metalnessMap
"
,
"
gradient
Map
"
,
"
alphaMap
"
,
"
combine
"
,
"
vertexColors
"
,
"
fog
"
,
"
useFog
"
,
"
fogExp
"
,
"
flatShading
"
,
"
sizeAttenuation
"
,
"
logarithmicDepthBuffer
"
,
"
skinning
"
,
"
maxBones
"
,
"
useVertexTexture
"
,
"
morphTargets
"
,
"
morphNormals
"
,
...
...
@@ -153,8 +153,8 @@ function WebGLPrograms( renderer, capabilities ) {
specularMap
:
!!
material
.
specularMap
,
alphaMap
:
!!
material
.
alphaMap
,
toonMap
:
!!
material
.
toon
Map
,
toonMapDirectionY
:
!!
material
.
toonMapDirection
Y
,
gradientMap
:
!!
material
.
gradient
Map
,
gradientMapAxisY
:
!!
material
.
gradientMapAxis
Y
,
combine
:
material
.
combine
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录