优化代码，分离glsl脚本

iamscottxu · Sep 27, 2020 · 7f5bc24 · 7f5bc24
1 parent 0e5f58e
commit 7f5bc24
Show file tree

Hide file tree

Showing 6 changed files with 342 additions and 63 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,14 +1,19 @@
 const gulp = require('gulp');
+
 const bro = require('gulp-bro');
 const uglify = require('gulp-uglify');
 const rename = require("gulp-rename");
 const header = require('gulp-header');
 const jsdoc = require('gulp-jsdoc3');
 const jeditor = require('gulp-json-editor');
-const fs = require('fs-extra');
+const glsl = require('gulp-glsl');
 const sourcemaps = require('gulp-sourcemaps');
 const babel = require("gulp-babel");
 const eslint = require('gulp-eslint');
+const addsrc = require('gulp-add-src');
+
+const fs = require('fs-extra');
+
 const buildConfig = require('./build.json');
 const packageConfig = require('./package.json');
 
@@ -21,40 +26,46 @@ gulp.task('doc', (cb) => {
 
 gulp.task('es6', gulp.series(gulp.parallel(() => {
     return gulp.src("./build.json")
-    .pipe(jeditor({
-        'buildDate': new Date().toUTCString(),
-        'version': packageConfig.version
-    }))
-    .pipe(gulp.dest('dist'))
+        .pipe(jeditor({
+            'buildDate': new Date().toUTCString(),
+            'version': packageConfig.version
+        }))
+        .pipe(gulp.dest('dist'))
 }, () => {
     return gulp.src('src/lib/resources.json')
-      .pipe(gulp.dest('dist/lib'))
+        .pipe(gulp.dest('dist/lib'))
 }),
-() => {
-    return gulp.src(['src/**/*.js', '!src/lib/JS-Interpreter/acorn_interpreter.js', '!src/lib/JS-Interpreter/demos/**/*'])
-        .pipe(sourcemaps.init())
-        .pipe(babel({
-            presets: [
-                [
-                    '@babel/preset-env',
-                    {
-                        useBuiltIns: 'usage',
-                        corejs: 3
-                    }
-                ]
-            ],
-            shouldPrintComment: (val) => /^\*/.test(val)
-        }))
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('dist'));
-}));
+    () => {
+        return gulp.src('src/**/*.glsl')
+            .pipe(sourcemaps.init())
+            .pipe(glsl({
+                es6: true
+            }))
+            .pipe(addsrc([
+                'src/**/*.js',
+                '!src/lib/JS-Interpreter/acorn_interpreter.js',
+                '!src/lib/JS-Interpreter/demos/**/*']))
+            .pipe(babel({
+                presets: [
+                    [
+                        '@babel/preset-env',
+                        {
+                            useBuiltIns: 'usage',
+                            corejs: 3
+                        }
+                    ]
+                ],
+                shouldPrintComment: (val) => /^\*/.test(val)
+            }))
+            .pipe(sourcemaps.write())
+            .pipe(gulp.dest('dist'));
+    }));
 
 gulp.task('browserify', () => {
     let license = fs.readFileSync('./LICENSE').toString();
     return gulp.src('dist/app.js')
         .pipe(bro({
-            debug: true,
-            require: './openBSE.js'
+            debug: true
         }))
         .pipe(rename(`${buildConfig.name}.all.js`))
         .pipe(sourcemaps.init({ loadMaps: true }))
@@ -88,7 +99,7 @@ gulp.task('eslint', () => {
 
 gulp.task('copy', () => {
     return gulp.src('src/openBSE.d.ts')
-      .pipe(gulp.dest('dist'))
+        .pipe(gulp.dest('dist'))
 });
 
 gulp.task('build', gulp.parallel(
@@ -98,10 +109,10 @@ gulp.task('build', gulp.parallel(
 
 gulp.task('changename', () => {
     return gulp.src("./package.json")
-    .pipe(jeditor({
-        'name': "@iamscottxu/openbse"
-    }))
-    .pipe(gulp.dest('./'))
+        .pipe(jeditor({
+            'name': "@iamscottxu/openbse"
+        }))
+        .pipe(gulp.dest('./'))
 });
 
-gulp.task('default', gulp.parallel('build','doc'));
+gulp.task('default', gulp.parallel('build', 'doc'));