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
b3f4d71f
Commit
b3f4d71f
authored
Dec 08, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change slow function(get plain equation)
parent
27708a1b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
13 deletions
+40
-13
common/Charts/ChartsDrawer.js
common/Charts/ChartsDrawer.js
+40
-13
No files found.
common/Charts/ChartsDrawer.js
View file @
b3f4d71f
...
...
@@ -2752,8 +2752,10 @@ CChartsDrawer.prototype =
},
//TODO временная функция для теста результата значений
getPlainEquation
:
function
(
point1
,
point2
,
point3
)
getPlainEquation
3
:
function
(
point1
,
point2
,
point3
)
{
var
a1
=
point1
.
x
,
b1
=
point1
.
y
,
c1
=
point1
.
z
,
a2
=
point2
.
x
,
b2
=
point2
.
y
,
c2
=
point2
.
z
,
a3
=
point3
.
x
,
b3
=
point3
.
y
,
c3
=
point3
.
z
;
var
subMatrix
=
function
(
oldmat
,
row
,
col
)
{
var
i
;
...
...
@@ -2826,17 +2828,8 @@ CChartsDrawer.prototype =
}
return
tmp
;
};
var
a1
=
point1
.
x
;
var
b1
=
point1
.
y
;
var
c1
=
point1
.
z
;
var
a2
=
point2
.
x
;
var
b2
=
point2
.
y
;
var
c2
=
point2
.
z
;
var
a3
=
point3
.
x
;
var
b3
=
point3
.
y
;
var
c3
=
point3
.
z
;
var
mat
=
[];
mat
[
0
]
=
[];
mat
[
1
]
=
[];
mat
[
2
]
=
[];
mat
[
0
][
0
]
=
a1
;
mat
[
0
][
1
]
=
b1
;
mat
[
0
][
2
]
=
c1
;
...
...
@@ -2863,11 +2856,45 @@ CChartsDrawer.prototype =
var
c
=
determinant
(
replaceCol
(
mat
,
2
,
vec
))
*
factor
;
var
d
=
det
*
factor
;
return
{
a
:
a
,
b
:
b
,
c
:
c
,
d
:
d
};
var
res1
=
{
a
:
a
,
b
:
b
,
c
:
c
,
d
:
d
};
/*var t = this.getPlainEquation(point1, point2, point3)
if(!(Math.sign(res1.a) === Math.sign(t.a) && Math.sign(res1.b) === Math.sign(t.b) && Math.sign(res1.c) === Math.sign(t.c) && Math.sign(res1.d) === Math.sign(t.d)))
{
console.log("palundra");
}*/
return
res1
;
},
//TODO если будет проблема при отрисовке граней(перекрытие друг другом), вернуть протестированную функцию - getPlainEquation3
getPlainEquation
:
function
(
point1
,
point2
,
point3
)
{
var
x1
=
point1
.
x
,
y1
=
point1
.
y
,
z1
=
point1
.
z
;
var
x2
=
point2
.
x
,
y2
=
point2
.
y
,
z2
=
point2
.
z
;
var
x3
=
point3
.
x
,
y3
=
point3
.
y
,
z3
=
point3
.
z
;
var
a
=
x2
-
x1
;
var
b
=
y2
-
y1
;
var
c
=
z2
-
z1
;
var
d
=
x3
-
x1
;
var
e
=
y3
-
y1
;
var
f
=
z3
-
z1
;
var
xK
=
b
*
f
-
e
*
c
;
var
yK
=
-
(
a
*
f
-
d
*
c
);
var
zK
=
a
*
e
-
d
*
b
;
var
a1
=
-
xK
;
var
b1
=
-
yK
;
var
c1
=
-
zK
;
var
d1
=
-
(
-
y1
*
yK
-
x1
*
xK
-
z1
*
zK
);
return
{
a
:
a1
,
b
:
b1
,
c
:
c1
,
d
:
d1
};
},
//уравнение плоскости
getPlainEquation2
:
function
(
point1
,
point2
,
point3
,
point4
)
getPlainEquation2
:
function
(
point1
,
point2
,
point3
)
{
var
x1
=
point1
.
x
,
y1
=
point1
.
y
,
z1
=
point1
.
z
;
var
x2
=
point2
.
x
,
y2
=
point2
.
y
,
z2
=
point2
.
z
;
...
...
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