Skip to content

Commit

Permalink
Merge pull request #5 from 6mahdapihka9/develop
Browse files Browse the repository at this point in the history 
second release
  • Loading branch information
@6mahdapihka9
6mahdapihka9 authored Jun 14, 2021
2 parents 3c3e386 + cc0200a commit 4c87026
Show file tree
Hide file tree
Showing 10 changed files with 316 additions and 73 deletions.
Binary file removed images/color map.png
View file
Binary file not shown.
Binary file removed images/gray map.png
View file
Binary file not shown.
Binary file removed images/test.png
View file
Binary file not shown.
Binary file removed images/test1.png
View file
Binary file not shown.
9 changes: 9 additions & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,15 @@ <h4>Evaluation property</h4>
</div>


<!-- exportDotsDiv -->
<div id="exportDotsDiv" class="operations">
<a id="exportDots">
<button id="exportDotsButton" onclick="exportDots()">Export dots</button>
</a>
</div>



<!-- buildGlobalSphere -->
<div id="buildGlobalSphere" class="operations">
<button onclick="buildGlobalSphere()">Build global sphere</button>
Expand Down
294 changes: 229 additions & 65 deletions scripts/algorithmsFunctions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,101 +73,78 @@ algC.onmousedown = (e) => {
const buildGlobalSphere = ()=>{
//two dots
//выбор двух опорных точок между которыми самое большое растояние, чтобы построить на них окружность
let k = 0, m = 0, n = 0;
let max = 0;
let newDist;
dist = [];
minDistGlob = 100000000;
let k = 0, m = 0, n = 0, max = 0, newDist;

for (let i = 0; i < DTC.length-1; i++)
for (let j = i+1; j < DTC.length; j++) {
newDist = new Dist(DTC[i], DTC[j]);

if (newDist.value < minDistGlob)
minDistGlob = newDist.value;
newDist = dist(DTC[i], DTC[j]);

dist.push(newDist);
if (max < dist[k].value) {
max = dist[k].value;
if (max < newDist) {
max = newDist;
m = i;
n = j;
}
k++;
}

tempX = (DTC[m].x + DTC[n].x)/2;
tempY = (DTC[m].y + DTC[n].y)/2;
tempZ = (DTC[m].z + DTC[n].z)/2;
tempR = (new Dist(DTC[m], DTC[n])).value/2;

GS = new Sphere((DTC[m].x + DTC[n].x)/2,
(DTC[m].y + DTC[n].y)/2,
(DTC[m].z + DTC[n].z)/2,
dist(DTC[m], DTC[n])/2);

areAllDotsInsideSphere = true;
//проверка все ли точки входят в этот круг
for (let i = 0; i < DTC.length; i++)
// console.log((new Dist(DTC[i], new Dot(GS.x, GS.y, GS.z))).value, tempR, Math.round( tempR * 100000000.0) / 100000000.0 + 0.0001);

if ((new Dist(DTC[i], new Dot(tempX, tempY, tempZ))).value > tempR) {
if (dist(DTC[i], GS) > GS.r) {
areAllDotsInsideSphere = false;
break;
} else
DTC[i].covered = true;//checkPath(DTC[i], new Dot(tempX, tempY, tempZ));
DTC[i].covered = true;//checkPath(DTC[i], GS);


//three dots
if (!areAllDotsInsideSphere) {
console.log("two are not enough");
let threeR = max, threeX = 0, threeY = 0, threeZ = 0;

let tempX = 0, tempY = 0,tempZ = 0, tempR = max;

let a,b,c, NC;
for (let n = 0; n < DTC.length-2; n++)
for (let m = n+1; m < DTC.length-1; m++)
for (let l = m+1; l < DTC.length; l++) {
let dmx2 = DTC[m].x * DTC[m].x,
dmy2 = DTC[m].y * DTC[m].y,

dlx2 = DTC[l].x * DTC[l].x,
dly2 = DTC[l].y * DTC[l].y,

dnx2 = DTC[n].x * DTC[n].x,
dny2 = DTC[n].y * DTC[n].y;
Cx = -(DTC[n].y * (dmx2 + dmy2 - dlx2 - dly2) +
DTC[m].y * (dlx2 + dly2 - dnx2 - dny2) +
DTC[l].y * (dnx2 + dny2 - dmx2 - dmy2)) /
(2 * (DTC[n].x * (DTC[m].y - DTC[l].y) +
DTC[m].x * (DTC[l].y - DTC[n].y) +
DTC[l].x * (DTC[n].y - DTC[m].y)));

Cy = (DTC[n].x * (dmx2 + dmy2 - dlx2 - dly2) +
DTC[m].x * (dlx2 + dly2 - dnx2 - dny2) +
DTC[l].x * (dnx2 + dny2 - dmx2 - dmy2)) /
(2 * (DTC[n].x * (DTC[m].y - DTC[l].y) +
DTC[m].x * (DTC[l].y - DTC[n].y) +
DTC[l].x * (DTC[n].y - DTC[m].y)));

let newTr = new Triangle(DTC[l], DTC[m], DTC[n]);
let tZ = newTr.simpleOperation(new Dot(Cx, Cy, -1000), new Dot(Cx, Cy, 1000));

if (tZ !== false)
R = (new Dist(tZ, DTC[n])).value;
else
continue;
a = DTC[l];
b = DTC[m];
c = DTC[n];

//NEW CENTER BY 3 POINTS!!!
if (DTC[l].z !== DTC[m].z || DTC[m].z !== DTC[n].z || DTC[l].z !== DTC[n].z)
NC = translateTriangleOnPlaneOxy(a,b,c);
else
NC = findCenterOnCircle(a,b,c);

areAllDotsInsideSphere = true;
for (let iter = 0; iter < DTC.length; iter++)
if ((new Dist(DTC[iter], tZ)).value/2 >
Math.round(R * 100000000.0)/100000000.0 + 0.0001) {
for (let d of DTC) {
console.log(NC.r,dist(d,NC));
if (dist(d, NC) > NC.r+0.001) {
areAllDotsInsideSphere = false;
break;
}
} else
d.covered = true;
}

if (areAllDotsInsideSphere && R < threeR) {
threeX = Cx;
threeY = Cy;
threeZ = tZ.z;
threeR = R;
if (areAllDotsInsideSphere && NC.r < tempR) {
tempX = NC.x;
tempY = NC.y;
tempZ = NC.z;
tempR = NC.r;
}
}
Cx = threeX; Cy = threeY; Cz = threeZ; R = threeR;

GS = new Sphere(tempX, tempY, tempZ, tempR);
}

GS = new Sphere(tempX, tempY, tempZ, tempR);
getById("gsInfo").innerHTML = `<p>Sphere's info:</p>
<p>X = ${GS.x}</p>
<p>Y = ${GS.y}</p>
Expand Down Expand Up @@ -205,7 +182,8 @@ const checkPath = (d1, d2, htmlRequest)=>{
for (let t of TBlock) {
let newT = new Triangle(t.a, t.b, t.c);

isObstacleOnTheWay = newT.simpleOperation(d1, d2) || newT.whichSide(new Dot(x, y, z)) < 0;
// isObstacleOnTheWay = newT.simpleOperation(d1, d2) || newT.whichSide(new Dot(x, y, z)) < 0;
isObstacleOnTheWay = newT.whichSide(new Dot(x, y, z)) < 0;

if (isObstacleOnTheWay)
break end;
Expand All @@ -231,8 +209,8 @@ const checkPath = (d1, d2, htmlRequest)=>{

}
if (htmlRequest)
getById("isObstacleBetween").innerText = isObstacleOnTheWay;
// console.log(isObstacleOnTheWay);
getById("isObstacleBetween").innerText = "" + isObstacleOnTheWay;

return isObstacleOnTheWay;
} else {
alert("You should choose two different dots!");
Expand All @@ -248,9 +226,195 @@ const redraw = ()=>{
};


const test1 = ()=>{
let A,B,C;
// A = new Dot(10, 0, 0);
// B = new Dot(0, 10, 0);
// C = new Dot(5, 5, 10);
// translateTriangleOnPlaneOxy(A, B, C);

// A = new Dot(0, 0, 0);
// B = new Dot(10, 0, 0);
// C = new Dot(0, 1, 10);
// test(A, B, C);

// A = new Dot(0, 0, 0);
// B = new Dot(10, 0, 0);
// C = new Dot(0, -1, 10);
// test(A, B, C);


// A = new Dot(0, 0, 0);
// B = new Dot(0, 10, 0);
// C = new Dot(0, 0, 10);
// test(A, B, C);

// A = new Dot(0, 0, 0);
// B = new Dot(0, 10, 0);
// C = new Dot(-1, 0, 10);
// test(A, B, C);


// A = new Dot(0, 0, 0);
// B = new Dot(0, 10, 0);
// C = new Dot(1, 0, 10);
// test(A, B, C);
}

const translateTriangleOnPlaneOxy = (A,B,C)=>{

//самая нижняя точка
// let lowestDot = [A,B,C].filter(el => el.z<=Math.min(A.z,B.z,C.z));

//--------------уравнение прямой
//треугольник
//уравнение плоскости по треугольнику
// T.n.i*x + T.n.j*y + T.n.k*z + T.n.d = 0
let T = new Triangle(A, B, C);
// console.log(T)

//уравнение плоскости Оху
//0*х + 0*у + 1*z - 10 = 0

//точка через которую будет проходить прямая
// let M = new Dot(0, -(T.n.d + T.n.k*10)/T.n.j, 10);

//--------------вектор прямой
//напрявляющий вектор прямой
//p = (-B)*i - (-A)*j + 0*k
let pI = -T.n.j, pJ = T.n.i, pK = 0;
// console.log('pi',pI,'pJ',pJ,'pK',pK);

//модуль вектора прямой
let modV = Math.sqrt(Math.pow(-T.n.j, 2) + Math.pow(T.n.i, 2));
// console.log('module vec',modV);

//--------------единичный вектор прямой
// cosX = pI/modV,
// cosY = pJ/modV,
// cosZ = pK/modV;
let vX = pI/modV,
vY = pJ/modV,
vZ = pK/modV;
// console.log('vX',vX,'vY',vY,'vZ',vZ);

//--------------угол поворота
let cosT = Math.abs(T.n.k)/Math.sqrt( Math.pow(T.n.i, 2) + Math.pow(T.n.j, 2) + Math.pow(T.n.k, 2)),
sinT = Math.sqrt(1 - Math.pow(cosT, 2));
// console.log("cos",cosT,"sin",sinT);
// console.log('Tetta',Math.acos (cosT) * 180 / Math.PI);

//--------------матрица поворота
//M(v,Tetta) = [...]
let matrix = [[cosT+(1-cosT)*vX*vX, (1-cosT)*vX*vY-sinT*vZ, (1-cosT)*vX*vZ+sinT*vY],
[(1-cosT)*vX*vY+sinT*vZ, cosT+(1-cosT)*vY*vY, (1-cosT)*vY*vZ-sinT*vX],
[(1-cosT)*vX*vZ-sinT*vY, (1-cosT)*vY*vZ+sinT*vX, cosT+(1-cosT)*vZ*vZ]];
// console.log('matrix',matrix);

//--------------умножить матрицу на координаты точек чтобы получить получить перенесенные
let newA = matrixOnVector(matrix, [A.x, A.y, A.z]),
newB = matrixOnVector(matrix, [B.x, B.y, B.z]),
newC = matrixOnVector(matrix, [C.x, C.y, C.z]);



if ([newA,newB,newC].filter(el => el.z!==0).length !== 0){
cosT = -cosT;

matrix = [[cosT+(1-cosT)*vX*vX, (1-cosT)*vX*vY-sinT*vZ, (1-cosT)*vX*vZ+sinT*vY],
[(1-cosT)*vX*vY+sinT*vZ, cosT+(1-cosT)*vY*vY, (1-cosT)*vY*vZ-sinT*vX],
[(1-cosT)*vX*vZ-sinT*vY, (1-cosT)*vY*vZ+sinT*vX, cosT+(1-cosT)*vZ*vZ]];

newA = matrixOnVector(matrix, [A.x, A.y, A.z]);
newB = matrixOnVector(matrix, [B.x, B.y, B.z]);
newC = matrixOnVector(matrix, [C.x, C.y, C.z]);
}

// console.log("A",{x:A.x, y:A.y, z:A.z},"A'", newA);
// console.log("B",{x:B.x, y:B.y, z:B.z},"B'", newB);
// console.log("C",{x:C.x, y:C.y, z:C.z},"C'", newC);

//--------------найти центр окружности на плоскости
let _2DCenter = findCenterOnCircle(newA,newB,newC);
// console.log('2d center',_2DCenter);

const test = ()=>{
console.log(getById("inputImageButton"));

//--------------решить систему уравнений чтобы перенести центр снова в пространство - это ответ
let _3DC = cramer(matrix, [_2DCenter.x, _2DCenter.y, _2DCenter.z]);
// console.log('3d center',_3DC);

return {x:_3DC.x, y:_3DC.y, z:_3DC.z, r:_2DCenter.r};
};

const exportDots = ()=>{

let filename = `dots.txt`;
let text = '';
for (let d of DTC)
text += `${d.x} ${d.y} ${d.z}\n`;

let blob = new Blob([text], {type: 'text/plain'});
let expDots = getById("exportDots");
expDots.download = filename;
expDots.href = window.URL.createObjectURL(blob);
};

// //three dots
// if (!areAllDotsInsideSphere) {
// console.log("two are not enough");
// let threeR = max, threeX = 0, threeY = 0, threeZ = 0;
// for (let n = 0; n < DTC.length-2; n++)
// for (let m = n+1; m < DTC.length-1; m++)
// for (let l = m+1; l < DTC.length; l++) {
//
// //CENTER BY 3 POINTS!!!
// let newCenter = findCenterOnCircle(DTC[l],DTC[m],DTC[n]);
//
// let dmx2 = DTC[m].x * DTC[m].x,
// dmy2 = DTC[m].y * DTC[m].y,
//
// dlx2 = DTC[l].x * DTC[l].x,
// dly2 = DTC[l].y * DTC[l].y,
//
// dnx2 = DTC[n].x * DTC[n].x,
// dny2 = DTC[n].y * DTC[n].y;
// Cx = -(DTC[n].y * (dmx2 + dmy2 - dlx2 - dly2) +
// DTC[m].y * (dlx2 + dly2 - dnx2 - dny2) +
// DTC[l].y * (dnx2 + dny2 - dmx2 - dmy2)) /
// (2 * (DTC[n].x * (DTC[m].y - DTC[l].y) +
// DTC[m].x * (DTC[l].y - DTC[n].y) +
// DTC[l].x * (DTC[n].y - DTC[m].y)));
//
// Cy = (DTC[n].x * (dmx2 + dmy2 - dlx2 - dly2) +
// DTC[m].x * (dlx2 + dly2 - dnx2 - dny2) +
// DTC[l].x * (dnx2 + dny2 - dmx2 - dmy2)) /
// (2 * (DTC[n].x * (DTC[m].y - DTC[l].y) +
// DTC[m].x * (DTC[l].y - DTC[n].y) +
// DTC[l].x * (DTC[n].y - DTC[m].y)));
//
// let newTr = new Triangle(DTC[l], DTC[m], DTC[n]);
// let tZ = newTr.simpleOperation(new Dot(Cx, Cy, -1000), new Dot(Cx, Cy, 1000));
//
// if (tZ !== false)
// R = (new Dist(tZ, DTC[n])).value;
// else
// continue;
//
//
// areAllDotsInsideSphere = true;
// for (let iter = 0; iter < DTC.length; iter++)
// if ((new Dist(DTC[iter], tZ)).value/2 >
// Math.round(R * 100000000.0)/100000000.0 + 0.0001) {
// areAllDotsInsideSphere = false;
// break;
// }
//
// if (areAllDotsInsideSphere && R < threeR) {
// threeX = Cx;
// threeY = Cy;
// threeZ = tZ.z;
// threeR = R;
// }
// }
// Cx = threeX; Cy = threeY; Cz = threeZ; R = threeR;
// }
Loading

0 comments on commit 4c87026

Please sign in to comment.