소스 검색

Merge pull request #2148 from NasimiAsl/master

Rename Deffiuse to Diffuse
David Catuhe 8 년 전
부모
커밋
3d291b0c4b
1개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 5
      materialsLibrary/src/custom/babylon.customMaterial.ts

+ 5 - 5
materialsLibrary/src/custom/babylon.customMaterial.ts

@@ -24,7 +24,7 @@ module BABYLON {
     public Fragment_MainBegin: string;
     
     // diffuseColor
-    public Fragment_Custom_Deffiuse: string;
+    public Fragment_Custom_Diffuse: string;
     
     // alpha
     public Fragment_Custom_Alpha : string;
@@ -149,7 +149,7 @@ vec3 viewDirectionW=normalize(vEyePosition-vPositionW);\n\
 \n\
 vec4 baseColor=vec4(1.,1.,1.,1.);\n\
 vec3 diffuseColor=vDiffuseColor.rgb;\n\
-#[Fragment_Custom_Deffiuse]\n\
+#[Fragment_Custom_Diffuse]\n\
 \n\
 float alpha=vDiffuseColor.a;\n\
 #[Fragment_Custom_Alpha]\n\
@@ -617,7 +617,7 @@ vColor=color;\n\
             .replace('#[Fragment_Begin]',(this.CustomParts.Fragment_Begin ? this.CustomParts.Fragment_Begin : ""))
             .replace('#[Fragment_MainBegin]',(this.CustomParts.Fragment_MainBegin  ? this.CustomParts.Fragment_MainBegin : ""))
             .replace('#[Fragment_Definations]',(this._customUnifrom? this._customUnifrom.join("\n"):"")+(this.CustomParts.Fragment_Definations ? this.CustomParts.Fragment_Definations : ""))
-            .replace('#[Fragment_Custom_Deffiuse]',(this.CustomParts.Fragment_Custom_Deffiuse ? this.CustomParts.Fragment_Custom_Deffiuse : ""))
+            .replace('#[Fragment_Custom_Diffuse]',(this.CustomParts.Fragment_Custom_Diffuse ? this.CustomParts.Fragment_Custom_Diffuse : ""))
             .replace('#[Fragment_Custom_Alpha]',(this.CustomParts.Fragment_Custom_Alpha ? this.CustomParts.Fragment_Custom_Alpha : ""))
             .replace('#[Fragment_Before_FragColor]',(this.CustomParts.Fragment_Before_FragColor ? this.CustomParts.Fragment_Before_FragColor : "")) ;
  
@@ -674,8 +674,8 @@ vColor=color;\n\
             this.CustomParts.Fragment_MainBegin = shaderPart;
             return this;
          }
-         public Fragment_Custom_Deffiuse(shaderPart:string):CustomMaterial{            
-            this.CustomParts.Fragment_Custom_Deffiuse = shaderPart.replace("result","diffuseColor");
+         public Fragment_Custom_Diffuse(shaderPart:string):CustomMaterial{            
+            this.CustomParts.Fragment_Custom_Diffuse = shaderPart.replace("result","diffuseColor");
             return this;
          }
          public Fragment_Custom_Alpha(shaderPart:string):CustomMaterial{