Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

TransformControls: Firefox support.
Not sure how this was working...

Mr.doob 12 years ago
parent
77da0db2f5
commit
afba0bbf5b
2 changed files with 5 additions and 4 deletions
Split View Show Diff Stats
  1. 1 0
      editor/index.html
  2. 4 4
      examples/js/controls/TransformControls.js

+ 1 - 0
editor/index.html
View File 

@@ -2,6 +2,7 @@
 
 <html lang="en">
 
 	<head>
 
 		<title>three.js editor</title>
 
+		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<style>
 
 			body {

+ 4 - 4
examples/js/controls/TransformControls.js
View File 

@@ -553,7 +553,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 
 			scope.updateGizmo();
 
 
-			intersect = intersectObjects( pickerAxes[scope.mode].children );
 
+			intersect = intersectObjects( event, pickerAxes[scope.mode].children );
 
 
 			if ( intersect ) {
 
 
@@ -561,7 +561,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 
 				scope.setIntersectionPlane();
 
 
-				planeIntersect = intersectObjects( [intersectionPlanes[currentPlane]] );
 
+				planeIntersect = intersectObjects( event, [intersectionPlanes[currentPlane]] );
 
 
 				if ( planeIntersect ) {
 
 
@@ -592,7 +592,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 
 		if ( scope.active ) {
 
 
-			planeIntersect = intersectObjects( [intersectionPlanes[currentPlane]] );
 
+			planeIntersect = intersectObjects( event, [intersectionPlanes[currentPlane]] );
 
 
 			if ( planeIntersect ) {
 
 
@@ -803,7 +803,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 
 	}
 
 
-	function intersectObjects( objects ) {
 
+	function intersectObjects( event, objects ) {
 
 
 		pointerVector.set(
 
 			( event.layerX / scope.domElement.offsetWidth ) * 2 - 1,