Merge pull request #1511 from pandamicro/develop

Fixed #3824: EGLView now works well without initialization of director

Author: dingpinglv

HelloHTML5World/main.js

@@ -40,12 +40,13 @@ var cocos2dApp = cc.Application.extend({
             alert("Browser doesn't support WebGL");
             return false;
         }
-        // initialize director
-        var director = cc.Director.getInstance();
 
         cc.EGLView.getInstance().resizeWithBrowserSize(true);
         cc.EGLView.getInstance().setDesignResolutionSize(800, 450, cc.RESOLUTION_POLICY.SHOW_ALL);
 
+	    // initialize director
+	    var director = cc.Director.getInstance();
+
         // turn on display FPS
         director.setDisplayStats(this.config['showFPS']);
 

cocos2d/core/platform/CCEGLView.js

@@ -828,7 +828,10 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
 
 cc.EGLView.getInstance = function () {
     if (!this._instance) {
-        this._instance = new cc.EGLView();
+	    // First init director
+	    cc.Director.getInstance();
+
+        this._instance = this._instance || new cc.EGLView();
         this._instance.initialize();
     }
     return this._instance;