bachir/ouatterrir-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified superpositions to get only one superposition by mapitem

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2023-10-24 11:28:40 +02:00
parent 6f5062b774
commit ecc838abbb
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/App.vue
View File

@ -94,16 +94,19 @@ export default {
superposition_ids: [], superposition_ids: [],
clone: false, clone: false,
} }
// loop through superposistions couples // loop through all superposistions couples
couple_ids.forEach(couple_id => { couple_ids.forEach(couple_id => {
let cids = couple_id.match(/(\d+)-(\d+)/i); let cids = couple_id.match(/(\d+)-(\d+)/i);
// console.log('cids', cids); // console.log('cids', cids);
if (concernement.id === parseInt(cids[1]) || concernement.id === parseInt(cids[2])) { if (concernement.id === parseInt(cids[1]) || concernement.id === parseInt(cids[2])) {
let i = 0; let i = 0;
// loop through all superpositions of couple
for(let [superposition_id, superposition] of Object.entries(this.allSuperpositions_byid[couple_id])){ for(let [superposition_id, superposition] of Object.entries(this.allSuperpositions_byid[couple_id])){
i++; i++;
if (i === 1) { if (!mapitem.superposition_ids.length) {
// if main map item does not yet have a superposition use it and alter his id (for matter constraints)
mapitem.superposition_ids.push(superposition_id) mapitem.superposition_ids.push(superposition_id)
mapitem.id = `${concernement.id}___${superposition_id}`
}else{ }else{
let mapitem_superposition = { let mapitem_superposition = {
id: `${concernement.id}___${superposition_id}`, id: `${concernement.id}___${superposition_id}`,

14
src/components/ConcernementMapItem.vue
View File

@ -522,7 +522,9 @@ export default {
}); });
// fadein intro // fadein intro
this.paper_main_object.opacity = (1 + Math.random())*0.001; if(!this.mapitem.clone){
this.paper_main_object.opacity = (1 + Math.random())*0.001;
}
// the sub items for one concernement // the sub items for one concernement
this.paper_main_object.addChild(this.setPaperContour()); this.paper_main_object.addChild(this.setPaperContour());
@ -2142,10 +2144,12 @@ export default {
this.paper_main_object.position = this.pos = this.body.position; this.paper_main_object.position = this.pos = this.body.position;
// fadein intro // fadein intro
if (this.paper_main_object.opacity < 9) { if(!this.mapitem.clone){
this.paper_main_object.opacity = this.paper_main_object.opacity * 1.04; if (this.paper_main_object.opacity < 9) {
} else{ this.paper_main_object.opacity = this.paper_main_object.opacity * 1.04;
this.paper_main_object.opacity = 1; } else{
this.paper_main_object.opacity = 1;
}
} }
this.handlePaperVisibilityOnAfterEnginUpdate() this.handlePaperVisibilityOnAfterEnginUpdate()

10
src/components/MapConcernements.vue
View File

@ -1139,13 +1139,13 @@ export default {
// console.log('superposition', superposition_id, superposition); // console.log('superposition', superposition_id, superposition);
let mapitemA_id, mapitemB_id; let mapitemA_id, mapitemB_id;
if (i === 1) { // if (i === 1) {
mapitemA_id = superposition[0].cid // mapitemA_id = superposition[0].cid
mapitemB_id = superposition[1].cid // mapitemB_id = superposition[1].cid
} else { // } else {
mapitemA_id = `${superposition[0].cid}___${superposition_id}` mapitemA_id = `${superposition[0].cid}___${superposition_id}`
mapitemB_id = `${superposition[1].cid}___${superposition_id}` mapitemB_id = `${superposition[1].cid}___${superposition_id}`
} // }
// get the concernement matter bodies with id // get the concernement matter bodies with id