diff --git a/static/MAIN.js b/static/MAIN.js index b5d4a48..73d59dc 100644 --- a/static/MAIN.js +++ b/static/MAIN.js @@ -84,13 +84,13 @@ function init_variable(premier_appel){ // Enchainement des pages if (premier_appel){ - page_avertissement = false + page_avertissement = true page_contexte = false page_inscription = false page_explication = false page_warning = false page_explication_bis = false - page_vues = true // false + page_vues = false // false page_explication_analyse = false page_analyse = false // cas raz : on recommence juste la partie vues @@ -302,6 +302,7 @@ function init_data(){ boutons["raccourcis"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_raccourcis.png') boutons["skip"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_skip_tutorial.png') boutons["envoie_data"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_envoie_data.png') + boutons["consigne"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_consigne.png') // Mouse xyMouseMove = {"x": -1, "y": -1} diff --git a/static/fonctions_choix_vues.js b/static/fonctions_choix_vues.js index a6b515e..b6bb148 100644 --- a/static/fonctions_choix_vues.js +++ b/static/fonctions_choix_vues.js @@ -69,10 +69,11 @@ function pose_deja_choisie(L_poses, i_choix, j_choix){ function show_consignes(){ w_consigne = 0.02*window.innerWidth h_consigne = w_consigne - ctx.drawImage(imgs["exemple1"], W_3D + 10, h_progress_bar + 10, w_consigne, h_consigne) - // survol - x_consigne = W_3D + 10 + x_titre_vue = W_3D + ((window.innerWidth-W_3D)/2)- (largeur/2) // Position de "Selected Viewpoints" + x_consigne = W_3D + (x_titre_vue - W_3D)/2 - w_consigne/2 y_consigne = h_progress_bar + 10 + ctx.drawImage(boutons["consigne"], x_consigne, y_consigne, w_consigne, h_consigne) + // survol if (is_inside(xyMouseMove, x_consigne, y_consigne, w_consigne, h_consigne)){ x_ecran = W_3D y_ecran = 0.15*window.innerHeight @@ -80,10 +81,10 @@ function show_consignes(){ h_ecran = H_3D/2 draw_rectangle(x_ecran, y_ecran, w_ecran, h_ecran, "rgb(255, 255, 255)", 1) // Texte - tt = {"t":"- You will be presented "+nb_mesh+" different objects."} - ff = {"t":"- For each of them, you will chose a viewpoint you find most representative of the given object. You will have to do this "+nb_choix_demande+" times."} - print_text(handle_text(tt.t, x_ecran + 20, y_ecran+ 0.2*h_ecran, (0.01*window.innerWidth)+"pt Courier", w_ecran-20, "rgb(0,0,0)")) - print_text(handle_text(ff.t, x_ecran + 20, y_ecran+0.4*h_ecran, (0.01*window.innerWidth)+"pt Courier", w_ecran-20, "rgb(0,0,0)")) + //tt = {"t":"- You will be presented "+nb_mesh+" different objects."} + //ff = {"t":"- For each of them, you will chose a viewpoint you find most representative of the given object. You will have to do this "+nb_choix_demande+" times."} + print_text(handle_text(textes['texte13'].t, x_ecran + 20, y_ecran+ 0.2*h_ecran, (0.01*window.innerWidth)+"pt Courier", w_ecran-20, "rgb(0,0,0)")) + print_text(handle_text(textes['texte14'].t, x_ecran + 20, y_ecran+0.4*h_ecran, (0.01*window.innerWidth)+"pt Courier", w_ecran-20, "rgb(0,0,0)")) } }