Skip to content

Commit feff3d4

Browse files
authored
Merge pull request #17407 from Mugen87/dev37
Examples: Clean up.
2 parents e9a6868 + 3de103c commit feff3d4

File tree

5 files changed

+29
-35
lines changed

5 files changed

+29
-35
lines changed

examples/jsm/loaders/sea3d/physics/SEA3DAmmoLoader.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ var AMMO = {
172172
},
173173
containsConstraint: function ( ctrt ) {
174174

175-
return this.constraints.indexOf( rb ) > - 1;
175+
return this.constraints.indexOf( ctrt ) > - 1;
176176

177177
},
178178

@@ -249,8 +249,6 @@ var AMMO = {
249249

250250
var mConvexHull = new Ammo.btConvexHullShape();
251251

252-
var v0 = new Ammo.btVector3( 0, 0, 0 );
253-
254252
var vertex = geometry.getAttribute( 'position' ).array;
255253
var indexes = geometry.getIndex().array;
256254

examples/jsm/nodes/accessors/PositionNode.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44

55
import { TempNode } from '../core/TempNode.js';
6-
import { NormalNode } from '../accessors/NormalNode.js';
76
import { NodeLib } from '../core/NodeLib.js';
87

98
function PositionNode( scope ) {

examples/jsm/nodes/misc/TextureCubeNode.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { TextureCubeUVNode } from './TextureCubeUVNode.js';
99
import { ReflectNode } from '../accessors/ReflectNode.js';
1010
import { NormalNode } from '../accessors/NormalNode.js';
1111
import { ColorSpaceNode } from '../utils/ColorSpaceNode.js';
12-
import { SpecularMIPLevelNode } from '../utils/SpecularMIPLevelNode.js';
1312

1413
function TextureCubeNode( value, textureSize, uv, bias ) {
1514

examples/webgl_loader_gltf_extensions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
loader = new GLTFLoader();
269269

270270
var dracoLoader = new DRACOLoader();
271-
dracoLoader.setDecoderPath( 'js/libs/draco/gltf/' )
271+
dracoLoader.setDecoderPath( 'js/libs/draco/gltf/' );
272272
loader.setDRACOLoader( dracoLoader );
273273

274274
loader.setDDSLoader( new DDSLoader() );

examples/webgl_materials_nodes.html

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,6 @@
560560

561561
// NODES
562562

563-
var mask = new Nodes.SwitchNode( new Nodes.TextureNode( getTexture( "decalDiffuse" ) ), 'w' );
564-
565563
var normalScale = new Nodes.FloatNode( .3 );
566564

567565
var radiance = new Nodes.FloatNode( 1 );
@@ -579,8 +577,8 @@
579577
var envNode = new Nodes.TextureCubeNode( new Nodes.TextureNode( premTexture ) );
580578

581579
var subSlotNode = new Nodes.SubSlotNode();
582-
subSlotNode.slots['radiance'] = new Nodes.OperatorNode( radiance, envNode, Nodes.OperatorNode.MUL );
583-
subSlotNode.slots['irradiance'] = new Nodes.OperatorNode( irradiance, envNode, Nodes.OperatorNode.MUL );
580+
subSlotNode.slots[ 'radiance' ] = new Nodes.OperatorNode( radiance, envNode, Nodes.OperatorNode.MUL );
581+
subSlotNode.slots[ 'irradiance' ] = new Nodes.OperatorNode( irradiance, envNode, Nodes.OperatorNode.MUL );
584582

585583
mtl.environment = subSlotNode;
586584

@@ -2496,7 +2494,7 @@
24962494

24972495
function biasMode( val ) {
24982496

2499-
switch( val ) {
2497+
switch ( val ) {
25002498

25012499
case 'prem':
25022500

@@ -2595,42 +2593,42 @@
25952593

25962594
case 'node-reflect':
25972595

2598-
// MATERIAL
2596+
// MATERIAL
25992597

2600-
var node = new Nodes.ReflectNode();
2598+
var node = new Nodes.ReflectNode();
26012599

2602-
var nodeMaterial = new Nodes.StandardNodeMaterial();
2603-
nodeMaterial.environment = new Nodes.CubeTextureNode( cubemap, node );
2604-
nodeMaterial.roughness.value = .5;
2605-
nodeMaterial.metalness.value = 1;
2600+
var nodeMaterial = new Nodes.StandardNodeMaterial();
2601+
nodeMaterial.environment = new Nodes.CubeTextureNode( cubemap, node );
2602+
nodeMaterial.roughness.value = .5;
2603+
nodeMaterial.metalness.value = 1;
26062604

2607-
var standardMaterial = new THREE.MeshStandardMaterial( {
2608-
color: nodeMaterial.color.value,
2609-
side: defaultSide,
2610-
envMap: cubemap,
2611-
roughness: nodeMaterial.roughness.value,
2612-
metalness: 1
2613-
} );
2605+
var standardMaterial = new THREE.MeshStandardMaterial( {
2606+
color: nodeMaterial.color.value,
2607+
side: defaultSide,
2608+
envMap: cubemap,
2609+
roughness: nodeMaterial.roughness.value,
2610+
metalness: 1
2611+
} );
26142612

2615-
mtl = nodeMaterial;
2613+
mtl = nodeMaterial;
26162614

2617-
// GUI
2615+
// GUI
26182616

2619-
addGui( 'node', true, function ( val ) {
2617+
addGui( 'node', true, function ( val ) {
26202618

2621-
mtl = val ? nodeMaterial : standardMaterial;
2622-
mesh.material = mtl;
2619+
mtl = val ? nodeMaterial : standardMaterial;
2620+
mesh.material = mtl;
26232621

2624-
} );
2622+
} );
26252623

2626-
addGui( 'roughness', nodeMaterial.roughness.value, function ( val ) {
2624+
addGui( 'roughness', nodeMaterial.roughness.value, function ( val ) {
26272625

2628-
nodeMaterial.roughness.value = val;
2629-
standardMaterial.roughness = val;
2626+
nodeMaterial.roughness.value = val;
2627+
standardMaterial.roughness = val;
26302628

2631-
}, false, 0, 1 );
2629+
}, false, 0, 1 );
26322630

2633-
break;
2631+
break;
26342632

26352633

26362634
case 'varying':

0 commit comments

Comments
 (0)