Move PBR block directory one level up

nodeEditor/src/blockTools.ts

@@ -62,12 +62,12 @@ import { DerivativeBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/deriva
 import { RefractBlock } from 'babylonjs/Materials/Node/Blocks/refractBlock';
 import { ReflectBlock } from 'babylonjs/Materials/Node/Blocks/reflectBlock';
 import { DesaturateBlock } from 'babylonjs/Materials/Node/Blocks/desaturateBlock';
-import { PBRMetallicRoughnessBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/pbrMetallicRoughnessBlock';
-import { SheenBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/sheenBlock';
-import { AmbientOcclusionBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/ambientOcclusionBlock';
-import { ReflectivityBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/reflectivityBlock';
-import { AnisotropyBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/anisotropyBlock';
-import { ReflectionBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/reflectionBlock';
+import { PBRMetallicRoughnessBlock } from 'babylonjs/Materials/Node/Blocks/PBR/pbrMetallicRoughnessBlock';
+import { SheenBlock } from 'babylonjs/Materials/Node/Blocks/PBR/sheenBlock';
+import { AmbientOcclusionBlock } from 'babylonjs/Materials/Node/Blocks/PBR/ambientOcclusionBlock';
+import { ReflectivityBlock } from 'babylonjs/Materials/Node/Blocks/PBR/reflectivityBlock';
+import { AnisotropyBlock } from 'babylonjs/Materials/Node/Blocks/PBR/anisotropyBlock';
+import { ReflectionBlock } from 'babylonjs/Materials/Node/Blocks/PBR/reflectionBlock';
 
 export class BlockTools {
     public static GetBlockFromString(data: string, scene: Scene, nodeMaterial: NodeMaterial) {

nodeEditor/src/diagram/properties/texturePropertyTabComponent.tsx

@@ -14,7 +14,7 @@ import { CubeTexture } from 'babylonjs/Materials/Textures/cubeTexture';
 import { OptionsLineComponent } from '../../sharedComponents/optionsLineComponent';
 import { IPropertyComponentProps } from './propertyComponentProps';
 import { ReflectionTextureBlock } from 'babylonjs/Materials/Node/Blocks/Dual/reflectionTextureBlock';
-import { ReflectionBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/PBR/reflectionBlock';
+import { ReflectionBlock } from 'babylonjs/Materials/Node/Blocks/PBR/reflectionBlock';
 import { TextureBlock } from 'babylonjs/Materials/Node/Blocks/Dual/textureBlock';
 import { GeneralPropertyTabComponent, GenericPropertyTabComponent } from './genericNodePropertyComponent';
 

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

@@ -5,4 +5,3 @@ export * from "./perturbNormalBlock";
 export * from "./discardBlock";
 export * from "./frontFacingBlock";
 export * from "./derivativeBlock";
-export * from "./PBR/index";

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

@@ -1,15 +1,15 @@
-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 { Nullable } from '../../../../../types';
-import { editableInPropertyPage, PropertyTypeForEdition } from "../../../nodeMaterialDecorator";
-import { _TypeStore } from '../../../../../Misc/typeStore';
-import { AbstractMesh } from '../../../../../Meshes/abstractMesh';
-import { NodeMaterialConnectionPointCustomObject } from "../../../nodeMaterialConnectionPointCustomObject";
-import { Scene } from '../../../../../scene';
+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 { Nullable } from '../../../../types';
+import { editableInPropertyPage, PropertyTypeForEdition } from "../../nodeMaterialDecorator";
+import { _TypeStore } from '../../../../Misc/typeStore';
+import { AbstractMesh } from '../../../../Meshes/abstractMesh';
+import { NodeMaterialConnectionPointCustomObject } from "../../nodeMaterialConnectionPointCustomObject";
+import { Scene } from '../../../../scene';
 
 export class AmbientOcclusionBlock extends NodeMaterialBlock {
 

src/Materials/Node/Blocks/Fragment/PBR/anisotropyBlock.ts

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

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

@@ -1,28 +1,28 @@
-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';
 import { ReflectivityBlock } from './reflectivityBlock';
-import { BaseTexture } from '../../../../Textures/baseTexture';
-import { BRDFTextureTools } from '../../../../../Misc/brdfTextureTools';
-import { MaterialFlags } from '../../../../materialFlags';
+import { BaseTexture } from '../../../Textures/baseTexture';
+import { BRDFTextureTools } from '../../../../Misc/brdfTextureTools';
+import { MaterialFlags } from '../../../materialFlags';
 import { AnisotropyBlock } from './anisotropyBlock';
 import { ReflectionBlock } from './reflectionBlock';
 

src/Materials/Node/Blocks/Fragment/PBR/reflectionBlock.ts

@@ -1,20 +1,20 @@
-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 { _TypeStore } from '../../../../../Misc/typeStore';
-import { NodeMaterialConnectionPointCustomObject } from "../../../nodeMaterialConnectionPointCustomObject";
-import { ReflectionTextureBaseBlock } from '../../Dual/reflectionTextureBaseBlock';
-import { AbstractMesh } from '../../../../../Meshes/abstractMesh';
-import { Nullable } from '../../../../../types';
-import { Texture } from '../../../../Textures/texture';
-import { BaseTexture } from '../../../../Textures/baseTexture';
-import { Mesh } from '../../../../../Meshes/mesh';
-import { SubMesh } from '../../../../../Meshes/subMesh';
-import { Effect } from '../../../../effect';
-import { editableInPropertyPage, PropertyTypeForEdition } from "../../../nodeMaterialDecorator";
-import { Scene } from '../../../../../scene';
+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 { _TypeStore } from '../../../../Misc/typeStore';
+import { NodeMaterialConnectionPointCustomObject } from "../../nodeMaterialConnectionPointCustomObject";
+import { ReflectionTextureBaseBlock } from '../Dual/reflectionTextureBaseBlock';
+import { AbstractMesh } from '../../../../Meshes/abstractMesh';
+import { Nullable } from '../../../../types';
+import { Texture } from '../../../Textures/texture';
+import { BaseTexture } from '../../../Textures/baseTexture';
+import { Mesh } from '../../../../Meshes/mesh';
+import { SubMesh } from '../../../../Meshes/subMesh';
+import { Effect } from '../../../effect';
+import { editableInPropertyPage, PropertyTypeForEdition } from "../../nodeMaterialDecorator";
+import { Scene } from '../../../../scene';
 
 export class ReflectionBlock extends ReflectionTextureBaseBlock {
 

src/Materials/Node/Blocks/Fragment/PBR/reflectivityBlock.ts

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

src/Materials/Node/Blocks/Fragment/PBR/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/index.ts

@@ -45,3 +45,4 @@ export * from "./rotate2dBlock";
 export * from "./reflectBlock";
 export * from "./refractBlock";
 export * from "./desaturateBlock";
+export * from "./PBR/index";