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
7d269741
Commit
7d269741
authored
Dec 07, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add constant matrix into header class
parent
ee908adf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
5 deletions
+28
-5
common/Charts/3DTransformation.js
common/Charts/3DTransformation.js
+28
-5
No files found.
common/Charts/3DTransformation.js
View file @
7d269741
...
@@ -98,6 +98,11 @@ function Processor3D(width, height, left, right, bottom, top, chartSpace, charts
...
@@ -98,6 +98,11 @@ function Processor3D(width, height, left, right, bottom, top, chartSpace, charts
this
.
orientationCatAx
=
null
;
this
.
orientationCatAx
=
null
;
this
.
orientationValAx
=
null
;
this
.
orientationValAx
=
null
;
this
.
matrixRotateOx
=
null
;
this
.
matrixRotateOy
=
null
;
this
.
matrixRotateAllAxis
=
null
;
this
.
matrixShearXY
=
null
;
}
}
Processor3D
.
prototype
.
calaculate3DProperties
=
function
(
baseDepth
,
gapDepth
,
bIsCheck
)
Processor3D
.
prototype
.
calaculate3DProperties
=
function
(
baseDepth
,
gapDepth
,
bIsCheck
)
...
@@ -686,8 +691,11 @@ Processor3D.prototype.calculatePropertiesForPieCharts = function()
...
@@ -686,8 +691,11 @@ Processor3D.prototype.calculatePropertiesForPieCharts = function()
//***functions for matrix transformation***
//***functions for matrix transformation***
Processor3D
.
prototype
.
_shearXY
=
function
()
Processor3D
.
prototype
.
_shearXY
=
function
()
{
{
//TODO матрица перевёрнута
if
(
null
===
this
.
matrixShearXY
)
return
[[
1
,
0
,
0
,
0
],
[
0
,
1
,
0
,
0
],
[
Math
.
sin
(
-
this
.
angleOy
),
Math
.
sin
(
this
.
angleOx
),
0
,
0
],
[
0
,
0
,
0
,
0
]];
{
this
.
matrixShearXY
=
[[
1
,
0
,
0
,
0
],
[
0
,
1
,
0
,
0
],
[
Math
.
sin
(
-
this
.
angleOy
),
Math
.
sin
(
this
.
angleOx
),
0
,
0
],
[
0
,
0
,
0
,
0
]];
}
return
this
.
matrixShearXY
;
};
};
Processor3D
.
prototype
.
_getMatrixRotateAllAxis
=
function
()
Processor3D
.
prototype
.
_getMatrixRotateAllAxis
=
function
()
...
@@ -702,18 +710,33 @@ Processor3D.prototype._getMatrixRotateAllAxis = function()
...
@@ -702,18 +710,33 @@ Processor3D.prototype._getMatrixRotateAllAxis = function()
|-sinOy * cosOx sinOx cosOy * cosOx 0|
|-sinOy * cosOx sinOx cosOy * cosOx 0|
|-sinOy 0 (cosOy + 1) 1|*/
|-sinOy 0 (cosOy + 1) 1|*/
if
(
null
===
this
.
matrixRotateAllAxis
)
{
this
.
matrixRotateAllAxis
=
Point3D
.
prototype
.
multiplyMatrix
(
matrixRotateOY
,
matrixRotateOX
);
}
return
Point3D
.
prototype
.
multiplyMatrix
(
matrixRotateOY
,
matrixRotateOX
)
;
return
this
.
matrixRotateAllAxis
;
};
};
Processor3D
.
prototype
.
_getMatrixRotateOx
=
function
()
Processor3D
.
prototype
.
_getMatrixRotateOx
=
function
()
{
{
return
[[
1
,
0
,
0
,
0
],
[
0
,
Math
.
cos
(
-
this
.
angleOx
),
Math
.
sin
(
-
this
.
angleOx
),
0
],
[
0
,
-
Math
.
sin
(
-
this
.
angleOx
),
Math
.
cos
(
-
this
.
angleOx
),
1
],
[
0
,
0
,
0
,
1
]];
//todo посмотреть возможность заменить массивы на Float32Array
if
(
null
===
this
.
matrixRotateOx
)
{
this
.
matrixRotateOx
=
[[
1
,
0
,
0
,
0
],
[
0
,
Math
.
cos
(
-
this
.
angleOx
),
Math
.
sin
(
-
this
.
angleOx
),
0
],
[
0
,
-
Math
.
sin
(
-
this
.
angleOx
),
Math
.
cos
(
-
this
.
angleOx
),
1
],
[
0
,
0
,
0
,
1
]];
}
return
this
.
matrixRotateOx
;
};
};
Processor3D
.
prototype
.
_getMatrixRotateOy
=
function
()
Processor3D
.
prototype
.
_getMatrixRotateOy
=
function
()
{
{
return
[[
Math
.
cos
(
-
this
.
angleOy
),
0
,
-
Math
.
sin
(
-
this
.
angleOy
),
0
],
[
0
,
1
,
0
,
0
],
[
Math
.
sin
(
-
this
.
angleOy
),
0
,
Math
.
cos
(
-
this
.
angleOy
),
1
],
[
0
,
0
,
0
,
1
]];
if
(
null
===
this
.
matrixRotateOy
)
{
this
.
matrixRotateOy
=
[[
Math
.
cos
(
-
this
.
angleOy
),
0
,
-
Math
.
sin
(
-
this
.
angleOy
),
0
],
[
0
,
1
,
0
,
0
],
[
Math
.
sin
(
-
this
.
angleOy
),
0
,
Math
.
cos
(
-
this
.
angleOy
),
1
],
[
0
,
0
,
0
,
1
]];
}
return
this
.
matrixRotateOy
;
};
};
Processor3D
.
prototype
.
_getMatrixRotateOz
=
function
()
Processor3D
.
prototype
.
_getMatrixRotateOz
=
function
()
...
...
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