Merge pull request #2 from mrdoob/dev

Update fork
mrdoob · Feb 21, 2019 · 27403a0 · 27403a0
2 parents 65ebf35 + 70d7d06
commit 27403a0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/editor/js/Sidebar.Geometry.TubeGeometry.js b/editor/js/Sidebar.Geometry.TubeGeometry.js
@@ -107,7 +107,7 @@ Sidebar.Geometry.TubeGeometry = function ( editor, object ) {
 
 	// tension
 
-	var tensionRow = new UI.Row();
+	var tensionRow = new UI.Row().setDisplay( curveType.getValue() == 'catmullrom' ? '' : 'none' );
 	var tension = new UI.Number( parameters.path.tension ).setStep( 0.01 ).onChange( update );
 
 	tensionRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/tube_geometry/tension' ) ).setWidth( '90px' ), tension );
@@ -133,6 +133,8 @@ Sidebar.Geometry.TubeGeometry = function ( editor, object ) {
 
 		}
 
+		tensionRow.setDisplay( curveType.getValue() == 'catmullrom' ? '' : 'none' );
+
 		editor.execute( new SetGeometryCommand( object, new THREE[ geometry.type ](
 			new THREE.CatmullRomCurve3( points, closed.getValue(), curveType.getValue(), tension.getValue() ),
 			tubularSegments.getValue(),

diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js
@@ -73,6 +73,7 @@ import { Skeleton } from './objects/Skeleton.js';
 import { SkinnedMesh } from './objects/SkinnedMesh.js';
 import { WebGLRenderer } from './renderers/WebGLRenderer.js';
 import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js';
+import { WebGLRenderTargetCube } from './renderers/WebGLRenderTargetCube.js';
 import { WebGLShadowMap } from './renderers/webgl/WebGLShadowMap.js';
 import { WebVRManager } from './renderers/webvr/WebVRManager.js';
 import { ImageUtils } from './extras/ImageUtils.js';
@@ -1577,6 +1578,27 @@ Object.defineProperties( WebGLShadowMap.prototype, {
 
 //
 
+Object.defineProperties( WebGLRenderTargetCube.prototype, {
+
+	activeCubeFace: {
+		set: function ( /* value */ ) {
+
+			console.warn( 'THREE.WebGLRenderTargetCube: .activeCubeFace has been removed. It is now the second parameter of WebGLRenderer.setRenderTarget().' );
+
+		}
+	},
+	activeMipMapLevel: {
+		set: function ( /* value */ ) {
+
+			console.warn( 'THREE.WebGLRenderTargetCube: .activeMipMapLevel has been removed. It is now the third parameter of WebGLRenderer.setRenderTarget().' );
+
+		}
+	}
+
+} );
+
+//
+
 Object.defineProperties( WebGLRenderTarget.prototype, {
 
 	wrapS: {