Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
5f4b4925
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,发现更多精彩内容 >>
提交
5f4b4925
编写于
1月 09, 2018
作者:
S
sunag
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add Matrix3Node and optimize UVTransformNode
上级
bf55c1c3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
42 addition
and
16 deletion
+42
-16
examples/js/loaders/NodeMaterialLoader.js
examples/js/loaders/NodeMaterialLoader.js
+2
-1
examples/js/nodes/NodeMaterial.js
examples/js/nodes/NodeMaterial.js
+1
-0
examples/js/nodes/inputs/Matrix3Node.js
examples/js/nodes/inputs/Matrix3Node.js
+31
-0
examples/js/nodes/utils/UVTransformNode.js
examples/js/nodes/utils/UVTransformNode.js
+6
-14
examples/webgl_materials_nodes.html
examples/webgl_materials_nodes.html
+2
-1
未找到文件。
examples/js/loaders/NodeMaterialLoader.js
浏览文件 @
5f4b4925
...
...
@@ -214,6 +214,7 @@ Object.assign( THREE.NodeMaterialLoader.prototype, {
break
;
case
"
Matrix3Node
"
:
case
"
Matrix4Node
"
:
object
.
value
.
fromArray
(
node
.
elements
);
...
...
@@ -321,7 +322,7 @@ Object.assign( THREE.NodeMaterialLoader.prototype, {
case
"
UVTransformNode
"
:
object
.
uv
=
this
.
getNode
(
node
.
uv
);
object
.
transform
.
value
.
fromArray
(
node
.
elements
);
object
.
transform
=
this
.
getNode
(
node
.
transform
);
break
;
...
...
examples/js/nodes/NodeMaterial.js
浏览文件 @
5f4b4925
...
...
@@ -21,6 +21,7 @@ THREE.NodeMaterial.types = {
v2
:
'
vec2
'
,
v3
:
'
vec3
'
,
v4
:
'
vec4
'
,
m3
:
'
mat3
'
,
m4
:
'
mat4
'
};
...
...
examples/js/nodes/inputs/Matrix3Node.js
0 → 100644
浏览文件 @
5f4b4925
/**
* @author sunag / http://www.sunag.com.br/
*/
THREE
.
Matrix3Node
=
function
(
matrix
)
{
THREE
.
InputNode
.
call
(
this
,
'
m3
'
);
this
.
value
=
matrix
||
new
THREE
.
Matrix3
();
};
THREE
.
Matrix3Node
.
prototype
=
Object
.
create
(
THREE
.
InputNode
.
prototype
);
THREE
.
Matrix3Node
.
prototype
.
constructor
=
THREE
.
Matrix3Node
;
THREE
.
Matrix3Node
.
prototype
.
nodeType
=
"
Matrix3
"
;
THREE
.
Matrix3Node
.
prototype
.
toJSON
=
function
(
meta
)
{
var
data
=
this
.
getJSONNode
(
meta
);
if
(
!
data
)
{
data
=
this
.
createJSONNode
(
meta
);
data
.
elements
=
this
.
value
.
elements
.
concat
();
}
return
data
;
};
examples/js/nodes/utils/UVTransformNode.js
浏览文件 @
5f4b4925
...
...
@@ -4,10 +4,10 @@
THREE
.
UVTransformNode
=
function
()
{
THREE
.
FunctionNode
.
call
(
this
,
"
( uvTransform * vec
4( uvNode, 0
, 1 ) ).xy
"
,
"
vec2
"
);
THREE
.
FunctionNode
.
call
(
this
,
"
( uvTransform * vec
3( uvNode
, 1 ) ).xy
"
,
"
vec2
"
);
this
.
uv
=
new
THREE
.
UVNode
();
this
.
transform
=
new
THREE
.
Matrix
4
Node
();
this
.
transform
=
new
THREE
.
Matrix
3
Node
();
};
...
...
@@ -26,21 +26,13 @@ THREE.UVTransformNode.prototype.generate = function ( builder, output ) {
THREE
.
UVTransformNode
.
prototype
.
compose
=
function
()
{
var
defaultPivot
=
new
THREE
.
Vector2
(
.
5
,
.
5
),
tempVector
=
new
THREE
.
Vector3
(),
tempMatrix
=
new
THREE
.
Matrix4
();
var
defaultPivot
=
new
THREE
.
Vector2
(
.
5
,
.
5
);
return
function
compose
(
translate
,
rotate
,
scal
e
,
optionalCenter
)
{
return
function
compose
(
translate
,
scale
,
rotat
e
,
optionalCenter
)
{
optionalCenter
=
optionalCenter
!==
undefined
?
optionalCenter
:
defaultPivot
;
var
matrix
=
this
.
transform
.
value
;
matrix
.
identity
()
.
setPosition
(
tempVector
.
set
(
-
optionalCenter
.
x
,
-
optionalCenter
.
y
,
0
)
)
.
premultiply
(
tempMatrix
.
makeRotationZ
(
rotate
)
)
.
multiply
(
tempMatrix
.
makeScale
(
scale
.
x
,
scale
.
y
,
0
)
)
.
multiply
(
tempMatrix
.
makeTranslation
(
translate
.
x
,
translate
.
y
,
0
)
);
this
.
transform
.
value
.
setUvTransform
(
translate
.
x
,
translate
.
y
,
scale
.
x
,
scale
.
y
,
rotate
,
optionalCenter
.
x
,
optionalCenter
.
y
);
return
this
;
...
...
@@ -57,7 +49,7 @@ THREE.UVTransformNode.prototype.toJSON = function ( meta ) {
data
=
this
.
createJSONNode
(
meta
);
data
.
uv
=
this
.
uv
.
toJSON
(
meta
).
uuid
;
data
.
elements
=
this
.
transform
.
value
.
elements
.
concat
()
;
data
.
transform
=
this
.
transform
.
toJSON
(
meta
).
uuid
;
}
...
...
examples/webgl_materials_nodes.html
浏览文件 @
5f4b4925
...
...
@@ -72,6 +72,7 @@
<script
src=
"js/nodes/inputs/Vector3Node.js"
></script>
<script
src=
"js/nodes/inputs/Vector4Node.js"
></script>
<script
src=
"js/nodes/inputs/TextureNode.js"
></script>
<script
src=
"js/nodes/inputs/Matrix3Node.js"
></script>
<script
src=
"js/nodes/inputs/Matrix4Node.js"
></script>
<script
src=
"js/nodes/inputs/CubeTextureNode.js"
></script>
...
...
@@ -860,7 +861,7 @@
function
updateUVTransform
()
{
texture
.
coord
.
compose
(
translate
,
THREE
.
Math
.
degToRad
(
rotate
),
scale
);
texture
.
coord
.
compose
(
translate
,
scale
,
THREE
.
Math
.
degToRad
(
rotate
)
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录