Browse Source

Fix docs + ubo def

Popov72 5 years ago
parent
commit
5bd58bd76e

+ 4 - 3
src/Materials/material.detailMap.ts

@@ -21,6 +21,9 @@ export interface IMaterialDetailMapDefines {
     _areTexturesDirty: boolean;
 }
 
+/**
+ * Define the code related to the detail map parameters of a material
+ */
 export class DetailMap {
 
     private _texture: Nullable<BaseTexture> = null;
@@ -110,7 +113,7 @@ export class DetailMap {
      * @param defines the list of "defines" to update.
      * @param scene defines the scene the material belongs to.
      */
-    public prepareDefines(defines: IMaterialDetailMapDefines, scene: Scene): boolean {
+    public prepareDefines(defines: IMaterialDetailMapDefines, scene: Scene): void {
         if (this._isEnabled) {
             defines.DETAIL_NORMALBLENDMETHOD = this._normalBlendMethod;
 
@@ -127,8 +130,6 @@ export class DetailMap {
         } else {
             defines.DETAIL = false;
         }
-
-        return true;
     }
 
     /**

+ 1 - 1
src/Shaders/ShadersInclude/defaultUboDeclaration.fx

@@ -38,7 +38,7 @@ uniform Material
 	float visibility;
 	vec4 vDiffuseColor;
 
-	vec3 vDetailInfos;
+	vec4 vDetailInfos;
 	mat4 detailMatrix;
 };