David Catuhe 4 年之前
父节点
当前提交
3b7201c2de

+ 1 - 0
src/Engines/nullEngine.ts

@@ -142,6 +142,7 @@ export class NullEngine extends Engine {
             maxMSAASamples: 1,
             blendMinMax: false,
             canUseGLInstanceID: false,
+            canUseGLVertexID: false
         };
 
         this._features = {

+ 1 - 1
src/Layers/effectLayer.ts

@@ -535,7 +535,7 @@ export abstract class EffectLayer {
                 defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);
                 if (manager.isUsingTextureForTargets) {
                     defines.push("#define MORPHTARGETS_TEXTURE");
-                };
+                }
                 MaterialHelper.PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, morphInfluencers);
             }
         }

+ 1 - 1
src/Lights/Shadows/shadowGenerator.ts

@@ -1420,7 +1420,7 @@ export class ShadowGenerator implements IShadowGenerator {
                     defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);
                     if (manager.isUsingTextureForTargets) {
                         defines.push("#define MORPHTARGETS_TEXTURE");
-                    };
+                    }
                     MaterialHelper.PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, morphInfluencers);
                 }
             }

+ 1 - 1
src/Materials/Node/nodeMaterial.ts

@@ -81,7 +81,7 @@ export class NodeMaterialDefines extends MaterialDefines implements IImageProces
     public MORPHTARGETS_NORMAL = false;
     public MORPHTARGETS_TANGENT = false;
     public MORPHTARGETS_UV = false;
-    public NUM_MORPH_INFLUENCERS = 0;    
+    public NUM_MORPH_INFLUENCERS = 0;
     public MORPHTARGETS_TEXTURE = false;
 
     /** IMAGE PROCESSING */

+ 1 - 1
src/Materials/PBR/pbrBaseMaterial.ts

@@ -191,7 +191,7 @@ export class PBRMaterialDefines extends MaterialDefines
     public MORPHTARGETS_NORMAL = false;
     public MORPHTARGETS_TANGENT = false;
     public MORPHTARGETS_UV = false;
-    public NUM_MORPH_INFLUENCERS = 0;    
+    public NUM_MORPH_INFLUENCERS = 0;
     public MORPHTARGETS_TEXTURE = false;
 
     public IMAGEPROCESSING = false;

+ 3 - 3
src/Morph/morphTargetManager.ts

@@ -64,7 +64,7 @@ export class MorphTargetManager implements IDisposable {
             this._scene.morphTargetManagers.push(this);
 
             this._uniqueId = this._scene.getUniqueId();
-            
+
             const engineCaps = this._scene.getEngine().getCaps();
             this._canUseTextureForTargets = engineCaps.canUseGLVertexID && engineCaps.textureFloat && engineCaps.maxVertexTextureImageUnits > 0;
         }
@@ -335,7 +335,7 @@ export class MorphTargetManager implements IDisposable {
                     const tangents = target.getTangents();
 
                     if (!positions) {
-                        if (index ===0) {
+                        if (index === 0) {
                             Logger.Error("Invalid morph target. Target must have positions.");
                         }
                         return;
@@ -369,7 +369,7 @@ export class MorphTargetManager implements IDisposable {
                         }
                     }
 
-                    this._targetStoreTextures[index]= RawTexture.CreateRGBATexture(data, this._textureWidth, this._textureHeight, 
+                    this._targetStoreTextures[index] = RawTexture.CreateRGBATexture(data, this._textureWidth, this._textureHeight,
                         this._scene, false, false, Constants.TEXTURE_NEAREST_SAMPLINGMODE, Constants.TEXTURETYPE_FLOAT);
                 }
             }

+ 1 - 1
src/Rendering/depthRenderer.ts

@@ -242,7 +242,7 @@ export class DepthRenderer {
 
                 if (morphTargetManager.isUsingTextureForTargets) {
                     defines.push("#define MORPHTARGETS_TEXTURE");
-                };
+                }
 
                 MaterialHelper.PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, numMorphInfluencers);
             }

+ 1 - 1
src/Rendering/geometryBufferRenderer.ts

@@ -430,7 +430,7 @@ export class GeometryBufferRenderer {
                 defines.push("#define NUM_MORPH_INFLUENCERS " + numMorphInfluencers);
                 if (morphTargetManager.isUsingTextureForTargets) {
                     defines.push("#define MORPHTARGETS_TEXTURE");
-                };
+                }
                 MaterialHelper.PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, numMorphInfluencers);
             }
         }

+ 2 - 2
src/Rendering/outlineRenderer.ts

@@ -273,7 +273,7 @@ export class OutlineRenderer implements ISceneComponent {
 
                 if (morphTargetManager.isUsingTextureForTargets) {
                     defines.push("#define MORPHTARGETS_TEXTURE");
-                };
+                }
 
                 MaterialHelper.PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, numMorphInfluencers);
             }
@@ -294,7 +294,7 @@ export class OutlineRenderer implements ISceneComponent {
             this._cachedDefines = join;
             this._effect = this.scene.getEngine().createEffect("outline",
                 attribs,
-                ["world", "mBones", "viewProjection", "diffuseMatrix", "offset", "color", "logarithmicDepthConstant", 
+                ["world", "mBones", "viewProjection", "diffuseMatrix", "offset", "color", "logarithmicDepthConstant",
                 "morphTargetInfluences", "morphTargetTextureInfo"],
                 ["diffuseSampler", "morphTargets"], join,
                 undefined, undefined, undefined,