diff --git a/WebDoorView/3DM_test/test_js_call/index2.html b/WebDoorView/3DM_test/test_js_call/index2.html
new file mode 100644
index 0000000..d9f7041
--- /dev/null
+++ b/WebDoorView/3DM_test/test_js_call/index2.html
@@ -0,0 +1,59 @@
+
+
+
+
+ Door render
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebDoorView/3DM_test/test_js_call/index3.html b/WebDoorView/3DM_test/test_js_call/index3.html
new file mode 100644
index 0000000..c55d3a3
--- /dev/null
+++ b/WebDoorView/3DM_test/test_js_call/index3.html
@@ -0,0 +1,80 @@
+
+
+
+
+ Door render
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..48b4119
--- /dev/null
+++ b/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw_call.js
@@ -0,0 +1,20 @@
+import { webgl_original } from './webgl_draw.js';
+
+const WGL = new webgl_original();
+
+let options ={
+ modelPath: 'https://iis01.egalware.com/Test3D/THREEJS_DOORS/Door_models',
+ fName: getUrlParameter('src')
+}
+
+// Reading URL parameters -------------------------------------------------------------------------
+function getUrlParameter( name) {
+ // get query string from URL
+ const queryString = window.location.search ;
+ // create URLSearchParams object from query string
+ const urlParams = new URLSearchParams( queryString) ;
+ // get parameter value by name
+ return urlParams.get( name) ;
+ }
+
+WGL.initcall(options);
\ No newline at end of file
diff --git a/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw.js b/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/webgl_draw.js
similarity index 83%
rename from WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw.js
rename to WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/webgl_draw.js
index 52ce57d..738aea3 100644
--- a/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/draw.js
+++ b/WebDoorView/3DM_test/test_js_call/lib/node_modules/webgl-door-visualizer/webgl_draw.js
@@ -5,9 +5,7 @@ import { Rhino3dmLoader} from './jsm/loaders/3DMLoader.js' ;
import ViewCubeControls from './custom/cubeControls.js';
import { getStaticRef, updateRef } from './custom/refControls.js' ;
-
-
-// VARIABILI DI CONTROLLO - da rivedere
+// VARIABILI DI CONTROLLO
const EPS_SMALL = 0.001 ;
const GRID_GROUP_NAME = 'gridGroup' ;
const FRAME_GROUP_NAME = 'frameGroup' ;
@@ -22,8 +20,8 @@ var CAMERA_TYPE = CAMERA_ORTHO ;
var SHOW_DIMENSION = true ;
var GRID_MAIN_COLOR = new THREE.Color( 0x000000) ;
var GRID_SECOND_COLOR = new THREE.Color( 0xcccccc) ;
-var PATH = 'https://iis01.egalware.com/Test3D/THREEJS_DOORS/Door_models' ;
-var FILE_NAME = getUrlParameter('src') ;
+var PATH = './Door_models' ;
+var FILE_NAME = 'Demo.3dm'
var CTRL_DOWN = false ;
// ref global variables ---------
@@ -35,64 +33,55 @@ var scene_ref1 ; var renderer_ref1 ; var camera_ref1 ; var group_ref1 ; var fram
var m_box ; var m_size ; var m_center ; // set in setCameraPosition(), used in setGrid(), setFrame()
/* ------------------------------ */
-//init();
+// costanti globali
+// scene
+const scene = new THREE.Scene() ;
+scene.background = SCENE_BACKGROUND_COLOR ;
+// camera
+const perspCamera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 0.01, 150000) ;
+const ortoCamera = new THREE.OrthographicCamera( window.innerWidth / - 2, window.innerWidth / 2,
+ window.innerHeight / 2, window.innerHeight / - 2, EPS_SMALL, 150000) ;
+
+// render
+const renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true}) ;
+renderer.setSize( window.innerWidth, window.innerHeight) ;
+renderer.setPixelRatio( 2 * window.devicePixelRatio) ;
+document.getElementById( 'DoorRender').appendChild( renderer.domElement) ;
+renderer.shadowMap.enabled = true ;
+
+// light
+const ambientLight = new THREE.AmbientLight( 0xffffff, 2.5) ; // color, intensity
+scene.add( ambientLight) ;
+
+// controls
+const controls = new OrbitControls( CAMERA_TYPE == CAMERA_PERSP ? perspCamera : ortoCamera, renderer.domElement) ;
+controls.autoRotate = true ;
+
+// entity-groups ( to split entities between dimensions and general's ones )
+const dimensionGroup = new THREE.Group() ;
+dimensionGroup.name = DIMENSION_GROUP_NAME ;
+const general_entity_Group = new THREE.Group() ;
+general_entity_Group.name = GENERAL_ENTITY_GROUP_NAME ;
+// creating grid and frame ( over it ) Group
+const gridGroup = new THREE.Group() ;
+const frameGroup = new THREE.Group() ;
+
+
+//init();
class webgl_original {
async initcall({ modelPath, fName}) {
PATH = modelPath;
FILE_NAME = fName;
+ console.log('path: ' + modelPath)
+ console.log('name: ' + fName)
- // scene
- const scene = new THREE.Scene() ;
- scene.background = SCENE_BACKGROUND_COLOR ;
-
- // camera
- const perspCamera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 0.01, 150000) ;
- const ortoCamera = new THREE.OrthographicCamera( window.innerWidth / - 2, window.innerWidth / 2,
- window.innerHeight / 2, window.innerHeight / - 2, EPS_SMALL, 150000) ;
-
- // render
- const renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true}) ;
- renderer.setSize( window.innerWidth, window.innerHeight) ;
- renderer.setPixelRatio( 2 * window.devicePixelRatio) ;
- document.getElementById( 'DoorRender').appendChild( renderer.domElement) ;
- renderer.shadowMap.enabled = true ;
-
- // light
- const ambientLight = new THREE.AmbientLight( 0xffffff, 2.5) ; // color, intensity
- scene.add( ambientLight) ;
-
- // controls
- const controls = new OrbitControls( CAMERA_TYPE == CAMERA_PERSP ? perspCamera : ortoCamera, renderer.domElement) ;
- controls.autoRotate = true ;
-
- // entity-groups ( to split entities between dimensions and general's ones )
- const dimensionGroup = new THREE.Group() ;
- dimensionGroup.name = DIMENSION_GROUP_NAME ;
- const general_entity_Group = new THREE.Group() ;
- general_entity_Group.name = GENERAL_ENTITY_GROUP_NAME ;
- // creating grid and frame ( over it ) Group
- const gridGroup = new THREE.Group() ;
- const frameGroup = new THREE.Group() ;
-
+ let startTime = performance.now();
// reading .3dm file
- readDoor() ;
-
- // //console.log(fName)
- // setLoaders();
- // await init();
+ await readDoor() ;
+ let endTime = performance.now();
+ let timeElapsed = endTime - startTime;
+ console.log('init done in : ' + timeElapsed);
}
-
- // setCameraType(){
- // toggleCamera( perspectiveCamera, orthographicCamera);
- // }
-
- // refreshcall(nStart, nEnd) {
- // refreshElement(nStart, nEnd);
- // }
-
- // resetCamera() {
- // SetCameraPos( m_nCameraStartPos, ORIG) ;
- // }
}
export { webgl_original }
@@ -393,12 +382,12 @@ helpButton.addEventListener( "click", function() {
infoDiv.style.display = "none";
}) ;
-// Reading URL parameters -------------------------------------------------------------------------
-function getUrlParameter( name) {
- // get query string from URL
- const queryString = window.location.search ;
- // create URLSearchParams object from query string
- const urlParams = new URLSearchParams( queryString) ;
- // get parameter value by name
- return urlParams.get( name) ;
-}
\ No newline at end of file
+// // Reading URL parameters -------------------------------------------------------------------------
+// function getUrlParameter( name) {
+// // get query string from URL
+// const queryString = window.location.search ;
+// // create URLSearchParams object from query string
+// const urlParams = new URLSearchParams( queryString) ;
+// // get parameter value by name
+// return urlParams.get( name) ;
+// }
\ No newline at end of file
+