diff --git a/package.json b/package.json index 3620ee6..431f6ca 100644 --- a/package.json +++ b/package.json @@ -32,15 +32,16 @@ "dependencies": { "async": "^1.5.0", "bit-twiddle": "^1.0.2", - "browserify-versionify": "^1.0.6", "earcut": "^2.0.7", "eventemitter3": "^1.1.1", + "ismobilejs": "git+https://github.com/kaimallea/isMobile.git", "object-assign": "^4.0.1", "pixi-gl-core": "git+https://github.com/GoodBoyDigital/pixi-gl-core.git", "resource-loader": "^1.6.4" }, "devDependencies": { "browserify": "^11.1.0", + "browserify-versionify": "^1.0.6", "chai": "^3.2.0", "del": "^2.0.2", "glslify": "^5.0.2", diff --git a/package.json b/package.json index 3620ee6..431f6ca 100644 --- a/package.json +++ b/package.json @@ -32,15 +32,16 @@ "dependencies": { "async": "^1.5.0", "bit-twiddle": "^1.0.2", - "browserify-versionify": "^1.0.6", "earcut": "^2.0.7", "eventemitter3": "^1.1.1", + "ismobilejs": "git+https://github.com/kaimallea/isMobile.git", "object-assign": "^4.0.1", "pixi-gl-core": "git+https://github.com/GoodBoyDigital/pixi-gl-core.git", "resource-loader": "^1.6.4" }, "devDependencies": { "browserify": "^11.1.0", + "browserify-versionify": "^1.0.6", "chai": "^3.2.0", "del": "^2.0.2", "glslify": "^5.0.2", diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 8e298c9..8f205e1 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -32,7 +32,7 @@ for (var i = 0; i < maxTextures; i++) { if(i > 0)src += '\nelse '; - if(i < maxTextures-1)src += 'if(ndx == ' + i + ')'; + if(i < maxTextures-1)src += 'if(ndx == ' + i + '.0)'; src += '\n{'; src += '\n\tcolor = texture2D(uSamplers['+i+'], vTextureCoord);'; src += '\n}'; @@ -54,7 +54,7 @@ 'void main(void){', 'vec4 color;', - 'int ndx = int(vTextureId);', + 'float ndx = vTextureId;', '%forloop%', 'gl_FragColor = color * vColor;', '}' diff --git a/package.json b/package.json index 3620ee6..431f6ca 100644 --- a/package.json +++ b/package.json @@ -32,15 +32,16 @@ "dependencies": { "async": "^1.5.0", "bit-twiddle": "^1.0.2", - "browserify-versionify": "^1.0.6", "earcut": "^2.0.7", "eventemitter3": "^1.1.1", + "ismobilejs": "git+https://github.com/kaimallea/isMobile.git", "object-assign": "^4.0.1", "pixi-gl-core": "git+https://github.com/GoodBoyDigital/pixi-gl-core.git", "resource-loader": "^1.6.4" }, "devDependencies": { "browserify": "^11.1.0", + "browserify-versionify": "^1.0.6", "chai": "^3.2.0", "del": "^2.0.2", "glslify": "^5.0.2", diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 8e298c9..8f205e1 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -32,7 +32,7 @@ for (var i = 0; i < maxTextures; i++) { if(i > 0)src += '\nelse '; - if(i < maxTextures-1)src += 'if(ndx == ' + i + ')'; + if(i < maxTextures-1)src += 'if(ndx == ' + i + '.0)'; src += '\n{'; src += '\n\tcolor = texture2D(uSamplers['+i+'], vTextureCoord);'; src += '\n}'; @@ -54,7 +54,7 @@ 'void main(void){', 'vec4 color;', - 'int ndx = int(vTextureId);', + 'float ndx = vTextureId;', '%forloop%', 'gl_FragColor = color * vColor;', '}' diff --git a/src/core/utils/maxRecommendedTextures.js b/src/core/utils/maxRecommendedTextures.js new file mode 100644 index 0000000..f3e1d5c --- /dev/null +++ b/src/core/utils/maxRecommendedTextures.js @@ -0,0 +1,20 @@ + + +var Device = require('ismobilejs'); + +var maxRecommendedTextures = function(max) +{ + + if(Device.tablet || Device.phone) + { + // check if the res is iphone 6 or higher.. + return 2; + } + else + { + // desktop should be ok + return max; + } +} + +module.exports = maxRecommendedTextures; \ No newline at end of file