Add files via upload

//New in 1.12 => improve auto_zoom algorithm by Michal Jirku (https://wejn.org/2020/12/cracking-the-threejs-object-fitting-nut/)
//New in 1.12 => "dispose" function
//New in 1.12 => fixed memory leak on "clean" function (thanks to Anthony https://github.com/antho1404)
//New in 1.12 => use 'fetch' instead for xhr when possible (thanks to Anthony https://github.com/antho1404)
//New in 1.12 => added get_vsb_blob (returns vsb file as binary)
//New in 1.12 => set viewstl to take all of the container (and not 5px margin)
//New in 1.12 => fixed bug in json_without_nulls function

build/load_stl.min.js

@@ -1,2 +1,2 @@
-//=========== Stl Viewer v1.10, by Omri Rips, Viewstl.com, July 2020 ; admin@viewstl.com ===========
-importScripts("parser.min.js"),MSG_DATA=0,MSG_LOAD=1,MSG_ERROR=2,MSG_STL_LOADED=3,MSG_LOAD_IN_PROGRESS=4;var filename=null,local_file=null,load_from_blob_or_ab=null,x=0,y=0,z=0,model_id=-1,get_progress=!1;function isNumeric(a){return!isNaN(parseFloat(a))&&isFinite(a)}function send_error(a){postMessage({msg_type:MSG_ERROR,data:a})}function download_from_local(a){var e=new XMLHttpRequest;get_progress&&(e.onprogress=function(a){postMessage({msg_type:MSG_LOAD_IN_PROGRESS,id:model_id,loaded:a.loaded,total:a.total})}),e.onreadystatechange=function(a){4==e.readyState&&200==e.status&&after_file_load(e.response)},e.open("GET",a,!0),e.setRequestHeader("Content-type","application/x-www-form-urlencoded"),e.responseType="arraybuffer",e.send(null)}function after_file_load(a){var e;if(a){try{e=parse_3d_file(filename,a)}catch(a){e="Error parsing the file"}"string"!=typeof e?postMessage({msg_type:MSG_STL_LOADED,vertices:e.vertices,faces:e.faces,colors:e.colors}):send_error(e)}else send_error("no data")}function read_file(a){var e=new FileReader;e.onerror=function(a){var e="";switch(a.target.error.code){case a.target.error.NOT_FOUND_ERR:e="File not found";break;case a.target.error.NOT_READABLE_ERR:e="Can't read file - too large?";break;case a.target.error.ABORT_ERR:e="Read operation aborted";break;case a.target.error.SECURITY_ERR:e="File is locked";break;case a.target.error.ENCODING_ERR:e="File too large";break;default:e="Error reading file"}send_error(e)},e.onprogress=function(a){postMessage({msg_type:MSG_LOAD_IN_PROGRESS,id:model_id,loaded:a.loaded,total:a.total})},e.onload=function(a){after_file_load(a.target.result)},e.readAsArrayBuffer(a)}self.addEventListener("message",function(a){switch(a.data.msg_type){case MSG_DATA:if(!a.data.data){send_error("no data");break}if(!a.data.data.filename&&!a.data.data.local_file){send_error("no file");break}a.data.data.local_file?(filename=a.data.data.local_file.name,local_file=a.data.data.local_file?a.data.data.local_file:null):a.data.data.filename&&(filename=a.data.data.filename),a.data.data.x&&isNumeric(a.data.data.x)&&(x=a.data.data.x),a.data.data.y&&isNumeric(a.data.data.y)&&(y=a.data.data.y),a.data.data.y&&isNumeric(a.data.data.z)&&(z=a.data.data.z),load_from_blob_or_ab=null,a.data.load_from_blob_or_ab&&(load_from_blob_or_ab=a.data.load_from_blob_or_ab),model_id=a.data.data.id?a.data.data.id:-1,get_progress=!!a.data.get_progress&&a.data.get_progress;break;case MSG_LOAD:load_from_blob_or_ab?load_from_blob_or_ab instanceof ArrayBuffer?after_file_load(load_from_blob_or_ab):read_file(load_from_blob_or_ab):local_file?read_file(local_file):filename&&download_from_local(filename);break;default:console.log("invalid msg: "+a.data.msg_type)}});
+//=========== Stl Viewer v1.12, by Omri Rips, Viewstl.com, February 2021 ; admin@viewstl.com ===========
+importScripts("parser.min.js"),MSG_DATA=0,MSG_LOAD=1,MSG_ERROR=2,MSG_STL_LOADED=3,MSG_LOAD_IN_PROGRESS=4;var filename=null,local_file=null,load_from_blob_or_ab=null,x=0,y=0,z=0,model_id=-1,get_progress=!1;function isNumeric(a){return!isNaN(parseFloat(a))&&isFinite(a)}function send_error(a){postMessage({msg_type:MSG_ERROR,data:a})}function download_from_local(a){fetch?download_from_local_fetch(a):download_from_local_xhr(a)}function download_from_local_xhr(a){var e=new XMLHttpRequest;get_progress&&(e.onprogress=function(a){postMessage({msg_type:MSG_LOAD_IN_PROGRESS,id:model_id,loaded:a.loaded,total:a.total})}),e.onreadystatechange=function(a){4==e.readyState&&200==e.status&&after_file_load(e.response)},e.open("GET",a,!0),e.responseType="arraybuffer",e.send(null)}async function download_from_local_fetch(a){const e=await fetch(a),o=e.body.getReader(),r=Number(e.headers.get("content-length")),t=new Uint8Array(r);let l=0;for(;;){const{done:a,value:e}=await o.read();if(a)break;e&&(t.set(e,l),l+=e.length,get_progress&&postMessage({msg_type:MSG_LOAD_IN_PROGRESS,id:model_id,loaded:l,total:r}))}after_file_load(t.buffer)}function after_file_load(a){var e;if(a){try{e=parse_3d_file(filename,a)}catch(a){e="Error parsing the file"}"string"!=typeof e?postMessage({msg_type:MSG_STL_LOADED,vertices:e.vertices,faces:e.faces,colors:e.colors}):send_error(e)}else send_error("no data")}function read_file(a){var e=new FileReader;e.onerror=function(a){var e="";switch(a.target.error.code){case a.target.error.NOT_FOUND_ERR:e="File not found";break;case a.target.error.NOT_READABLE_ERR:e="Can't read file - too large?";break;case a.target.error.ABORT_ERR:e="Read operation aborted";break;case a.target.error.SECURITY_ERR:e="File is locked";break;case a.target.error.ENCODING_ERR:e="File too large";break;default:e="Error reading file"}send_error(e)},e.onprogress=function(a){postMessage({msg_type:MSG_LOAD_IN_PROGRESS,id:model_id,loaded:a.loaded,total:a.total})},e.onload=function(a){after_file_load(a.target.result)},e.readAsArrayBuffer(a)}self.addEventListener("message",function(a){switch(a.data.msg_type){case MSG_DATA:if(!a.data.data){send_error("no data");break}if(!a.data.data.filename&&!a.data.data.local_file){send_error("no file");break}a.data.data.local_file?(filename=a.data.data.local_file.name?a.data.data.local_file.name:a.data.data.filename,local_file=a.data.data.local_file?a.data.data.local_file:null):a.data.data.filename&&(filename=a.data.data.filename),a.data.data.x&&isNumeric(a.data.data.x)&&(x=a.data.data.x),a.data.data.y&&isNumeric(a.data.data.y)&&(y=a.data.data.y),a.data.data.y&&isNumeric(a.data.data.z)&&(z=a.data.data.z),load_from_blob_or_ab=null,a.data.load_from_blob_or_ab&&(load_from_blob_or_ab=a.data.load_from_blob_or_ab),model_id=a.data.data.id?a.data.data.id:-1,get_progress=!!a.data.get_progress&&a.data.get_progress;break;case MSG_LOAD:load_from_blob_or_ab?load_from_blob_or_ab instanceof ArrayBuffer?after_file_load(load_from_blob_or_ab):read_file(load_from_blob_or_ab):local_file?read_file(local_file):filename&&download_from_local(filename);break;default:console.log("invalid msg: "+a.data.msg_type)}});

src/load_stl.js

@@ -1,4 +1,4 @@
-//1.10
+//1.12
 //load STL file info geometry and returns it
 
 importScripts("parser.min.js");
@@ -28,7 +28,7 @@ self.addEventListener("message", function(e)
 			
 			if (e.data.data.local_file)
 			{
-				filename=e.data.data.local_file.name;
+				filename=e.data.data.local_file.name?e.data.data.local_file.name:e.data.data.filename; //filename property is usefull for blob files, 10x Fraser
 				local_file=e.data.data.local_file?e.data.data.local_file:null;
 			}
 			else if (e.data.data.filename)
@@ -44,6 +44,7 @@ self.addEventListener("message", function(e)
 			
 			model_id=e.data.data.id?e.data.data.id:-1;
 			get_progress=e.data.get_progress?e.data.get_progress:false;
+
 			break;
 			
 		case MSG_LOAD:
@@ -74,13 +75,26 @@ self.addEventListener("message", function(e)
 function isNumeric(n)
 {
 	return !isNaN(parseFloat(n)) && isFinite(n);
-}
+}
+
 function send_error(s)
 {
 	postMessage({msg_type:MSG_ERROR, data:s});
 }
 
 function download_from_local(filename)
+{
+	if (fetch)
+	{
+		download_from_local_fetch(filename);
+	}
+	else
+	{
+		download_from_local_xhr(filename);
+	}
+}
+
+function download_from_local_xhr(filename)
 {
 	var xhr = new XMLHttpRequest();
 	
@@ -108,12 +122,34 @@ function download_from_local(filename)
 	}
 	
 	xhr.open("GET", filename, true);
-	xhr.open("GET", filename, true);
+	//xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
 	xhr.responseType = "arraybuffer";
 	
 	xhr.send(null);
 }
 
+async function download_from_local_fetch(filename)
+{
+	const response = await fetch(filename);
+	const reader = response.body.getReader();
+	const total = Number(response.headers.get('content-length'));
+ 	const chunksAll = new Uint8Array(total);
+  	let position = 0
+	while (true)
+	{
+		const { done, value } = await reader.read()
+    	if (done) break;
+    	if (!value) continue;
+    	chunksAll.set(value, position);
+    	position += value.length;
+		if (get_progress)
+		{
+    		postMessage({ msg_type: MSG_LOAD_IN_PROGRESS, id: model_id, loaded: position, total: total });
+    	}
+  	}
+	after_file_load(chunksAll.buffer)
+}
+
 function after_file_load(s)
 {
 	var vf_data;

src/stl_viewer.js

@@ -1,5 +1,21 @@
-//1.10
+//1.12
 //**********************************************************
+//New in 1.12 => improve auto_zoom algorithm by Michal Jirku (https://wejn.org/2020/12/cracking-the-threejs-object-fitting-nut/)
+//New in 1.12 => "dispose" function
+//New in 1.12 => fixed memory leak on "clean" function (thanks to Anthony https://github.com/antho1404)
+//New in 1.12 => use 'fetch' instead for xhr when possible (thanks to Anthony https://github.com/antho1404)
+//New in 1.12 => added get_vsb_blob (returns vsb file as binary)
+//New in 1.12 => set viewstl to take all of the container (and not 5px margin)
+//New in 1.12 => fixed bug in json_without_nulls function
+//New in 1.12 => cal vol/area bug
+//New in 1.12 => remove edges where model is removed
+//New in 1.11 => set grid
+//New in 1.10 => revoke dataURLs
+//New in 1.10 => fix issue with rotation at 0 angle
+//New in 1.10 => fix issue with colored STL on vsb
+//New in 1.10 => make all vsb ids -1
+//New in 1.10 => fixed issue with mesh cloning
+//New in 1.10 => mm/inch settings
 //New in 1.10 => Option to trigger 'no model' click event - 'send_no_model_click_event'
 //New in 1.10 => Scale always 1 for vsb file, ro avoid double scalling
 //New in 1.10 => define default path for loading THREE JS files by script path (and not by html page path) - thanks venkyr!
@@ -7,7 +23,6 @@
 //New in 1.10 => fix rotation issues
 //New in 1.09 => get_camera_state - get camera's info
 //New in 1.09 => set_camera_state - set camera
-
 //New in 1.09 => Returns 'orig_filename' optional parameter at 'get_model_info'
 //New in 1.09 => 'get_vsj' - returns object current stands as json, files not included
 //New in 1.09 => 'download_vsj' - download json descriptor of current scene
@@ -40,13 +55,14 @@ function StlViewer(parent_element_obj, options)
 		if (!_this.options) return def;
 		
 		if (_this.options[opt_id]===false) return false;
+
 		return _this.options[opt_id]?_this.options[opt_id]:def;
 	}
 	
 	this.canvas_width="100%";
 	this.canvas_height="100%";
 	this.bg_color="transparent";
-	this.models_to_add=null; //at start
+	this.models_to_add=[]; //at start
 	this.models=new Array();
 	this.models_count=0;
 	this.models_ref=new Array(); //models with index - direct reference from id(comes from user) to model array (above)
@@ -65,6 +81,7 @@ function StlViewer(parent_element_obj, options)
 	this.camerax=0;
 	this.cameray=0;
 	this.cameraz=0;
+
 	this.camera_state=null;
 	this.auto_rotate=false;
 	this.mouse_zoom=true;
@@ -81,6 +98,9 @@ function StlViewer(parent_element_obj, options)
 	this.pre_loaded_vsj=null; //VSJ file content, waiting to be loaded (used when loading VSB)
 	this.zip_load_count=-1; //Zip files waiting to be loaded to memory (used when loading VSB)
 	this.send_no_model_click_event=false; //will trigger click event even if no model was clicked (just parent element was clicked)
+	this.grid=null; //draw grid over scene
+
+	this.killsign=false; //use by 'dispose', stl_viewer instqance will be unusable after setting this to true
 	
 	this.set_on_model_mousedown = function (callback)
 	{
@@ -89,6 +109,7 @@ function StlViewer(parent_element_obj, options)
 		if (_this.onmousedown_callback)
 		{
 			_this.parent_element.addEventListener('mousedown', _this.onmousedown);
+			_this.parent_element.addEventListener('dblclick', _this.onmousedown);
 			_this.parent_element.addEventListener('touchstart', _this.onmousedown);
 		}
 	}
@@ -111,7 +132,7 @@ function StlViewer(parent_element_obj, options)
 	{
 		_this.canvas_width=_this.get_opt("width",_this.canvas_width);
 		_this.canvas_height=_this.get_opt("height",_this.canvas_height);
-		_this.bg_color=_this.get_opt("bgcolor",_this.bg_color);
+		_this.bg_color=_this.get_opt("bg_color",_this.bg_color);
 		_this.models_to_add=_this.get_opt("models",_this.models_to_add);
 		_this.model_loaded_callback=_this.get_opt("model_loaded_callback",_this.model_loaded_callback);
 		_this.all_loaded_callback=_this.get_opt("all_loaded_callback",_this.all_loaded_callback);
@@ -130,6 +151,7 @@ function StlViewer(parent_element_obj, options)
 		_this.on_model_drop=_this.get_opt("on_model_drop",_this.on_model_drop);
 		_this.center_models=_this.get_opt("center_models",_this.center_models);
 		_this.controls_type=_this.get_opt("controls", _this.controls_type);
+		_this.grid=_this.get_opt("grid",_this.grid?true:false); //now it is boolean, later it will be grid helper object
 		if (_this.zoom>=0)
 			_this.cameraz=_this.zoom;
 		else
@@ -170,7 +192,7 @@ function StlViewer(parent_element_obj, options)
 		_this.set_geo_minmax(model);
 		_this.recalc_dims(model);
 		
-		model.color=model.mesh.material.color.getHexString();
+		model.color='#'+model.mesh.material.color.getHexString();
 		
 		_this.scene.add(model.mesh);
 		_this.model_loaded(model.id);
@@ -197,7 +219,8 @@ function StlViewer(parent_element_obj, options)
 					if (geo)
 					{
 						//if (!geo.boundingBox) geo.computeBoundingBox();
-						var material=new THREE.MeshLambertMaterial({color:0x909090, overdraw: 1, wireframe: false, vertexColors: model.color?THREE.NoColors:THREE.FaceColors}); //if model color is set, ignores face colors set on the STL file itself (if any)
+						//var material=new THREE.MeshLambertMaterial({color:0x909090, overdraw: 1, wireframe: false, vertexColors: model.color?THREE.NoColors:THREE.FaceColors}); //if model color is set, ignores face colors set on the STL file itself (if any)
+						var material=new THREE.MeshLambertMaterial({color:0x909090, wireframe: false, vertexColors: model.color?THREE.NoColors:THREE.FaceColors}); //if model color is set, ignores face colors set on the STL file itself (if any)
 						if (!_this.is_ie) material.side = THREE.DoubleSide;
 						if (!model.display) model.display="flat";
 						_this.set_material_display(model.display, material, geo); //shading (aka display)
@@ -239,6 +262,7 @@ function StlViewer(parent_element_obj, options)
 		var blob_to_load=null;
 		if (_this.pre_loaded_ab_files) if (model.filename) if (_this.pre_loaded_ab_files[model.filename]) blob_to_load=_this.pre_loaded_ab_files[model.filename];
 		
+		//console.log ('blob to load', blob_to_load, _this.pre_loaded_ab_files, _this.pre_loaded_ab_files[model.filename]);
 		model_worker.postMessage({msg_type:_this.MSG2WORKER_DATA, data:model, load_from_blob_or_ab:blob_to_load, get_progress:(_this.loading_progress_callback!=null)});
 		model_worker.postMessage({msg_type:_this.MSG2WORKER_LOAD});
 	
@@ -258,6 +282,7 @@ function StlViewer(parent_element_obj, options)
 				_this.camera_state=null; //it is one time thingy (next bunch of models will have to set camera state again)
 			
 			_this.set_light();
+			_this.set_grid(_this.grid?true:false);
 		
 			_this.load_session++; //from now on it is a new loading session
 			
@@ -268,6 +293,26 @@ function StlViewer(parent_element_obj, options)
 		}
 	}
 	
+	this.set_grid=function(b, size, divisions)
+	{
+		if (_this.grid) _this.scene.remove(_this.grid);
+		_this.grid=null;
+
+		if (b)
+		{
+			if (!size) size=Math.max(Math.abs(_this.maxx),Math.abs(_this.minx))*2.5;
+			if (size<=0)
+			{
+				var height = isNaN(window.innerHeight) ? window.clientHeight : window.innerHeight;
+				var width = isNaN(window.innerWidth) ? window.clientWidth : window.innerWidth;
+				size=Math.min(height, width)*0.8;
+			}
+			if (!divisions) divisions=10;
+			_this.grid = new THREE.GridHelper(size,divisions);
+			_this.scene.add(_this.grid);
+		}
+	}
+
 	this.remove_model = function(model_id)
 	{
 		if (_this.models_ref[model_id]===undefined) return _this.model_error("remove_model - id not found: "+model_id);
@@ -275,6 +320,8 @@ function StlViewer(parent_element_obj, options)
 		var model=_this.models[_this.models_ref[model_id]];
 		if (!model) return;
 		
+		_this.set_or_update_geo_edges (model, false);
+
 		delete _this.models[_this.models_ref[model_id]];
 		delete _this.models_ref[model_id];
 		delete _this.loaded_models_arr[model_id];
@@ -297,14 +344,42 @@ function StlViewer(parent_element_obj, options)
 	{
 		if (zoom) _this.zoom=zoom;
 		
-		if ((_this.zoom_done)&&(!force_zoom)&&(_this.zoom>=0)) //don't do zoom for more than once
+		//if ((_this.zoom_done)&&(!force_zoom)&&(_this.zoom>=0)) //don't do zoom for more than once
+		if ((_this.zoom_done)&&(!force_zoom)) //don't do zoom for more than once
 			return;
 			
 		_this.zoom_done=true;
 		
-		var max_dim = Math.max(_this.maxx*2, _this.maxy*2, _this.maxz);
-			_this.camera.position.set(_this.camera.position.x,_this.camera.position.y,_this.zoom>=0?_this.zoom:(max_dim*1.2*Math.max(1,_this.camera.aspect/2))); //-1 = auto zoom
+		//var max_dim = Math.max(Math.abs(_this.maxx-_this.minx), Math.abs(_this.maxy-_this.miny), Math.abs(_this.maxz-_this.minz));
+		var cameraZ=_this.zoom;
+		if (_this.zoom<0) cameraZ=_this.calc_z_for_auto_zoom(); //-1 = auto zoom
+		_this.camera.position.set(_this.camera.position.x,_this.camera.position.y,cameraZ);
+
+		// set the far plane of the camera so that it easily encompasses the whole object
+		const minZ = _this.minz;
+		const cameraToFarEdge = ( minZ < 0 ) ? -minZ + cameraZ : cameraZ - minZ;
+
+		_this.camera.far = cameraToFarEdge * 3;
+		_this.camera.updateProjectionMatrix();		
+
 	}
+
+	this.calc_z_for_auto_zoom=function (offset)
+	{
+		offset = offset || 1.01;
+
+		const boundingBox = new THREE.Box3(new THREE.Vector3( _this.minx, _this.miny, _this.minz ), new THREE.Vector3( _this.maxx, _this.maxy, _this.maxz ));
+    	var size = new THREE.Vector3();
+    	boundingBox.getSize(size);
+
+		const fov = _this.camera.fov * ( Math.PI / 180 );
+		const fovh = 2*Math.atan(Math.tan(fov/2) * _this.camera.aspect);
+		let dx = size.z / 2 + Math.abs( size.x / 2 / Math.tan( fovh / 2 ) );
+		let dy = size.z / 2 + Math.abs( size.y / 2 / Math.tan( fov / 2 ) );
+		let cameraZ = Math.max(dx, dy);
+		cameraZ *= offset;
+		return cameraZ;
+	}	
 	
 	//position, up and target vectors (each 3 coors vector) described camera's position
 	this.get_camera_state=function()
@@ -377,12 +452,14 @@ function StlViewer(parent_element_obj, options)
 	this.stop_auto_zoom=function ()
 	{
 		_this.zoom=_this.camera.position.z;
+		_this.zoom_done=true;
 	}	
 	
 	this.set_camera=function (x,y,z)
 	{
 		if (y) _this.zoom=y;
-		_this.camera.position.set(!_this.is_empty(x)?x:_this.camera.position.x,!_this.is_empty(y)?y:_this.camera.position.y,_this.zoom>=0?_this.zoom:Math.max(_this.maxx*3, _this.maxy*3, _this.maxz*3.5));
+		//_this.camera.position.set(!_this.is_empty(x)?x:_this.camera.position.x,!_this.is_empty(y)?y:_this.camera.position.y,_this.zoom>=0?_this.zoom:Math.max(_this.maxx*3, _this.maxy*3, _this.maxz*3.5));
+		_this.camera.position.set(!_this.is_empty(x)?x:_this.camera.position.x,!_this.is_empty(y)?y:_this.camera.position.y,!_this.is_empty(z)?z:_this.camera.position.z);
 	}
 	
 	this.set_auto_zoom=function()
@@ -451,6 +528,10 @@ function StlViewer(parent_element_obj, options)
 	//set model custome properties
 	this.set_model_custom_props = function (model)
 	{
+		//units
+		model.units=model.units?model.units:'mm';
+		_this.set_model_units(model.id, model.units, true);
+	
 		//position
 		model.x=model.x?model.x:0;
 		model.y=model.y?model.y:0;
@@ -491,7 +572,7 @@ function StlViewer(parent_element_obj, options)
 			_this.set_or_update_geo_edges (model, true);
 			
 		//opacity
-		if (model.opacity)
+		if (typeof model.opacity !== 'undefined')
 			this.set_material_opacity(model.mesh.material, model.opacity);
 			
 		//animation
@@ -578,6 +659,9 @@ function StlViewer(parent_element_obj, options)
 		if (!model) return;
 		if (!model.mesh) return;
 		
+		if (color.length<6) return;
+		if (color.charAt(0)!='#') color='#'+color;
+		
 		model.color=color;
 		
 		_this.update_mesh_color(model.mesh, color, color?false:model.colors);
@@ -618,6 +702,8 @@ function StlViewer(parent_element_obj, options)
 			this.renderer.setClearColor(0x000000, 0);
 		else
 			this.renderer.setClearColor(bg_color, 1);
+
+		_this.bg_color=bg_color;
 	}
 
 	this.set_display = function(model_id, display)
@@ -637,10 +723,11 @@ function StlViewer(parent_element_obj, options)
 	this.set_opacity = function(model_id, opacity)
 	{
 		if (_this.models_ref[model_id]===undefined) return _this.model_error("set_display - id not found: "+model_id);
-	
+
 		var model=_this.models[_this.models_ref[model_id]];
 		if (!model) return;
 		
+		model.opacity=opacity;
 		this.set_material_opacity(model.mesh.material, opacity);
 	}
 
@@ -664,32 +751,40 @@ function StlViewer(parent_element_obj, options)
 		event.stopPropagation();
 		event.preventDefault();
 		
+		//reset click_type: 1=left click, 3=right click, 11=double click, 20=touch
+		var click_type=event.which;
+
 		switch (event.type)
 		{
 			case 'touchstart':
+				click_type=20;
 				var touch = event.touches[0] || event.changedTouches[0];
 				_this.mouse.x = ( (touch.pageX-_this.parent_element.offsetLeft) / _this.parent_element.clientWidth ) * 2 - 1;
 				_this.mouse.y = - ( (touch.pageY-_this.parent_element.offsetTop) / _this.parent_element.clientHeight ) * 2 + 1;
 				break;
-				
+			
+			case 'dblclick': //double-click
+				click_type=11;
 			default: //click
 				_this.mouse.x = ( (event.clientX-_this.parent_element.offsetLeft) / _this.parent_element.clientWidth ) * 2 - 1;
 				_this.mouse.y = - ( (event.clientY-_this.parent_element.offsetTop) / _this.parent_element.clientHeight ) * 2 + 1;
 		}
-		
+
 		_this.raycaster.setFromCamera( _this.mouse, _this.camera );
 		var intersects = _this.raycaster.intersectObjects( _this.scene.children );
 		
+		
+
 		if (intersects.length>0)
 		{
 			if (intersects[0].object.model_id===undefined) return;
 			if (_this.onmousedown_callback)
 			{
-				_this.onmousedown_callback(intersects[0].object.model_id, event, intersects[0].distance);
+				_this.onmousedown_callback(intersects[0].object.model_id, event, intersects[0].distance, click_type);
 			}
 		}
 		else if (_this.send_no_model_click_event)
-			_this.onmousedown_callback(null, event, 0);
+			_this.onmousedown_callback(null, event, 0, click_type);
 	}
 
 	//will return if value is empty (null/undefined etc.) and not zero (which is valid)
@@ -698,6 +793,41 @@ function StlViewer(parent_element_obj, options)
 		return (!a && a !== 0);
 	}
 
+	this.set_model_units = function(model_id, units, scale)
+	{
+		if (_this.models_ref[model_id]===undefined) return _this.model_error("set_model_units - id not found: "+model_id);
+	
+		var model=_this.models[_this.models_ref[model_id]];
+		if (!model) return;
+		if (!model.mesh) return;
+	
+		var scale_factor=1;
+		switch (units)
+		{
+			case 'mm':
+				if (scale) if (model.units=='inch') scale_factor=1/25.4;
+				model.units='mm';
+				break;
+				
+			case 'inch':
+				if (scale) if (model.units=='mm') scale_factor=25.4;
+				model.units='inch';
+				break;
+				
+			default:
+				return _this.model_error("set_model_units - invalid unit "+units);
+		}
+
+		if (scale_factor!=1)
+		{		
+			_this.set_scale(model.id,
+			model.scalex*scale_factor,
+			model.scaley*scale_factor,
+			model.scalez*scale_factor
+			);
+		}
+	}
+
 	this.set_position = function(model_id, x,y,z)
 	{
 		if (_this.models_ref[model_id]===undefined) return _this.model_error("set_position - id not found: "+model_id);
@@ -729,7 +859,8 @@ function StlViewer(parent_element_obj, options)
 			
 			case "smooth":
 				material.wireframe=false;
-				material.shading=THREE.SmoothShading;
+				//material.shading=THREE.SmoothShading;
+				material.flatShading=false;
 				if (geo)
 				{
 					geo.mergeVertices();
@@ -739,7 +870,8 @@ function StlViewer(parent_element_obj, options)
 				
 			case "flat":
 				material.wireframe=false;
-				material.shading=THREE.FlatShading;
+				//material.shading=THREE.FlatShading;
+				material.flatShading=true;
 				if (geo)
 					geo.computeFlatVertexNormals();
 				break;
@@ -757,19 +889,19 @@ function StlViewer(parent_element_obj, options)
 
 		var c=add_to_current?1:0; //add or set angle
 
-		if (axis_x_angel)
+		if (axis_x_angel!==undefined)
 		{
 			model.rotationx=axis_x_angel+model.mesh.rotation.x*c;
 			model.mesh.rotation.x=model.rotationx;
 		}
 			
-		if (axis_y_angel)
+		if (axis_y_angel!==undefined)
 		{
 			model.rotationy=axis_y_angel+model.mesh.rotation.y*c;
 			model.mesh.rotation.y=model.rotationy;
 		}
 			
-		if (axis_z_angel)
+		if (axis_z_angel!==undefined)
 		{
 			model.rotationz=axis_z_angel+model.mesh.rotation.z*c;
 			model.mesh.rotation.z=model.rotationz;
@@ -795,6 +927,7 @@ function StlViewer(parent_element_obj, options)
 		return filename.split(/[\\/]/).pop();
 	}
 
+
 	this.get_model_filename=function(model, no_null, basename, skip_url)
 	{
 		var fn=null;
@@ -908,7 +1041,7 @@ function StlViewer(parent_element_obj, options)
 		return _this.status;
 	}
 
-	this.calc_volume_and_area=function(geo)
+	this.calc_volume_and_area=function(geo, factor)
 	{
 		var x1,x2,x3,y1,y2,y3,z1,z2,z3,i;
 		var len=geo.faces.length;
@@ -918,15 +1051,15 @@ function StlViewer(parent_element_obj, options)
 				
 		for (i=0;i<len;i++)
 		{
-			x1=geo.vertices[geo.faces[i].a].x;
-			y1=geo.vertices[geo.faces[i].a].y;
-			z1=geo.vertices[geo.faces[i].a].z;
-			x2=geo.vertices[geo.faces[i].b].x;
-			y2=geo.vertices[geo.faces[i].b].y;
-			z2=geo.vertices[geo.faces[i].b].z;
-			x3=geo.vertices[geo.faces[i].c].x;
-			y3=geo.vertices[geo.faces[i].c].y;
-			z3=geo.vertices[geo.faces[i].c].z;
+			x1=geo.vertices[geo.faces[i].a].x*factor;
+			y1=geo.vertices[geo.faces[i].a].y*factor;
+			z1=geo.vertices[geo.faces[i].a].z*factor;
+			x2=geo.vertices[geo.faces[i].b].x*factor;
+			y2=geo.vertices[geo.faces[i].b].y*factor;
+			z2=geo.vertices[geo.faces[i].b].z*factor;
+			x3=geo.vertices[geo.faces[i].c].x*factor;
+			y3=geo.vertices[geo.faces[i].c].y*factor;
+			z3=geo.vertices[geo.faces[i].c].z*factor;
 					
 			totalVolume += 
 				(-x3 * y2 * z1 + 
@@ -936,9 +1069,9 @@ function StlViewer(parent_element_obj, options)
 				x2 * y1 * z3 + 
 				x1 * y2 * z3);
 						
-			a=geo.vertices[geo.faces[i].a].distanceTo(geo.vertices[geo.faces[i].b]);
-			b=geo.vertices[geo.faces[i].b].distanceTo(geo.vertices[geo.faces[i].c]);
-			c=geo.vertices[geo.faces[i].c].distanceTo(geo.vertices[geo.faces[i].a]);
+			a=geo.vertices[geo.faces[i].a].distanceTo(geo.vertices[geo.faces[i].b])*factor;
+			b=geo.vertices[geo.faces[i].b].distanceTo(geo.vertices[geo.faces[i].c])*factor;
+			c=geo.vertices[geo.faces[i].c].distanceTo(geo.vertices[geo.faces[i].a])*factor;
 			s=(a+b+c)/2;
 			totalArea+=Math.sqrt(s*(s-a)*(s-b)*(s-c));
 		}
@@ -956,8 +1089,8 @@ function StlViewer(parent_element_obj, options)
 		if (!model.mesh) return null;
 		if (!model.mesh.geometry) return null;
 		
-		var vol_and_area=model.mesh.geometry?_this.calc_volume_and_area(model.mesh.geometry):[0,0,0];
-		return {name:model.filename?model.filename:(model.local_file?model.local_file.name:""), orig_filename:model.orig_filename?model.orig_filename:null, position:{x:model.x, y:model.y, z:model.z}, dims:{x:model.mesh.geometry.maxx-model.mesh.geometry.minx, y:model.mesh.geometry.maxy-model.mesh.geometry.miny, z:model.mesh.geometry.maxz-model.mesh.geometry.minz}, rotation:{x:model.mesh.rotation.x,y:model.mesh.rotation.y,z:model.mesh.rotation.z}, display:model.display?model.display:null, color:model.color?model.color:null, scale:{x:model.scalex,y:model.scaley,z:model.scalez}, volume:vol_and_area[0], area:vol_and_area[1], triangles:vol_and_area[2]};
+		var vol_and_area=model.mesh.geometry?_this.calc_volume_and_area(model.mesh.geometry, model.units=='inch'?1/25.4:1):[0,0,0];
+		return {name:model.filename?model.filename:(model.local_file?model.local_file.name:""), orig_filename:model.orig_filename?model.orig_filename:null, position:{x:model.x, y:model.y, z:model.z}, dims:{x:model.mesh.geometry.maxx-model.mesh.geometry.minx, y:model.mesh.geometry.maxy-model.mesh.geometry.miny, z:model.mesh.geometry.maxz-model.mesh.geometry.minz}, rotation:{x:model.mesh.rotation.x,y:model.mesh.rotation.y,z:model.mesh.rotation.z}, display:model.display?model.display:null, color:model.color?model.color:null, scale:{x:model.scalex,y:model.scaley,z:model.scalez}, volume:vol_and_area[0], area:vol_and_area[1], triangles:vol_and_area[2], units:model.units, opacity:model.opacity!==undefined?model.opacity:1};
 	}
 
 	this.get_vsb = function()
@@ -980,18 +1113,20 @@ function StlViewer(parent_element_obj, options)
 		//get object info in json format
 		var pos=_this.camera.position;
 		var data={canvas_height:_this.canvas_height, bg_color:_this.bg_color, camera_state:_this.get_camera_state(), auto_rotate:_this.auto_rotate, mouse_zoom:_this.mouse_zoom, auto_resize:_this.auto_resize, center_models:_this.center_models};
+		if (_this.grid) data['grid']=1;
 		data['models']=[];
 		
 		Object.keys(_this.models_ref).forEach(function(key)
 		{
 			var model=_this.models[_this.models_ref[key]];
-			var info={id:model.id};
-			
+			var info={id:for_vsb?-1:model.id};
+
 			if (for_vsb)
 			{
 				//console.log(model);
-				var curr_filename=_this.get_model_filename(model, true, true, true);
-				if (curr_filename) info['filename']=curr_filename;
+				//var curr_filename=_this.get_model_filename(model, true, true, true);
+				//if (curr_filename) info['filename']=curr_filename;
+				info['filename']=model.id+'.stl';
 			}
 			else
 			{
@@ -999,11 +1134,13 @@ function StlViewer(parent_element_obj, options)
 				if (curr_filename) info['filename']=curr_filename;
 				if (model.local_file) info['local_file']=model.local_file;
 			}
+			
 			if (model.x) info['x']=model.x;
 			if (model.y) info['y']=model.y;
 			if (model.z) info['z']=model.z;
 			if (model.display) info['display']=model.display;
-			if (model.color) info['color']=model.color;
+			if (!((model.colors)&&(model.color=='#ffffff'))) if (model.color) info['color']=model.color; //if model is colored stl and the color is #FFFFFF, skip color property (cause this is the defauly for colored STL)
+			if (model.units) info['units']=model.units;
 			if (model.rotationx) info['rotationx']=model.rotationx;
 			if (model.rotationy) info['rotationy']=model.rotationy;
 			if (model.rotationz) info['rotationz']=model.rotationz;
@@ -1048,6 +1185,7 @@ function StlViewer(parent_element_obj, options)
 		
 		link.download = download_name+'.vsj';
 		link.click();
+		URL.revokeObjectURL(link.href);
 	}
 
 	this.load_vsj = function(filename)
@@ -1208,11 +1346,12 @@ function StlViewer(parent_element_obj, options)
 
 	this.json_without_nulls=function(arr)
 	{
-		return JSON.stringify(arr).split(",null").join("");
+		return JSON.stringify(arr).split(",null").join("").split("null,").join("");
 	}
 
-	this.download_vsb = function(filename)
+	this.get_vsb_blob = function()
 	{
+		//makes vsb and returns it as a blob
 		var zip=null;
 		try
 		{
@@ -1234,31 +1373,33 @@ function StlViewer(parent_element_obj, options)
 			zip.file(curr_filename, vsb.files[key].bin);
 		});
 		
-		zip.generateAsync({type:"blob"})
-			.then(function(content)
-			{
-				var blob = new Blob([content], {type: "application/zip"});
-				
-				var link = document.createElement("a");
-				link.href = window.URL.createObjectURL(blob);
-				var download_name=filename?filename:"1";
-				var p=download_name.toLowerCase().indexOf('.vsb');
-				if (p>=0) download_name=download_name.substring( 0, p );
-				if (download_name.length<1) download_name='1';
-				
-				if (window.navigator.msSaveOrOpenBlob)
-				{
-					//only for IE
-					window.navigator.msSaveBlob(blob, download_name+'.vsb');
-					return;
-				}
+		return zip.generateAsync({type:"blob"});
+	} 
 
+	this.download_vsb = function(filename)
+	{
+		_this.get_vsb_blob(filename).then(function(content)
+		{
+			var blob = new Blob([content], {type: "application/zip"});
 				
-				link.download = download_name+'.vsb';
-				link.click();
-			});
-		
-		return;
+			var link = document.createElement("a");
+			link.href = window.URL.createObjectURL(blob);
+			var download_name=filename?filename:"1";
+			var p=download_name.toLowerCase().indexOf('.vsb');
+			if (p>=0) download_name=download_name.substring( 0, p );
+			if (download_name.length<1) download_name='1';
+				
+			if (window.navigator.msSaveOrOpenBlob)
+			{
+				//only for IE
+				window.navigator.msSaveBlob(blob, download_name+'.vsb');
+				return;
+			}
+
+			link.download = download_name+'.vsb';
+			link.click();
+			URL.revokeObjectURL(link.href);
+		});
 	}
 
 	this.load_vsb = function(filename)
@@ -1371,7 +1512,7 @@ function StlViewer(parent_element_obj, options)
 		link.href = window.URL.createObjectURL(blob);
 		//var download_name=filename?filename:(model.filename?model.filename:(model.local_file?model.local_file.name:"1"));
 		var download_name=_this.get_model_filename(model,true,true,true);
-		console.log(download_name);
+		
 		var p=download_name.toLowerCase().indexOf('.stl');
 		if (p>=0) download_name=download_name.substring( 0, p );
 		if (download_name.length<1) download_name='1';
@@ -1385,6 +1526,7 @@ function StlViewer(parent_element_obj, options)
 		
 		link.download = download_name+'.stl';
 		link.click();
+		URL.revokeObjectURL(link.href);
 	}
 
 	this.get_model_mesh = function(model_id)
@@ -1395,7 +1537,10 @@ function StlViewer(parent_element_obj, options)
 		if (!model) return;
 		if (!model.mesh) return;
 		
-		return model.mesh.clone();
+		var mesh=model.mesh.clone();
+		mesh.geometry=model.mesh.geometry.clone();
+		mesh.material=model.mesh.material.clone();
+		return mesh;
 	}
 
 
@@ -1435,28 +1580,32 @@ function StlViewer(parent_element_obj, options)
 
 	this.do_resize = function()
 	{
+		if (!_this.parent_element) return;
 		var r=_this.parent_element.getBoundingClientRect();
+		//var r=_this.parent_element.children[0].getBoundingClientRect();
 		var rsize_width=r.width;
 		var rsize_height=r.height;
 					
 		_this.camera.aspect = rsize_width / rsize_height;
 		_this.camera.updateProjectionMatrix();
-		_this.renderer.setSize(rsize_width-5, rsize_height-5);
+		//_this.renderer.setSize(rsize_width-5, rsize_height-5);
+		_this.renderer.setSize(rsize_width, rsize_height);
 	}
 
 	this.animation=new Array();	
 	this.animate = function()
 	{
+		if (_this.killsign) return;
 		Object.keys(_this.animation).forEach(function(key)
 		{
 			if (!(_this.models_ref[key]===undefined))
 				_this.do_model_animation(_this.models[_this.models_ref[key]]);
 		});
 	
- 		requestAnimationFrame(_this.animate);
- 		_this.renderer.render(_this.scene, _this.camera);
- 		
- 		//console.log(_this.camera.position);
+		requestAnimationFrame(_this.animate);
+		 
+		if (_this.renderer)
+			_this.renderer.render(_this.scene, _this.camera);
  		
  		if (_this.controls)
 			_this.controls.update();
@@ -1906,25 +2055,41 @@ function StlViewer(parent_element_obj, options)
 	
 	this.clean = function()
 	{
+		_this.models=null;_this.models=[];
+		_this.models_count=0;
+		_this.models_ref=null;_this.models_ref=[];
+		_this.max_model_id=0;
+		_this.load_status=null;_this.load_status=[];
+		_this.load_session=0;
+		_this.loaded_models_arr=null;_this.loaded_models_arr=[];
+		_this.animation=null;_this.animation=[];
+		_this.models_to_add=null;_this.models_to_add=[];
+		_this.options.models=null;
+
+
 		if (!_this.scene) return;
 		var scene=_this.scene;
 		i=scene.children.length;
 		while (i--)
 		{ 
 			if (scene.children[i].type==='Mesh')
+			{
+				scene.children[i].geometry.dispose();
+				scene.children[i].material.dispose();				
 				scene.remove(scene.children[i]);
+			}
 		}
 		
-		_this.camera.position.set(_this.camerax,_this.cameray,_this.cameraz);
+		//remove edges for each model
+		Object.keys(_this.models_ref).forEach(function(key)
+		{
+			_this.set_or_update_geo_edges (_this.models[_this.models_ref[key]], false);
+		});
 		
-		_this.models=new Array();
-		_this.models_count=0;
-		_this.models_ref=new Array();
-		_this.max_model_id=0;
-		_this.load_status=new Array();
-		_this.load_session=0;
-		_this.loaded_models_arr=new Array();
-		_this.animation=new Array();
+
+		//_this.camera.position.set(_this.camerax,_this.cameray,_this.cameraz);
+
+		_this.renderer.renderLists.dispose();
 	}
 	
 	this.reset_parent_element=function(parent_element_obj)
@@ -1970,13 +2135,63 @@ function StlViewer(parent_element_obj, options)
 		}
 	
 		_this.options=data;
-		
+
 		_this.set_options();
 		
 		if (_this.ready)
 			_this.init();
 	}
 	
+	this.dispose = function()
+	{
+		//clean object's references (and let brower's GC do it work)
+		_this.clean();
+
+		_this.killsign=true; //not to render anymore
+
+		if (_this.renderer) //one last render (to clean it all)
+			_this.renderer.render(_this.scene, _this.camera);
+ 		
+ 		if (_this.controls)
+			_this.controls.update();
+
+		_this.animate=null;
+		_this.animation=null;
+		_this.error=null;
+		_this.options=null;
+		_this.parent_element=null;	
+		_this.models_to_add=null;
+		_this.models=null;
+		_this.models_ref=null;
+		_this.model_loaded_callback=null;
+		_this.all_loaded_callback=null;
+		_this.load_error_callback=null;
+		_this.loading_progress_callback=null;
+		_this.load_status=null;
+		_this.loaded_models_arr=null;
+		_this.onmousedown_callback=null;
+		_this.camera_state=null;
+		_this.ready_callback=null;
+		_this.on_model_drop=null;
+		_this.pre_loaded_ab_files=null;
+		_this.pre_loaded_vsj=null;
+		_this.grid=null;
+		_this.WORLD_X_VECTOR=null;
+		_this.WORLD_Y_VECTOR=null;
+		_this.WORLD_Z_VECTOR=null;
+		_this.edges_material=null;
+		_this.raycaster=null;
+		_this.mouse =null;
+		_this.renderer = null;
+		_this.scene = null;
+		_this.camera = null;
+		_this.ambientLight = null;
+		_this.directionalLight = null;
+		_this.pointLight = null;
+		_this.controls = null;
+	}
+
+
 	//constructor
 	_this.set_options();