Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zeroing-engine
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-engine
Commits
0c12aa3e
Commit
0c12aa3e
authored
Mar 23, 2020
by
rockyl
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into mvvm
# Conflicts: # manifest.json # src/2d/display/Stage.ts
parents
eedc3d22
ff29b190
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
manifest.json
manifest.json
+1
-1
Stage.ts
src/2d/display/Stage.ts
+0
-1
No files found.
manifest.json
View file @
0c12aa3e
{
"id"
:
"engine"
,
"url"
:
"engine.210e93fc8ecfcb27da00c77582649b96949d28c3.js"
}
\ No newline at end of file
{
"id"
:
"engine"
,
"url"
:
"engine.47eb390007c368d3dc5648734153301ebead724b.js"
}
\ No newline at end of file
src/2d/display/Stage.ts
View file @
0c12aa3e
...
...
@@ -646,7 +646,6 @@ export class Stage extends Container {
let
rootDiv
=
s
.
rootDiv
;
let
doc
=
document
.
documentElement
;
let
box
=
rootDiv
.
getBoundingClientRect
();
//points[o].target
console
.
log
(
box
.
y
);
let
left
=
box
.
left
+
window
.
pageXOffset
-
doc
.
clientLeft
;
let
top
=
box
.
top
+
window
.
pageYOffset
-
doc
.
clientTop
;
cp
.
x
=
(
points
[
o
].
pageX
-
left
)
*
devicePixelRatio
;
...
...
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