Compare commits
10
Commits
1667fd0403
..
prod
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5124cfe60f | ||
|
|
6c660f6725 | ||
|
|
0d861d7cdd | ||
|
|
a1cc86b44e | ||
|
|
12a2702f30 | ||
|
|
3fdeb082ec | ||
|
|
d0f69a3838 | ||
|
|
1381e2506b | ||
|
|
6dc717dd6b | ||
|
|
bc2260b505 |
@@ -120,6 +120,7 @@ export default {
|
||||
|
||||
let activeEntites = this.getActiveEntites(this.entites);
|
||||
// this.getSalientPoints()
|
||||
// console.log('this concernement id', this.cid);
|
||||
this.sailentEntites = this.concernement.sailentEntites = this.getJarvisEnvelopeConvexeEntites(activeEntites)
|
||||
|
||||
// define init position of the item
|
||||
@@ -494,12 +495,18 @@ export default {
|
||||
|
||||
},
|
||||
getActiveEntites(entites){
|
||||
// console.log('getActiveEntites', entites);
|
||||
console.log('getActiveEntites', entites);
|
||||
|
||||
let activeEntites = [];
|
||||
for (let i = 0; i < entites.length; i++) {
|
||||
if (entites[i].active) {
|
||||
activeEntites.push(entites[i])
|
||||
if (entites[i].active) { // && (entities[i].actuelfuture != 0 && entities[i].menacemaintien != 0 && entities[i].prise != 100)
|
||||
// console.log(entites[i]);
|
||||
let x = (entites[i].display.ray) * Math.cos(entites[i].display.alpha * (Math.PI/180));
|
||||
let y = (entites[i].display.ray) * Math.sin(entites[i].display.alpha * (Math.PI/180));
|
||||
console.log(`x=${x}, y=${y}`);
|
||||
if(x != 0 && y != 0){
|
||||
activeEntites.push(entites[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
return activeEntites;
|
||||
@@ -539,7 +546,7 @@ export default {
|
||||
// console.log(`this.salientPoints ${this.concernement.id}`, this.salientPoints);
|
||||
},
|
||||
getJarvisEnvelopeConvexeEntites(entites){
|
||||
// console.log(`getJarvisEnvelopeConvexeEntites cid:${this.cid}`, entites);
|
||||
console.log(`getJarvisEnvelopeConvexeEntites cid:${this.cid}`, entites);
|
||||
if (entites.length === 0) {
|
||||
console.error('getJarvisEnvelopeConvexeEntites entites must not be empty')
|
||||
return;
|
||||
@@ -1019,7 +1026,7 @@ export default {
|
||||
}
|
||||
},
|
||||
getPaddedRoundedSegments(points, scale){
|
||||
// console.log(`setPaperContour ${this.concernement.id}, points`, points);
|
||||
console.log(`getPaddedRoundedSegments ${this.concernement.id}, points`, points);
|
||||
let getSegmentProps = (b,a,c) => {
|
||||
const ac = { x: c.x - a.x, y: c.y - a.y } // get ac vecteur
|
||||
const lac = Math.sqrt(Math.pow(ac.x, 2) + Math.pow(ac.y, 2)); // get ac longueur ac
|
||||
@@ -1417,6 +1424,8 @@ export default {
|
||||
|
||||
// convert points to rouded and padded segments props
|
||||
let segments = this.getPaddedRoundedSegments(points, scaledown)
|
||||
console.log('segments', segments);
|
||||
|
||||
// create "real" Paper Segments from previous segments props
|
||||
let paper_segments = [];
|
||||
segments.forEach(seg => {
|
||||
|
||||
@@ -94,7 +94,7 @@ export const ConcernementsStore = defineStore({
|
||||
console.log('parse concernements');
|
||||
let temp_allSuperpositions = [];
|
||||
allconcernements.forEach((concernement) => {
|
||||
// console.log(`parsing concernement ${concernement.id}`);
|
||||
console.log(`parsing concernement ${concernement.id}`);
|
||||
concernement.visible = true;
|
||||
|
||||
concernement.entites_byid = {};
|
||||
@@ -128,7 +128,7 @@ export const ConcernementsStore = defineStore({
|
||||
|
||||
// PROXIMITES
|
||||
if (entite.entite.proximite.length) {
|
||||
// console.log("proximite", entite.entite.proximite);
|
||||
console.log("proximite", entite.entite.proximite);
|
||||
concernement.has_proximites = true;
|
||||
}
|
||||
|
||||
@@ -181,12 +181,8 @@ export const ConcernementsStore = defineStore({
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}); // end of concernement.entites loop
|
||||
|
||||
|
||||
// revisions
|
||||
concernement.active_revision = concernement.revision_id;
|
||||
|
||||
Reference in New Issue
Block a user