Skip to content

Commit

Permalink
fix: WebGLRenderer.isSupported => WebGLRenderer.isSupport
Browse files Browse the repository at this point in the history
  • Loading branch information
06wj committed Nov 18, 2016
1 parent ef7f355 commit 89c7243
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
25 changes: 13 additions & 12 deletions src/renderer/WebGLRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,18 @@ var WebGLRenderer = Class.create(/** @lends WebGLRenderer.prototype */{
* 是否支持WebGL。只读属性。
* @type {Boolean}
*/
isSupported:null
isSupport:function(){
if(this._isSupported == undefined){
var canvas = document.createElement('canvas');
if(canvas.getContext && (canvas.getContext('webgl')||canvas.getContext('experimental-webgl'))){
this._isSupported = true;
}
else{
this._isSupported = false;
}
}
return this._isSupported;
}
},
renderType:'webgl',
gl:null,
Expand Down Expand Up @@ -584,14 +595,4 @@ Shader.prototype = {
}
return shader;
}
};

WebGLRenderer.isSupported = (function(){
var canvas = document.createElement('canvas');
if(canvas.getContext && (canvas.getContext('webgl')||canvas.getContext('experimental-webgl'))){
return true;
}
else{
return false;
}
})();
};
2 changes: 1 addition & 1 deletion src/view/Stage.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ var Stage = Class.create(/** @lends Stage.prototype */{
this.renderer = new DOMRenderer(props);
break;
case 'webgl':
if(WebGLRenderer.isSupported){
if(WebGLRenderer.isSupport()){
this.renderer = new WebGLRenderer(props);
}
else{
Expand Down
4 changes: 2 additions & 2 deletions test/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ describe('view', function() {
renderType:'webgl'
});

if(Hilo.WebGLRenderer.isSupported){
if(Hilo.WebGLRenderer.isSupport()){
stage.renderer.should.instanceOf(Hilo.WebGLRenderer);
}
else{
Expand All @@ -503,7 +503,7 @@ describe('view', function() {
renderType:'webgl'
});

if(Hilo.WebGLRenderer.isSupported){
if(Hilo.WebGLRenderer.isSupport()){
stage.renderer.should.instanceOf(Hilo.WebGLRenderer);
}
else{
Expand Down

0 comments on commit 89c7243

Please sign in to comment.