From eca6b3b7ceab80b357785105d1be3b8fe6806378 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Sat, 21 May 2016 11:43:46 -0400 Subject: [PATCH] More post-release fixes. --- editor/js/Viewport.js | 8 ++++++-- editor/js/libs/tern-threejs/threejs.js | 6 +----- examples/webgl_loader_amf.html | 3 +-- examples/webgl_loader_fbx.html | 3 +-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/editor/js/Viewport.js b/editor/js/Viewport.js index 32abbc3c8f..f93fe54f28 100644 --- a/editor/js/Viewport.js +++ b/editor/js/Viewport.js @@ -283,11 +283,15 @@ var Viewport = function ( editor ) { switch ( value ) { case 'css/light.css': - grid.setColors( 0x444444, 0x888888 ); + sceneHelpers.remove( grid ); + grid = new THREE.GridHelper( 30, 1, 0x444444, 0x888888 ); + sceneHelpers.add( grid ); clearColor = 0xaaaaaa; break; case 'css/dark.css': - grid.setColors( 0xbbbbbb, 0x888888 ); + sceneHelpers.remove( grid ); + grid = new THREE.GridHelper( 30, 1, 0xbbbbbb, 0x888888 ); + sceneHelpers.add( grid ); clearColor = 0x333333; break; diff --git a/editor/js/libs/tern-threejs/threejs.js b/editor/js/libs/tern-threejs/threejs.js index df61e82ad6..bc94e72cd8 100644 --- a/editor/js/libs/tern-threejs/threejs.js +++ b/editor/js/libs/tern-threejs/threejs.js @@ -1884,11 +1884,7 @@ "GridHelper": { "!url": "http://threejs.org/docs/#Reference/extras/helpers/GridHelper", "prototype": { - "!proto": "THREE.Line.prototype", - "setColors": { - "!type": "fn(colorCenterLine: number, colorGrid: number)", - "!doc": "Updates the color of the grid lines." - } + "!proto": "THREE.Line.prototype" }, "!doc": "The GridHelper is an object to define grids. Grids are two-dimensional arrays of lines.", "!type": "fn(size: number, step: number)" diff --git a/examples/webgl_loader_amf.html b/examples/webgl_loader_amf.html index ea58dce2e7..98bf9e16dd 100644 --- a/examples/webgl_loader_amf.html +++ b/examples/webgl_loader_amf.html @@ -74,8 +74,7 @@ scene.add( camera ); - var grid = new THREE.GridHelper( 25, 1.0 ); - grid.setColors( 0xffffff, 0x555555 ); + var grid = new THREE.GridHelper( 25, 1.0, 0xffffff, 0x555555 ); grid.rotateOnAxis( new THREE.Vector3( 1, 0, 0 ), 90 * ( Math.PI/180 ) ); scene.add( grid ); diff --git a/examples/webgl_loader_fbx.html b/examples/webgl_loader_fbx.html index 59b8584d3f..b342b1557d 100644 --- a/examples/webgl_loader_fbx.html +++ b/examples/webgl_loader_fbx.html @@ -62,8 +62,7 @@ scene = new THREE.Scene(); // grid - var gridHelper = new THREE.GridHelper( 14, 1 ); - gridHelper.setColors( 0x303030, 0x303030 ); + var gridHelper = new THREE.GridHelper( 14, 1, 0x303030, 0x303030 ); gridHelper.position.set( 0, - 0.04, 0 ); scene.add( gridHelper ); -- GitLab