From f3eb8e9ed48a3b0d0bffd7245b3e7d45a7e30366 Mon Sep 17 00:00:00 2001 From: mpelissi Date: Tue, 11 Apr 2023 09:18:07 +0200 Subject: [PATCH] pbl position mesh dans interactipon fleche ok --- Readme.txt | 5 +++ static/fonctions_choix_vues.js | 11 ++++-- static/mesh_names.js | 67 +++++++++++++++------------------- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/Readme.txt b/Readme.txt index 881d6a7..bcec4d9 100644 --- a/Readme.txt +++ b/Readme.txt @@ -3,3 +3,8 @@ (3) npm install (4) nodemon server.js (5) go on http://localhost:8000/ + + +run get_json : +(1) se placer dans BVS-study +(2) ./get_json.sh outputs/...../ diff --git a/static/fonctions_choix_vues.js b/static/fonctions_choix_vues.js index 26fd9a7..2dd5633 100644 --- a/static/fonctions_choix_vues.js +++ b/static/fonctions_choix_vues.js @@ -276,24 +276,27 @@ function traitement_fleche(){ function action_fleche_gauche(){ idx_i = (idx_i+1)%8 interactions.push({"time": new Date().getTime(), "type": get_message('FG', [num_tache, nb_choix_fait, idx_i, idx_j])})} + function action_fleche_droite(){ idx_i = (idx_i+7)%8 interactions.push({"time": new Date().getTime(), "type": get_message('FD', [num_tache, nb_choix_fait, idx_i, idx_j])})} + function action_fleche_haut(){ - interactions.push({"time": new Date().getTime(), "type": get_message('FH', [num_tache, nb_choix_fait, idx_i, idx_j])}) if (idx_j == 0){ texte_temporaire = {"text": "You can't go any further, GO BACK DOWN.", "x": x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} - interactions.push({"time": new Date().getTime(), "type": get_message("erreur_FH", [num_tache, nb_choix_fait]) }) - } + interactions.push({"time": new Date().getTime(), "type": get_message("erreur_FH", [num_tache, nb_choix_fait]) })} + idx_j = Math.max(idx_j-1,0) + interactions.push({"time": new Date().getTime(), "type": get_message('FH', [num_tache, nb_choix_fait, idx_i, idx_j])}) } + function action_fleche_bas(){ - interactions.push({"time": new Date().getTime(), "type": get_message('FB', [num_tache, nb_choix_fait, idx_i, idx_j])}) if (idx_j == 4){ texte_temporaire = {"text": "You can't go any further, GO UP.", "x": x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} interactions.push({"time": new Date().getTime(), "type": get_message("erreur_FB", [num_tache, nb_choix_fait]) }) } idx_j = Math.min(idx_j+1,4) + interactions.push({"time": new Date().getTime(), "type": get_message('FB', [num_tache, nb_choix_fait, idx_i, idx_j])}) } /////////////////////////////////////////////////////////////// diff --git a/static/mesh_names.js b/static/mesh_names.js index aba9d4f..e4f6439 100644 --- a/static/mesh_names.js +++ b/static/mesh_names.js @@ -1,3 +1,4 @@ +//obj_names = ['backpack_regulier_tri_normed_centered_user_study.obj'] // obj_names = ['octopus_update_normed_centered_user_study.obj', // 'casting_update_normed_centered_user_study.obj', // 'carVasa_update_normed_centered_user_study.obj', @@ -44,43 +45,35 @@ // 'cabinet_regulier_tri_normed_centered_user_study.obj'] +obj_names = [ 'octopus_update_normed_centered_user_study.obj', + 'casting_update_normed_centered_user_study.obj', + 'carVasa_update_normed_centered_user_study.obj', + 'blade_update_normed_centered_user_study.obj', + 'bunny_update_normed_centered_user_study.obj', + 'igea_update_normed_centered_user_study.obj', + 'camel_update_normed_centered_user_study.obj', + 'Harley_update_normed_centered_user_study.obj', + 'MaxPlanck_update_normed_centered_user_study.obj', + 'gorgoile_update_normed_centered_user_study.obj', + 'prot_update_normed_centered_user_study.obj', + 'michael3_update_normed_centered_user_study.obj', + 'A380_update_normed_centered_user_study.obj', + 'chair107_update_normed_centered_user_study.obj', + 'dragon_update_normed_centered_user_study.obj', + 'rockerArm_update_normed_centered_user_study.obj', + 'michael8_update_normed_centered_user_study.obj', + 'vase_update_normed_centered_user_study.obj', + 'fandisk_update_normed_centered_user_study.obj', + 'james_update_normed_centered_user_study.obj', + 'cow_update_normed_centered_user_study.obj', + 'dinosaur_update_normed_centered_user_study.obj', + 'flowerpot_update_normed_centered_user_study.obj', + 'bimba_update_normed_centered_user_study.obj', + 'horse_update_normed_centered_user_study.obj', + 'turbine_update_normed_centered_user_study.obj'] - - - - - - -//obj_names = [ 'octopus_update_normed_centered_user_study.obj', -// 'casting_update_normed_centered_user_study.obj', -// 'carVasa_update_normed_centered_user_study.obj', -// 'blade_update_normed_centered_user_study.obj', -// 'bunny_update_normed_centered_user_study.obj', -// 'igea_update_normed_centered_user_study.obj', -// 'camel_update_normed_centered_user_study.obj', -// 'Harley_update_normed_centered_user_study.obj', -// 'MaxPlanck_update_normed_centered_user_study.obj', -// 'gorgoile_update_normed_centered_user_study.obj', -// 'prot_update_normed_centered_user_study.obj', -// 'michael3_update_normed_centered_user_study.obj', -// 'A380_update_normed_centered_user_study.obj', -// 'chair107_update_normed_centered_user_study.obj', -// 'dragon_update_normed_centered_user_study.obj', -// 'rockerArm_update_normed_centered_user_study.obj', -// 'michael8_update_normed_centered_user_study.obj', -// 'vase_update_normed_centered_user_study.obj', -// 'fandisk_update_normed_centered_user_study.obj', -// 'james_update_normed_centered_user_study.obj', -// 'cow_update_normed_centered_user_study.obj', -// 'dinosaur_update_normed_centered_user_study.obj', -// 'flowerpot_update_normed_centered_user_study.obj', -// 'bimba_update_normed_centered_user_study.obj', -// 'horse_update_normed_centered_user_study.obj', -// 'turbine_update_normed_centered_user_study.obj'] - - - obj_names = [//'basket_regulier_tri_normed_centered_user_study.obj', + //obj_names = [//'basket_regulier_tri_normed_centered_user_study.obj', //'calculator_regulier_tri_normed_centered_user_study.obj', //'eyeglasses_regulier_tri_normed_centered_user_study.obj', //'cap_regulier_tri_normed_centered_user_study.obj', @@ -93,9 +86,9 @@ //'bicycle_regulier_tri_normed_centered_user_study.obj', //'coffee_regulier_tri_normed_centered_user_study.obj', //'boat_regulier_tri_normed_centered_user_study.obj', - 'ashtray_regulier2_tri_normed_centered_user_study.obj', + //'ashtray_regulier_tri_normed_centered_user_study.obj', //'eraser_regulier_tri_normed_centered_user_study.obj', //'bucket_regulier_tri_normed_centered_user_study.obj', //'bench_regulier_tri_normed_centered_user_study.obj', //'cabinet_regulier_tri_normed_centered_user_study.obj' -] \ No newline at end of file +//] \ No newline at end of file