tforgione/bvs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ajout mesh lavoue

Browse Source
This commit is contained in:
mpelissi
2023-03-31 19:04:05 +02:00
parent 4f987abc15
commit e9b1909997
39 changed files with 2456452 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/MAIN.js
+16 -12
View File
@@ -42,11 +42,13 @@ function init_variable(premier_appel){
// DATA github
indice_mesh = 0 // indice du premier mesh à visionner
mesh_courant = "nope" // nom des mesh
// nombre de mesh a visionner AU TOTAL
nb_mesh = 4
// random nom mesh
obj_file = shuffle(['dragon_update_user_study_normed.obj', 'camel_update_user_study_normed.obj', 'gorgoile_update_user_study_centered_normed.obj', 'horse_update_user_study_normed.obj'])
//obj_file_random = shuffle(['backpack_regulier_tri_centered_user_study_normed.obj', 'dragon_update_user_study_normed.obj', 'camel_update_user_study_normed.obj', 'gorgoile_update_user_study_centered_normed.obj', 'horse_update_user_study_normed.obj'])
obj_file_random = shuffle(obj_names)
// nombre de mesh a visionner AU TOTAL
nb_mesh = obj_file_random.length
// nb analyse demandé
nb_analyse_demande = 2
list_idx_tache =[]
@@ -229,25 +231,26 @@ function setUp_3D(idx_mesh, idx_i_init, idx_j_init, explication=false){
setUp_light(R)
// Data 3D
//obj_file = shuffle(['dragon_update_user_study_normed.obj', 'camel_update_user_study_normed.obj', 'gorgoile_update_user_study_centered_normed.obj', 'horse_update_user_study_normed.obj'])
//obj_file_random = shuffle(['dragon_update_user_study_normed.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();
// Si on load le mesh 3d dans les explicationq, on imporse que ce soit le dragon
// Si on load le mesh 3d dans les explication, on importe que ce soit le dragon
if (explication){
objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/3DMesh/dragon_update_user_study_normed.obj', (event) => {
//objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/3DMesh/dragon_update_user_study_normed.obj', (event) => {
objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/3DMesh/dragon_update_normed_centered_user_study.obj', (event) => {
const root = event.detail.loaderRootNode;
scene.add(root);
});
// sinon on est dans l'étide dans on fait du random entre tous les mesh dispo sur le git
} else {
//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) => {
//objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/3DMesh/'+obj_file_random[idx_mesh], (event) => {
objLoader.load('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/3DMesh/'+obj_file_random[idx_mesh], (event) => {
const root = event.detail.loaderRootNode;
scene.add(root);
});
}
mesh_courant = obj_file[idx_mesh].split('_')[0]
choix_courant['obj_file'] = obj_file[idx_mesh]
mesh_courant = obj_file_random[idx_mesh].split('_')[0]
choix_courant['obj_file_random'] = obj_file_random[idx_mesh]
choix_courant['mesh'] = mesh_courant
choix_courant['position_init_idx_i'] = idx_i_init
choix_courant['position_init_idx_j'] =idx_j_init
@@ -255,6 +258,7 @@ function setUp_3D(idx_mesh, idx_i_init, idx_j_init, explication=false){
choix_courant['delta_init'] = delta_init
// pour savoir quel mesh on affiche
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>> "+obj_file_random[idx_mesh])
interactions.push({"time": new Date().getTime(), "type": get_message('affichage_mesh_IJ', [num_tache, nb_choix_fait, mesh_courant, idx_i_init, idx_j_init])})
interactions.push({"time": new Date().getTime(), "type": get_message('affichage_mesh_TD', [num_tache, nb_choix_fait, mesh_courant, theta_init, delta_init])})//"Affichage Mesh random : "+mesh_courant+" en theta, delta : ("+theta_init+", "+delta_init+")"})
}
@@ -453,7 +457,7 @@ function animate() {
else{print_text(handle_text(texte_temporaire.text, texte_temporaire.x, texte_temporaire.y, taille_texte+"pt Courier", longueur_max_error, "#118AB2"))}
}
// progress bar
progress_bar(num_tache-1, nb_mesh, taille_texte)
progress_bar(num_tache, nb_mesh, taille_texte)
// Affichage fleche
afficher_fleche(imgs)
// affichage de sboutons
static/mesh_names.js
+31
View File
@@ -0,0 +1,31 @@
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',
'hand_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',
'torso_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',
'meca_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',
'carter_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',
'backpack_regulier_tri_centered_user_study_normed.obj']