Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,087 Commits 3 Branches 31 Tags 1.1 GiB
Commit Graph

4045 Commits

Author SHA1 Message Date
rh101 5b3b0989b4 Remove redundant std::move 2021-04-23 22:00:33 +10:00
RH b7506fed0c
Merge pull request #4 from rh101/master 
Sync with master
 2021-04-22 21:49:43 +10:00
rh101 8de1099614 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 41f5307d36 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
halx99 04b87dfe5d Fix #318 2021-01-27 12:03:42 +08:00
halx99 ab8cde3e95 Fix ParticleBatchNode texture not bind [ci build] 2021-01-19 23:53:22 +08:00
halx99 57c767a66d fix #260 [ci build] 2020-11-16 12:21:27 +08:00
halx99 9d0cb09f5d Remove Sprite::updateShaders [ci build] 2020-10-31 20:08:32 +08:00
halx99 119740da15 Sprite::setTexture, programType >= ProgramType::HSV needs update by user manually. 2020-10-27 11:14:36 +08:00
HALX99 e5a05ab7b8
Refine DrawNode, should not use Node::_programState for private use (#251) 
The follow classes should not reuse Node::_programState, otherwise needs override Node::setProgramState to update programState of pipelineDescriptor:
- DrawNode
- LayerColor
- LayerRadialGradient
- ParticleBatchNode
- ParticleSystemQuad
 2020-10-26 14:49:14 +08:00
halx99 27bdca35f8 Don't update sprite shader when it's not default 2020-10-26 13:08:02 +08:00
halx99 5fc71649a7 fix clear flow for rendertexture and grid since we use clearCommand to clear renderTarget, see #233 2020-10-16 16:25:10 +08:00
HALX99 b342ebd7ae
Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
halx99 755a0fb45a fix #233 2020-10-15 10:22:18 +08:00
halx99 e28a292ec3 API qualifiers improments 2020-10-07 00:07:53 +08:00
halx99 2b8514fdc4 fix warning 2020-10-06 12:31:17 +08:00
HALX99 1090f732c9
Clearly texture usage and TextureGL initWithZeros usage (#219) 
* Clearly texture usage and TextureGL initWithZeros usage

* More properly function name
 2020-09-25 15:04:55 +08:00
HALX99 235f09f635
Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 158b12e452 fix AtlasNode, needs update atlas values when ignore content scale factor changed 2020-09-22 16:35:24 +08:00
HALX99 5a32bcfdaf
RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
HALX99 b9ea114b9c
Merge pull request #209 from halx99/delete-copy-stubs 
Explicit delete copy stubs for CustomCommand
 2020-09-16 22:45:38 -07:00
halx99 ebd19a07b3 fix ci 2020-09-17 12:10:08 +08:00
halx99 22a4586af9 Sync pr from https://github.com/cocos2d/cocos2d-x/pull/20580 2020-09-17 12:05:31 +08:00
halx99 dbf23f4826 Explicit delete copy stubs for CustomCommand 2020-09-17 11:41:14 +08:00
halx99 fdb29d65c2 Needs recalculate max items when AtlasNode::setIgnoreContentScaleFactor 2020-09-16 13:34:20 +08:00
halx99 c5d6f35d9d Refine code 2020-09-13 19:16:59 +08:00
halx99 782e0c61bb No need CaptureCommand for capture screen or node 2020-09-13 13:27:50 +08:00
halx99 efc5a00b60 Remove comment 2020-09-11 12:39:16 +08:00
halx99 04358791ec v4 captureScreen API compatiable, gl needs flip always for capture 2020-09-11 11:57:55 +08:00
HALX99 d346204936
Update CCRenderTexture.cpp 2020-09-11 01:46:12 +08:00
halx99 6497a92ec7 finish gl backend 2020-09-11 01:19:10 +08:00
halx99 874946fccb Tidy code 2020-09-11 00:10:44 +08:00
halx99 2a50ae6cf8 Refine code 2020-09-10 21:38:24 +08:00
halx99 f6a8d993fc Refactor capture, fix data race for apple metal reanderer backend 2020-09-10 21:14:28 +08:00
halx99 f89763b416 Tidy, update programState texture at attachProgramState 2020-09-09 15:29:56 +08:00
halx99 992d6139d9 More clearly programState management 2020-09-09 13:03:31 +08:00
halx99 1dd638535e fix memory leak for ProgramStateRegistry use 2020-09-08 22:13:10 +08:00
HALX99 2539e78774
Merge pull request #188 from halx99/etc2-support 
Add etc2 compressed texture support
 2020-09-01 00:16:01 -07:00
halx99 aa9e5130e4 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
halx99 18037c44de Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 989330672e fix #187 2020-08-30 13:03:32 +08:00
halx99 50fe831d7a fix ci 2020-08-28 17:26:30 +08:00
halx99 8b7505e171 Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 ae99a5965b Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 d4aa6900c3 By default, disable stream parsing 2020-08-27 11:40:44 +08:00
halx99 bf3a608c01 freetype stream parsing support, reduce memory use on FontCache 2020-08-27 11:35:55 +08:00
halx99 e9ba5420ef Refine code 2020-08-19 12:10:29 +08:00
halx99 82ceee2fdb fix label crashing, add private use BatchCommand move constructor to adapte std::vector resize properly 2020-08-19 11:46:13 +08:00
halx99 927f05f670 Sync mssing code from official-v3 2020-08-18 14:43:09 +08:00
halx99 a567820461 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 9d9067dec4 Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 f88dfdc167 FreeType: Output missing char in .ttf at _DEBUG compiling mode 2020-08-12 14:24:06 +08:00
halx99 4eb4660c9d Reorder members of Node, sizeof(Node) decrease from 640 to 616 on 32bit application 2020-08-06 13:30:35 +08:00
halx99 2b24a1cb6f Add ENGINEX_VERSION and improve ABI compatiable 2020-08-04 12:11:36 +08:00
halx99 a735abaf65 Take care _programState use 2020-07-21 23:11:03 +08:00
halx99 cd656f8b8b fix label not rendering 2020-06-12 11:34:02 +08:00
halx99 9da96e3e1a Sync from: https://github.com/cocos2d/cocos2d-x/pull/20531 2020-06-12 11:24:10 +08:00
halx99 e379fc513d Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 ddb30e881c Clean JSB sources, optmize script event dispatch. 2020-02-28 02:15:33 +08:00
halx99 f36d21c9bf fix #51 2020-02-12 20:15:09 +08:00
coulsonwang 2b4b7c4aae fix drawnode line width issue (#20442) 2020-01-18 20:40:34 +08:00
RH 93352ff06f V4 bmfont improved api (#20406) 
* Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
 2020-01-18 20:40:17 +08:00
Arnold 2fdb65e2c6 set attribute (#20417) 2020-01-18 20:40:09 +08:00
minggo 3ffb04f84a fix flicker of fast tilemap (#20387) 2019-11-30 16:58:55 +08:00
codetypes 4310342862 missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 5f1dc7c748 Use toString instead. 2019-11-25 17:06:01 +08:00
halx99 3fcb8883c2 Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
HALX99 7723fabb78
Merge pull request #13 from cocos2d/v4 
sync V4
 2019-11-23 20:20:02 -08:00
coulsonwang c048d6b6bd no need to update color (#20363) 2019-11-23 10:04:23 +08:00
codetypes b9df4bd63b format spelling (#20360) 2019-11-22 16:07:43 +08:00
HALX99 c08e2cda4d
Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
halx99 78ed4e230b TextureFormatEXT 2019-11-22 03:36:01 +08:00
halx99 5d5e6fcfec Remove comment. 2019-11-20 18:44:45 +08:00
halx99 0caf671edd Fix merge error. 2019-11-20 18:35:48 +08:00
halx99 e647820c9c Merge from official-v4. 2019-11-20 18:27:56 +08:00
halx99 e7906acfa4 v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
coulsonwang 912ba30e49 remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
coulsonwang b2940949dd implement setProgramState for SpriteBatchNode (#20344) 2019-11-18 15:04:47 +08:00
Arnold 587bcabf44 fix asan reported errors (#20332) 2019-11-15 13:39:23 +08:00
coulsonwang 292e4c3b4d fix effect test (#20286) 2019-11-06 16:25:30 +08:00
minggo 01ff6ddd66
delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
coulsonwang a0d7751510 rename to make function name more clear 2019-10-28 16:47:27 +08:00
coulsonwang eb23e1ffde needs update texture info 2019-10-28 16:05:05 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
minggo 7f796936ee
Revert "fix RotateTo animation when angle is bigger than 360 (#20009) (#20211)" (#20257) 
This reverts commit 8a64e6f983.
 2019-10-28 09:53:07 +08:00
coulsonwang 2501f53b9b add CameraTest (#20253) 
* nodeTest

* fix
 2019-10-25 18:22:35 +08:00
minggo c9af873e2e
fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
minggo be038d9ffc
fix some warnings (#20236) 2019-10-25 09:27:54 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
minggo d29adb3180
sync #19914 (#20215) 2019-10-17 11:14:04 +08:00
minggo 99e984dde5
fix crash when plist filename hasn't suffix (#19999) (#20212) 2019-10-17 11:12:37 +08:00
minggo 24b04e561b
sync #20007 to v4 (#20210) 
* sync #20007 to v4

* Fixing a bug in Node::enumerateChildren (#20045)

This patch fixes an issue that if both // (recursive enumeration)
and .. (starting from parent node) are specified,
Node::enumerateChildren does not honor the latter and starts searching
from current node rather than parent node.
 2019-10-17 11:12:25 +08:00
minggo 8a64e6f983
fix RotateTo animation when angle is bigger than 360 (#20009) (#20211) 2019-10-16 16:31:35 +08:00
coulsonwang 67ae2e756e fix ProgramState and Program performance (#20189) 
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
 2019-10-15 09:40:59 +08:00
coulsonwang c7020fbb5f fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
coulsonwang 49a3b5b228 fix auto test fails (#20183) 
needs an integer position
 2019-10-08 15:06:47 +08:00
rh101 4ac3f94774 V4 RenderTexture PMA flag fix (#20153) 
* This is to ensure the RenderTexture internal texture2D PMA flag is set to the correct value.
[CCSprite.cpp] Blending mode needs to be set based on the PMA flag of the texture if using Sprite::initWithTexture().

* [CCSprite.cpp] Removed redundant code related to blending mode and opacityModifyRGB when creating a sprite with a texture.
 2019-09-26 16:11:23 +08:00
coulsonwang 6de088ab98 fix C4244 warning (#20162) 
* fix C4244 warning

* fix warning C4244

* fix compile error
 2019-09-25 14:32:26 +08:00
coulsonwang 03a4ddf764 fix warning (#20146) 
* fix warning
fix warning

* remove integer type constructor for Vec2
 2019-09-24 11:31:35 +08:00