Add EMSCRIPTEN_KEEPALIVE to texutre cache

emscripten-ports · Mar 22, 2017 · e751e47 · e751e47
1 parent 904bd91
commit e751e47
Show file tree

Hide file tree

Showing 11 changed files with 124 additions and 9 deletions.
diff --git a/CocosDenshion/emscripten/SimpleAudioEngine.cpp b/CocosDenshion/emscripten/SimpleAudioEngine.cpp
@@ -231,9 +231,11 @@ namespace CocosDenshion
         {
             sound = s_effects[key];
         }
+        // TODO: @caiiiycuk make it works on linux
+
         // This is safe here since Emscripten is just passing back an
         // incrementing integer each time you use the Mix_LoadWAV method.
-        unsigned int result = (unsigned int) sound->chunk;
+        unsigned int result = (size_t) sound->chunk;
 
         // XXX: This is a bit of a hack, but... Choose a channel based on the
         // modulo of the # of channels. This allows us to set the volume

diff --git a/cocos2dx/base_nodes/CCNode.cpp b/cocos2dx/base_nodes/CCNode.cpp
@@ -256,6 +256,11 @@ void Node::setScale(float scale)
     _transformDirty = _inverseDirty = true;
 }
 
+Size Node::getScaleAsSize() const
+{
+        return Size( _scaleX, _scaleY );
+}
+
 /// scaleX getter
 float Node::getScaleX() const
 {

diff --git a/cocos2dx/base_nodes/CCNode.h b/cocos2dx/base_nodes/CCNode.h
@@ -272,6 +272,8 @@ class CC_DLL Node : public Object
      * @return The scale factor of the node.
      */
     virtual float getScale() const;
+
+    virtual Size getScaleAsSize() const;
 
 
     /**

diff --git a/cocos2dx/cocoa/CCGeometry.cpp b/cocos2dx/cocoa/CCGeometry.cpp
@@ -235,6 +235,12 @@ Size Size::operator*(float a) const
     return Size(this->width * a, this->height * a);
 }
 
+Size Size::operator*(Size a) const
+{
+    return Size( this->width * a.width, this->height * a.height );
+}
+
+
 Size Size::operator/(float a) const
 {
 	CCASSERT(a!=0, "CCSize division by 0.");

diff --git a/cocos2dx/cocoa/CCGeometry.h b/cocos2dx/cocoa/CCGeometry.h
@@ -34,6 +34,80 @@ THE SOFTWARE.
 
 NS_CC_BEGIN
 
+const float NEAR_ZERO = 0.0001f;
+
+inline bool floatEquals( float a, float b, float margin )
+{
+        if( fabs( a - b ) < margin )
+        {
+                return true;
+        }
+        return false;
+}
+
+
+inline bool floatEquals( float a, float b )
+{
+        if( fabs( a - b ) < NEAR_ZERO )
+        {
+                return true;
+        }
+        return false;
+}
+
+inline bool isZero( float value, float margin )
+{
+        if( fabs( value ) < margin )
+        {
+                return true;
+        }
+        return false;
+}
+
+inline bool isZero( float value )
+{
+        if( fabs( value ) < NEAR_ZERO )
+        {
+                return true;
+        }
+        return false;
+}
+
+inline int getDirection( int value )
+{
+        if( value < 0 ) return -1;
+        if( value > 0 ) return 1;
+        return 0;
+}
+
+inline int getDirection( float value )
+{
+        if( value < 0 ) return -1;
+        if( value > 0 ) return 1;
+        return 0;
+}
+
+inline int getDirectionOrZero( float value, float margin )
+{
+        if( isZero( value, margin ) )
+                return 0;
+
+        if( value < 0 ) return -1;
+        if( value > 0 ) return 1;
+        return 0;
+}
+
+/** Clamp a value between from and to.
+ @since v0.99.1
+ */
+inline int clampi( int value, int min_inclusive, int max_inclusive)
+{
+    if (min_inclusive > max_inclusive) {
+        CC_SWAP(min_inclusive, max_inclusive, int );
+    }
+    return value < min_inclusive ? min_inclusive : value < max_inclusive? value : max_inclusive;
+}
+
 /** Clamp a value between from and to.
  @since v0.99.1
  */
@@ -45,6 +119,7 @@ inline float clampf(float value, float min_inclusive, float max_inclusive)
     return value < min_inclusive ? min_inclusive : value < max_inclusive? value : max_inclusive;
 }
 
+
 /**
  * @addtogroup data_structures
  * @{
@@ -295,6 +370,7 @@ class CC_DLL Size
     Size operator+(const Size& right) const;
     Size operator-(const Size& right) const;
     Size operator*(float a) const;
+    Size operator*(Size a) const;
     Size operator/(float a) const;
     void setSize(float width, float height);
     bool equals(const Size& target) const;

diff --git a/cocos2dx/label_nodes/CCLabelBMFont.cpp b/cocos2dx/label_nodes/CCLabelBMFont.cpp
@@ -1196,6 +1196,20 @@ void LabelBMFont::setScaleY(float scaleY)
     updateLabel();
 }
 
+void LabelBMFont::setScaleXY(float scaleX, float scaleY)
+{
+        SpriteBatchNode::setScaleX(scaleX);
+        SpriteBatchNode::setScaleY(scaleY);
+        updateLabel( );
+}
+
+void LabelBMFont::modifyScaleXY(float deltaScaleX, float deltaScaleY )
+{
+        SpriteBatchNode::setScaleX( getScaleX( ) * deltaScaleX );
+        SpriteBatchNode::setScaleY( getScaleY( ) * deltaScaleY );
+        updateLabel( );
+}
+
 float LabelBMFont::getLetterPosXLeft( Sprite* sp )
 {
     return sp->getPosition().x * _scaleX - (sp->getContentSize().width * _scaleX * sp->getAnchorPoint().x);

diff --git a/cocos2dx/label_nodes/CCLabelBMFont.h b/cocos2dx/label_nodes/CCLabelBMFont.h
@@ -224,6 +224,8 @@ class CC_DLL LabelBMFont : public SpriteBatchNode, public LabelProtocol, public
     virtual void setScale(float scale);
     virtual void setScaleX(float scaleX);
     virtual void setScaleY(float scaleY);
+    virtual void setScaleXY(float scaleX, float scaleY);
+    virtual void modifyScaleXY(float deltaScaleX, float deltaScaleY );
 
     // RGBAProtocol 
     virtual bool isOpacityModifyRGB() const;

diff --git a/cocos2dx/platform/emscripten/CCTextureCacheEmscripten.cpp b/cocos2dx/platform/emscripten/CCTextureCacheEmscripten.cpp
@@ -214,14 +214,13 @@ var LibraryCocosHelper = {
                     this.ctx.drawImage(args.img, args.i, args.j, rw, rh, args.i, args.j, rw, rh);
 
                     var imgData = this.ctx.getImageData(args.i, args.j, rw, rh);
-                    var inImgData = _malloc(rw * rh * 4);
+                    var inImgData = Module['_malloc'](rw * rh * 4);
                     Module.HEAP8.set(imgData.data, inImgData);
 
                     // Call into C++ code in CCTextureCacheEmscripten.cpp to do the actual
                     // copy and pre-multiply.
-                    _CCTextureCacheEmscripten_preMultiplyImageRegion(inImgData, rw, rh, args.outImgData, args.w, args.h, args.i, args.j);
-
-                    _free(inImgData);
+                    Module['_TextureCacheEmscripten_preMultiplyImageRegion'](inImgData, rw, rh, args.outImgData, args.w, args.h, args.i, args.j);
+                    Module['_free'](inImgData);
                 };
 
                 /**
@@ -254,7 +253,7 @@ var LibraryCocosHelper = {
                         };
                         that.operationQueue.enqueue(setupCanvas, { w: w, h: h });
 
-                        var outImgData = _malloc(w * h * 4);
+                        var outImgData = Module['_malloc'](w * h * 4);
 
                         for(var i = 0; i < w; i += that.regionSize)
                         {
@@ -271,7 +270,7 @@ var LibraryCocosHelper = {
                         }
 
                         var fireCallback = function(args) {
-                            _CCTextureCacheEmscripten_addImageAsyncCallBack(that.cxxTextureCache, args.asyncData, args.imgData, args.w, args.h);
+                            Module['_TextureCacheEmscripten_addImageAsyncCallBack'](that.cxxTextureCache, args.asyncData, args.imgData, args.w, args.h);
                         };
                         var opArgs = {
                             asyncData: asyncData,
@@ -348,8 +347,8 @@ window['cocos2dx'] = LibraryCocosHelper.$cocos2dx;
 extern "C" {
 // This C interface is exposed so that the JavaScript in
 // TextureCacheEmscripten.js is able to call into these functions.
-void TextureCacheEmscripten_addImageAsyncCallBack(TextureCacheEmscripten *tc, TextureCache::AsyncStruct *data, unsigned char *imgData, int width, int height);
-void TextureCacheEmscripten_preMultiplyImageRegion( unsigned char *in, int win, int hin, unsigned char *out, int wout, int hout, int xout, int yout);
+void EMSCRIPTEN_KEEPALIVE TextureCacheEmscripten_addImageAsyncCallBack(TextureCacheEmscripten *tc, TextureCache::AsyncStruct *data, unsigned char *imgData, int width, int height);
+void EMSCRIPTEN_KEEPALIVE TextureCacheEmscripten_preMultiplyImageRegion( unsigned char *in, int win, int hin, unsigned char *out, int wout, int hout, int xout, int yout);
 };
 
 void TextureCacheEmscripten_addImageAsyncCallBack(TextureCacheEmscripten *tc, TextureCache::AsyncStruct *data, unsigned char *imgData, int width, int height)

diff --git a/cocos2dx/sprite_nodes/CCSprite.cpp b/cocos2dx/sprite_nodes/CCSprite.cpp
@@ -826,6 +826,12 @@ void Sprite::setScale(float fScale)
     SET_DIRTY_RECURSIVELY();
 }
 
+void Sprite::setScale(float scaleX, float scaleY )
+{
+        setScaleX( scaleX );
+        setScaleY( scaleY );
+}
+
 void Sprite::setVertexZ(float fVertexZ)
 {
     Node::setVertexZ(fVertexZ);

diff --git a/cocos2dx/sprite_nodes/CCSprite.h b/cocos2dx/sprite_nodes/CCSprite.h
@@ -472,6 +472,7 @@ class CC_DLL Sprite : public NodeRGBA, public TextureProtocol
     virtual void addChild(Node *child, int zOrder, int tag) override;
     virtual void sortAllChildren() override;
     virtual void setScale(float scale) override;
+    virtual void setScale(float scaleX, float scaleY);
     virtual void setVertexZ(float vertexZ) override;
     virtual void setAnchorPoint(const Point& anchor) override;
     virtual void ignoreAnchorPointForPosition(bool value) override;

diff --git a/generate-cmake-lists.py b/generate-cmake-lists.py
@@ -23,6 +23,8 @@
 include_lines = ""
 for include in includes:
 	include = include.replace('/platform/emscripten', '/platform/linux')
+	include = include.replace('/platform/third_party/emscripten', '/platform/third_party/linux')
+	include = include.replace('libtiff/include', 'libtiff')
 	include_lines = include_lines + "\n\t PUBLIC " + include