Merge pull request #32 from giannif/master

Use umd build for main in package.json, upgrade xhr package so import works
patriciogonzalezvivo · Jun 14, 2018 · e30f862 · e30f862
2 parents dbfabb1 + cecbd69
commit e30f862
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/dist/GlslCanvas.es.js b/dist/GlslCanvas.es.js
@@ -645,6 +645,8 @@ function subscribeMixin$1(target) {
 }
 
 // Texture management
+// GL texture wrapper object for keeping track of a global set of textures, keyed by a unique user-defined name
+
 var Texture = function () {
     function Texture(gl, name) {
         var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -939,9 +941,6 @@ var Texture = function () {
     return Texture;
 }();
 
-// Report max texture size for a GL context
-
-
 Texture.getMaxTextureSize = function (gl) {
     return gl.getParameter(gl.MAX_TEXTURE_SIZE);
 };

diff --git a/dist/GlslCanvas.js b/dist/GlslCanvas.js
@@ -1050,6 +1050,8 @@ function subscribeMixin$1(target) {
 }
 
 // Texture management
+// GL texture wrapper object for keeping track of a global set of textures, keyed by a unique user-defined name
+
 var Texture = function () {
     function Texture(gl, name) {
         var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -1344,9 +1346,6 @@ var Texture = function () {
     return Texture;
 }();
 
-// Report max texture size for a GL context
-
-
 Texture.getMaxTextureSize = function (gl) {
     return gl.getParameter(gl.MAX_TEXTURE_SIZE);
 };

diff --git a/dist/GlslCanvas.min.js b/dist/GlslCanvas.min.js
diff --git a/dist/GlslCanvas.min.js.map b/dist/GlslCanvas.min.js.map
diff --git a/lib/GlslCanvas.js b/lib/GlslCanvas.js
@@ -1046,6 +1046,8 @@ function subscribeMixin$1(target) {
 }
 
 // Texture management
+// GL texture wrapper object for keeping track of a global set of textures, keyed by a unique user-defined name
+
 var Texture = function () {
     function Texture(gl, name) {
         var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -1340,9 +1342,6 @@ var Texture = function () {
     return Texture;
 }();
 
-// Report max texture size for a GL context
-
-
 Texture.getMaxTextureSize = function (gl) {
     return gl.getParameter(gl.MAX_TEXTURE_SIZE);
 };

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "glslCanvas",
     "version": "0.1.3",
     "description": "Simple GLSL Fragment Shader Sandbox",
-    "main": "lib/GlslCanvas.js",
+    "main": "dist/GlslCanvas.js",
     "module": "dist/GlslCanvas.es.js",
     "jsnext:main": "dist/GlslCanvas.es.js",
     "scripts": {
@@ -46,7 +46,7 @@
         "uglify-es": "^3.1.6"
     },
     "dependencies": {
-        "xhr": "^2.4.0"
+        "xhr": "^2.5.0"
     },
     "browserify-shim": {}
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2038,9 +2038,9 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-xhr@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
+xhr@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd"
   dependencies:
     global "~4.3.0"
     is-function "^1.0.1"