added initial shader minification draft

Author: Matthias Wolff

index.js

@@ -1,83 +1,95 @@
 var path = require('path')
 var fs = require('fs')
 var loaderUtils = require('loader-utils')
+var Readable = require('stream').Readable
+var Tokenizer = require('glsl-tokenizer/stream')
+var Parser = require('glsl-parser/stream')
+var Deparser = require('glsl-deparser')
+var Minify = require('glsl-min-stream')
 
 var chunks = {}
 var chunkPath = ""
 
-module.exports = function(source) {
-	this.cacheable && this.cacheable()
+module.exports = function (source) {
+    this.cacheable && this.cacheable()
 
-	var uid = new Object()
-		uid.callback = this.async()
-		uid.finalString = source
-		uid.queue = 0
-		uid.done = false
+    var uid = new Object()
+    uid.callback = this.async()
+    uid.finalString = source
+    uid.queue = 0
+    uid.done = false
 
-	var options = loaderUtils.getOptions(this) || {}
+    var options = loaderUtils.getOptions(this) || {}
 
-	if(options.glsl && options.glsl.chunkPath){
-		chunkPath =  options.glsl.chunkPath
-	}
+    if (options.glsl && options.glsl.chunkPath) {
+        chunkPath = options.glsl.chunkPath
+    }
 
-	var r = /\$[\w-.]+/gi
-	var match = source.match( r )
+    var r = /\$[\w-.]+/gi
+    var match = source.match(r)
 
-	if(match){
-		for (var i = 0; i < match.length; i++) {
-			chunks[match[i]] = ""
-		}
-	} else {
-		onChunksLoaded.call(uid)
-	}
+    if (match) {
+        for (var i = 0; i < match.length; i++) {
+            chunks[match[i]] = ""
+        }
+    } else {
+        onChunksLoaded.call(uid)
+    }
 
-	var keys = []
-	for (var key in chunks){
-		keys.push(key)
-	}
-	keys.sort()
-	keys.reverse()
-	uid.queue+=keys.length
+    var keys = []
+    for (var key in chunks) {
+        keys.push(key)
+    }
+    keys.sort()
+    keys.reverse()
+    uid.queue += keys.length
 
-	for(var i=0; i < keys.length; i++){
-		loadChunk.call(this, keys[i], uid )
+    for (var i = 0; i < keys.length; i++) {
+        loadChunk.call(this, keys[i], uid)
 
-	}
+    }
 }
 
-function loadChunk(key, uid){
-	var name = key.substr(1, key.length-1)
-	var headerPath = path.resolve(chunkPath+"/"+name+".glsl");
-	this.dependency(headerPath)
-	fs.readFile(headerPath, "utf-8", function(err, content) {
-		uid.queue--
-		chunks[key]=content
-		if(err) {
-			chunks[key]=""
-			console.error("Can't open the shader chunk "+name+":\n"+err.toString())
-		}
-		if(uid.queue==0){
-			onChunksLoaded.call(uid)
-		}
-	})
+function loadChunk (key, uid) {
+    var name = key.substr(1, key.length - 1)
+    var headerPath = path.resolve(chunkPath + "/" + name + ".glsl");
+    this.dependency(headerPath)
+    fs.readFile(headerPath, "utf-8", function (err, content) {
+        uid.queue--
+        chunks[key] = content
+        if (err) {
+            chunks[key] = ""
+            console.error("Can't open the shader chunk " + name + ":\n" + err.toString())
+        }
+        if (uid.queue == 0) {
+            onChunksLoaded.call(uid)
+        }
+    })
 
 }
 
-function onChunksLoaded(){
-	if(this.done){ return }
-	this.done = true
-	var keys = []
-	for (var key in chunks){
-		keys.push(key)
-	}
-	keys.sort()
-	keys.reverse()
-	for(var i=0; i < keys.length; i++){
-		var key = keys[i]
-		var re = new RegExp("(\\"+key+")", "gi")
-		this.finalString = this.finalString.replace(re,chunks[key])
-	}
+function onChunksLoaded () {
+    if (this.done) { return }
+    this.done = true
+    var keys = []
+    for (var key in chunks) {
+        keys.push(key)
+    }
+    keys.sort()
+    keys.reverse()
+    for (var i = 0; i < keys.length; i++) {
+        var key = keys[i]
+        var re = new RegExp("(\\" + key + ")", "gi")
+        this.finalString = this.finalString.replace(re, chunks[key])
+    }
 
-	this.finalString = "module.exports = " + JSON.stringify(this.finalString)
-	this.callback(null, this.finalString)
+    var s = new Readable()
+    s._read = function noop () {}
+    s.push(this.finalString)
+    s.push(null)
+    this.res = ''
+    s.pipe(Tokenizer()).pipe(Parser()).pipe(Minify(['main', 'x', 'y', 'z', 'texCoord0', 'bakedTc'], false)).pipe(Deparser(false)).on('data', function (chunk) { this.res += chunk }).on('end', function () {
+        this.finalString = "module.exports = " + JSON.stringify(this.res)
+        this.callback(null, this.finalString)
+    });
 }

package.json

@@ -24,6 +24,10 @@
   },
   "homepage": "https://github.com/Makio64/shader-loader",
   "dependencies": {
+    "glsl-deparser": "^1.0.0",
+    "glsl-min-stream": "git+ssh://[email protected]:33669/glsl-min-stream.git#master",
+    "glsl-parser": "^2.0.0",
+    "glsl-tokenizer": "git+ssh://[email protected]:33669/glsl-tokenizer.git#master",
     "loader-utils": "^1.1.0"
   }
 }