Merge branch 'master' of github.com:fserb/glix

Conflicts: TODO
fserb · Aug 28, 2011 · 00082bd · 00082bd
2 parents 02dd07c + 7b1aad2
commit 00082bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/objects.js b/objects.js
@@ -5,4 +5,9 @@ glix.module.objects = function(gl) {
     b.bind();
     return b.assign();
   };
+  gl.remove = function(objectName) {
+    delete gl._objects[objectName];
+    return gl;
+  };
+
 };
diff --git a/shader.js b/shader.js
@@ -1,7 +1,4 @@
 glix.module.shader = function(gl) {
-  // contains all programs currently loaded.
-  var programs = {};
-
   var loadShader = function(type, name) {
     var data;
     if (name[0] == "#") {
@@ -102,9 +99,9 @@ glix.module.shader = function(gl) {
 
   gl.program = function(shaderName) {
     if (shaderName === undefined) shaderName = "";
-    var p = programs[shaderName];
+    var p = gl._objects[shaderName];
     if (!p) {
-      p = programs[shaderName] = {
+      p = gl._objects[shaderName] = {
         _attached: 0,
         val: gl.createProgram(),
         attrib: {},