Commit Graph

39 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
yinkaile 22a1e2994a 1. support camera sort
2. support camera culling mask with node group
3. add MAIN_CAMERA to Canvas
2018-03-09 16:12:00 +08:00
yinkaile 9e0290ea63 fixed physics debug draw 2018-03-02 16:19:07 +08:00
yinkaile a676485c68 fixed cameras 2018-02-09 11:37:43 +08:00
yinkaile cf3f20bfc2 upgrade CCCamera 2018-02-08 18:07:43 +08:00
yinkaile d93cf3acac support camera 2018-02-07 10:59:23 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
pandamicro 8cf1591e3a Use cc.renderer to point at new renderer 2017-12-25 14:02:15 +08:00
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +08:00
yinkaile b452a415d2 enable/disable camera on native platform 2017-11-07 11:26:33 +08:00
yinkaile c39e6a5bb9 support dynamic enable/disable culling 2017-10-31 15:39:04 +08:00
yinkaile 1598f74623 use temp matrix to avoid create new object 2017-10-24 10:55:19 +08:00
pandamicro 1328899442 Add matrix calculations into Node 2017-10-12 16:25:33 +08:00
pandamicro 48faf3ca49 Removed SGComponent, ComponentInSG, ComponentUnderSG 2017-10-06 17:54:34 +08:00
Jare Guo e1601ac00f Merge 1.6
# Conflicts:
#	cocos2d/core/CCDirector.js
#	cocos2d/core/components/CCSprite.js
2017-09-22 10:48:01 +08:00
Jare Guo 87c749dd90 fix empty node size when attached with a camera 2017-09-11 11:58:03 +08:00
2youyouo2 68c8f9c4ac separate culling and transform step 2017-08-31 15:35:03 +08:00
2youyouo2 7f27102435 fixed camera api doc 2017-08-30 11:59:21 +08:00
2youyouo2 2e59812891 add protection code to camera 2017-08-10 15:09:47 +08:00
2youyouo2 bf86a81347 dynamic check whether node's sgNode changed 2017-08-03 14:32:54 +08:00
2youyouo2 c79e323884 add comment 2017-08-02 16:40:39 +08:00
2youyouo2 7903bff5a7 fixed camera memory leak 2017-08-02 16:36:32 +08:00
2youyouo2 4dd3158de5 set transform updated for native 2017-06-23 15:20:17 +08:00
2youyouo2 0f14c7d8ea recalculate targets culling when camera view matrix changed 2017-06-22 11:41:32 +08:00
2youyouo2 86cb5ca2ac should revisit nodes when add/remove target to camera 2017-06-19 15:38:36 +08:00
2youyouo2 dee1703b83 refine code 2017-06-09 18:14:09 +08:00
2youyouo2 1b338378b2 refine code 2017-06-09 18:11:06 +08:00
2youyouo2 1643955b5c support camera culling 2017-06-09 17:47:15 +08:00
2youyouo2 dabeb3d5e3 fixed camera typo 2017-05-26 18:05:51 +08:00
2youyouo2 6eb4269254 update api docs 2017-05-02 16:53:14 +08:00
2youyouo2 2eb3e8a3ca update api docs 2017-05-02 16:28:32 +08:00
2youyouo2 10d1498a95 refine camera 2017-04-19 09:54:18 +08:00
2youyouo2 bfc6fa87ab add warn info for camera 2017-04-18 18:00:18 +08:00
2youyouo2 6c77064f2c set camera executeInEditMode to false 2017-03-27 14:41:06 +08:00
2youyouo2 5e94bc4a87 refine camera 2017-03-27 12:00:50 +08:00
2youyouo2 e1090e85e1 refine camera 2017-03-27 11:28:33 +08:00
2youyouo2 b12914197c refine camera 2017-03-27 10:34:35 +08:00
2youyouo2 cf536cc315 add camera 2017-03-24 14:01:30 +08:00