@babylonjs/core 6.11.0 → 6.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Culling/ray.js +2 -2
- package/Culling/ray.js.map +1 -1
- package/Engines/thinEngine.js +2 -2
- package/Engines/thinEngine.js.map +1 -1
- package/Materials/PBR/pbrBaseMaterial.d.ts +5 -0
- package/Materials/PBR/pbrBaseMaterial.js +6 -1
- package/Materials/PBR/pbrBaseMaterial.js.map +1 -1
- package/Materials/PBR/pbrMaterial.d.ts +4 -0
- package/Materials/PBR/pbrMaterial.js +8 -0
- package/Materials/PBR/pbrMaterial.js.map +1 -1
- package/Materials/greasedLinePluginMaterial.d.ts +129 -41
- package/Materials/greasedLinePluginMaterial.js +190 -114
- package/Materials/greasedLinePluginMaterial.js.map +1 -1
- package/Materials/materialHelper.d.ts +2 -1
- package/Materials/materialHelper.js +3 -1
- package/Materials/materialHelper.js.map +1 -1
- package/Materials/standardMaterial.d.ts +6 -0
- package/Materials/standardMaterial.js +9 -1
- package/Materials/standardMaterial.js.map +1 -1
- package/Meshes/Builders/greasedLineBuilder.d.ts +45 -1
- package/Meshes/Builders/greasedLineBuilder.js +59 -20
- package/Meshes/Builders/greasedLineBuilder.js.map +1 -1
- package/Meshes/greasedLineMesh.d.ts +24 -11
- package/Meshes/greasedLineMesh.js +64 -24
- package/Meshes/greasedLineMesh.js.map +1 -1
- package/Misc/greasedLineTools.d.ts +11 -2
- package/Misc/greasedLineTools.js +18 -5
- package/Misc/greasedLineTools.js.map +1 -1
- package/Particles/gpuParticleSystem.js +1 -1
- package/Particles/gpuParticleSystem.js.map +1 -1
- package/Shaders/ShadersInclude/pbrBlockAlbedoOpacity.js +5 -0
- package/Shaders/ShadersInclude/pbrBlockAlbedoOpacity.js.map +1 -1
- package/Shaders/default.fragment.js +4 -1
- package/Shaders/default.fragment.js.map +1 -1
- package/package.json +2 -2
|
@@ -195,6 +195,7 @@ export declare class PBRMaterialDefines extends MaterialDefines implements IImag
|
|
|
195
195
|
FORCENORMALFORWARD: boolean;
|
|
196
196
|
SPECULARAA: boolean;
|
|
197
197
|
UNLIT: boolean;
|
|
198
|
+
DECAL_AFTER_DETAIL: boolean;
|
|
198
199
|
DEBUGMODE: number;
|
|
199
200
|
/**
|
|
200
201
|
* Initializes the PBR Material defines.
|
|
@@ -647,6 +648,10 @@ export declare abstract class PBRBaseMaterial extends PushMaterial {
|
|
|
647
648
|
* If set to true, no lighting calculations will be applied.
|
|
648
649
|
*/
|
|
649
650
|
private _unlit;
|
|
651
|
+
/**
|
|
652
|
+
* If sets to true, the decal map will be applied after the detail map. Else, it is applied before (default: false)
|
|
653
|
+
*/
|
|
654
|
+
private _applyDecalMapAfterDetailMap;
|
|
650
655
|
private _debugMode;
|
|
651
656
|
/**
|
|
652
657
|
* @internal
|
|
@@ -209,6 +209,7 @@ export class PBRMaterialDefines extends MaterialDefines {
|
|
|
209
209
|
this.FORCENORMALFORWARD = false;
|
|
210
210
|
this.SPECULARAA = false;
|
|
211
211
|
this.UNLIT = false;
|
|
212
|
+
this.DECAL_AFTER_DETAIL = false;
|
|
212
213
|
this.DEBUGMODE = 0;
|
|
213
214
|
this.rebuild();
|
|
214
215
|
}
|
|
@@ -659,6 +660,10 @@ export class PBRBaseMaterial extends PushMaterial {
|
|
|
659
660
|
* If set to true, no lighting calculations will be applied.
|
|
660
661
|
*/
|
|
661
662
|
this._unlit = false;
|
|
663
|
+
/**
|
|
664
|
+
* If sets to true, the decal map will be applied after the detail map. Else, it is applied before (default: false)
|
|
665
|
+
*/
|
|
666
|
+
this._applyDecalMapAfterDetailMap = false;
|
|
662
667
|
this._debugMode = 0;
|
|
663
668
|
/**
|
|
664
669
|
* @internal
|
|
@@ -1495,7 +1500,7 @@ export class PBRBaseMaterial extends PushMaterial {
|
|
|
1495
1500
|
defines.HORIZONOCCLUSION = this._useHorizonOcclusion;
|
|
1496
1501
|
// Misc.
|
|
1497
1502
|
if (defines._areMiscDirty) {
|
|
1498
|
-
MaterialHelper.PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh) || this._forceAlphaTest, defines);
|
|
1503
|
+
MaterialHelper.PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh) || this._forceAlphaTest, defines, this._applyDecalMapAfterDetailMap);
|
|
1499
1504
|
defines.UNLIT = this._unlit || ((this.pointsCloud || this.wireframe) && !mesh.isVerticesDataPresent(VertexBuffer.NormalKind));
|
|
1500
1505
|
defines.DEBUGMODE = this._debugMode;
|
|
1501
1506
|
}
|