Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zeroing-editor
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
劳工
zeroing-editor
Commits
a3b53360
Commit
a3b53360
authored
May 28, 2020
by
任建锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
--
parent
dd6e52a5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
Views.vue
src/views/Editor/Views.vue
+2
-2
RuntimeLayer.vue
src/views/Editor/components/RuntimeLayer.vue
+1
-0
editControlView.vue
src/views/Editor/components/editControlView.vue
+15
-9
No files found.
src/views/Editor/Views.vue
View file @
a3b53360
...
...
@@ -169,8 +169,8 @@
y
:
parseInt
(
node
.
y
),
anchorX
:
parseInt
(
node
.
anchorX
),
anchorY
:
parseInt
(
node
.
anchorY
),
scaleX
:
parseInt
(
node
.
anchor
X
),
scaleY
:
parseInt
(
node
.
anchor
Y
),
scaleX
:
parseInt
(
node
.
scale
X
),
scaleY
:
parseInt
(
node
.
scale
Y
),
// imageWidth:parseInt(node.imageWidth),
// imageHeight:parseInt(node.imageHeight),
width
:
parseInt
(
node
.
_width
),
...
...
src/views/Editor/components/RuntimeLayer.vue
View file @
a3b53360
...
...
@@ -95,6 +95,7 @@
let
view
=
this
.
getNode
(
''
,
true
);
return
node
.
getIndexPath
(
view
);
},
}
}
</
script
>
...
...
src/views/Editor/components/editControlView.vue
View file @
a3b53360
...
...
@@ -311,10 +311,11 @@ export default {
this
.
styleCatch
=
{
x
:
this
.
targetNode
.
x
,
y
:
this
.
targetNode
.
y
,
worldVisible
:
this
.
targetNode
.
worldVisible
,
anchorX
:
this
.
targetNode
.
anchorX
,
anchorY
:
this
.
targetNode
.
anchorY
,
imageWidth
:
this
.
targetNode
.
imag
eWidth
,
imageHeight
:
this
.
targetNode
.
imag
eHeight
,
textureWidth
:
this
.
targetNode
.
textur
eWidth
,
textureHeight
:
this
.
targetNode
.
textur
eHeight
,
worldMatrix
:
this
.
targetNode
.
worldMatrix
,
width
:
this
.
targetNode
.
width
,
height
:
this
.
targetNode
.
height
,
...
...
@@ -356,15 +357,16 @@ export default {
}
let
result
=
{
width
:
`
${
(
this
.
styleCatch
.
imageWidth
?
this
.
styleCatch
.
imageWidth
:(
this
.
styleCatch
.
width
?
this
.
styleCatch
.
width
:
0
))
*
scaleX
/
window
.
devicePixelRatio
}
px`
,
height
:
`
${
(
this
.
styleCatch
.
imageHeight
?
this
.
styleCatch
.
imageHeight
:(
this
.
styleCatch
.
height
?
this
.
styleCatch
.
height
:
0
))
*
scaleY
/
window
.
devicePixelRatio
}
px`
,
width
:
`
${
(
this
.
styleCatch
.
textureWidth
?
this
.
styleCatch
.
textureWidth
:(
this
.
styleCatch
.
_width
?
this
.
styleCatch
.
_width
:(
this
.
styleCatch
.
width
?
this
.
styleCatch
.
width
:
0
)
))
*
scaleX
/
window
.
devicePixelRatio
}
px`
,
height
:
`
${
(
this
.
styleCatch
.
textureHeight
?
this
.
styleCatch
.
textureHeight
:(
this
.
styleCatch
.
_height
?
this
.
styleCatch
.
_height
:(
this
.
styleCatch
.
height
?
this
.
styleCatch
.
height
:
0
)
))
*
scaleY
/
window
.
devicePixelRatio
}
px`
,
marginTop
:
`
${
y
/
window
.
devicePixelRatio
}
px`
,
marginLeft
:
`
${
x
/
window
.
devicePixelRatio
}
px`
,
transform
:
`rotate(
${
rotation
}
deg)`
,
// webkitTransformOriginY: `${ this.styleCatch.anchorY?this.styleCatch.anchorY:0}px`,
// webkitTransformOriginX: `${ this.styleCatch.anchorX?this.styleCatch.anchorX:0}px`,
webkitTransformOrigin
:
`0px 0px 0px`
,
opacity
:
`
${
this
.
canFouce
?
"1"
:
"0"
}
`
opacity
:
`
${
this
.
canFouce
?
"1"
:
"0"
}
`
,
display
:
`
${
this
.
styleCatch
.
worldVisible
?
"block"
:
"none"
}
`
// transform: `matrix(${this.styleCatch.worldMatrix.a},${this.styleCatch.worldMatrix.b},${this.styleCatch.worldMatrix.c},${this.styleCatch.worldMatrix.d},${this.styleCatch.worldMatrix.tx},${this.styleCatch.worldMatrix.ty})`
}
...
...
@@ -410,18 +412,21 @@ export default {
},
targetNode
:
function
(){
console
.
log
(
"targetNode变化"
,
this
.
targetNode
)
// console.log(this.targetNode.getLocalBounds())
if
(
!
this
.
targetNode
){
return
}
let
{
x
,
y
,
worldVisible
,
anchorX
,
anchorY
,
width
,
height
,
imag
eWidth
,
imag
eHeight
,
textur
eWidth
,
textur
eHeight
,
left
,
top
,
right
,
...
...
@@ -449,8 +454,8 @@ export default {
anchorY
,
width
,
height
,
imag
eWidth
,
imag
eHeight
,
textur
eWidth
,
textur
eHeight
,
left
,
top
,
right
,
...
...
@@ -461,6 +466,7 @@ export default {
instanceType
,
verticalCenter
,
source
,
worldVisible
,
_width
,
_height
,
}
...
...
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