Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get async image loading building with -O2 and asm.js

This commit is contained in:
James Gregory 2013-06-17 17:10:41 -07:00
parent 872be8e964
commit 5095b03f9c
4 changed files with 261 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos2dx/platform/emscripten/CCEGLView.cpp
View File

@ -139,9 +139,6 @@ CCEGLView::CCEGLView()
glutMouseFunc(&mouseCB); glutMouseFunc(&mouseCB);
glutMotionFunc(&motionCB); glutMotionFunc(&motionCB);
glutPassiveMotionFunc(&motionCB); glutPassiveMotionFunc(&motionCB);
// Setup a JS namespace for all cocos2dx helper functions.
emscripten_run_script("Module.cocos2dx = { classes: {}, objects: {} };");
} }
CCEGLView::~CCEGLView() CCEGLView::~CCEGLView()

6
cocos2dx/platform/emscripten/CCTextureCacheEmscripten.cpp
View File

@ -59,11 +59,6 @@ void CCTextureCacheEmscripten_addImageAsyncCallBack(CCTextureCacheEmscripten *tc
*/ */
CCTextureCacheEmscripten::CCTextureCacheEmscripten() CCTextureCacheEmscripten::CCTextureCacheEmscripten()
{ {
const char *js =
# include "CCTextureCacheEmscripten.js"
;
emscripten_run_script(js);
// Add dummy references to these functions so that the compiler will emit // Add dummy references to these functions so that the compiler will emit
// code for them prior to this point (which is before when we will call // code for them prior to this point (which is before when we will call
// them. // them.
@ -84,7 +79,6 @@ CCTextureCacheEmscripten::CCTextureCacheEmscripten()
CCTextureCacheEmscripten::~CCTextureCacheEmscripten() CCTextureCacheEmscripten::~CCTextureCacheEmscripten()
{ {
cocos2dx_shutdownAsyncImageLoader(); cocos2dx_shutdownAsyncImageLoader();
emscripten_run_script("Module.cocos2dx.AsyncImageLoader = null;");
} }
/** /**

101
cocos2dx/platform/emscripten/CCTextureCacheEmscripten.js
View File

@ -22,26 +22,43 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
MULTILINE(
// Class declarations.
// Non-namespaced facade over underlying objects. See above methods for
// documentation. These methods serve two purposes:
//
// 1. convert types to/from JS equivalents.
// 2. expose a "C-like" interface, such that the symbols are easy to find
// for calling code (Emscripten provides no easy way to access nested
// dictionaries).
//
// Note that the leading '_' is because Emscripten prefixes all function
// calls like this. Since this code is being injected at runtime,
// Emscripten's compiler doesn't have a chance to add it for us.
var LibraryCocosHelper = {
$cocos2dx__deps: [ '_CCTextureCacheEmscripten_preMultiplyImageRegion' ],
$cocos2dx: {
objects: {},
classes: {
// AsyncOperationQueue -- simple worker queue. Note that all functions // AsyncOperationQueue -- simple worker queue. Note that all functions
// passed in should effectively be "static", and have all requisite // passed in should effectively be "static", and have all requisite
// information contained in their args object. // information contained in their args object.
Module.cocos2dx.classes.AsyncOperationQueue = function() AsyncOperationQueue: function()
{ {
this.ops = []; this.ops = [];
this.timeoutId = null; this.timeoutId = null;
// Target using 2/3 of available CPU for texture loading.
this.sliceBudget = 8; this.sliceBudget = 8;
this.sliceInterval = 2 * this.sliceBudget; this.sliceInterval = 4;
};
/** /**
* If there is a valid scheduled queue consumer, cancel it. Won't cancel * If there is a valid scheduled queue consumer, cancel it. Won't cancel
* currently executing operations (as this is not multi-threaded), but will * currently executing operations (as this is not multi-threaded), but will
* prevent future execution from happening until it is re-scheduled. * prevent future execution from happening until it is re-scheduled.
*/ */
Module.cocos2dx.classes.AsyncOperationQueue.prototype.unschedule = function(interval) this.unschedule = function(interval)
{ {
if(typeof this.timeoutId == "number") if(typeof this.timeoutId == "number")
{ {
@ -53,7 +70,7 @@ MULTILINE(
/** /**
* Schedule the queue-processor to run @interval ms in the future. * Schedule the queue-processor to run @interval ms in the future.
*/ */
Module.cocos2dx.classes.AsyncOperationQueue.prototype.schedule = function(interval) this.schedule = function(interval)
{ {
this.unschedule(); this.unschedule();
@ -71,7 +88,7 @@ MULTILINE(
* are guaranteed to be run in the order in which they are enqueued, but no * are guaranteed to be run in the order in which they are enqueued, but no
* guarantee is given about when or in what context they will be executed. * guarantee is given about when or in what context they will be executed.
*/ */
Module.cocos2dx.classes.AsyncOperationQueue.prototype.enqueue = function(fn, args) this.enqueue = function(fn, args)
{ {
var op = { var op = {
fn: fn, fn: fn,
@ -91,7 +108,7 @@ MULTILINE(
* schedule it to run at some point after the next frame has been * schedule it to run at some point after the next frame has been
* requested, whilst still maintaining maximum bandwidth. * requested, whilst still maintaining maximum bandwidth.
*/ */
Module.cocos2dx.classes.AsyncOperationQueue.prototype.run = function() this.run = function()
{ {
if(this.ops.length === 0) if(this.ops.length === 0)
{ {
@ -116,24 +133,21 @@ MULTILINE(
/** /**
* Unschedule any remaining operations in the queue. * Unschedule any remaining operations in the queue.
*/ */
Module.cocos2dx.classes.AsyncOperationQueue.prototype.shutdown = function() this.shutdown = function()
{ {
this.unschedule(); this.unschedule();
this.ops = []; this.ops = [];
}; };
},
// AsyncImageLoader
/** /**
* Construct a new AsyncImageLoader object. @cxxTextureCache should be a * Construct a new AsyncImageLoader object. @cxxTextureCache should be a
* pointer to a valid CCTextureCacheEmscripten object in C++. * pointer to a valid CCTextureCacheEmscripten object in C++.
* @deps__ignored is ignored, but is accepted so that we can communicate to
* the compiler what functions we need to ensure are ready by the time this
* class gets instantiated.
*/ */
Module.cocos2dx.classes.AsyncImageLoader = function(cxxTextureCache) AsyncImageLoader: function(cxxTextureCache)
{ {
this.cxxTextureCache = cxxTextureCache; this.cxxTextureCache = cxxTextureCache;
this.operationQueue = new Module.cocos2dx.classes.AsyncOperationQueue(); this.operationQueue = new cocos2dx.classes.AsyncOperationQueue();
// Since there will only ever be one image being processed at a time, // Since there will only ever be one image being processed at a time,
// we pre-initialize a canvas object and use it for all operations so // we pre-initialize a canvas object and use it for all operations so
@ -143,14 +157,12 @@ MULTILINE(
this.ctx = this.canvas.getContext('2d'); this.ctx = this.canvas.getContext('2d');
this.regionSize = 128; this.regionSize = 128;
};
/** /**
* "Private" and "static" method to copy an input image to a given * "Private" and "static" method to copy an input image to a given
* rectangle in the output image. Used by @loadImage. * rectangle in the output image. Used by @loadImage.
*/ */
Module.cocos2dx.classes.AsyncImageLoader.prototype._blitAndPremultipyRegion = function(args) this._blitAndPremultipyRegion = function(args)
{ {
// Calculate width and height for this region such that we // Calculate width and height for this region such that we
// do not run off the edge of the image. // do not run off the edge of the image.
@ -178,7 +190,7 @@ MULTILINE(
* spread out over several frames such that disruptions to frame rate are * spread out over several frames such that disruptions to frame rate are
* minimized. * minimized.
*/ */
Module.cocos2dx.classes.AsyncImageLoader.prototype.loadImage = function(path, asyncData) this.loadImage = function(path, asyncData)
{ {
var img = new Image(); var img = new Image();
var that = this; var that = this;
@ -238,45 +250,40 @@ MULTILINE(
/** /**
* Shutdown this image loader object. Used by destructor in cocos2dx. * Shutdown this image loader object. Used by destructor in cocos2dx.
*/ */
Module.cocos2dx.classes.AsyncImageLoader.prototype.shutdown = function() this.shutdown = function()
{ {
this.operationQueue.shutdown(); this.operationQueue.shutdown();
}; };
}
// Non-namespaced facade over underlying objects. See above methods for }
// documentation. These methods serve two purposes: },
//
// 1. convert types to/from JS equivalents.
// 2. expose a "C-like" interface, such that the symbols are easy to find
// for calling code (Emscripten provides no easy way to access nested
// dictionaries).
//
// Note that the leading '_' is because Emscripten prefixes all function
// calls like this. Since this code is being injected at runtime,
// Emscripten's compiler doesn't have a chance to add it for us.
/* /*
* Construct a new AsyncImageLoader object. Held as a singleton, referred * Construct a new AsyncImageLoader object. Held as a singleton, referred
* to in other wrapper methods here. * to in other wrapper methods here.
* @deps__ignored is ignored, but is accepted so that we can communicate to
* the compiler what functions we need to ensure are ready by the time this
* class gets instantiated.
*/ */
_cocos2dx_newAsyncImageLoader = function(cxxTextureCache, deps__ignored) cocos2dx_newAsyncImageLoader: function(cxxTextureCache, deps__ignored)
{ {
Module.cocos2dx.objects.asyncImageLoader = new Module.cocos2dx.classes.AsyncImageLoader(cxxTextureCache); cocos2dx.objects.asyncImageLoader = new cocos2dx.classes.AsyncImageLoader(cxxTextureCache);
}; },
/** /**
* Shutdown the current image loader object. Used by the cocos2dx * Shutdown the current image loader object. Used by the cocos2dx
* destructor method. * destructor method.
*/ */
_cocos2dx_shutdownAsyncImageLoader = function() cocos2dx_shutdownAsyncImageLoader: function()
{ {
Module.cocos2dx.objects.asyncImageLoader.shutdown(); cocos2dx.objects.asyncImageLoader.shutdown();
Module.cocos2dx.objects.asyncImageLoader = null; cocos2dx.objects.asyncImageLoader = null;
}; },
/** /**
* Load a new image asynchronously. * Load a new image asynchronously.
*/ */
_cocos2dx_asyncImageLoader_LoadImage = function(path, asyncData) cocos2dx_asyncImageLoader_LoadImage: function(path, asyncData)
{ {
var opArgs = { var opArgs = {
path: Pointer_stringify(path), path: Pointer_stringify(path),
@ -284,8 +291,12 @@ MULTILINE(
}; };
var op = function(args) var op = function(args)
{ {
Module.cocos2dx.objects.asyncImageLoader.loadImage(args.path, args.data); cocos2dx.objects.asyncImageLoader.loadImage(args.path, args.data);
}; };
Module.cocos2dx.objects.asyncImageLoader.operationQueue.enqueue(op, opArgs); cocos2dx.objects.asyncImageLoader.operationQueue.enqueue(op, opArgs);
}; }
) };
autoAddDeps(LibraryCocosHelper, '$cocos2dx');
mergeInto(LibraryManager.library, LibraryCocosHelper);

21
cocos2dx/proj.emscripten/cocos2dx.mk
View File

@ -13,12 +13,21 @@ OBJ_DIR ?= obj
EMSCRIPTEN_ROOT := $(realpath $(COCOS_ROOT)/external/emscripten) EMSCRIPTEN_ROOT := $(realpath $(COCOS_ROOT)/external/emscripten)
PACKAGER := $(EMSCRIPTEN_ROOT)/tools/file_packager.py PACKAGER := $(EMSCRIPTEN_ROOT)/tools/file_packager.py
AR := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/emar
ARFLAGS = cr
CC := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/emcc CC := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/emcc
CXX := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/em++ CXX := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/em++
AR := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/emar
CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1 -U__native_client__ # XXX: Not entirely sure why main, malloc and free need to be explicitly listed
CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1 -U__native_client__ # here, but after adding a --js-library library, these symbols seem to get
ARFLAGS = cr # stripped unless enumerated here.
EXPORTED_FLAGS := -s EXPORTED_FUNCTIONS="['_CCTextureCacheEmscripten_addImageAsyncCallBack','_CCTextureCacheEmscripten_preMultiplyImageRegion','_malloc','_free','_main']"
JSLIBS := --js-library $(COCOS_SRC)/platform/emscripten/CCTextureCacheEmscripten.js
CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1 -U__native_client__ $(EXPORTED_FLAGS) $(JSLIBS)
CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1 -U__native_client__ $(EXPORTED_FLAGS) $(JSLIBS)
LIB_DIR = $(COCOS_SRC)/lib/emscripten LIB_DIR = $(COCOS_SRC)/lib/emscripten
BIN_DIR = bin BIN_DIR = bin
@ -51,8 +60,8 @@ else
# Async image loading code incompatible with asm.js for now. Disable until # Async image loading code incompatible with asm.js for now. Disable until
# we've had time to investigate. --closure 0 so that symbols don't get mangled, # we've had time to investigate. --closure 0 so that symbols don't get mangled,
# rendering them inaccessible from JS code. # rendering them inaccessible from JS code.
CCFLAGS += -O2 --jcache -s GL_UNSAFE_OPTS=0 -s ASM_JS=0 --closure 0 CCFLAGS += -O2 --jcache -s GL_UNSAFE_OPTS=0 -s ASM_JS=1
CXXFLAGS += -O2 --jcache -s GL_UNSAFE_OPTS=0 -s ASM_JS=0 --closure 0 CXXFLAGS += -O2 --jcache -s GL_UNSAFE_OPTS=0 -s ASM_JS=1
DEFINES += -DNDEBUG -DCP_USE_DOUBLES=0 DEFINES += -DNDEBUG -DCP_USE_DOUBLES=0
OBJ_DIR := $(OBJ_DIR)/release OBJ_DIR := $(OBJ_DIR)/release
LIB_DIR := $(LIB_DIR)/release LIB_DIR := $(LIB_DIR)/release