Merge pull request #4 from cocos2d/develop

sync original repo

Author: zilongshanren

AUTHORS

@@ -678,6 +678,9 @@ Developers:
     seobyeongky
         Updates spine runtime.
 
+    luocker
+        Fix a bug that string itself is also modified in `String::componentsSeparatedByString`.
+        
 Retired Core Developers:
     WenSheng Yang
         Author of windows port, CCTextField,

CHANGELOG

@@ -15,6 +15,7 @@ cocos2d-x-3.0beta0 ?? 2013
      [FIX]          LabelBMFont string can't be shown integrally.
      [FIX]          Deprecates FileUtils::getFileData, adds FileUtils::getStringFromFile/getDataFromFile.
      [FIX]          GUI refactoring: Removes UI prefix, Widget is inherited from Node, uses new containers(Vector<T>, Map<K,V>).
+     [FIX]          String itself is also modified in `String::componentsSeparatedByString`.
 [Android]
      [NEW]          build/android-build.sh: add supporting to generate .apk file
      [FIX]          XMLHttpRequest receives wrong binary array.

cocos/2d/CCDirector.cpp

@@ -1076,6 +1076,8 @@ void DisplayLinkDirector::startAnimation()
     }
 
     _invalid = false;
+
+    Application::getInstance()->setAnimationInterval(_animationInterval);
 }
 
 void DisplayLinkDirector::mainLoop()

cocos/2d/CCShaderCache.cpp

@@ -185,6 +185,11 @@ void ShaderCache::reloadDefaultShaders()
     p->reset();
     loadDefaultShader(p, kShaderType_PositionTextureColor);
 
+    // Position Texture Color without MVP shader
+    p = getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP);
+    p->reset();    
+    loadDefaultShader(p, kShaderType_PositionTextureColor_noMVP);
+
     // Position Texture Color alpha test
     p = getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST);
     p->reset();    

cocos/2d/CCTMXTiledMap.h

@@ -204,7 +204,7 @@ class CC_DLL TMXTiledMap : public Node
     ValueMap _properties;
 
     //! tile properties
-    IntValueMap _tileProperties;
+    ValueMapIntKey _tileProperties;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(TMXTiledMap);

cocos/2d/CCTMXXMLParser.cpp

@@ -536,7 +536,7 @@ void TMXMapInfo::startElement(void *ctx, const char *name, const char **atts)
         }
         else if ( tmxMapInfo->getParentElement() == TMXPropertyTile ) 
         {
-            IntValueMap& dict = tmxMapInfo->getTileProperties().at(tmxMapInfo->getParentGID()).asIntKeyMap();
+            ValueMapIntKey& dict = tmxMapInfo->getTileProperties().at(tmxMapInfo->getParentGID()).asIntKeyMap();
 
             int propertyName = attributeDict["name"].asInt();
             dict[propertyName] = attributeDict["value"];

cocos/2d/CCTMXXMLParser.h

@@ -195,8 +195,8 @@ class CC_DLL TMXMapInfo : public Object, public SAXDelegator
     /* initializes parsing of an XML string, either a tmx (Map) string or tsx (Tileset) string */
     bool parseXMLString(const std::string& xmlString);
 
-    IntValueMap& getTileProperties() { return _tileProperties; };
-    void setTileProperties(const IntValueMap& tileProperties) {
+    ValueMapIntKey& getTileProperties() { return _tileProperties; };
+    void setTileProperties(const ValueMapIntKey& tileProperties) {
         _tileProperties = tileProperties;
     };
 
@@ -311,7 +311,7 @@ class CC_DLL TMXMapInfo : public Object, public SAXDelegator
     //! current string
     std::string _currentString;
     //! tile properties
-    IntValueMap _tileProperties;
+    ValueMapIntKey _tileProperties;
     unsigned int _currentFirstGID;
 };
 

cocos/2d/renderer/CCRenderer.cpp

@@ -65,11 +65,14 @@ Renderer::~Renderer()
         glDeleteVertexArrays(1, &_quadVAO);
         GL::bindVAO(0);
     }
+#if CC_ENABLE_CACHE_TEXTURE_DATA
+    NotificationCenter::getInstance()->removeObserver(this, EVNET_COME_TO_FOREGROUND);
+#endif
 }
 
 void Renderer::initGLView()
 {
-#if 0//CC_ENABLE_CACHE_TEXTURE_DATA
+#if CC_ENABLE_CACHE_TEXTURE_DATA
     // listen the event when app go to background
     NotificationCenter::getInstance()->addObserver(this,
                                                            callfuncO_selector(Renderer::onBackToForeground),

cocos/base/CCMap.h

@@ -26,7 +26,7 @@
 #define __CCMAP_H__
 
 #include "ccMacros.h"
-
+#include "CCObject.h"
 #include <vector>
 #include <unordered_map>
 
@@ -62,20 +62,23 @@ class CC_DLL Map
     Map<K, V>()
     : _data()
     {
+        static_assert(std::is_convertible<V, Object*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the default constructor of Map!");
     }
 
     /** Contructor with capacity */
     explicit Map<K, V>(ssize_t capacity)
     : _data()
     {
+        static_assert(std::is_convertible<V, Object*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the constructor with capacity of Map!");
         _data.reserve(capacity);
     }
 
     /** Copy constructor */
     Map<K, V>(const Map<K, V>& other)
     {
+        static_assert(std::is_convertible<V, Object*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the copy constructor of Map!");
         _data = other._data;
         addRefForAllObjects();
@@ -84,6 +87,7 @@ class CC_DLL Map
     /** Move constructor */
     Map<K, V>(Map<K, V>&& other)
     {
+        static_assert(std::is_convertible<V, Object*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the move constructor of Map!");
         _data = std::move(other._data);
     }

cocos/base/CCString.cpp

@@ -181,20 +181,20 @@ void __String::appendWithFormat(const char* format, ...)
 __Array* __String::componentsSeparatedByString(const char *delimiter)
 {
     __Array* result = __Array::create();
-    
+    std::string strTmp = _string;
     size_t cutAt;
-    while( (cutAt = _string.find_first_of(delimiter)) != _string.npos )
+    while( (cutAt = strTmp.find_first_of(delimiter)) != strTmp.npos )
     {
         if(cutAt > 0)
         {
-            result->addObject(__String::create(_string.substr(0, cutAt)));
+            result->addObject(__String::create(strTmp.substr(0, cutAt)));
         }
-        _string = _string.substr(cutAt + 1);
+        strTmp = strTmp.substr(cutAt + 1);
     }
 
-    if(_string.length() > 0)
+    if(strTmp.length() > 0)
     {
-        result->addObject(__String::create(_string));
+        result->addObject(__String::create(strTmp));
     }
 
     return result;