shaders

Tools/Config/config.js

@@ -36,6 +36,9 @@ config.modules.map(function(module) {
     const tsConfig = require(tsConfigPath);
     const srcDirectory = path.resolve(mainDirectory, tsConfig.compilerOptions.rootDir);
 
+    const shaderGlob = srcDirectory + "/**/*.fx";
+    const shaderTSGlob = srcDirectory + "/**/*.fx.ts";
+
     for (let library of settings.libraries) {
         const entryPath = path.join(srcDirectory, library.entry);
 
@@ -53,7 +56,9 @@ config.modules.map(function(module) {
         ES6PackageDirectory,
         webpackConfigPath,
         tsConfigPath,
-        packageJSONPath
+        packageJSONPath,
+        shaderGlob,
+        shaderTSGlob
     }
 });
 

Tools/Gulp/helpers/gulp-processShaders.js

@@ -128,7 +128,6 @@ function main(isCore) {
 export var ${shaderName} = { name, shader };`)
 
             // Go to disk.
-            console.log(directory + '/' + tsFilename);
             fs.writeFileSync(directory + '/' + tsFilename, tsContent);
 
             return cb();

Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -25,14 +25,14 @@ const tempTypingsPath = path.join(config.computed.tempFolder, tempTypingsFileNam
  * Clean shader ts files.
  */
 var cleanShaders = function(settings) {
-    return del([settings.computed.srcDirectory + "**/*.fx.ts"]);
+    return del([settings.computed.shaderTSGlob], { force: true });
 }
 
 /**
  * Create shader ts files.
  */
 var buildShaders = function(settings) {
-    return gulp.src(settings.computed.srcDirectory + "**/*.fx")
+    return gulp.src(settings.computed.shaderGlob)
             .pipe(uncommentShaders())
             .pipe(processShaders(settings.isCore));
 }

Tools/Gulp/tasks/gulpTasks-watchCore.js

@@ -21,10 +21,10 @@ gulp.task("watchCore-cleanShaders", async function startWatch() {
     var settings = config[module].computed;
 
     // Clean shaders.
-    await del([settings.srcDirectory + "**/*.fx.ts"]);
+    await del([settings.shaderTSGlob], { force: true });
 
     // Generate shaders.
-    return gulp.src(settings.srcDirectory + "**/*.fx")
+    return gulp.src(settings.shaderGlob)
         .pipe(uncommentShaders())
         .pipe(processShaders(true));
 });
@@ -58,9 +58,9 @@ gulp.task("watchCore", gulp.series("watchCore-cleanShaders", async function() {
     });
 
     // Launch shader watch.
-    gulp.watch(settings.srcDirectory + "**/*.fx", { interval: 1000 }, function() {
+    gulp.watch(settings.shaderGlob, { interval: 1000 }, function() {
         console.log(library.output + ": Shaders.");
-        return gulp.src(settings.srcDirectory + "**/*.fx")
+        return gulp.src(settings.shaderGlob)
             .pipe(uncommentShaders())
             .pipe(processShaders(true));
     });

Tools/Gulp/tasks/gulpTasks-watchLibraries.js

@@ -44,7 +44,7 @@ gulp.task("watchLibraries", function startWatch() {
                 };
 
                 tasks.push(
-                    gulp.src(settings.srcDirectory + "**/*.fx")
+                    gulp.src(settings.shaderGlob)
                         .pipe(uncommentShaders())
                         .pipe(processShaders(false))
                 );
@@ -56,9 +56,9 @@ gulp.task("watchLibraries", function startWatch() {
                 );
 
                 tasks.push(
-                    gulp.watch(settings.srcDirectory + "**/*.fx", { interval: 1000 }, function() {
+                    gulp.watch(settings.shaderGlob, { interval: 1000 }, function() {
                         console.log(library.output + ": Shaders.");
-                        return gulp.src(settings.srcDirectory + "**/*.fx")
+                        return gulp.src(settings.shaderGlob)
                             .pipe(uncommentShaders())
                             .pipe(processShaders(false));
                     })