Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions editor/js/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,27 +263,27 @@ Editor.prototype = {

var helper;

if ( object instanceof THREE.Camera ) {
if ( object.isCamera ) {

helper = new THREE.CameraHelper( object, 1 );

} else if ( object instanceof THREE.PointLight ) {
} else if ( object.isPointLight ) {

helper = new THREE.PointLightHelper( object, 1 );

} else if ( object instanceof THREE.DirectionalLight ) {
} else if ( object.isDirectionalLight ) {

helper = new THREE.DirectionalLightHelper( object, 1 );

} else if ( object instanceof THREE.SpotLight ) {
} else if ( object.isSpotLight ) {

helper = new THREE.SpotLightHelper( object, 1 );

} else if ( object instanceof THREE.HemisphereLight ) {
} else if ( object.isHemisphereLight ) {

helper = new THREE.HemisphereLightHelper( object, 1 );

} else if ( object instanceof THREE.SkinnedMesh ) {
} else if ( object.isSkinnedMesh ) {

helper = new THREE.SkeletonHelper( object );

Expand Down
2 changes: 1 addition & 1 deletion editor/js/Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ var Loader = function ( editor ) {

var result = loader.parse( data );

if ( result instanceof THREE.Scene ) {
if ( result.isScene ) {

editor.execute( new SetSceneCommand( result ) );

Expand Down
2 changes: 1 addition & 1 deletion editor/js/Menubar.Edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Menubar.Edit = function ( editor ) {

var material = object.material;

if ( material instanceof THREE.ShaderMaterial ) {
if ( material.isShaderMaterial ) {

try {

Expand Down
2 changes: 1 addition & 1 deletion editor/js/Sidebar.Geometry.BufferGeometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Sidebar.Geometry.BufferGeometry = function ( editor ) {

var geometry = object.geometry;

if ( geometry instanceof THREE.BufferGeometry ) {
if ( geometry && geometry.isBufferGeometry ) {

container.clear();
container.setDisplay( 'block' );
Expand Down
2 changes: 1 addition & 1 deletion editor/js/Sidebar.Geometry.Geometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Sidebar.Geometry.Geometry = function ( editor ) {

var geometry = object.geometry;

if ( geometry instanceof THREE.Geometry ) {
if ( geometry && geometry.isGeometry ) {

container.setDisplay( 'block' );

Expand Down
2 changes: 1 addition & 1 deletion editor/js/Sidebar.Geometry.Modifiers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Sidebar.Geometry.Modifiers = function ( editor, object ) {

geometry.computeVertexNormals();

if ( geometry instanceof THREE.BufferGeometry ) {
if ( geometry.isBufferGeometry ) {

geometry.attributes.normal.needsUpdate = true;

Expand Down
2 changes: 1 addition & 1 deletion editor/js/Sidebar.Geometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Sidebar.Geometry = function ( editor ) {

case 'Convert':

if ( geometry instanceof THREE.Geometry ) {
if ( geometry && geometry.isGeometry ) {

editor.execute( new SetGeometryCommand( object, new THREE.BufferGeometry().fromGeometry( geometry ) ) );

Expand Down
6 changes: 3 additions & 3 deletions editor/js/Sidebar.Material.js
Original file line number Diff line number Diff line change
Expand Up @@ -525,9 +525,9 @@ Sidebar.Material = function ( editor ) {
var textureWarning = false;
var objectHasUvs = false;

if ( object instanceof THREE.Sprite ) objectHasUvs = true;
if ( geometry instanceof THREE.Geometry && geometry.faceVertexUvs[ 0 ].length > 0 ) objectHasUvs = true;
if ( geometry instanceof THREE.BufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true;
if ( object.isSprite ) objectHasUvs = true;
if ( geometry.isGeometry && geometry.faceVertexUvs[ 0 ].length > 0 ) objectHasUvs = true;
if ( geometry.isBufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true;

if ( material ) {

Expand Down
4 changes: 2 additions & 2 deletions editor/js/Sidebar.Object.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,8 @@ Sidebar.Object = function ( editor ) {

function updateTransformRows( object ) {

if ( object instanceof THREE.Light ||
( object instanceof THREE.Object3D && object.userData.targetInverse ) ) {
if ( object.isLight ||
( object.isObject3D && object.userData.targetInverse ) ) {

objectRotationRow.setDisplay( 'none' );
objectScaleRow.setDisplay( 'none' );
Expand Down
6 changes: 3 additions & 3 deletions editor/js/Sidebar.Scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Sidebar.Scene = function ( editor ) {

var html = '<span class="type ' + object.type + '"></span> ' + escapeHTML( object.name );

if ( object instanceof THREE.Mesh ) {
if ( object.isMesh ) {

var geometry = object.geometry;
var material = object.material;
Expand Down Expand Up @@ -231,13 +231,13 @@ Sidebar.Scene = function ( editor ) {

fogColor.setHexValue( scene.fog.color.getHex() );

if ( scene.fog instanceof THREE.Fog ) {
if ( scene.fog.isFog ) {

fogType.setValue( "Fog" );
fogNear.setValue( scene.fog.near );
fogFar.setValue( scene.fog.far );

} else if ( scene.fog instanceof THREE.FogExp2 ) {
} else if ( scene.fog.isFogExp2 ) {

fogType.setValue( "FogExp2" );
fogDensity.setValue( scene.fog.density );
Expand Down
6 changes: 3 additions & 3 deletions editor/js/Viewport.Info.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ Viewport.Info = function ( editor ) {

objects ++;

if ( object instanceof THREE.Mesh ) {
if ( object.isMesh ) {

var geometry = object.geometry;

if ( geometry instanceof THREE.Geometry ) {
if ( geometry.isGeometry ) {

vertices += geometry.vertices.length;
triangles += geometry.faces.length;

} else if ( geometry instanceof THREE.BufferGeometry ) {
} else if ( geometry.isBufferGeometry ) {

vertices += geometry.attributes.position.count;

Expand Down
6 changes: 3 additions & 3 deletions editor/js/Viewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ var Viewport = function ( editor ) {

}

if ( object instanceof THREE.PerspectiveCamera ) {
if ( object.isPerspectiveCamera ) {

object.updateProjectionMatrix();

Expand Down Expand Up @@ -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.near = fogNear;
scene.fog.far = fogFar;

} else if ( scene.fog instanceof THREE.FogExp2 ) {
} else if ( scene.fog.isFogExp2 ) {

scene.fog.color.setHex( fogColor );
scene.fog.density = fogDensity;
Expand Down