Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
6dda5e7a
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,发现更多精彩内容 >>
提交
6dda5e7a
编写于
3月 19, 2015
作者:
B
Ben Houston
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
implementation of ambient occlusion map in materials and in WebGLRenderer/Program.
上级
b76ad9f2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
0 deletion
+14
-0
src/materials/MeshBasicMaterial.js
src/materials/MeshBasicMaterial.js
+3
-0
src/materials/MeshLambertMaterial.js
src/materials/MeshLambertMaterial.js
+3
-0
src/materials/MeshPhongMaterial.js
src/materials/MeshPhongMaterial.js
+3
-0
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+2
-0
src/renderers/shaders/UniformsLib.js
src/renderers/shaders/UniformsLib.js
+1
-0
src/renderers/webgl/WebGLProgram.js
src/renderers/webgl/WebGLProgram.js
+2
-0
未找到文件。
src/materials/MeshBasicMaterial.js
浏览文件 @
6dda5e7a
...
...
@@ -8,6 +8,7 @@
* map: new THREE.Texture( <Image> ),
*
* lightMap: new THREE.Texture( <Image> ),
* ambientOcclusionMap: new THREE.Texture( <Image> ),
*
* specularMap: new THREE.Texture( <Image> ),
*
...
...
@@ -46,6 +47,7 @@ THREE.MeshBasicMaterial = function ( parameters ) {
this
.
map
=
null
;
this
.
lightMap
=
null
;
this
.
ambientOcclusionMap
=
null
;
this
.
specularMap
=
null
;
...
...
@@ -88,6 +90,7 @@ THREE.MeshBasicMaterial.prototype.clone = function () {
material
.
map
=
this
.
map
;
material
.
lightMap
=
this
.
lightMap
;
material
.
ambientOcclusionMap
=
this
.
ambientOcclusionMap
;
material
.
specularMap
=
this
.
specularMap
;
...
...
src/materials/MeshLambertMaterial.js
浏览文件 @
6dda5e7a
...
...
@@ -10,6 +10,7 @@
* map: new THREE.Texture( <Image> ),
*
* lightMap: new THREE.Texture( <Image> ),
* ambientOcclusionMap: new THREE.Texture( <Image> ),
*
* specularMap: new THREE.Texture( <Image> ),
*
...
...
@@ -53,6 +54,7 @@ THREE.MeshLambertMaterial = function ( parameters ) {
this
.
map
=
null
;
this
.
lightMap
=
null
;
this
.
ambientOcclusionMap
=
null
;
this
.
specularMap
=
null
;
...
...
@@ -100,6 +102,7 @@ THREE.MeshLambertMaterial.prototype.clone = function () {
material
.
map
=
this
.
map
;
material
.
lightMap
=
this
.
lightMap
;
material
.
ambientOcclusionMap
=
this
.
ambientOcclusionMap
;
material
.
specularMap
=
this
.
specularMap
;
...
...
src/materials/MeshPhongMaterial.js
浏览文件 @
6dda5e7a
...
...
@@ -12,6 +12,7 @@
* map: new THREE.Texture( <Image> ),
*
* lightMap: new THREE.Texture( <Image> ),
* ambientOcclusionMap: new THREE.Texture( <Image> ),
*
* bumpMap: new THREE.Texture( <Image> ),
* bumpScale: <float>,
...
...
@@ -65,6 +66,7 @@ THREE.MeshPhongMaterial = function ( parameters ) {
this
.
map
=
null
;
this
.
lightMap
=
null
;
this
.
ambientOcclusionMap
=
null
;
this
.
bumpMap
=
null
;
this
.
bumpScale
=
1
;
...
...
@@ -122,6 +124,7 @@ THREE.MeshPhongMaterial.prototype.clone = function () {
material
.
map
=
this
.
map
;
material
.
lightMap
=
this
.
lightMap
;
material
.
ambientOcclusionMap
=
this
.
ambientOcclusionMap
;
material
.
bumpMap
=
this
.
bumpMap
;
material
.
bumpScale
=
this
.
bumpScale
;
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
6dda5e7a
...
...
@@ -4153,6 +4153,7 @@ THREE.WebGLRenderer = function ( parameters ) {
envMap
:
!!
material
.
envMap
,
envMapMode
:
material
.
envMap
&&
material
.
envMap
.
mapping
,
lightMap
:
!!
material
.
lightMap
,
ambientOcclusionMap
:
!!
material
.
ambientOcclusionMap
,
bumpMap
:
!!
material
.
bumpMap
,
normalMap
:
!!
material
.
normalMap
,
specularMap
:
!!
material
.
specularMap
,
...
...
@@ -4595,6 +4596,7 @@ THREE.WebGLRenderer = function ( parameters ) {
uniforms
.
map
.
value
=
material
.
map
;
uniforms
.
lightMap
.
value
=
material
.
lightMap
;
uniforms
.
ambientOcclusionMap
.
value
=
material
.
ambientOcclusionMap
;
uniforms
.
specularMap
.
value
=
material
.
specularMap
;
uniforms
.
alphaMap
.
value
=
material
.
alphaMap
;
...
...
src/renderers/shaders/UniformsLib.js
浏览文件 @
6dda5e7a
...
...
@@ -13,6 +13,7 @@ THREE.UniformsLib = {
"
offsetRepeat
"
:
{
type
:
"
v4
"
,
value
:
new
THREE
.
Vector4
(
0
,
0
,
1
,
1
)
},
"
lightMap
"
:
{
type
:
"
t
"
,
value
:
null
},
"
ambientOcclusionMap
"
:
{
type
:
"
t
"
,
value
:
null
},
"
specularMap
"
:
{
type
:
"
t
"
,
value
:
null
},
"
alphaMap
"
:
{
type
:
"
t
"
,
value
:
null
},
...
...
src/renderers/webgl/WebGLProgram.js
浏览文件 @
6dda5e7a
...
...
@@ -182,6 +182,7 @@ THREE.WebGLProgram = ( function () {
parameters
.
envMap
?
'
#define USE_ENVMAP
'
:
''
,
parameters
.
envMap
?
'
#define
'
+
envMapModeDefine
:
''
,
parameters
.
lightMap
?
'
#define USE_LIGHTMAP
'
:
''
,
parameters
.
ambientOcclusionMap
?
'
#define USE_AMBIENTOCCLUSIONMAP
'
:
''
,
parameters
.
bumpMap
?
'
#define USE_BUMPMAP
'
:
''
,
parameters
.
normalMap
?
'
#define USE_NORMALMAP
'
:
''
,
parameters
.
specularMap
?
'
#define USE_SPECULARMAP
'
:
''
,
...
...
@@ -295,6 +296,7 @@ THREE.WebGLProgram = ( function () {
parameters
.
envMap
?
'
#define
'
+
envMapModeDefine
:
''
,
parameters
.
envMap
?
'
#define
'
+
envMapBlendingDefine
:
''
,
parameters
.
lightMap
?
'
#define USE_LIGHTMAP
'
:
''
,
parameters
.
ambientOcclusionMap
?
'
#define USE_AMBIENTOCCLUSIONMAP
'
:
''
,
parameters
.
bumpMap
?
'
#define USE_BUMPMAP
'
:
''
,
parameters
.
normalMap
?
'
#define USE_NORMALMAP
'
:
''
,
parameters
.
specularMap
?
'
#define USE_SPECULARMAP
'
:
''
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录