提交 0d695ccc 编写于 作者: M Mr.doob

Editor: Removed instanceof usage.

上级 f3c609f8
...@@ -263,27 +263,27 @@ Editor.prototype = { ...@@ -263,27 +263,27 @@ Editor.prototype = {
var helper; var helper;
if ( object instanceof THREE.Camera ) { if ( object.isCamera ) {
helper = new THREE.CameraHelper( object, 1 ); helper = new THREE.CameraHelper( object, 1 );
} else if ( object instanceof THREE.PointLight ) { } else if ( object.isPointLight ) {
helper = new THREE.PointLightHelper( object, 1 ); helper = new THREE.PointLightHelper( object, 1 );
} else if ( object instanceof THREE.DirectionalLight ) { } else if ( object.isDirectionalLight ) {
helper = new THREE.DirectionalLightHelper( object, 1 ); helper = new THREE.DirectionalLightHelper( object, 1 );
} else if ( object instanceof THREE.SpotLight ) { } else if ( object.isSpotLight ) {
helper = new THREE.SpotLightHelper( object, 1 ); helper = new THREE.SpotLightHelper( object, 1 );
} else if ( object instanceof THREE.HemisphereLight ) { } else if ( object.isHemisphereLight ) {
helper = new THREE.HemisphereLightHelper( object, 1 ); helper = new THREE.HemisphereLightHelper( object, 1 );
} else if ( object instanceof THREE.SkinnedMesh ) { } else if ( object.isSkinnedMesh ) {
helper = new THREE.SkeletonHelper( object ); helper = new THREE.SkeletonHelper( object );
......
...@@ -596,7 +596,7 @@ var Loader = function ( editor ) { ...@@ -596,7 +596,7 @@ var Loader = function ( editor ) {
var result = loader.parse( data ); var result = loader.parse( data );
if ( result instanceof THREE.Scene ) { if ( result.isScene ) {
editor.execute( new SetSceneCommand( result ) ); editor.execute( new SetSceneCommand( result ) );
......
...@@ -151,7 +151,7 @@ Menubar.Edit = function ( editor ) { ...@@ -151,7 +151,7 @@ Menubar.Edit = function ( editor ) {
var material = object.material; var material = object.material;
if ( material instanceof THREE.ShaderMaterial ) { if ( material.isShaderMaterial ) {
try { try {
......
...@@ -17,7 +17,7 @@ Sidebar.Geometry.BufferGeometry = function ( editor ) { ...@@ -17,7 +17,7 @@ Sidebar.Geometry.BufferGeometry = function ( editor ) {
var geometry = object.geometry; var geometry = object.geometry;
if ( geometry instanceof THREE.BufferGeometry ) { if ( geometry && geometry.isBufferGeometry ) {
container.clear(); container.clear();
container.setDisplay( 'block' ); container.setDisplay( 'block' );
......
...@@ -39,7 +39,7 @@ Sidebar.Geometry.Geometry = function ( editor ) { ...@@ -39,7 +39,7 @@ Sidebar.Geometry.Geometry = function ( editor ) {
var geometry = object.geometry; var geometry = object.geometry;
if ( geometry instanceof THREE.Geometry ) { if ( geometry && geometry.isGeometry ) {
container.setDisplay( 'block' ); container.setDisplay( 'block' );
......
...@@ -17,7 +17,7 @@ Sidebar.Geometry.Modifiers = function ( editor, object ) { ...@@ -17,7 +17,7 @@ Sidebar.Geometry.Modifiers = function ( editor, object ) {
geometry.computeVertexNormals(); geometry.computeVertexNormals();
if ( geometry instanceof THREE.BufferGeometry ) { if ( geometry.isBufferGeometry ) {
geometry.attributes.normal.needsUpdate = true; geometry.attributes.normal.needsUpdate = true;
......
...@@ -55,7 +55,7 @@ Sidebar.Geometry = function ( editor ) { ...@@ -55,7 +55,7 @@ Sidebar.Geometry = function ( editor ) {
case 'Convert': case 'Convert':
if ( geometry instanceof THREE.Geometry ) { if ( geometry && geometry.isGeometry ) {
editor.execute( new SetGeometryCommand( object, new THREE.BufferGeometry().fromGeometry( geometry ) ) ); editor.execute( new SetGeometryCommand( object, new THREE.BufferGeometry().fromGeometry( geometry ) ) );
......
...@@ -525,9 +525,9 @@ Sidebar.Material = function ( editor ) { ...@@ -525,9 +525,9 @@ Sidebar.Material = function ( editor ) {
var textureWarning = false; var textureWarning = false;
var objectHasUvs = false; var objectHasUvs = false;
if ( object instanceof THREE.Sprite ) objectHasUvs = true; if ( object.isSprite ) objectHasUvs = true;
if ( geometry instanceof THREE.Geometry && geometry.faceVertexUvs[ 0 ].length > 0 ) objectHasUvs = true; if ( geometry.isGeometry && geometry.faceVertexUvs[ 0 ].length > 0 ) objectHasUvs = true;
if ( geometry instanceof THREE.BufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true; if ( geometry.isBufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true;
if ( material ) { if ( material ) {
......
...@@ -542,8 +542,8 @@ Sidebar.Object = function ( editor ) { ...@@ -542,8 +542,8 @@ Sidebar.Object = function ( editor ) {
function updateTransformRows( object ) { function updateTransformRows( object ) {
if ( object instanceof THREE.Light || if ( object.isLight ||
( object instanceof THREE.Object3D && object.userData.targetInverse ) ) { ( object.isObject3D && object.userData.targetInverse ) ) {
objectRotationRow.setDisplay( 'none' ); objectRotationRow.setDisplay( 'none' );
objectScaleRow.setDisplay( 'none' ); objectScaleRow.setDisplay( 'none' );
......
...@@ -59,7 +59,7 @@ Sidebar.Scene = function ( editor ) { ...@@ -59,7 +59,7 @@ Sidebar.Scene = function ( editor ) {
var html = '<span class="type ' + object.type + '"></span> ' + escapeHTML( object.name ); var html = '<span class="type ' + object.type + '"></span> ' + escapeHTML( object.name );
if ( object instanceof THREE.Mesh ) { if ( object.isMesh ) {
var geometry = object.geometry; var geometry = object.geometry;
var material = object.material; var material = object.material;
...@@ -231,13 +231,13 @@ Sidebar.Scene = function ( editor ) { ...@@ -231,13 +231,13 @@ Sidebar.Scene = function ( editor ) {
fogColor.setHexValue( scene.fog.color.getHex() ); fogColor.setHexValue( scene.fog.color.getHex() );
if ( scene.fog instanceof THREE.Fog ) { if ( scene.fog.isFog ) {
fogType.setValue( "Fog" ); fogType.setValue( "Fog" );
fogNear.setValue( scene.fog.near ); fogNear.setValue( scene.fog.near );
fogFar.setValue( scene.fog.far ); fogFar.setValue( scene.fog.far );
} else if ( scene.fog instanceof THREE.FogExp2 ) { } else if ( scene.fog.isFogExp2 ) {
fogType.setValue( "FogExp2" ); fogType.setValue( "FogExp2" );
fogDensity.setValue( scene.fog.density ); fogDensity.setValue( scene.fog.density );
......
...@@ -46,16 +46,16 @@ Viewport.Info = function ( editor ) { ...@@ -46,16 +46,16 @@ Viewport.Info = function ( editor ) {
objects ++; objects ++;
if ( object instanceof THREE.Mesh ) { if ( object.isMesh ) {
var geometry = object.geometry; var geometry = object.geometry;
if ( geometry instanceof THREE.Geometry ) { if ( geometry.isGeometry ) {
vertices += geometry.vertices.length; vertices += geometry.vertices.length;
triangles += geometry.faces.length; triangles += geometry.faces.length;
} else if ( geometry instanceof THREE.BufferGeometry ) { } else if ( geometry.isBufferGeometry ) {
vertices += geometry.attributes.position.count; vertices += geometry.attributes.position.count;
......
...@@ -393,7 +393,7 @@ var Viewport = function ( editor ) { ...@@ -393,7 +393,7 @@ var Viewport = function ( editor ) {
} }
if ( object instanceof THREE.PerspectiveCamera ) { if ( object.isPerspectiveCamera ) {
object.updateProjectionMatrix(); object.updateProjectionMatrix();
...@@ -477,13 +477,13 @@ var Viewport = function ( editor ) { ...@@ -477,13 +477,13 @@ var Viewport = function ( editor ) {
} }
if ( scene.fog instanceof THREE.Fog ) { if ( scene.fog.isFog ) {
scene.fog.color.setHex( fogColor ); scene.fog.color.setHex( fogColor );
scene.fog.near = fogNear; scene.fog.near = fogNear;
scene.fog.far = fogFar; scene.fog.far = fogFar;
} else if ( scene.fog instanceof THREE.FogExp2 ) { } else if ( scene.fog.isFogExp2 ) {
scene.fog.color.setHex( fogColor ); scene.fog.color.setHex( fogColor );
scene.fog.density = fogDensity; scene.fog.density = fogDensity;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册