Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
a7aaed44
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,发现更多精彩内容 >>
提交
a7aaed44
编写于
7月 10, 2017
作者:
M
Mr.doob
提交者:
GitHub
7月 10, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11731 from WestLangley/dev-normal_flip
Merge <normal_flip> into <normal_fragment>
上级
a0bc2bdf
b5a6ae70
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
7 addition
and
13 deletion
+7
-13
examples/js/nodes/materials/PhongNode.js
examples/js/nodes/materials/PhongNode.js
+0
-1
examples/js/nodes/materials/StandardNode.js
examples/js/nodes/materials/StandardNode.js
+0
-1
src/renderers/shaders/ShaderChunk.js
src/renderers/shaders/ShaderChunk.js
+0
-2
src/renderers/shaders/ShaderChunk/normal_flip.glsl
src/renderers/shaders/ShaderChunk/normal_flip.glsl
+0
-5
src/renderers/shaders/ShaderChunk/normal_fragment.glsl
src/renderers/shaders/ShaderChunk/normal_fragment.glsl
+7
-1
src/renderers/shaders/ShaderLib/meshphong_frag.glsl
src/renderers/shaders/ShaderLib/meshphong_frag.glsl
+0
-1
src/renderers/shaders/ShaderLib/meshphysical_frag.glsl
src/renderers/shaders/ShaderLib/meshphysical_frag.glsl
+0
-1
src/renderers/shaders/ShaderLib/normal_frag.glsl
src/renderers/shaders/ShaderLib/normal_frag.glsl
+0
-1
未找到文件。
examples/js/nodes/materials/PhongNode.js
浏览文件 @
a7aaed44
...
...
@@ -151,7 +151,6 @@ THREE.PhongNode.prototype.build = function ( builder ) {
var
output
=
[
// prevent undeclared normal
"
#include <normal_flip>
"
,
"
#include <normal_fragment>
"
,
// prevent undeclared material
...
...
examples/js/nodes/materials/StandardNode.js
浏览文件 @
a7aaed44
...
...
@@ -190,7 +190,6 @@ THREE.StandardNode.prototype.build = function ( builder ) {
var
output
=
[
// prevent undeclared normal
"
#include <normal_flip>
"
,
"
#include <normal_fragment>
"
,
// prevent undeclared material
...
...
src/renderers/shaders/ShaderChunk.js
浏览文件 @
a7aaed44
...
...
@@ -55,7 +55,6 @@ import metalnessmap_pars_fragment from './ShaderChunk/metalnessmap_pars_fragment
import
morphnormal_vertex
from
'
./ShaderChunk/morphnormal_vertex.glsl
'
;
import
morphtarget_pars_vertex
from
'
./ShaderChunk/morphtarget_pars_vertex.glsl
'
;
import
morphtarget_vertex
from
'
./ShaderChunk/morphtarget_vertex.glsl
'
;
import
normal_flip
from
'
./ShaderChunk/normal_flip.glsl
'
;
import
normal_fragment
from
'
./ShaderChunk/normal_fragment.glsl
'
;
import
normalmap_pars_fragment
from
'
./ShaderChunk/normalmap_pars_fragment.glsl
'
;
import
packing
from
'
./ShaderChunk/packing.glsl
'
;
...
...
@@ -168,7 +167,6 @@ export var ShaderChunk = {
morphnormal_vertex
:
morphnormal_vertex
,
morphtarget_pars_vertex
:
morphtarget_pars_vertex
,
morphtarget_vertex
:
morphtarget_vertex
,
normal_flip
:
normal_flip
,
normal_fragment
:
normal_fragment
,
normalmap_pars_fragment
:
normalmap_pars_fragment
,
packing
:
packing
,
...
...
src/renderers/shaders/ShaderChunk/normal_flip.glsl
已删除
100644 → 0
浏览文件 @
a0bc2bdf
#ifdef DOUBLE_SIDED
float
flipNormal
=
(
float
(
gl_FrontFacing
)
*
2
.
0
-
1
.
0
);
#else
float
flipNormal
=
1
.
0
;
#endif
src/renderers/shaders/ShaderChunk/normal_fragment.glsl
浏览文件 @
a7aaed44
...
...
@@ -8,7 +8,13 @@
#else
vec3
normal
=
normalize
(
vNormal
)
*
flipNormal
;
vec3
normal
=
normalize
(
vNormal
);
#ifdef DOUBLE_SIDED
normal
=
normal
*
(
float
(
gl_FrontFacing
)
*
2
.
0
-
1
.
0
);
#endif
#endif
...
...
src/renderers/shaders/ShaderLib/meshphong_frag.glsl
浏览文件 @
a7aaed44
...
...
@@ -44,7 +44,6 @@ void main() {
#include <alphamap_fragment>
#include <alphatest_fragment>
#include <specularmap_fragment>
#include <normal_flip>
#include <normal_fragment>
#include <emissivemap_fragment>
...
...
src/renderers/shaders/ShaderLib/meshphysical_frag.glsl
浏览文件 @
a7aaed44
...
...
@@ -59,7 +59,6 @@ void main() {
#include <alphatest_fragment>
#include <roughnessmap_fragment>
#include <metalnessmap_fragment>
#include <normal_flip>
#include <normal_fragment>
#include <emissivemap_fragment>
...
...
src/renderers/shaders/ShaderLib/normal_frag.glsl
浏览文件 @
a7aaed44
...
...
@@ -23,7 +23,6 @@ uniform float opacity;
void
main
()
{
#include <logdepthbuf_fragment>
#include <normal_flip>
#include <normal_fragment>
gl_FragColor
=
vec4
(
packNormalToRGB
(
normal
),
opacity
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录