Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scilla-components
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
劳工
scilla-components
Commits
a2690009
Commit
a2690009
authored
Apr 11, 2019
by
rockyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加affectChildren属性,矩阵是否影响子节点
parent
c4311fa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
InteractComponent.ts
src/base/InteractComponent.ts
+1
-1
Transform.ts
src/base/Transform.ts
+3
-3
No files found.
src/base/InteractComponent.ts
View file @
a2690009
...
...
@@ -120,7 +120,7 @@ export default class InteractComponent extends ScillaComponent {
* @param e
*/
hitTest
(
e
):
boolean
{
const
matrix
=
this
.
transform
.
getMatrix
(
false
,
true
);
const
matrix
=
this
.
transform
.
getMatrix
(
false
,
true
,
true
);
matrix
.
transformPoint
(
e
.
x
,
e
.
y
,
this
.
localPos
);
let
result
=
false
;
...
...
src/base/Transform.ts
View file @
a2690009
...
...
@@ -209,7 +209,7 @@ export default class Transform extends ScillaComponent {
const
parentTransform
:
Transform
=
entity
.
parent
.
getComponent
(
Transform
);
if
(
parentTransform
)
{
this
.
_renderAlpha
=
parentTransform
.
_renderAlpha
*
this
.
alpha
;
_globalMatrix
.
concat
(
parentTransform
.
getMatrix
(
false
));
_globalMatrix
.
concat
(
parentTransform
.
getMatrix
(
false
,
false
,
true
));
}
else
{
this
.
_renderAlpha
=
this
.
alpha
;
}
...
...
@@ -226,9 +226,9 @@ export default class Transform extends ScillaComponent {
/**
* 获取矩阵
*/
getMatrix
(
withPivot
:
boolean
=
false
,
invert
:
boolean
=
false
):
Matrix
{
getMatrix
(
withPivot
:
boolean
=
false
,
invert
:
boolean
=
false
,
affectChildren
=
false
):
Matrix
{
let
matrix
;
if
(
this
.
affectChildren
){
if
(
this
.
affectChildren
||
affectChildren
){
matrix
=
withPivot
?
this
.
_globalPivotMatrix
:
this
.
_globalMatrix
;
if
(
invert
)
{
const
invertMatrix
=
this
.
_globalInvertMatrix
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment