浏览代码

Merge pull request #1225 from sebavan/AsciiArtSpelling

Fix
Raanan Weber 9 年之前
父节点
当前提交
e757aea553

+ 4 - 4
proceduralTexturesLibrary/dist/babylon.asciiArtPostProcess.js

@@ -178,7 +178,7 @@ var BABYLON;
             this.mixToNormal = 0;
             // Default values.
             var font = "40px Monospace";
-            var caracterSet = " `-.'_:,\"=^;<+!*?/cL\\zrs7TivJtC{3F)Il(xZfY5S2eajo14[nuyE]P6V9kXpKwGhqAUbOd8#HRDB0$mgMW&Q%N@";
+            var characterSet = " `-.'_:,\"=^;<+!*?/cL\\zrs7TivJtC{3F)Il(xZfY5S2eajo14[nuyE]P6V9kXpKwGhqAUbOd8#HRDB0$mgMW&Q%N@";
             // Use options.
             if (options) {
                 if (typeof (options) === "string") {
@@ -186,16 +186,16 @@ var BABYLON;
                 }
                 else {
                     font = options.font || font;
-                    caracterSet = options.caracterSet || caracterSet;
+                    characterSet = options.characterSet || characterSet;
                     this.mixToTile = options.mixToTile || this.mixToTile;
                     this.mixToNormal = options.mixToNormal || this.mixToNormal;
                 }
             }
-            this._asciiArtFontTexture = new AsciiArtFontTexture(name, font, caracterSet, camera.getScene());
+            this._asciiArtFontTexture = new AsciiArtFontTexture(name, font, characterSet, camera.getScene());
             var textureSize = this._asciiArtFontTexture.getSize();
             this.onApply = function (effect) {
                 effect.setTexture("asciiArtFont", _this._asciiArtFontTexture);
-                effect.setFloat4("asciiArtFontInfos", _this._asciiArtFontTexture.charSize, caracterSet.length, textureSize.width, textureSize.height);
+                effect.setFloat4("asciiArtFontInfos", _this._asciiArtFontTexture.charSize, characterSet.length, textureSize.width, textureSize.height);
                 effect.setFloat4("asciiArtOptions", _this.width, _this.height, _this.mixToNormal, _this.mixToTile);
             };
         }

文件差异内容过多而无法显示
+ 1 - 1
proceduralTexturesLibrary/dist/babylon.asciiArtPostProcess.min.js


+ 6 - 6
proceduralTexturesLibrary/proceduralTextures/asciiArt/babylon.asciiArtPostProcess.ts

@@ -163,9 +163,9 @@ module BABYLON {
         font?: string;
 
         /**
-         * The caracter set to use in the postprocess.
+         * The character set to use in the postprocess.
          */
-        caracterSet?: string;
+        characterSet?: string;
 
         /**
          * This defines the amount you want to mix the "tile" or caracter space colored in the ascii art.
@@ -227,7 +227,7 @@ module BABYLON {
 
             // Default values.
             var font = "40px Monospace";
-            var caracterSet =  " `-.'_:,\"=^;<+!*?/cL\\zrs7TivJtC{3F)Il(xZfY5S2eajo14[nuyE]P6V9kXpKwGhqAUbOd8#HRDB0$mgMW&Q%N@";
+            var characterSet =  " `-.'_:,\"=^;<+!*?/cL\\zrs7TivJtC{3F)Il(xZfY5S2eajo14[nuyE]P6V9kXpKwGhqAUbOd8#HRDB0$mgMW&Q%N@";
 
             // Use options.
             if (options) {
@@ -236,13 +236,13 @@ module BABYLON {
                 }   
                 else {
                     font = (<IAsciiArtPostProcessOptions>options).font || font;
-                    caracterSet = (<IAsciiArtPostProcessOptions>options).caracterSet || caracterSet;
+                    characterSet = (<IAsciiArtPostProcessOptions>options).characterSet || characterSet;
                     this.mixToTile = (<IAsciiArtPostProcessOptions>options).mixToTile || this.mixToTile;
                     this.mixToNormal = (<IAsciiArtPostProcessOptions>options).mixToNormal || this.mixToNormal;
                 } 
             }
 
-            this._asciiArtFontTexture = new AsciiArtFontTexture(name, font, caracterSet, camera.getScene());
+            this._asciiArtFontTexture = new AsciiArtFontTexture(name, font, characterSet, camera.getScene());
             var textureSize = this._asciiArtFontTexture.getSize();
 
             this.onApply = (effect: Effect) => {
@@ -250,7 +250,7 @@ module BABYLON {
 				
                 effect.setFloat4("asciiArtFontInfos", 
                     this._asciiArtFontTexture.charSize, 
-                    caracterSet.length, 
+                    characterSet.length, 
                     textureSize.width, 
                     textureSize.height);