Shader Build in es6

Tools/Config/config.js

@@ -60,8 +60,12 @@ 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";
+        const shaderGlob = srcDirectory.replace(/\\/g, "/") + "/**/*.fx";
+        const shaderTSGlob = [
+            srcDirectory.replace(/\\/g, "/") + "/**/*.fragment.ts",
+            srcDirectory.replace(/\\/g, "/") + "/**/*.vertex.ts",
+            srcDirectory.replace(/\\/g, "/") + "/**/ShadersInclude/*.ts",
+        ];
 
         for (let library of settings.libraries) {
             const entryPath = path.join(srcDirectory, library.entry);

Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -27,7 +27,7 @@ const tempTypingsFile = path.join(config.computed.tempFolder, tempTypingsFileNam
  * Clean shader ts files.
  */
 var cleanShaders = function(settings) {
-    return del([settings.computed.shaderTSGlob], { force: true });
+    return del(settings.computed.shaderTSGlob, { force: true });
 }
 
 /**

Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -9,20 +9,39 @@ var concat = require('gulp-concat');
 var rmDir = require("../../NodeHelpers/rmDir");
 var processImports = require("../helpers/gulp-processImportsToEs6");
 var processLooseDeclaration = require("../helpers/gulp-processLooseDeclarationEs6");
+var uncommentShaders = require('../helpers/gulp-removeShaderComments');
+var processShaders = require("../helpers/gulp-processShaders");
+var del = require("del");
 
 // Import Build Config
 var config = require("../../Config/config.js");
 
 /**
- * Clean folders.
+ * Clean Source And Dist folders.
  */
-var clean = function(settings, cb) {
+var cleanSourceAndDist = function(settings, cb) {
     rmDir(settings.computed.sourceES6Directory);
     rmDir(settings.computed.distES6Directory);
     cb();
 }
 
 /**
+ * Clean shader ts files.
+ */
+var cleanShaders = function(settings) {
+    return del(settings.computed.shaderTSGlob, { force: true });
+}
+
+/**
+ * Create shader ts files.
+ */
+var buildShaders = function(settings) {
+    return gulp.src(settings.computed.shaderGlob)
+            .pipe(uncommentShaders())
+            .pipe(processShaders(settings.isCore));
+}
+
+/**
  * Copy Sources.
  */
 var source = function(settings) {
@@ -220,11 +239,17 @@ function buildES6Library(settings, module) {
     // Creates the required tasks.
     var tasks = [];
 
-    var cleanup = function(cb) { return clean(settings, cb); };
+    var cleanTasks = [
+        function cleanES6(cb) { return cleanSourceAndDist(settings, cb); },
+        function cleanES6Shaders() { return cleanShaders(settings); }
+    ];
+    var shaders = function() { return buildShaders(settings); };
     var copySource = function() { return source(settings); };
     var dependencies = function() { return dep(settings); };
     var adaptSourceImportPaths = function() { return modifySources(settings); };
     var adaptTsConfigImportPaths = function(cb) { return modifyTsConfig(settings, cb); };
+
+    // Build with ts or webpack
     var buildSteps = null;
     if (settings.build.es6.webpackBuild) {
         buildSteps = [
@@ -239,7 +264,7 @@ function buildES6Library(settings, module) {
         ];
     }
 
-    tasks.push(cleanup, copySource, dependencies, adaptSourceImportPaths, adaptTsConfigImportPaths, ...buildSteps);
+    tasks.push(...cleanTasks, shaders, copySource, dependencies, adaptSourceImportPaths, adaptTsConfigImportPaths, ...buildSteps);
 
     return gulp.series.apply(this, tasks);
 }

Tools/Gulp/tasks/gulpTasks-watchCore.js

@@ -21,7 +21,7 @@ gulp.task("watchCore-cleanShaders", async function startWatch() {
     var settings = config[module].computed;
 
     // Clean shaders.
-    await del([settings.shaderTSGlob], { force: true });
+    await del(settings.shaderTSGlob, { force: true });
 
     // Generate shaders.
     return gulp.src(settings.shaderGlob)