Merge branch 'v3' into downloader_decouple

dabingnn · Aug 12, 2015 · 2ea66af · 2ea66af
2 parents 8cdb0b6 + bc964e8
commit 2ea66af
Show file tree

Hide file tree

Showing 52 changed files with 994 additions and 628 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -741,6 +741,7 @@ Developers:
 
     dmurtagh
         Fixed a bug that UserDefault::getDoubleForKey() doesn't pass default value to Java.
+        Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
 
     seobyeongky
         Updates spine runtime.

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,32 +1,43 @@
 cocos2d-x-3.8 ??
     [NEW]           ui: Enhance ScrollView with easing out scrolling
+    [NEW]           Animate: Added Animate's getCurrentFrameIndex function
 
     [FIX]           renderer: UI component can't click correctly by moving UI and camera far away of origin.
     [FIX]           JS: Fixed issue of iOS/JS reflection `callStaticMethod` with bool arg
 
-cocos2d-x-3.7.1    ??
+cocos2d-x-3.7.1    August.12 2015
     [HIGHLIGHT]     studio: Added new skeleton animation support and csb parser for cocos v2.3.2 beta
     [HIGHLIGHT]     studio: Added new skeleton animation support and JSON parser in the web engine
     [HIGHLIGHT]     studio: Added Skybox csb/JSON parser for cocos v2.3.2 beta
 
     [NEW]           Node: Added getNodeToParentTransform with selected ancestor
     [NEW]           studio: Parsed Touch/Click/Event callback in JSON parser
     [NEW]           web: Added cc.director.setClearColor and support transparent background
-    [NEW]           web: Added Animate's getCurrentFrameIndex function
 
+    [REFINE]        Widget: Synchronize enable state and bright state for Widget
     [REFINE]        studio: Optimized JSON parser's performance by removing audio play
     [REFINE]        studio: Optimized editor related extension data to a component instead of hosting in _userObject
     [REFINE]        studio: Updated Game3DNodeReader & UserCameraReader
+    [REFINE]        Label: Remove file error notice label from TextBMFontReader
+    [REFINE]        JSB: Add firefox remote debugger support in JS templates
     [REFINE]        web: Improved color/opacity manipulations in MenuItems
 
     [FIX]           Scene: Fixed Scene can't be inherited with std::vector members
+    [FIX]           Sprite: Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
     [FIX]           Label: Fixed creation fail if the font(TTF) contains a non-unicode charmap
+    [FIX]           Label: Fixed LabelAtlas rendering error for invalid characters and characters out of boundaries
+    [FIX]           Label: Fixed Mac system font crash issue
     [FIX]           platform: Fixed building with system prebuilt libs on Linux
     [FIX]           studio: Fixed ccs.Skin construction issue in JSON parser
+    [FIX]           studio: Fixed Particle3d crash while reading file with error
+    [FIX]           studio: Fixed parser crash when sprite 3d resource isn't correct
+    [FIX]           UI: Fixed CheckBox issue that _isSelected state is updated after event processing callbacks
+    [FIX]           JSB: Fixed JSON parser issue that 3d particle can not be displayed
     [FIX]           web: Fixed an issue that loading process won't trigger callback problem
     [FIX]           web: Fixed a bug where not resetting cc.Audio._ignoreEnded when replaying a sound caused it to stay in a "playing" state
     [FIX]           web: cc.ScrollView and cc.TableView: added check for parent visibility in onTouchBegan method
     [FIX]           web: Fixed TurnPageDown effect
+    [FIX]           web: Fixed Cocos Studio parser issue that all elements are missing while the timeline action contains rotation
 
 cocos2d-x-3.7final July.21 2015
     [REFINE]        JS: Improve manual binding code for `retain`, `release`, `onEnter`, `onExit`, `onEnterTransitionDidFinish` and `onExitTransitionDidStart`

diff --git a/cocos/3d/CCRay.cpp b/cocos/3d/CCRay.cpp
@@ -29,6 +29,11 @@ Ray::Ray()
 {
 }
 
+Ray::Ray(const Ray& ray)
+{
+    set(ray._origin, ray._direction);
+}
+
 Ray::Ray(const Vec3& origin, const Vec3& direction)
 {
     set(origin, direction);

diff --git a/cocos/3d/CCTerrain.cpp b/cocos/3d/CCTerrain.cpp
@@ -541,8 +541,12 @@ cocos2d::Vec3 Terrain::getIntersectionPoint(const Ray & ray) const
     }
 }
 
-bool Terrain::getIntersectionPoint(const Ray & ray, Vec3 & intersectionPoint) const
+bool Terrain::getIntersectionPoint(const Ray & ray_, Vec3 & intersectionPoint) const
 {
+	// convert ray from world space to local space
+    Ray ray(ray_);
+    getWorldToNodeTransform().transformPoint(&(ray._origin));
+
     std::set<Chunk *> closeList;
     Vec2 start = Vec2(ray._origin.x,ray._origin.z);
     Vec2 dir = Vec2(ray._direction.x,ray._direction.z);

diff --git a/cocos/audio/apple/AudioEngine-inl.h b/cocos/audio/apple/AudioEngine-inl.h
@@ -35,7 +35,9 @@
 #include "AudioPlayer.h"
 
 NS_CC_BEGIN
-    namespace experimental{
+class Scheduler;
+
+namespace experimental{
 #define MAX_AUDIOINSTANCES 24
 
 class AudioEngineImpl : public cocos2d::Ref
@@ -50,7 +52,7 @@ class AudioEngineImpl : public cocos2d::Ref
     void setLoop(int audioID, bool loop);
     bool pause(int audioID);
     bool resume(int audioID);
-    bool stop(int audioID);
+    void stop(int audioID);
     void stopAll();
     float getDuration(int audioID);
     float getCurrentTime(int audioID);
@@ -74,17 +76,13 @@ class AudioEngineImpl : public cocos2d::Ref
     std::unordered_map<std::string, AudioCache> _audioCaches;
 
     //audioID,AudioInfo
-    std::unordered_map<int, AudioPlayer>  _audioPlayers;
-
+    std::unordered_map<int, AudioPlayer*>  _audioPlayers;
     std::mutex _threadMutex;
 
-    std::vector<AudioCache*> _toRemoveCaches;
-    std::vector<int> _toRemoveAudioIDs;
-
     bool _lazyInitLoop;
 
     int _currentAudioID;
-
+    Scheduler* _scheduler;
 };
 }
 NS_CC_END