Put the factory methods on MagicProgram.

halfbyte · May 30, 2011 · 57581b3 · 57581b3
1 parent b578a86
commit 57581b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/examples/500_triangle/app.js b/examples/500_triangle/app.js
@@ -16,7 +16,7 @@ plask.simpleWindow({
 
     this.framerate(30);
 
-    this.mprogram = plask.gl.createMagicProgramFromFiles(
+    this.mprogram = plask.gl.MagicProgram.createFromFiles(
         gl,
         path.join(__dirname, 'app.vshader'),
         path.join(__dirname, 'app.fshader'));

diff --git a/plask.js b/plask.js
@@ -1356,7 +1356,7 @@ function MagicProgram(gl, program) {
   }
 }
 
-function createMagicProgramFromFiles(gl, vfn, ffn) {
+MagicProgram.createFromFiles = function(gl, vfn, ffn) {
   return new MagicProgram(gl, webGLcreateProgramFromShaderSources(
       gl, fs.readFileSync(vfn, 'utf8'), fs.readFileSync(ffn, 'utf8')));
 }
@@ -1376,7 +1376,4 @@ exports.Vec2 = Vec2;
 exports.Vec4 = Vec4;
 exports.Mat4 = Mat4;
 
-exports.gl = {
+exports.gl = {MagicProgram: MagicProgram};
-  MagicProgram: MagicProgram,
-  createMagicProgramFromFiles: createMagicProgramFromFiles
-};