Revert "Axes and orbit control are modulized. three bundle.js to use …

…all as one module" This reverts commit c6e6195.
dgossow · Feb 25, 2013 · 73be11c · 73be11c
1 parent 50a2225
commit 73be11c
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 167 deletions.
diff --git a/examples/basic_controls.html b/examples/basic_controls.html
@@ -44,7 +44,6 @@
 
     <script src="include/helpers/RosAxisHelper.js"></script>
     <script src="include/helpers/RosOrbitControls.js"></script>
-    <script src="include/helpers/three_bundle.js"></script>
 
     <script src="interactive_marker_viewer.js"></script>
 

diff --git a/examples/include/helpers/RosAxisHelper.js b/examples/include/helpers/RosAxisHelper.js
@@ -6,12 +6,11 @@
     define(['three'], factory);
   }
   else {
-    root.RosAxisHelper = factory(root.THREE);
+    factory(root.THREE);
   }
 }(this, function (THREE) {
 
-  //THREE.Axes = function ( options ) 
-  var Axes = function ( options ) 
+  THREE.Axes = function ( options ) 
   {
     THREE.Object3D.call( this );
 
@@ -61,7 +60,5 @@
     addAxis( new THREE.Vector3(0,0,1) );
   };
 
-  Axes.prototype = Object.create( THREE.Object3D.prototype );
-
-  return Axes;
+  THREE.Axes.prototype = Object.create( THREE.Object3D.prototype );
 }));