|
@@ -560,8 +560,6 @@
|
|
|
|
|
|
// NODES
|
|
|
|
|
|
- var mask = new Nodes.SwitchNode( new Nodes.TextureNode( getTexture( "decalDiffuse" ) ), 'w' );
|
|
|
-
|
|
|
var normalScale = new Nodes.FloatNode( .3 );
|
|
|
|
|
|
var radiance = new Nodes.FloatNode( 1 );
|
|
@@ -579,8 +577,8 @@
|
|
|
var envNode = new Nodes.TextureCubeNode( new Nodes.TextureNode( premTexture ) );
|
|
|
|
|
|
var subSlotNode = new Nodes.SubSlotNode();
|
|
|
- subSlotNode.slots['radiance'] = new Nodes.OperatorNode( radiance, envNode, Nodes.OperatorNode.MUL );
|
|
|
- subSlotNode.slots['irradiance'] = new Nodes.OperatorNode( irradiance, envNode, Nodes.OperatorNode.MUL );
|
|
|
+ subSlotNode.slots[ 'radiance' ] = new Nodes.OperatorNode( radiance, envNode, Nodes.OperatorNode.MUL );
|
|
|
+ subSlotNode.slots[ 'irradiance' ] = new Nodes.OperatorNode( irradiance, envNode, Nodes.OperatorNode.MUL );
|
|
|
|
|
|
mtl.environment = subSlotNode;
|
|
|
|
|
@@ -2496,7 +2494,7 @@
|
|
|
|
|
|
function biasMode( val ) {
|
|
|
|
|
|
- switch( val ) {
|
|
|
+ switch ( val ) {
|
|
|
|
|
|
case 'prem':
|
|
|
|
|
@@ -2595,42 +2593,42 @@
|
|
|
|
|
|
case 'node-reflect':
|
|
|
|
|
|
- // MATERIAL
|
|
|
+ // MATERIAL
|
|
|
|
|
|
- var node = new Nodes.ReflectNode();
|
|
|
+ var node = new Nodes.ReflectNode();
|
|
|
|
|
|
- var nodeMaterial = new Nodes.StandardNodeMaterial();
|
|
|
- nodeMaterial.environment = new Nodes.CubeTextureNode( cubemap, node );
|
|
|
- nodeMaterial.roughness.value = .5;
|
|
|
- nodeMaterial.metalness.value = 1;
|
|
|
+ var nodeMaterial = new Nodes.StandardNodeMaterial();
|
|
|
+ nodeMaterial.environment = new Nodes.CubeTextureNode( cubemap, node );
|
|
|
+ nodeMaterial.roughness.value = .5;
|
|
|
+ nodeMaterial.metalness.value = 1;
|
|
|
|
|
|
- var standardMaterial = new THREE.MeshStandardMaterial( {
|
|
|
- color: nodeMaterial.color.value,
|
|
|
- side: defaultSide,
|
|
|
- envMap: cubemap,
|
|
|
- roughness: nodeMaterial.roughness.value,
|
|
|
- metalness: 1
|
|
|
- } );
|
|
|
+ var standardMaterial = new THREE.MeshStandardMaterial( {
|
|
|
+ color: nodeMaterial.color.value,
|
|
|
+ side: defaultSide,
|
|
|
+ envMap: cubemap,
|
|
|
+ roughness: nodeMaterial.roughness.value,
|
|
|
+ metalness: 1
|
|
|
+ } );
|
|
|
|
|
|
- mtl = nodeMaterial;
|
|
|
+ mtl = nodeMaterial;
|
|
|
|
|
|
- // GUI
|
|
|
+ // GUI
|
|
|
|
|
|
- addGui( 'node', true, function ( val ) {
|
|
|
+ addGui( 'node', true, function ( val ) {
|
|
|
|
|
|
- mtl = val ? nodeMaterial : standardMaterial;
|
|
|
- mesh.material = mtl;
|
|
|
+ mtl = val ? nodeMaterial : standardMaterial;
|
|
|
+ mesh.material = mtl;
|
|
|
|
|
|
- } );
|
|
|
+ } );
|
|
|
|
|
|
- addGui( 'roughness', nodeMaterial.roughness.value, function ( val ) {
|
|
|
+ addGui( 'roughness', nodeMaterial.roughness.value, function ( val ) {
|
|
|
|
|
|
- nodeMaterial.roughness.value = val;
|
|
|
- standardMaterial.roughness = val;
|
|
|
+ nodeMaterial.roughness.value = val;
|
|
|
+ standardMaterial.roughness = val;
|
|
|
|
|
|
- }, false, 0, 1 );
|
|
|
+ }, false, 0, 1 );
|
|
|
|
|
|
- break;
|
|
|
+ break;
|
|
|
|
|
|
|
|
|
case 'varying':
|