Skip to content

S
sdkjs
Commit 76886c51 authored by GoshaZotov's avatar GoshaZotov
Browse files
Options

create class CSortFaces

parent 1b22f4c8
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 398 deletions
common/Charts/ChartsDrawer.js
View file @ 76886c51
...@@ -2497,6 +2497,168 @@ CChartsDrawer.prototype = ...@@ -2497,6 +2497,168 @@ CChartsDrawer.prototype =
return counter; return counter;
}, },
//вспомогательные функции работающие с тремя координатами
//получаем к-ты уравнения прямой по 2 точкам
getLineEquation: function(point1, point2)
{
var x0 = point1.x, y0 = point1.y, z0 = point1.z;
var x1 = point2.x, y1 = point2.y, z1 = point2.z;
/*x - x0 = y - y0 = z - z0
x1 - x0 y1 - y0 z1 - z0
l m n
*/
var l = x1 - x0;
var m = y1 - y0;
var n = z1 - z0;
//check line
var x123 = (point1.x - x0) / (x1 - x0);
var y123 = (point1.y - y0) / (y1 - y0);
var z123 = (point1.z - z0) / (z1 - z0);
var x321 = (point2.x - x0) / (x1 - x0);
var y321 = (point2.y - y0) / (y1 - y0);
var z321 = (point2.z - z0) / (z1 - z0);
return {l: l, m: m, n: n, x1: x0, y1: y0, z1: z0};
},
//поиск точки пересечения плоскости и прямой
isIntersectionPlainAndLine: function(plainEquation, lineEquation)
{
var A = plainEquation.a;
var B = plainEquation.b;
var C = plainEquation.c;
var D = plainEquation.d;
var l = lineEquation.l;
var m = lineEquation.m;
var n = lineEquation.n;
var x1 = lineEquation.x1;
var y1 = lineEquation.y1;
var z1 = lineEquation.z1;
//x - x1 y - y1 z - z1
// = = t
// l m n
/*x = t * l + x1
y = t * m + y1
z = t * n + z1*/
/*A * x + B * y + C * z + D = 0
A * (t * l + x1) + B * (t * m + y1) + C * (t * n + z1) + D = 0;
A * t * l + A * x1 + B * t * m + B * y1 + C * t * n + C * z1 + D
A * t * l + B * t * m + C * t * n + A * x1 + B * y1 + C * z1 + D*/
var t = -(A * x1 + B * y1 + C * z1 + D) / (A * l + B * m + C * n);
var x = t * l + x1;
var y = t * m + y1;
var z = t * n + z1;
return {x: x, y: y, z: z};
},
//получаем площадь произвольного выпуклого четырехугольника
getAreaQuadrilateral: function(point0, point1, point2, point3)
{
//длины сторон
var a = Math.sqrt(Math.pow(point3.x - point0.x, 2) + Math.pow(point3.y - point0.y, 2));
var b = Math.sqrt(Math.pow(point1.x - point0.x, 2) + Math.pow(point1.y - point0.y, 2));
var c = Math.sqrt(Math.pow(point2.x - point1.x, 2) + Math.pow(point2.y - point1.y, 2));
var d = Math.sqrt(Math.pow(point3.x - point2.x, 2) + Math.pow(point3.y - point2.y, 2));
//длины диагоналей
var e = Math.sqrt(Math.pow(point3.x - point1.x, 2) + Math.pow(point3.y - point1.y, 2));
var f = Math.sqrt(Math.pow(point0.x - point2.x, 2) + Math.pow(point0.y - point2.y, 2));
//полупериметр
var p = (a + b + c + d) / 2;
var res = Math.sqrt((p - a) * (p - b) * (p - c) * (p - d) + (1/4) * ((e * f + a * c + b * d) * (e * f - a * c - b * d)));
return res;
},
//получаем площадь произвольного трехугольника
getAreaTriangle: function(point0, point1, point2)
{
//длины сторон
var a = Math.sqrt(Math.pow(point1.x - point0.x, 2) + Math.pow(point1.y - point0.y, 2));
var b = Math.sqrt(Math.pow(point2.x - point1.x, 2) + Math.pow(point2.y - point1.y, 2));
var c = Math.sqrt(Math.pow(point2.x - point0.x, 2) + Math.pow(point2.y - point0.y, 2));
//полупериметр
var p = (a + b + c ) / 2;
var res = Math.sqrt(p * (p - a) * (p - b) * (p - c));
return res;
},
//из массива точек получаем минимальные/максимальные x,y,z
getMinMaxPoints: function(points)
{
var minX, maxX, minY, maxY, minZ, maxZ;
for(var n = 0; n < points.length; n++)
{
if(0 === n)
{
minX = points[0].x;
maxX = points[0].x;
minY = points[0].y;
maxY = points[0].y;
minZ = points[0].z;
maxZ = points[0].z;
}
else
{
if(points[n].x < minX)
{
minX = points[n].x;
}
if(points[n].x > maxX)
{
maxX = points[n].x;
}
if(points[n].y < minY)
{
minY = points[n].y;
}
if(points[n].y > maxY)
{
maxY = points[n].y;
}
if(points[n].z < minZ)
{
minZ = points[n].z;
}
if(points[n].z > maxZ)
{
maxZ = points[n].z;
}
}
}
return {minX: minX, maxX: maxX, minY : minY, maxY: maxY, minZ: minZ, maxZ: maxZ};
},
//******calculate graphic objects for 3d******* //******calculate graphic objects for 3d*******
...@@ -6334,505 +6496,109 @@ drawHBarChart.prototype = ...@@ -6334,505 +6496,109 @@ drawHBarChart.prototype =
} }
newStartX = startX; newStartX = startX;
if(this.cChartSpace.chart.plotArea.valAx.scaling.orientation != ORIENTATION_MIN_MAX && (this.chartProp.subType == "stackedPer" || this.chartProp.subType == "stacked")) if(this.cChartSpace.chart.plotArea.valAx.scaling.orientation != ORIENTATION_MIN_MAX && (this.chartProp.subType == "stackedPer" || this.chartProp.subType == "stacked"))
{ {
newStartX = startX - width; newStartX = startX - width;
}
if(this.cChartDrawer.nDimensionCount === 3)
{
width = width * this.chartProp.pxToMM;
newStartX = newStartX * this.chartProp.pxToMM;
newStartY = newStartY - individualBarHeight;
//рассчитываем 8 точек для каждого столбца
x1 = newStartX, y1 = newStartY, z1 = DiffGapDepth;
x2 = newStartX, y2 = newStartY, z2 = perspectiveDepth + DiffGapDepth;
x3 = newStartX + width, y3 = newStartY, z3 = perspectiveDepth + DiffGapDepth;
x4 = newStartX + width, y4 = newStartY, z4 = DiffGapDepth;
x5 = newStartX, y5 = newStartY + individualBarHeight, z5 = DiffGapDepth;
x6 = newStartX, y6 = newStartY + individualBarHeight, z6 = perspectiveDepth + DiffGapDepth;
x7 = newStartX + width, y7 = newStartY + individualBarHeight, z7 = perspectiveDepth + DiffGapDepth;
x8 = newStartX + width, y8 = newStartY + individualBarHeight, z8 = DiffGapDepth;
//поворот относительно осей
point1 = this.cChartDrawer._convertAndTurnPoint(x1, y1, z1);
point2 = this.cChartDrawer._convertAndTurnPoint(x2, y2, z2);
point3 = this.cChartDrawer._convertAndTurnPoint(x3, y3, z3);
point4 = this.cChartDrawer._convertAndTurnPoint(x4, y4, z4);
point5 = this.cChartDrawer._convertAndTurnPoint(x5, y5, z5);
point6 = this.cChartDrawer._convertAndTurnPoint(x6, y6, z6);
point7 = this.cChartDrawer._convertAndTurnPoint(x7, y7, z7);
point8 = this.cChartDrawer._convertAndTurnPoint(x8, y8, z8);
//не проецируем на плоскость
var point11 = this.cChartDrawer._convertAndTurnPoint(x1, y1, z1, null, null, true);
var point22 = this.cChartDrawer._convertAndTurnPoint(x2, y2, z2, null, null, true);
var point33 = this.cChartDrawer._convertAndTurnPoint(x3, y3, z3, null, null, true);
var point44 = this.cChartDrawer._convertAndTurnPoint(x4, y4, z4, null, null, true);
var point55 = this.cChartDrawer._convertAndTurnPoint(x5, y5, z5, null, null, true);
var point66 = this.cChartDrawer._convertAndTurnPoint(x6, y6, z6, null, null, true);
var point77 = this.cChartDrawer._convertAndTurnPoint(x7, y7, z7, null, null, true);
var point88 = this.cChartDrawer._convertAndTurnPoint(x8, y8, z8, null, null, true);
paths = this.cChartDrawer.calculateRect3D(point1, point2, point3, point4, point5, point6, point7, point8, val);
var widthScreen = this.chartProp.widthCanvas - this.chartProp.chartGutter._right;
var centralViewPoint = {x: widthScreen / 2, y: heightGraph + this.chartProp.chartGutter._bottom, z: 0};
var plainEquation1 = getPlainEquation(point11, point44, point88, point55);
var plainEquation2 = getPlainEquation(point11, point22, point33, point44);
var plainEquation3 = getPlainEquation(point11, point22, point66, point55);
var plainEquation4 = getPlainEquation(point44, point88, point77, point33);
var plainEquation5 = getPlainEquation(point55, point66, point77, point88);
var plainEquation6 = getPlainEquation(point66, point22, point33, point77);
var plainEquations = [plainEquation1, plainEquation2, plainEquation3, plainEquation4, plainEquation5, plainEquation6];
var arrPoints = [[point1, point4, point8, point5], [point1, point2, point3, point4], [point1, point2, point6, point5], [point4, point8, point7, point3], [point5, point6, point7, point8], [point6, point2, point3, point7]];
var arrPoints2 = [[point11, point44, point88, point55], [point11, point22, point33, point44], [point11, point22, point66, point55], [point44, point88, point77, point33], [point55, point66, point77, point88], [point66, point22, point33, point77]];
for(var k = 0; k < paths.length; k++)
{
/*if(!(k == 0 || k == 4))
{
continue;
}*/
if(null === paths[k])
continue;
this.sortZIndexPaths.push({seria: i, point: idx, verge: k, paths: paths[k], points: arrPoints2[k], points2: arrPoints[k], plainEquation: plainEquations[k]});
}
}
else
{
paths = this._calculateRect(newStartX, newStartY / this.chartProp.pxToMM, width, individualBarHeight / this.chartProp.pxToMM);
}
if(!this.paths.series)
this.paths.series = [];
if(!this.paths.series[i])
this.paths.series[i] = [];
if(height != 0)
this.paths.series[i][idx] = paths;
}
if(seria.length)
seriesCounter++;
}
if(this.cChartDrawer.nDimensionCount === 3)
{
console.time("asd");
this._sort3DVerges();
console.timeEnd("asd");
}
},
_sort3DVerges: function()
{
var heightGraph = this.chartProp.heightCanvas - this.chartProp.chartGutter._top - this.chartProp.chartGutter._bottom;
var widthScreen = this.chartProp.widthCanvas - this.chartProp.chartGutter._right;
var diffY = this.cChartDrawer.processor3D.cameraDiffY;
var diffX = 0/*-this.cChartDrawer.processor3D.cameraDiffX*/;
var centralViewPoint = {x: this.chartProp.widthCanvas / 2 - diffX, y: this.chartProp.heightCanvas / 2 - diffY, z: -500};
//centralViewPoint = this.cChartDrawer._convertAndTurnPoint(centralViewPoint.x, centralViewPoint.y, centralViewPoint.z, true, null, true);
var firstVerges = [];
var lastVerges = [];
//уравнение плоскости
var getLineEquation = function(point1, point2)
{
var x0 = point1.x, y0 = point1.y, z0 = point1.z;
var x1 = point2.x, y1 = point2.y, z1 = point2.z;
/*x - x0 = y - y0 = z - z0
x1 - x0 y1 - y0 z1 - z0
l m n
*/
var l = x1 - x0;
var m = y1 - y0;
var n = z1 - z0;
//check line
var x123 = (point1.x - x0) / (x1 - x0);
var y123 = (point1.y - y0) / (y1 - y0);
var z123 = (point1.z - z0) / (z1 - z0);
var x321 = (point2.x - x0) / (x1 - x0);
var y321 = (point2.y - y0) / (y1 - y0);
var z321 = (point2.z - z0) / (z1 - z0);
return {l: l, m: m, n: n, x1: x0, y1: y0, z1: z0};
};
//уравнение плоскости
var isIntersectionPlainAndLine = function(plainEquation, lineEquation)
{
var A = plainEquation.a;
var B = plainEquation.b;
var C = plainEquation.c;
var D = plainEquation.d;
var l = lineEquation.l;
var m = lineEquation.m;
var n = lineEquation.n;
var x1 = lineEquation.x1;
var y1 = lineEquation.y1;
var z1 = lineEquation.z1;
//x - x1 y - y1 z - z1
// = = t
// l m n
/*x = t * l + x1
y = t * m + y1
z = t * n + z1*/
/*A * x + B * y + C * z + D = 0
A * (t * l + x1) + B * (t * m + y1) + C * (t * n + z1) + D = 0;
A * t * l + A * x1 + B * t * m + B * y1 + C * t * n + C * z1 + D
A * t * l + B * t * m + C * t * n + A * x1 + B * y1 + C * z1 + D*/
var t = -(A * x1 + B * y1 + C * z1 + D) / (A * l + B * m + C * n);
var x = t * l + x1;
var y = t * m + y1;
var z = t * n + z1;
return {x: x, y: y, z: z};
};
var getEquationLineOnPlane = function(point1, point2)
{
var x1 = point1.x;
var y1 = point1.y;
var x2 = point2.x;
var y2 = point2.y;
/*
(x-xa) * (yb - ya) = (y - ya) * (xb - xa)
x * yb - x * ya - xa * yb + xa * ya = y * xb - y * xa - ya * xb + ya * xa
y * xb - y * xa = x * yb - x * ya - xa * yb + xa * ya - ya * xa + ya * xb
var tempKY = xb - xa;
var tempKX = yb - ya;
var tempC = - xa * yb + xa * ya - ya * xa + ya * xb;
y * tempKY = tempKX * x + tempC
var a = tempKX / tempKY;
var b = tempC / tempKY;
var a = (y1 - y2) / (x1 - x2);
var b = y2 - a * x2;
*/
var tempKY = x2 - x1;
var tempKX = y2 - y1;
var tempC = - x1 * y2 + x1 * y1 - y1 * x1 + y1 * x2;
if(tempKY === 0)
{
var a = 0;
var b = x1;
}
else
{
var a = tempKX / tempKY;
var b = tempC / tempKY;
}
/*var a = (y1 - y2) / (x1 - x2);
if(x1 - x2 === 0)
{
a = 0;
}
var b = y2 - a * x2;*/
return {a: a, b: b};
};
var getMinMaxPoints = function(points)
{
var minX, maxX, minY, maxY, minZ, maxZ;
for(var n = 0; n < points.length; n++)
{
if(0 === n)
{
minX = points[0].x;
maxX = points[0].x;
minY = points[0].y;
maxY = points[0].y;
minZ = points[0].z;
maxZ = points[0].z;
}
else
{
if(points[n].x < minX)
{
minX = points[n].x;
}
if(points[n].x > maxX)
{
maxX = points[n].x;
}
if(points[n].y < minY)
{
minY = points[n].y;
}
if(points[n].y > maxY)
{
maxY = points[n].y;
}
if(points[n].z < minZ)
{
minZ = points[n].z;
}
if(points[n].z > maxZ)
{
maxZ = points[n].z;
}
}
}
return {minX: minX, maxX: maxX, minY : minY, maxY: maxY, minZ: minZ, maxZ: maxZ};
};
var getAreaQuadrilateral = function(point0, point1, point2, point3)
{
//длины сторон
var a = Math.sqrt(Math.pow(point3.x - point0.x, 2) + Math.pow(point3.y - point0.y, 2));
var b = Math.sqrt(Math.pow(point1.x - point0.x, 2) + Math.pow(point1.y - point0.y, 2));
var c = Math.sqrt(Math.pow(point2.x - point1.x, 2) + Math.pow(point2.y - point1.y, 2));
var d = Math.sqrt(Math.pow(point3.x - point2.x, 2) + Math.pow(point3.y - point2.y, 2));
//длины диагоналей
var e = Math.sqrt(Math.pow(point3.x - point1.x, 2) + Math.pow(point3.y - point1.y, 2));
var f = Math.sqrt(Math.pow(point0.x - point2.x, 2) + Math.pow(point0.y - point2.y, 2));
//полупериметр
var p = (a + b + c + d) / 2;
var res = Math.sqrt((p - a) * (p - b) * (p - c) * (p - d) + (1/4) * ((e * f + a * c + b * d) * (e * f - a * c - b * d)));
return res;
};
var getAreaTriangle = function(point0, point1, point2)
{
//длины сторон
var a = Math.sqrt(Math.pow(point1.x - point0.x, 2) + Math.pow(point1.y - point0.y, 2));
var b = Math.sqrt(Math.pow(point2.x - point1.x, 2) + Math.pow(point2.y - point1.y, 2));
var c = Math.sqrt(Math.pow(point2.x - point0.x, 2) + Math.pow(point2.y - point0.y, 2));
//полупериметр
var p = (a + b + c ) / 2;
var res = Math.sqrt(p * (p - a) * (p - b) * (p - c));
return res;
};
var isBetweenPoint= function(point, start, end)
{
//TODO округление пересмотреть
var res = false;
point = Math.round(point * 100) / 100;
start = Math.round(start * 100) / 100;
end = Math.round(end * 100) / 100;
if(point > start && point < end)
{
res = true;
}
return res;
};
var t = this;
var isNotIntersectionVergesAndLine = function(lineEqucation, pointFromVerge, i, j, sortZIndexPaths)
{
var res = true;
for(var k = 0; k < sortZIndexPaths.length; k++)
{
if(k === i)
continue;
var plainEqucation = sortZIndexPaths[k].plainEquation;
//get intersection
var nIntersectionPlainAndLine = isIntersectionPlainAndLine(plainEqucation ,lineEqucation);
if(null === nIntersectionPlainAndLine)
{
continue;
}
var projectIntersection = t.cChartDrawer._convertAndTurnPoint(nIntersectionPlainAndLine.x, nIntersectionPlainAndLine.y, nIntersectionPlainAndLine.z, true, true);
var minMaxpoints = getMinMaxPoints(sortZIndexPaths[k].points);
var minX = minMaxpoints.minX, maxX = minMaxpoints.maxX, minY = minMaxpoints.minY, maxY = minMaxpoints.maxY, minZ = minMaxpoints.minZ, maxZ = minMaxpoints.maxZ;
var iSX = nIntersectionPlainAndLine.x;
var iSY = nIntersectionPlainAndLine.y;
var iSZ = nIntersectionPlainAndLine.z;
if(iSZ < pointFromVerge.z && isBetweenPoint(iSZ, minZ, maxZ) && isBetweenPoint(iSX, minX, maxX) && isBetweenPoint(iSY, minY, maxY))
{
var point0 = sortZIndexPaths[k].points2[0];
var point1 = sortZIndexPaths[k].points2[1];
var point2 = sortZIndexPaths[k].points2[2];
var point3 = sortZIndexPaths[k].points2[3];
var areaQuadrilateral = getAreaQuadrilateral(point0, point1, point2, point3);
var areaTriangle1 = getAreaTriangle(point0, projectIntersection, point1);
var areaTriangle2 = getAreaTriangle(point1, projectIntersection, point2);
var areaTriangle3 = getAreaTriangle(point2, projectIntersection, point3);
var areaTriangle4 = getAreaTriangle(point3, projectIntersection, point0);
if(parseInt(areaQuadrilateral) === parseInt(areaTriangle1 + areaTriangle2 + areaTriangle3 + areaTriangle4))
{
//var pointFromVergeProject = t.cChartDrawer._convertAndTurnPoint(pointFromVerge.x, pointFromVerge.y, pointFromVerge.z, true, true);
//console.log("x: " + projectIntersection.x + " ;y: " + projectIntersection.y + " ;fromX:" + pointFromVergeProject.x + " ;fromY:" + pointFromVergeProject.y);
res = false;
break;
}
}
} }
return res; if(this.cChartDrawer.nDimensionCount === 3)
}; {
width = width * this.chartProp.pxToMM;
newStartX = newStartX * this.chartProp.pxToMM;
newStartY = newStartY - individualBarHeight;
//рассчитываем 8 точек для каждого столбца
x1 = newStartX, y1 = newStartY, z1 = DiffGapDepth;
x2 = newStartX, y2 = newStartY, z2 = perspectiveDepth + DiffGapDepth;
x3 = newStartX + width, y3 = newStartY, z3 = perspectiveDepth + DiffGapDepth;
x4 = newStartX + width, y4 = newStartY, z4 = DiffGapDepth;
x5 = newStartX, y5 = newStartY + individualBarHeight, z5 = DiffGapDepth;
x6 = newStartX, y6 = newStartY + individualBarHeight, z6 = perspectiveDepth + DiffGapDepth;
x7 = newStartX + width, y7 = newStartY + individualBarHeight, z7 = perspectiveDepth + DiffGapDepth;
x8 = newStartX + width, y8 = newStartY + individualBarHeight, z8 = DiffGapDepth;
var lineArray = []; //поворот относительно осей
var isIntersectionVergePointsLinesWithAnotherVerges = function(plainVerge, centralViewPoint, i, sortZIndexPaths) point1 = this.cChartDrawer._convertAndTurnPoint(x1, y1, z1);
{ point2 = this.cChartDrawer._convertAndTurnPoint(x2, y2, z2);
var res = true; point3 = this.cChartDrawer._convertAndTurnPoint(x3, y3, z3);
point4 = this.cChartDrawer._convertAndTurnPoint(x4, y4, z4);
point5 = this.cChartDrawer._convertAndTurnPoint(x5, y5, z5);
point6 = this.cChartDrawer._convertAndTurnPoint(x6, y6, z6);
point7 = this.cChartDrawer._convertAndTurnPoint(x7, y7, z7);
point8 = this.cChartDrawer._convertAndTurnPoint(x8, y8, z8);
for(var j = 0; j < plainVerge.points.length; j++) //не проецируем на плоскость
{ var point11 = this.cChartDrawer._convertAndTurnPoint(x1, y1, z1, null, null, true);
/*if(j !== 1) var point22 = this.cChartDrawer._convertAndTurnPoint(x2, y2, z2, null, null, true);
{ var point33 = this.cChartDrawer._convertAndTurnPoint(x3, y3, z3, null, null, true);
continue; var point44 = this.cChartDrawer._convertAndTurnPoint(x4, y4, z4, null, null, true);
}*/ var point55 = this.cChartDrawer._convertAndTurnPoint(x5, y5, z5, null, null, true);
var point66 = this.cChartDrawer._convertAndTurnPoint(x6, y6, z6, null, null, true);
var point77 = this.cChartDrawer._convertAndTurnPoint(x7, y7, z7, null, null, true);
var point88 = this.cChartDrawer._convertAndTurnPoint(x8, y8, z8, null, null, true);
var pointFromVerge = plainVerge.points[j]; paths = this.cChartDrawer.calculateRect3D(point1, point2, point3, point4, point5, point6, point7, point8, val);
//centralViewPoint.y = pointFromVerge.y;
//centralViewPoint.x = pointFromVerge.x;
var lineEqucation = getLineEquation(pointFromVerge, centralViewPoint);
var widthScreen = this.chartProp.widthCanvas - this.chartProp.chartGutter._right;
var centralViewPoint = {x: widthScreen / 2, y: heightGraph + this.chartProp.chartGutter._bottom, z: 0};
/*var testPoint = new Point3D(pointFromVerge.x, pointFromVerge.y, pointFromVerge.z, this);
var projectiveMatrix = t.cChartDrawer.processor3D._getPerspectiveProjectionMatrix(1 / (t.cChartDrawer.processor3D.rPerspective));
var testPoint = testPoint.project(projectiveMatrix);*/
var point1 = t.cChartDrawer._convertAndTurnPoint(pointFromVerge.x, pointFromVerge.y, pointFromVerge.z, true, true, null);
var point2 = centralViewPoint/*t.cChartDrawer._convertAndTurnPoint(centralViewPoint.x, centralViewPoint.y, centralViewPoint.z)*/;
var paths = t._calculateLine(point1.x, point1.y, point2.x, point2.y); var plainEquation1 = getPlainEquation(point11, point44, point88, point55);
lineArray.push({paths: paths}); var plainEquation2 = getPlainEquation(point11, point22, point33, point44);
var plainEquation3 = getPlainEquation(point11, point22, point66, point55);
var plainEquation4 = getPlainEquation(point44, point88, point77, point33);
var plainEquation5 = getPlainEquation(point55, point66, point77, point88);
var plainEquation6 = getPlainEquation(point66, point22, point33, point77);
var plainEquations = [plainEquation1, plainEquation2, plainEquation3, plainEquation4, plainEquation5, plainEquation6];
//пересечение грани и прямой
var isFirstVerge = isNotIntersectionVergesAndLine(lineEqucation, pointFromVerge, i, j, sortZIndexPaths);
if(false === isFirstVerge)
{
res = false;
break;
}
}
return res; var arrPoints = [[point1, point4, point8, point5], [point1, point2, point3, point4], [point1, point2, point6, point5], [point4, point8, point7, point3], [point5, point6, point7, point8], [point6, point2, point3, point7]];
};
var arrPoints2 = [[point11, point44, point88, point55], [point11, point22, point33, point44], [point11, point22, point66, point55], [point44, point88, point77, point33], [point55, point66, point77, point88], [point66, point22, point33, point77]];
var getFirstLastVerges = function(all, first, last)
{
//перебираем все грани
for(var i = 0; i < all.length; i++)
{
var plainVerge = all[i]; for(var k = 0; k < paths.length; k++)
/*if(i === 3) {
/*if(!(k == 0 || k == 4))
{ {
var isFirstVerge = isIntersectionVergePointsLinesWithAnotherVerges(plainVerge, centralViewPoint, i); continue;
}*/ }*/
var isFirstVerge = isIntersectionVergePointsLinesWithAnotherVerges(plainVerge, centralViewPoint, i, all); if(null === paths[k])
//push into array continue;
if(isFirstVerge)
{ this.sortZIndexPaths.push({seria: i, point: idx, verge: k, paths: paths[k], points: arrPoints2[k], points2: arrPoints[k], plainEquation: plainEquations[k]});
first.push(plainVerge); }
} }
else else
{ {
last.push(plainVerge); paths = this._calculateRect(newStartX, newStartY / this.chartProp.pxToMM, width, individualBarHeight / this.chartProp.pxToMM);
}
} }
};
var iterCount = 0;
var newArr = [];
var lastVerges = this.sortZIndexPaths;
while(lastVerges.length !== 0)
{
var firstVerges1 = [], lastVerges1 = [];
getFirstLastVerges(lastVerges, firstVerges1, lastVerges1);
newArr = firstVerges1.concat(newArr);
lastVerges = lastVerges1;
iterCount++;
if(iterCount > 100) if(!this.paths.series)
{ this.paths.series = [];
break; if(!this.paths.series[i])
this.paths.series[i] = [];
if(height != 0)
this.paths.series[i][idx] = paths;
} }
if(seria.length)
seriesCounter++;
} }
this.sortZIndexPaths = newArr;
/*var firstVerges1 = [], lastVerges1 = []; if(this.cChartDrawer.nDimensionCount === 3)
getFirstLastVerges(lastVerges, firstVerges1, lastVerges1); {
this.sortZIndexPaths = lastVerges1.concat(firstVerges1); console.time("asd");
this.sortZIndexPaths = this.sortZIndexPaths.concat(firstVerges);*/ var cSortFaces = new CSortFaces(this.cChartDrawer);
this.sortZIndexPaths = cSortFaces.sortFaces(this.sortZIndexPaths);
console.timeEnd("asd");
}
}, },
_calculateLine : function(x, y, x1, y1) _calculateLine : function(x, y, x1, y1)
...@@ -12082,6 +11848,198 @@ CColorObj.prototype = ...@@ -12082,6 +11848,198 @@ CColorObj.prototype =
} }
}; };
//sort parallalepiped faces
function CSortFaces(cChartDrawer)
{
this.cChartDrawer = cChartDrawer;
this.chartProp = cChartDrawer.calcProp;
this.centralViewPoint = null;
}
CSortFaces.prototype =
{
constructor: CSortFaces,
sortFaces: function(faces, centralViewPoint)
{
this._initProperties(centralViewPoint);
var firstVerges = [];
var lastVerges = [];
var t = this;
var iterCount = 0;
var newArr = [];
var lastFaces = faces;
while(lastFaces.length !== 0)
{
var firstFaces1 = [], lastFaces1 = [];
t._getFirstLastFaces(lastFaces, firstFaces1, lastFaces1);
newArr = firstFaces1.concat(newArr);
lastFaces = lastFaces1;
iterCount++;
if(iterCount > 100)
{
break;
}
}
return newArr;
/*var firstFaces1 = [], lastFaces1 = [];
getFirstLastVerges(lastVerges, firstFaces1, lastFaces1);
this.sortZIndexPaths = lastFaces1.concat(firstFaces1);
this.sortZIndexPaths = this.sortZIndexPaths.concat(firstVerges);*/
},
_initProperties: function(centralViewPoint)
{
if(!centralViewPoint)
{
var diffY = this.cChartDrawer.processor3D.cameraDiffY;
var diffX = 0/*-this.cChartDrawer.processor3D.cameraDiffX*/;
this.centralViewPoint = {x: this.chartProp.widthCanvas / 2 - diffX, y: this.chartProp.heightCanvas / 2 - diffY, z: -500};
}
else
{
this.centralViewPoint = centralViewPoint;
}
},
_getFirstLastFaces: function(all, first, last)
{
//перебираем все грани
for(var i = 0; i < all.length; i++)
{
var plainVerge = all[i];
var isFirstVerge = this._isIntersectionFacesPointLines(plainVerge, i, all);
//push into array
if(isFirstVerge)
{
first.push(plainVerge);
}
else
{
last.push(plainVerge);
}
}
},
//смотрим есть ли пересечения точек, выходящих из вершин данной грани, с другими гранями
_isIntersectionFacesPointLines: function(plainVerge, i, sortZIndexPaths)
{
var res = true;
var t = this;
var lineArray = [];
for(var j = 0; j < plainVerge.points.length; j++)
{
var pointFromVerge = plainVerge.points[j];
var lineEqucation = t.cChartDrawer.getLineEquation(pointFromVerge, this.centralViewPoint);
/*var point1 = t.cChartDrawer._convertAndTurnPoint(pointFromVerge.x, pointFromVerge.y, pointFromVerge.z, true, true, null);
var point2 = this.centralViewPoint;
var paths = t._calculateLine(point1.x, point1.y, point2.x, point2.y);
lineArray.push({paths: paths});*/
//пересечение грани и прямой
if(!t._isNotIntersectionVergesAndLine(lineEqucation, pointFromVerge, i, j, sortZIndexPaths))
{
res = false;
break;
}
}
return res;
},
_isNotIntersectionVergesAndLine: function(lineEqucation, pointFromVerge, i, j, sortZIndexPaths)
{
var res = true;
for(var k = 0; k < sortZIndexPaths.length; k++)
{
if(k === i)
continue;
var plainEqucation = sortZIndexPaths[k].plainEquation;
if(false === this._isNotIntersectionVergeAndLine(sortZIndexPaths[k], lineEqucation, pointFromVerge, i, j, k))
{
res = false;
break;
}
}
return res;
},
_isNotIntersectionVergeAndLine: function(plain, lineEquation, pointFromVerge, i, j, k)
{
var res = true;
var t = this;
//get intersection
var nIntersectionPlainAndLine = t.cChartDrawer.isIntersectionPlainAndLine(plain.plainEquation ,lineEquation);
if(null === nIntersectionPlainAndLine)
{
return res;
}
var projectIntersection = t.cChartDrawer._convertAndTurnPoint(nIntersectionPlainAndLine.x, nIntersectionPlainAndLine.y, nIntersectionPlainAndLine.z, true, true);
var minMaxpoints = t.cChartDrawer.getMinMaxPoints(plain.points);
var minX = minMaxpoints.minX, maxX = minMaxpoints.maxX, minY = minMaxpoints.minY, maxY = minMaxpoints.maxY, minZ = minMaxpoints.minZ, maxZ = minMaxpoints.maxZ;
var iSX = nIntersectionPlainAndLine.x;
var iSY = nIntersectionPlainAndLine.y;
var iSZ = nIntersectionPlainAndLine.z;
if(iSZ < pointFromVerge.z && t._isBetweenPoint(iSZ, minZ, maxZ) && t._isBetweenPoint(iSX, minX, maxX) && t._isBetweenPoint(iSY, minY, maxY))
{
var point0 = plain.points2[0];
var point1 = plain.points2[1];
var point2 = plain.points2[2];
var point3 = plain.points2[3];
var areaQuadrilateral = t.cChartDrawer.getAreaQuadrilateral(point0, point1, point2, point3);
var areaTriangle1 = t.cChartDrawer.getAreaTriangle(point0, projectIntersection, point1);
var areaTriangle2 = t.cChartDrawer.getAreaTriangle(point1, projectIntersection, point2);
var areaTriangle3 = t.cChartDrawer.getAreaTriangle(point2, projectIntersection, point3);
var areaTriangle4 = t.cChartDrawer.getAreaTriangle(point3, projectIntersection, point0);
if(parseInt(areaQuadrilateral) === parseInt(areaTriangle1 + areaTriangle2 + areaTriangle3 + areaTriangle4))
{
//var pointFromVergeProject = t.cChartDrawer._convertAndTurnPoint(pointFromVerge.x, pointFromVerge.y, pointFromVerge.z, true, true);
//console.log("x: " + projectIntersection.x + " ;y: " + projectIntersection.y + " ;fromX:" + pointFromVergeProject.x + " ;fromY:" + pointFromVergeProject.y);
res = false;
}
}
return res;
},
_isBetweenPoint: function(point, start, end)
{
//TODO округление пересмотреть
var res = false;
point = Math.round(point * 100) / 100;
start = Math.round(start * 100) / 100;
end = Math.round(end * 100) / 100;
if(point > start && point < end)
{
res = true;
}
return res;
}
};
//TEST primitive parallalepiped //TEST primitive parallalepiped
function TEST3D2() function TEST3D2()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7