Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
5e9a9419
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,发现更多精彩内容 >>
提交
5e9a9419
编写于
3月 15, 2012
作者:
A
alteredq
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/WestLangley/dev' into dev
上级
2ccfed2c
322839d6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
68 addition
and
5 deletion
+68
-5
src/extras/helpers/ArrowHelper.js
src/extras/helpers/ArrowHelper.js
+60
-0
src/renderers/WebGLShaders.js
src/renderers/WebGLShaders.js
+8
-5
未找到文件。
src/extras/helpers/ArrowHelper.js
0 → 100644
浏览文件 @
5e9a9419
/**
* @author WestLangley / https://github.com/WestLangley
* @author zz85 / https://github.com/zz85
*/
THREE
.
ArrowHelper
=
function
(
origin
,
dir
,
length
,
hex
)
{
THREE
.
Object3D
.
call
(
this
);
var
lineGeometry
=
new
THREE
.
Geometry
();
lineGeometry
.
vertices
.
push
(
new
THREE
.
Vertex
()
);
lineGeometry
.
vertices
.
push
(
new
THREE
.
Vertex
(
new
THREE
.
Vector3
(
0
,
1
,
0
)
)
);
line
=
new
THREE
.
Line
(
lineGeometry
,
new
THREE
.
LineBasicMaterial
(
{
color
:
hex
}
)
);
this
.
add
(
line
);
var
coneGeometry
=
new
THREE
.
CylinderGeometry
(
0
,
0.05
,
0.25
,
5
,
1
);
cone
=
new
THREE
.
Mesh
(
coneGeometry
,
new
THREE
.
MeshBasicMaterial
(
{
color
:
hex
}
)
);
cone
.
position
.
set
(
0
,
1
,
0
);
this
.
add
(
cone
);
this
.
position
=
origin
;
this
.
setDirection
(
dir
);
this
.
setLength
(
length
);
};
THREE
.
ArrowHelper
.
prototype
=
new
THREE
.
Object3D
();
THREE
.
ArrowHelper
.
prototype
.
constructor
=
THREE
.
ArrowHelper
;
THREE
.
ArrowHelper
.
prototype
.
setDirection
=
function
(
dir
)
{
var
axis
=
new
THREE
.
Vector3
(
0
,
1
,
0
).
crossSelf
(
dir
);
var
radians
=
Math
.
acos
(
new
THREE
.
Vector3
(
0
,
1
,
0
).
dot
(
dir
.
clone
().
normalize
()
)
);
this
.
matrix
=
new
THREE
.
Matrix4
().
setRotationAxis
(
axis
.
normalize
(),
radians
);
this
.
rotation
.
getRotationFromMatrix
(
this
.
matrix
,
this
.
scale
);
};
THREE
.
ArrowHelper
.
prototype
.
setLength
=
function
(
length
)
{
this
.
scale
.
set
(
length
,
length
,
length
);
};
THREE
.
ArrowHelper
.
prototype
.
setColor
=
function
(
hex
)
{
this
.
children
[
0
].
material
.
color
.
setHex
(
hex
);
this
.
children
[
1
].
material
.
color
.
setHex
(
hex
);
};
src/renderers/WebGLShaders.js
浏览文件 @
5e9a9419
...
...
@@ -558,8 +558,11 @@ THREE.ShaderChunk = {
"
#ifdef PHYSICALLY_BASED_SHADING
"
,
"
vec3 schlick = specular + vec3( 1.0 - specular ) * pow( dot( lVector, pointHalfVector ), 5.0 );
"
,
"
pointSpecular += schlick * pointLightColor[ i ] * pointSpecularWeight * pointDiffuseWeight * lDistance;
"
,
// normalization factor
"
float specularNormalization = ( shininess + 2.0 ) / 8.0;
"
,
"
vec3 schlick = specular + vec3( 1.0 - specular ) * pow( 1.0 - dot( lVector, pointHalfVector ), 5.0 );
"
,
"
pointSpecular += schlick * pointLightColor[ i ] * pointSpecularWeight * pointDiffuseWeight * lDistance * specularNormalization;
"
,
"
#else
"
,
...
...
@@ -628,12 +631,12 @@ THREE.ShaderChunk = {
*/
// normalization factor
//float specularNormalization = ( shininess + 2.0 ) / 8.0;
"
float specularNormalization = ( shininess + 2.0 ) / 8.0;
"
,
//"dirSpecular += specular * directionalLightColor[ i ] * dirSpecularWeight * dirDiffuseWeight * specularNormalization * fresnel;",
"
vec3 schlick = specular + vec3( 1.0 - specular ) * pow( dot( dirVector, dirHalfVector ), 5.0 );
"
,
"
dirSpecular += schlick * directionalLightColor[ i ] * dirSpecularWeight * dirDiffuseWeight;
"
,
"
vec3 schlick = specular + vec3( 1.0 - specular ) * pow(
1.0 -
dot( dirVector, dirHalfVector ), 5.0 );
"
,
"
dirSpecular += schlick * directionalLightColor[ i ] * dirSpecularWeight * dirDiffuseWeight
* specularNormalization
;
"
,
"
#else
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录