Moved files to subdir

src/Materials/Node/Blocks/Fragment/ambientOcclusionBlock.ts

@@ -1,13 +1,13 @@
-import { NodeMaterialBlock } from '../../nodeMaterialBlock';
-import { NodeMaterialBlockConnectionPointTypes } from '../../Enums/nodeMaterialBlockConnectionPointTypes';
-import { NodeMaterialBuildState } from '../../nodeMaterialBuildState';
-import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection } from '../../nodeMaterialBlockConnectionPoint';
-import { NodeMaterialBlockTargets } from '../../Enums/nodeMaterialBlockTargets';
-import { NodeMaterial, NodeMaterialDefines } from '../../nodeMaterial';
-import { editableInPropertyPage, PropertyTypeForEdition } from "../../nodeMaterialDecorator";
-import { _TypeStore } from '../../../../Misc/typeStore';
-import { AbstractMesh } from '../../../../Meshes/abstractMesh';
-import { NodeMaterialConnectionPointCustomObject } from "../../nodeMaterialConnectionPointCustomObject";
+import { NodeMaterialBlock } from '../../../nodeMaterialBlock';
+import { NodeMaterialBlockConnectionPointTypes } from '../../../Enums/nodeMaterialBlockConnectionPointTypes';
+import { NodeMaterialBuildState } from '../../../nodeMaterialBuildState';
+import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection } from '../../../nodeMaterialBlockConnectionPoint';
+import { NodeMaterialBlockTargets } from '../../../Enums/nodeMaterialBlockTargets';
+import { NodeMaterial, NodeMaterialDefines } from '../../../nodeMaterial';
+import { editableInPropertyPage, PropertyTypeForEdition } from "../../../nodeMaterialDecorator";
+import { _TypeStore } from '../../../../../Misc/typeStore';
+import { AbstractMesh } from '../../../../../Meshes/abstractMesh';
+import { NodeMaterialConnectionPointCustomObject } from "../../../nodeMaterialConnectionPointCustomObject";
 
 export class AmbientOcclusionBlock extends NodeMaterialBlock {
 

src/Materials/Node/Blocks/Fragment/pbrMetallicRoughnessBlock.ts

@@ -1,22 +1,22 @@
-import { NodeMaterialBlock } from '../../nodeMaterialBlock';
-import { NodeMaterialBlockConnectionPointTypes } from '../../Enums/nodeMaterialBlockConnectionPointTypes';
-import { NodeMaterialBuildState } from '../../nodeMaterialBuildState';
-import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection } from '../../nodeMaterialBlockConnectionPoint';
-import { MaterialHelper } from '../../../materialHelper';
-import { NodeMaterialBlockTargets } from '../../Enums/nodeMaterialBlockTargets';
-import { NodeMaterial, NodeMaterialDefines } from '../../nodeMaterial';
-import { NodeMaterialSystemValues } from '../../Enums/nodeMaterialSystemValues';
-import { InputBlock } from '../Input/inputBlock';
-import { Light } from '../../../../Lights/light';
-import { Nullable } from '../../../../types';
-import { _TypeStore } from '../../../../Misc/typeStore';
-import { AbstractMesh } from '../../../../Meshes/abstractMesh';
-import { Effect, IEffectCreationOptions } from '../../../effect';
-import { Mesh } from '../../../../Meshes/mesh';
-import { PBRBaseMaterial } from '../../../PBR/pbrBaseMaterial';
-import { Scene } from '../../../../scene';
-import { editableInPropertyPage, PropertyTypeForEdition } from "../../nodeMaterialDecorator";
-import { NodeMaterialConnectionPointCustomObject } from "../../nodeMaterialConnectionPointCustomObject";
+import { NodeMaterialBlock } from '../../../nodeMaterialBlock';
+import { NodeMaterialBlockConnectionPointTypes } from '../../../Enums/nodeMaterialBlockConnectionPointTypes';
+import { NodeMaterialBuildState } from '../../../nodeMaterialBuildState';
+import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection } from '../../../nodeMaterialBlockConnectionPoint';
+import { MaterialHelper } from '../../../../materialHelper';
+import { NodeMaterialBlockTargets } from '../../../Enums/nodeMaterialBlockTargets';
+import { NodeMaterial, NodeMaterialDefines } from '../../../nodeMaterial';
+import { NodeMaterialSystemValues } from '../../../Enums/nodeMaterialSystemValues';
+import { InputBlock } from '../../Input/inputBlock';
+import { Light } from '../../../../../Lights/light';
+import { Nullable } from '../../../../../types';
+import { _TypeStore } from '../../../../../Misc/typeStore';
+import { AbstractMesh } from '../../../../../Meshes/abstractMesh';
+import { Effect, IEffectCreationOptions } from '../../../../effect';
+import { Mesh } from '../../../../../Meshes/mesh';
+import { PBRBaseMaterial } from '../../../../PBR/pbrBaseMaterial';
+import { Scene } from '../../../../../scene';
+import { editableInPropertyPage, PropertyTypeForEdition } from "../../../nodeMaterialDecorator";
+import { NodeMaterialConnectionPointCustomObject } from "../../../nodeMaterialConnectionPointCustomObject";
 import { AmbientOcclusionBlock } from './ambientOcclusionBlock';
 import { SheenBlock } from './sheenBlock';
 
@@ -489,6 +489,8 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
                 vec3 surfaceAlbedo = albedoOpacityOut.surfaceAlbedo;
                 float alpha = albedoOpacityOut.alpha;\r\n`;
 
+            state.compilationString += state._emitCodeFromInclude("depthPrePass", comments);
+
             // _____________________________ AO  _______________________________
             state.compilationString += `ambientOcclusionOutParams aoOut;\r\n`;
 
@@ -504,6 +506,9 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
                     aoOut
                 );\r\n`;
 
+            // _____________________________ Reflectivity _______________________________
+            state.compilationString += `vec3 baseColor = surfaceAlbedo;\r\nreflectivityOutParams reflectivityOut;\r\n`;
+
             // _____________________________ Direct Lighting Info __________________________________
             state.compilationString += state._emitCodeFromInclude("pbrBlockDirectLighting", comments);
         }

src/Materials/Node/Blocks/Fragment/sheenBlock.ts

@@ -1,12 +1,12 @@
-import { NodeMaterialBlock } from '../../nodeMaterialBlock';
-import { NodeMaterialBlockConnectionPointTypes } from '../../Enums/nodeMaterialBlockConnectionPointTypes';
-import { NodeMaterialBuildState } from '../../nodeMaterialBuildState';
-import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection } from '../../nodeMaterialBlockConnectionPoint';
-import { NodeMaterialBlockTargets } from '../../Enums/nodeMaterialBlockTargets';
+import { NodeMaterialBlock } from '../../../nodeMaterialBlock';
+import { NodeMaterialBlockConnectionPointTypes } from '../../../Enums/nodeMaterialBlockConnectionPointTypes';
+import { NodeMaterialBuildState } from '../../../nodeMaterialBuildState';
+import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection } from '../../../nodeMaterialBlockConnectionPoint';
+import { NodeMaterialBlockTargets } from '../../../Enums/nodeMaterialBlockTargets';
 //import { Nullable } from "../../../../types";
-import { _TypeStore } from '../../../../Misc/typeStore';
-import { editableInPropertyPage } from "../../nodeMaterialDecorator";
-import { NodeMaterialConnectionPointCustomObject } from "../../nodeMaterialConnectionPointCustomObject";
+import { _TypeStore } from '../../../../../Misc/typeStore';
+import { editableInPropertyPage } from "../../../nodeMaterialDecorator";
+import { NodeMaterialConnectionPointCustomObject } from "../../../nodeMaterialConnectionPointCustomObject";
 
 export class SheenBlock extends NodeMaterialBlock {
 

src/Materials/Node/Blocks/Fragment/index.ts

@@ -5,6 +5,6 @@ export * from "./perturbNormalBlock";
 export * from "./discardBlock";
 export * from "./frontFacingBlock";
 export * from "./derivativeBlock";
-export * from "./pbrMetallicRoughnessBlock";
-export * from "./sheenBlock";
-export * from "./ambientOcclusionBlock";
+export * from "./PBR/pbrMetallicRoughnessBlock";
+export * from "./PBR/sheenBlock";
+export * from "./PBR/ambientOcclusionBlock";