From e4502353af85993d78047650d56ebdaa5937e10c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 Jun 2024 15:42:22 +0200 Subject: [PATCH] Refresh index x compilare npm --- WebDoorView/3DM_test/test_js_call/index.html | 77 +++++++------------ .../webgl-door-visualizer/draw_call.js | 51 ++++++------ WebDoorView/3DM_test/test_js_call/style.css | 14 +--- 3 files changed, 58 insertions(+), 84 deletions(-) diff --git a/WebDoorView/3DM_test/test_js_call/index.html b/WebDoorView/3DM_test/test_js_call/index.html index 721b434..191eaa9 100644 --- a/WebDoorView/3DM_test/test_js_call/index.html +++ b/WebDoorView/3DM_test/test_js_call/index.html @@ -33,19 +33,10 @@
-
-
@@ -61,67 +52,48 @@
  • Rotate CTRL + Drag Mouse-Wheel -
  • - +
  • Iso / Ortho
    | key : O
    -
  • Perspective
    | key : P
    -
  • AutoRotate
    | key : R
    -
  • Quotes
    | key : Q
    -
  • Grid
    | key : G
    -
  • Reset
    | key: SpaceBar
    -
  • Menu
    | key : H
    -
  • @@ -318,28 +290,33 @@ } function onKeyPress( event) { - if ( event.key.toLowerCase() === "r") - toggleRotate(); - else if ( event.key.toLowerCase() === "p") { - setPersp(); + + switch (event.key.toLowerCase() ){ + case " ": + resetCamera(); + break; + case "a": + toggleAnim(); + break; + case "h": + toggleMenu(); + break; + case "g": + toggleGrid(); + break; + case "o": + setOrtho(); + break; + case "p": + setPersp(); + break; + case "q": + toggleQuote(); + break; + case "r": + toggleRotate(); + break; } - else if ( event.key.toLowerCase() === "o") { - setOrtho(); - } - else if ( event.key.toLowerCase() === "q") - toggleQuote(); - else if ( event.key.toLowerCase() === " ") - resetCamera(); - // else if ( event.key.toLowerCase() === "c") - // toggleCube(); - // else if ( event.key.toLowerCase() === "f") - // toggleFrame(); - else if ( event.key.toLowerCase() === "g") - toggleGrid(); - else if ( event.key.toLowerCase() === "h") - toggleMenu(); - else if ( event.key.toLowerCase() === "a") - toggleAnim(); } function checkButton(event) diff --git a/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw_call.js b/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw_call.js index 429da9a..a6dc8db 100644 --- a/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw_call.js +++ b/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw_call.js @@ -1,5 +1,4 @@ import { webgl_original } from "./webgl_draw.js"; - const WGL = new webgl_original(); const infoDiv = document.getElementById( "infoDiv") ; @@ -20,6 +19,7 @@ let options ={ // init controllo WGL.initcall(options); + // --------------------------------------------------- // Funzioni pubbliche // --------------------------------------------------- @@ -46,7 +46,7 @@ window.resetCamera = () => }, millisecondsToWait); } -// reset camera persp +// set camera persp window.setOrtho = () => { console.log("Set Camera ISO/ORTHO"); @@ -169,28 +169,33 @@ function fixBtnRotate() } function onKeyPress( event) { - if ( event.key.toLowerCase() === "r") - toggleRotate(); - else if ( event.key.toLowerCase() === "p") { - setPersp(); + + switch (event.key.toLowerCase() ){ + case " ": + resetCamera(); + break; + case "a": + toggleAnim(); + break; + case "h": + toggleMenu(); + break; + case "g": + toggleGrid(); + break; + case "o": + setOrtho(); + break; + case "p": + setPersp(); + break; + case "q": + toggleQuote(); + break; + case "r": + toggleRotate(); + break; } - else if ( event.key.toLowerCase() === "o") { - setOrtho(); - } - else if ( event.key.toLowerCase() === "q") - toggleQuote(); - else if ( event.key.toLowerCase() === " ") - resetCamera(); - // else if ( event.key.toLowerCase() === "c") - // toggleCube(); - // else if ( event.key.toLowerCase() === "f") - // toggleFrame(); - else if ( event.key.toLowerCase() === "g") - toggleGrid(); - else if ( event.key.toLowerCase() === "h") - toggleMenu(); - else if ( event.key.toLowerCase() === "a") - toggleAnim(); } function checkButton(event) diff --git a/WebDoorView/3DM_test/test_js_call/style.css b/WebDoorView/3DM_test/test_js_call/style.css index 3cc604c..fec1c16 100644 --- a/WebDoorView/3DM_test/test_js_call/style.css +++ b/WebDoorView/3DM_test/test_js_call/style.css @@ -21,8 +21,8 @@ canvas { #divLogo{ position: fixed ; - top: 3.5rem; - right: 0.3rem; + top: 4rem; + right: 0.5rem; height: 5rem; width: 4rem; font-size: 0.8rem; @@ -30,7 +30,7 @@ canvas { #infoDiv { position: fixed ; - top: 2.75rem; + top: 3.75rem; right: 0.5rem; z-index: 10; @@ -41,14 +41,6 @@ canvas { font-size: 0.9em ; } -/* #Ref1Render { - position: fixed ; - width: 10rem ; - height: 10rem ; - bottom: 0.5rem ; - right: 0.5rem ; -} */ - #RefRender { position: fixed ; width: 8rem ;