From 5dcc760a436b3a534136731b8da15676b727c38c Mon Sep 17 00:00:00 2001 From: mpelissi Date: Fri, 10 Mar 2023 11:04:01 +0100 Subject: [PATCH] ras --- static/MAIN.js | 3 ++- static/fonctions_explications.js | 2 +- static/fonctions_inscription.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/static/MAIN.js b/static/MAIN.js index d05af6e..721cbc1 100644 --- a/static/MAIN.js +++ b/static/MAIN.js @@ -205,9 +205,10 @@ function setUp_3D(idx_mesh, idx_i_init, idx_j_init){ setUp_light(R) // Data 3D - obj_file = ['dragon_update_user_study.obj', 'camel_update_user_study_normed.obj', 'gorgoile_update_user_study_centered_normed.obj'] + obj_file = ['dragon_update_user_study.obj', 'camel_update_user_study_normed.obj', 'gorgoile_update_user_study_centered_normed.obj', 'horse_update_user_study_normed.obj'] const objLoader = new THREE.OBJLoader2(); objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/3DMesh/'+obj_file[idx_mesh], (event) => { + //objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/3DMesh/'+obj_file[idx_mesh], (event) => { const root = event.detail.loaderRootNode; scene.add(root); }); diff --git a/static/fonctions_explications.js b/static/fonctions_explications.js index e758f47..557b892 100644 --- a/static/fonctions_explications.js +++ b/static/fonctions_explications.js @@ -1,6 +1,6 @@ function init_explication(){ -alpha_ecran = 0.9 + alpha_ecran = 0.9 alpha_clignotement = 0.8 color_ecran ="rgb(255,255,255)" color_texte = "rgb(0,0,0)" diff --git a/static/fonctions_inscription.js b/static/fonctions_inscription.js index a84fdbe..6636020 100644 --- a/static/fonctions_inscription.js +++ b/static/fonctions_inscription.js @@ -22,7 +22,7 @@ function affichage_inscription(){ ctx.font = "24pt Courier" ctx.fillText("Male", parseInt(document.getElementById("SexeM").style.left)+40, parseInt(document.getElementById("SexeM").style.top)+24) ctx.fillText("Female", parseInt(document.getElementById("SexeF").style.left)+40, parseInt(document.getElementById("SexeM").style.top)+24) - ctx.fillText("None of this above", parseInt(document.getElementById("SexeA").style.left)+40, parseInt(document.getElementById("SexeA").style.top)+24) + ctx.fillText("None of these above", parseInt(document.getElementById("SexeA").style.left)+40, parseInt(document.getElementById("SexeA").style.top)+24) }