-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
105 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,16 @@ | ||
let transform = require('./transform'); | ||
let path = require('path'); | ||
let glslify = require('glslify'); | ||
|
||
module.exports = function (b, opts) { | ||
if (typeof b === 'string') { | ||
throw new Error('glslify-require appears to have been configured as a transform; it must be configured as a plugin.'); | ||
} | ||
|
||
b.transform(transform, { | ||
b: b | ||
let Glslyfier = require('./lib/glslyfier')(glslify); | ||
let glslyfier = new Glslyfier(opts); | ||
|
||
glslyfier.emitter.on('file', function(file) { | ||
b.emit('file', file); | ||
}); | ||
|
||
b.transform(glslyfier.transform.bind(glslyfier)); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
let through = require('through2'); | ||
let glslifyDeps = require('glslify-deps'); | ||
let path = require('path'); | ||
|
||
module.exports = function(glslify) { | ||
let Glslyfier = function() { | ||
this.emitter = require('event-emitter')(); | ||
}; | ||
|
||
Glslyfier.prototype.transform = function(file) { | ||
if (path.extname(file) == '.glsl') { | ||
let emitter = this.emitter; | ||
let src = null; | ||
|
||
let transform = function (chunk, enc, cb) { | ||
src = glslify.compile(chunk, { | ||
basedir: path.dirname(file) | ||
}); | ||
|
||
cb(); | ||
}; | ||
|
||
let flush = function (cb) { | ||
let self = this; | ||
let depper = glslifyDeps(); | ||
|
||
depper.add(file, function(err, deps) { | ||
deps.forEach(function(dep) { | ||
if (!dep.entry) { | ||
emitter.emit('file', dep.file); | ||
} | ||
}); | ||
|
||
self.push('module.exports = ' + JSON.stringify(src) + ';'); | ||
|
||
cb(); | ||
}); | ||
}; | ||
|
||
return through(transform, flush); | ||
} | ||
|
||
return through(); | ||
}; | ||
|
||
return Glslyfier; | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,7 @@ | ||
struct Foo { | ||
vec3 bar; | ||
}; | ||
#pragma glslify: bar = require(./sub/bar) | ||
|
||
struct Foo2 { | ||
vec3 bar; | ||
}; | ||
float foo() { | ||
return bar; | ||
} | ||
|
||
#pragma glslify: export(Foo) | ||
#pragma glslify: export(foo) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#pragma glslify: foo = require(./foo) | ||
|
||
void main() { | ||
bar = foo; | ||
foobar = foo(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
void secondary() { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
float v = 5; | ||
|
||
#pragma glslify: export(v) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
module.exports = { | ||
main: require('../fixtures/main.glsl'), | ||
secondary: require('../fixtures/secondary.glsl') | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,40 @@ | ||
const fs = require('fs'); | ||
const tap = require('tap'); | ||
const path = require('path'); | ||
const transformTools = require('browserify-transform-tools'); | ||
|
||
const transform = require('../src/transform'); | ||
const glslify = require('glslify'); | ||
const through = require('through2'); | ||
|
||
tap.test('transform', function (test) { | ||
test.plan(1); | ||
|
||
let Glslyfier = require('../src/lib/glslyfier')(glslify); | ||
let glslyfier = new Glslyfier(); | ||
|
||
let transform = glslyfier.transform.bind(glslyfier); | ||
|
||
test.test('should return a valid source', function (t) { | ||
let file = path.resolve('test/fixtures/main.glsl'); | ||
let data = null; | ||
|
||
fs.createReadStream(file) | ||
.pipe(transform(file)) | ||
.pipe(through(function(chunk, enc, cb) { | ||
data = chunk.toString(); | ||
|
||
transformTools.runTransform(transform, file, {}, | ||
function (err, transformed) { | ||
if (err) { | ||
cb(); | ||
})) | ||
.on('finish', function () { | ||
fs.readFile(path.resolve('test/transform/wanted.js'), function(err, readData) { | ||
t.same(data, readData.toString()); | ||
|
||
t.end(); | ||
}); | ||
}) | ||
.on('error', function (err) { | ||
t.fail(err); | ||
} | ||
else { | ||
let wanted = fs.readFileSync(path.resolve('test/transform/wanted.js')); | ||
|
||
t.same(transformed, wanted.toString()); | ||
t.end(); | ||
} | ||
|
||
t.end(); | ||
} | ||
); | ||
); | ||
}); | ||
}); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.