Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
abf63b05
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,发现更多精彩内容 >>
提交
abf63b05
编写于
1月 10, 2017
作者:
B
bdysvik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Proper prefixing of uniforms and attributes. Add 'color' to the attribreplaceTHREEShaderAttributes.
上级
50b2d2f7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
19 deletion
+26
-19
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+8
-1
examples/models/gltf/snowflake/line_vert.glsl
examples/models/gltf/snowflake/line_vert.glsl
+7
-7
examples/models/gltf/snowflake/snowFlake.gltf
examples/models/gltf/snowflake/snowFlake.gltf
+2
-2
examples/models/gltf/snowflakes/line_vert.glsl
examples/models/gltf/snowflakes/line_vert.glsl
+7
-7
examples/models/gltf/snowflakes/snowFlakes.gltf
examples/models/gltf/snowflakes/snowFlakes.gltf
+2
-2
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
abf63b05
...
@@ -486,6 +486,13 @@ THREE.GLTFLoader = ( function () {
...
@@ -486,6 +486,13 @@ THREE.GLTFLoader = ( function () {
shaderText
=
shaderText
.
replace
(
regEx
,
'
uv
'
);
shaderText
=
shaderText
.
replace
(
regEx
,
'
uv
'
);
break
;
break
;
case
'
COLOR_0
'
:
case
'
COLOR0
'
:
case
'
COLOR
'
:
shaderText
=
shaderText
.
replace
(
regEx
,
'
color
'
);
break
;
case
"
WEIGHT
"
:
case
"
WEIGHT
"
:
shaderText
=
shaderText
.
replace
(
regEx
,
'
skinWeight
'
);
shaderText
=
shaderText
.
replace
(
regEx
,
'
skinWeight
'
);
...
@@ -1758,4 +1765,4 @@ THREE.GLTFLoader = ( function () {
...
@@ -1758,4 +1765,4 @@ THREE.GLTFLoader = ( function () {
return
GLTFLoader
;
return
GLTFLoader
;
}
)();
}
)();
\ No newline at end of file
examples/models/gltf/snowflake/line_vert.glsl
浏览文件 @
abf63b05
precision
highp
float
;
precision
highp
float
;
attribute
vec3
position
;
attribute
vec3
a_
position
;
attribute
vec3
color
;
attribute
vec3
a_
color
;
varying
vec3
v_color
;
varying
vec3
v_color
;
uniform
mat4
modelViewMatrix
;
uniform
mat4
u_
modelViewMatrix
;
uniform
mat4
projectionMatrix
;
uniform
mat4
u_
projectionMatrix
;
void
main
(
void
)
{
void
main
(
void
)
{
vec4
pos
=
modelViewMatrix
*
vec4
(
position
,
1
.
0
);
vec4
pos
=
u_
modelViewMatrix
*
vec4
(
position
,
1
.
0
);
v_color
=
color
;
v_color
=
a_
color
;
gl_Position
=
projectionMatrix
*
pos
;
gl_Position
=
u_
projectionMatrix
*
pos
;
}
}
\ No newline at end of file
examples/models/gltf/snowflake/snowFlake.gltf
浏览文件 @
abf63b05
...
@@ -158,8 +158,8 @@
...
@@ -158,8 +158,8 @@
},
},
"program": "meshProgram",
"program": "meshProgram",
"uniforms": {
"uniforms": {
"modelViewMatrix": "modelViewMatrixParameter",
"
u_
modelViewMatrix": "modelViewMatrixParameter",
"projectionMatrix": "projectionMatrixParameter"
"
u_
projectionMatrix": "projectionMatrixParameter"
},
},
"states": {
"states": {
"enable": [
"enable": [
...
...
examples/models/gltf/snowflakes/line_vert.glsl
浏览文件 @
abf63b05
precision
highp
float
;
precision
highp
float
;
attribute
vec3
position
;
attribute
vec3
a_
position
;
attribute
vec3
color
;
attribute
vec3
a_
color
;
varying
vec3
v_color
;
varying
vec3
v_color
;
uniform
mat4
modelViewMatrix
;
uniform
mat4
u_
modelViewMatrix
;
uniform
mat4
projectionMatrix
;
uniform
mat4
u_
projectionMatrix
;
void
main
(
void
)
{
void
main
(
void
)
{
vec4
pos
=
modelViewMatrix
*
vec4
(
position
,
1
.
0
);
vec4
pos
=
u_modelViewMatrix
*
vec4
(
a_
position
,
1
.
0
);
v_color
=
color
;
v_color
=
a_
color
;
gl_Position
=
projectionMatrix
*
pos
;
gl_Position
=
u_
projectionMatrix
*
pos
;
}
}
\ No newline at end of file
examples/models/gltf/snowflakes/snowFlakes.gltf
浏览文件 @
abf63b05
...
@@ -181,8 +181,8 @@
...
@@ -181,8 +181,8 @@
},
},
"program": "meshProgram",
"program": "meshProgram",
"uniforms": {
"uniforms": {
"modelViewMatrix": "modelViewMatrixParameter",
"
u_
modelViewMatrix": "modelViewMatrixParameter",
"projectionMatrix": "projectionMatrixParameter"
"
u_
projectionMatrix": "projectionMatrixParameter"
},
},
"states": {
"states": {
"enable": [
"enable": [
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录