Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
b593b45f
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,发现更多精彩内容 >>
提交
b593b45f
编写于
3月 25, 2015
作者:
B
Ben Houston
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add lightScale parameter which varies the intensity of the lightMap.
上级
f7bb20d4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
17 addition
and
2 deletion
+17
-2
examples/webgl_materials_lightmap.html
examples/webgl_materials_lightmap.html
+6
-1
src/materials/MeshPhongMaterial.js
src/materials/MeshPhongMaterial.js
+7
-0
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+1
-0
src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl
src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl
+1
-1
src/renderers/shaders/ShaderChunk/lightmap_pars_fragment.glsl
...renderers/shaders/ShaderChunk/lightmap_pars_fragment.glsl
+1
-0
src/renderers/shaders/UniformsLib.js
src/renderers/shaders/UniformsLib.js
+1
-0
未找到文件。
examples/webgl_materials_lightmap.html
浏览文件 @
b593b45f
...
...
@@ -100,7 +100,7 @@
// LIGHTS
var
hemiLight
=
new
THREE
.
HemisphereLight
(
0xaabbff
,
0x040404
,
0.
5
);
var
hemiLight
=
new
THREE
.
HemisphereLight
(
0xaabbff
,
0x040404
,
0.
3
);
hemiLight
.
position
.
y
=
500
;
scene
.
add
(
hemiLight
);
...
...
@@ -152,7 +152,12 @@
var
loader
=
new
THREE
.
JSONLoader
();
loader
.
load
(
"
obj/lightmap/lightmap.js
"
,
function
(
geometry
,
materials
)
{
for
(
var
i
=
0
;
i
<
materials
.
length
;
i
++
)
{
materials
[
i
].
lightScale
=
0.75
;
}
var
mesh
=
new
THREE
.
Mesh
(
geometry
,
new
THREE
.
MeshFaceMaterial
(
materials
)
);
mesh
.
scale
.
multiplyScalar
(
100
);
scene
.
add
(
mesh
);
...
...
src/materials/MeshPhongMaterial.js
浏览文件 @
b593b45f
...
...
@@ -12,7 +12,10 @@
* map: new THREE.Texture( <Image> ),
*
* lightMap: new THREE.Texture( <Image> ),
* lightScale: <float>
*
* aoMap: new THREE.Texture( <Image> ),
* aoScale: <float>
*
* bumpMap: new THREE.Texture( <Image> ),
* bumpScale: <float>,
...
...
@@ -66,6 +69,8 @@ THREE.MeshPhongMaterial = function ( parameters ) {
this
.
map
=
null
;
this
.
lightMap
=
null
;
this
.
lightScale
=
null
;
this
.
aoMap
=
null
;
this
.
aoScale
=
1.0
;
...
...
@@ -125,6 +130,8 @@ THREE.MeshPhongMaterial.prototype.clone = function () {
material
.
map
=
this
.
map
;
material
.
lightMap
=
this
.
lightMap
;
material
.
lightScale
=
this
.
lightScale
;
material
.
aoMap
=
this
.
aoMap
;
material
.
aoScale
=
this
.
aoScale
;
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
b593b45f
...
...
@@ -4596,6 +4596,7 @@ THREE.WebGLRenderer = function ( parameters ) {
uniforms
.
map
.
value
=
material
.
map
;
uniforms
.
lightMap
.
value
=
material
.
lightMap
;
uniforms
.
lightScale
.
value
=
material
.
lightScale
;
uniforms
.
aoMap
.
value
=
material
.
aoMap
;
uniforms
.
aoScale
.
value
=
material
.
aoScale
;
uniforms
.
specularMap
.
value
=
material
.
specularMap
;
...
...
src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl
浏览文件 @
b593b45f
#ifdef USE_LIGHTMAP
outgoingLight
+=
diffuseColor
.
xyz
*
texture2D
(
lightMap
,
vUv2
).
xyz
;
outgoingLight
+=
diffuseColor
.
xyz
*
texture2D
(
lightMap
,
vUv2
).
xyz
*
lightScale
;
#endif
\ No newline at end of file
src/renderers/shaders/ShaderChunk/lightmap_pars_fragment.glsl
浏览文件 @
b593b45f
#ifdef USE_LIGHTMAP
uniform
sampler2D
lightMap
;
uniform
float
lightScale
;
#endif
\ No newline at end of file
src/renderers/shaders/UniformsLib.js
浏览文件 @
b593b45f
...
...
@@ -13,6 +13,7 @@ THREE.UniformsLib = {
"
offsetRepeat
"
:
{
type
:
"
v4
"
,
value
:
new
THREE
.
Vector4
(
0
,
0
,
1
,
1
)
},
"
lightMap
"
:
{
type
:
"
t
"
,
value
:
null
},
"
lightScale
"
:
{
type
:
"
f
"
,
value
:
1
},
"
aoMap
"
:
{
type
:
"
t
"
,
value
:
null
},
"
aoScale
"
:
{
type
:
"
f
"
,
value
:
1
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录