Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
dbffec78
Commit
dbffec78
authored
Apr 26, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MATRIX_ORDER_PREPEND -> AscCommon.MATRIX_ORDER_PREPEND
parent
20d53876
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
12 deletions
+5
-12
cell/native/DrawingContext.js
cell/native/DrawingContext.js
+5
-12
No files found.
cell/native/DrawingContext.js
View file @
dbffec78
...
...
@@ -134,13 +134,6 @@
function
rad2deg
(
rad
){
return
rad
*
180.0
/
Math
.
PI
;
}
/** @const */
var
MATRIX_ORDER_PREPEND
=
AscCommon
.
MATRIX_ORDER_PREPEND
;
var
MATRIX_ORDER_APPEND
=
AscCommon
.
MATRIX_ORDER_APPEND
;
/**
* @constructor
*/
...
...
@@ -192,9 +185,9 @@
};
Matrix
.
prototype
.
multiply
=
function
(
matrix
,
order
)
{
if
(
MATRIX_ORDER_PREPEND
===
order
)
{
if
(
AscCommon
.
MATRIX_ORDER_PREPEND
===
order
)
{
var
m
=
matrix
.
clone
();
m
.
multiply
(
this
,
MATRIX_ORDER_APPEND
);
m
.
multiply
(
this
,
AscCommon
.
MATRIX_ORDER_APPEND
);
this
.
copyFrom
(
m
);
}
else
{
var
t0
=
this
.
sx
*
matrix
.
sx
+
this
.
shy
*
matrix
.
shx
;
...
...
@@ -1314,12 +1307,12 @@
DrawingContext
.
prototype
.
_calcMFT
=
function
()
{
this
.
_mft
=
this
.
_mct
.
clone
();
this
.
_mft
.
multiply
(
this
.
_mbt
,
MATRIX_ORDER_PREPEND
);
this
.
_mft
.
multiply
(
this
.
_mt
,
MATRIX_ORDER_PREPEND
);
this
.
_mft
.
multiply
(
this
.
_mbt
,
AscCommon
.
MATRIX_ORDER_PREPEND
);
this
.
_mft
.
multiply
(
this
.
_mt
,
AscCommon
.
MATRIX_ORDER_PREPEND
);
this
.
_mift
=
this
.
_mt
.
clone
();
this
.
_mift
.
invert
();
this
.
_mift
.
multiply
(
this
.
_mft
,
MATRIX_ORDER_PREPEND
);
this
.
_mift
.
multiply
(
this
.
_mft
,
AscCommon
.
MATRIX_ORDER_PREPEND
);
};
/**
...
...
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