Commit Graph

429 Commits

Author SHA1 Message Date
James Chen 757425c54b issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
cai wenzhi 683d3c9f14 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
Ricardo Quesada cdc19eea1c Nodes: setAdditionalTransform() receives a pointer
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
2014-03-01 08:26:54 -08:00
Ricardo Quesada d78304599d Cache working OK.
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
Ricardo Quesada 6920bec6ef transform object returns the MV
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
Ricardo Quesada ff79c0d9ad Merge branch 'develop' into visit_draw_improved 2014-02-28 10:59:07 -08:00
James Chen ec4a4466b4 Merge pull request #5461 from Wilhansen/spine_skelFix
closed #4156: spine::Skeleton would not be updated after re-adding to scene.
2014-02-28 16:34:35 +08:00
Ricardo Quesada eb66ddd931 visit and draw improved.
`visit()` and `draw()` are improved.
they both receive:
 - `Renderer`
 - `kmMat4` for transformation
 - `bool` whether or not the transform changed from the previous frame

Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).

Those parameters are needed for:
 - `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
 - we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
 - whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.

We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
2014-02-27 21:43:54 -08:00
Ricardo Quesada 8ebf00fec1 SpineDrawing fixes 2014-02-27 19:40:21 -08:00
Wilhansen Li a1b7beb400 Fix spine::Skeleton not updating on re-entry.
Could be done in a tighter manner by scheduling updates in
spine::SkeletonAnimation instead and listening for animation events.
However, this may need a more robust interface on scheduleUpdate and
unscheduleUpdate to work correctly.
2014-02-25 15:36:57 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
Ricardo Quesada fe1160cd8c changes in API to support 3D 2014-02-22 19:16:42 -08:00
James Chen 0d8846d876 closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
James Chen 4cf4e15ba6 issue #4058: Adds CCStdC.h. 2014-02-20 15:12:35 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
andyque 143f5975a6 fix cross-platform comiple error
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
2014-02-18 14:22:15 +08:00
andyque 68b1c9f2c1 change CCTweenFunction class to tweenfunc namespace 2014-02-18 14:22:13 +08:00
andyque 838c71b135 refactor EaseIn with CCTweenFunction 2014-02-18 14:22:13 +08:00
andyque ab11147eeb rename namespace of CCTweenFunction to cocos2d and fix some compile errors 2014-02-18 14:22:13 +08:00
andyque f16b0022a3 move CCActionEaseEx content to CCActionEase 2014-02-18 14:22:13 +08:00
andyque 895b2a0055 move CCActionEaseEx and CCTweenFunction to core engine 2014-02-18 14:22:12 +08:00
James Chen f67f324378 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289
Conflicts:
	cocos/2d/platform/win32/CCImage.cpp
2014-02-17 22:10:45 +08:00
Denis deb4666e27 -fixed formating and small optimizations 2014-02-13 11:39:53 +03:00
CaiWenzhi c1cfa1cce2 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-02-07 11:26:46 +08:00
Maks 72ede55ac7 fix string size check and assert condition
1. std::string::size() return size_t (is never < 0)
2. "event must be larger than 0" and 'event' has unsigned int type
2014-02-03 22:12:03 +02:00
James Chen c6e7093270 closed #3833: SceneTest of CocoStudio crashes 2014-01-24 11:50:58 +08:00
andyque 43ff0c42cf fix a potential bug of CCSkin. It will cause the display of CCSkin wrongly. 2014-01-24 11:05:34 +08:00
minggo 4381685a9d deprecated some functions in Object 2014-01-22 13:47:29 +08:00
CaiWenzhi 88ef4e1cc5 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-22 11:58:59 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
CaiWenzhi a3f9a636e2 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-20 11:54:11 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority...
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
Ricardo Quesada 8931d968c0 Renderer uses a float as a key
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
 - No need to convert the 32-bit float into 24-bit int
 - keys are shorter
2014-01-17 16:08:29 -08:00
CaiWenzhi 58ed383c01 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-17 14:12:19 +08:00
Ricardo Quesada 1b5b9da102 compiles on Android
compiles on Android
2014-01-16 21:58:14 -08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CaiWenzhi 602133a071 Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs 2014-01-17 11:25:38 +08:00
andyque 4a6e137389 fixed #3683. fixed convertToWorldSpaceAR of CCSkin returning error coordinate 2014-01-16 15:00:35 +08:00
CaiWenzhi fdf5a4c0b5 Fixed bug of reader. 2014-01-15 20:06:49 +08:00
CaiWenzhi fdfa84ce20 Fixed bugs. 2014-01-14 14:37:31 +08:00
CaiWenzhi 4e2d6143af Fixed bug of reader 2014-01-10 17:02:16 +08:00
James Chen 1d852788e2 [Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw. 2014-01-07 21:40:06 +08:00
James Chen 9387e516be [JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer. 2014-01-07 21:19:51 +08:00
James Chen c7639319ee Fix Armature::init() crashes 2014-01-07 20:53:44 +08:00
James Chen e90f35daa6 Merge pull request #4975 from chengstory/fix_UIAction_play_error
fixed UIAction play error.
2014-01-07 03:17:41 -08:00
zhangcheng bf8187fee2 fixed UIAction play error. 2014-01-07 19:04:18 +08:00
James Chen 26efb4bf5c long —> ssize_t for some classes. 2014-01-07 18:26:31 +08:00
edwardzhou e1c21aa9cb rename UIHelper to Helper for consistency 2014-01-07 16:22:18 +08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
chengstory e44d28ea7b replace CC_SAFE_RELEASE to CC_SAFE_RELEASE_NULL 2014-01-06 13:27:19 +08:00
chengstory 76f96d0b41 fixed ActionNode memoryleak. 2014-01-06 10:42:17 +08:00
chengstory 877c6dddf3 fixed #3582
1.  CCScene ->  Scene.
2014-01-05 13:16:23 +08:00
chengstory bd9dc274f8 fixed #3482
1.   add override to  virtual functions.
                 2.   replace std::string::npos  to filePath.npos.
                 3.   replace std::string to  const std::string& .
2014-01-05 12:42:39 +08:00
chengstory 10fec47b04 fixed #3582 update libCocoStudio windows project. 2014-01-05 11:38:01 +08:00
chengstory b4118a7ccc fixed #3582
1.  add #include "cocostudio/CCComBase.h" into  CocoStudio.h
2014-01-05 03:55:10 +08:00
chengstory aae6d27c74 fixed #3582
1.  revert ComRender::create(cocos2d::Node *node, const char *comName).
2014-01-05 03:11:32 +08:00
chengstory bac600ab9f fixed #3582
1.  create Component By  component Factory.
2014-01-05 02:22:32 +08:00
James Chen 17be52740a Removes duplicated file in Android.mk 2014-01-04 16:57:46 +08:00
James Chen 284d845f2f Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795 2014-01-04 16:55:40 +08:00
James Chen 4c3fa3da49 Merge pull request #4865 from dumganhar/testjs-bugfix
Some fixes for TestJavascript
2014-01-03 23:34:08 -08:00
James Chen 98265e7961 Reverts GUIReader definition. it should be inherited from Object to make bindings happy. 2014-01-04 15:17:36 +08:00
James Chen ef5ab1b9be sharedXXX -> getInstance, purgeXXX -> destroyInstance. 2014-01-04 14:23:40 +08:00
James Chen 98346474b8 Merge pull request #4863 from Dhilan007/develop_crash
fix compiling error and miss file on vs.
2014-01-03 20:41:19 -08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen 322cf0d233 Fixing CocoStudio bindings error. 2014-01-04 12:11:10 +08:00
James Chen 55e45d44c4 Merge pull request #4810 from chengstory/#3480
Update SceneReaderTest Samples
2014-01-03 19:49:28 -08:00
James Chen 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
chengstory 46c7338008 fixed #3480
1.  remove unused getnode and setnode interface.
                 2.  add condition test.
                 3.  Modify ComAttribute to support for parse json file.
                 4.  Replace scenereader callback function  to C++ 11 implement.
2014-01-03 19:30:47 +08:00
chengstory e08e4ce0f8 fixed #3480 add search paths. 2014-01-03 02:21:36 +08:00
chengstory 77dca5958f issue #3480 upload Samples resources. 2014-01-03 02:03:05 +08:00
chengstory 5903a74bd2 issue #3480
1.  add getNode  and  setNode class function to Component.
            2.  fixes some build error.
2014-01-03 01:42:14 +08:00
chengstory 6892d8cf6a issue #3480
1.  add SceneReader Tests.
                  2.  Modify class member name.
2014-01-03 01:14:12 +08:00
Liam dd0b22be8d resolved ui animation easing error for develop branch 2014-01-02 17:18:40 +08:00
Liam ef76edbd1c merge from develop branch 2014-01-02 17:02:55 +08:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
Conflicts:
	cocos/editor-support/cocostudio/TriggerMng.cpp
2013-12-30 21:06:57 +08:00
James Chen 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +08:00
chengstory 0488aa6dcb fixed #3474
1.  Modify CCLOG, Add classname.
         2.  change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack.
         3.  remove unused do while(0).
2013-12-30 15:26:51 +08:00
minggo 0e9b43248c Merge pull request #4728 from dabingnn/develop_removeCommandPool
Develop remove command pool
2013-12-29 21:53:12 -08:00
James Chen e509a52551 Small fix for `FREE` wrong variable. 2013-12-28 14:38:13 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
James Chen f4825ec94a Bug fixes for cocostudio. 2013-12-27 20:54:05 +08:00
James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test
Conflicts:
	cocos/scripting/auto-generated
2013-12-27 20:18:58 +08:00
minggo 0690305398 Merge pull request #4666 from 2youyouo2/develop
change play interface name
2013-12-27 01:50:08 -08:00
chengstory faaf6d3f2b fixed #3457 fixes some bug. 2013-12-27 17:21:13 +08:00
Huabing.Xu 66e550e5a0 Merge branch 'develop' into develop_removeCommandPool
* develop: (33 commits)
  fix black screen when back to foreground  on android.
  Fix set FPS broken.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Update CCString.cpp
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Renames: IntValueMap —> ValueMapIntKey
  Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
  Modify reader
  long --> ssize_t for TableView callback.
  Generates execute file in cocos root_dir/bin folder for HelloCpp.
  Add listview and pageview  reader
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Modify actionnode
  [AUTO] : updating submodule reference to latest autogenerated bindings
  optimize loop
  fix LabelTestNew
  Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
  Fix box2dView
  ...
2013-12-27 14:07:04 +08:00
chengstory 4cb227ae0d fixed #3457 ui action can not play. 2013-12-27 12:45:05 +08:00
zhangcheng dd4339b0bb Merge branch '#3457' of git://github.com/chengstory/cocos2d-x into #3457 2013-12-27 12:41:01 +08:00
zhangcheng 1b666d4d41 fixed #3457 scenetest crashed when back to menu. 2013-12-27 12:39:21 +08:00
Liam 0cdf2d15fe merge from develop branch 2013-12-27 10:50:50 +08:00
Liam 2a6c24f8bf update coco action with correct coding rule 2013-12-27 10:43:49 +08:00
zhangcheng 6a9fbfbc60 fixed #3457 update libCocosStudio.vcxproj, add trigger code. 2013-12-27 10:24:50 +08:00
chengstory 7a7d939da0 issue #3457 use C++ 11 auto loop. 2013-12-26 23:51:55 +08:00
chengstory 774e3d8536 issue #3457
1. replace UIAction NULL to nullptr.
2. modify  class variable  name.
2013-12-26 23:40:50 +08:00
chengstory cfbbb7889b Merge branch 'develop' into #3457
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-12-26 23:01:34 +08:00
chengstory 26df681915 fixed #3457 remove jsoncpp. 2013-12-26 22:45:23 +08:00
CaiWenzhi 26a7f3474c Modify reader 2013-12-26 21:02:47 +08:00