included .obj files into downloaded archive

download.php

@@ -46,6 +46,16 @@ foreach($matches[1] as $v){
   $file .= " $path/$v";
 }
 
+// add obj
+$objfile = $path."/".$tmp[1].".obj";
+if (is_file($objfile)) $file .= " $objfile";
+
+// add mtl
+$mtlfile = $path."/".$tmp[1].".mtl";
+if (is_file($mtlfile)) $file .= " $mtlfile";
+
+
+
 $zipped_data = `zip -qj - $file `;
 header('Content-type: application/zip');
 header('Content-Disposition: attachment; filename="'.$zipfile.'"');

js/x3dom_init.js

@@ -374,9 +374,11 @@ X3DOMObject.Shape.prototype._registerEvents = function(){
 
         }
 
+        /*
         console.log("Shape event: ");
         console.log("  canvas: x= "+e.originalEvent.layerX+" y= "+e.originalEvent.layerY);
         console.log("  scene: x= "+e.originalEvent.worldX+" y= "+e.originalEvent.worldY+" z="+e.originalEvent.worldZ);
+        */
 
     });
 

viewer.html

@@ -72,7 +72,7 @@
     <div id='help_wrapper'>
         <div id='exit_button' title='Exit to models index'></div>
         <div id='help_button'>?</div>
-        <div id='download_button' title='Download 3d model'></div>
+        <div id='download_button' title='Download 3d model (.obj & .x3d formats)'></div>
         <div id='menu_button'></div>
         <div id='align_button' title='Run alignment algorithm for camera heading and location using markers.
 Instructions: