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

198 Commits

Author SHA1 Message Date
halx99 e53fa3560b Prepare 2020-09-11 00:14:03 +08:00
halx99 671b6b4ca9 Tidy code 2020-09-11 00:10:44 +08:00
halx99 3313720a20 Remove unused API, TODO: unify to Utils::readPixels 2020-09-10 23:11:43 +08:00
halx99 2cc14ef4d7 Add comment 2020-09-10 21:41:52 +08:00
halx99 dc3796d746 Refine code 2020-09-10 21:38:24 +08:00
halx99 e283a4fca0 Refactor capture, fix data race for apple metal reanderer backend 2020-09-10 21:14:28 +08:00
halx99 df43be0a7e fix 193 2020-09-10 18:12:46 +08:00
halx99 84ed7befe2 fix memory leak for ProgramStateRegistry use 2020-09-08 22:13:10 +08:00
halx99 e5d18c5118 Should set _mtlCommandBuffer to nil after release 2020-09-03 22:26:21 +08:00
halx99 4bb44288a5 Fix GL renderer backend API updateCompressedSubData will cause OpenGL 502 error 2020-09-03 18:03:43 +08:00
halx99 d66e62e436 ASTC6x6 support and more comment about bpp usage in engine (#191) 
* ASTC6x6 support and more comment abount bpp usage in engine

* fix log output

* Comment astc compression tool download url

* Add command line comment for astcenc tool [skip travis][skip appveyor]

* Add astc_6x6 test image[skip appveyor][skip travis]

* astc_6x6 mtl

* Refine log info[skip appveyor][skip travis]

* Empty line[skip appveyor][skip travis]
 2020-09-03 18:01:40 +08:00
halx99 93a461f779 Add getGPUHandler for backend::Texture for some purpose use 2020-09-02 13:00:32 +08:00
halx99 e9a61cc216 Remove unused member 'func' from CustomCommand, use CallbackCommand instead 2020-09-02 12:59:34 +08:00
halx99 ec9a1822be No need check GL_ETC1_RGB8_OES for ETC compression formats [skip appveyor][skip travis] 2020-09-01 14:32:52 +08:00
halx99 3e443d286e Remove unnecessary macro GL_ETC1_RGB8_OES check 2020-09-01 13:39:15 +08:00
halx99 f9ae5401ec Add copyright notice [skip appveyor][skip travis] 2020-09-01 13:24:45 +08:00
halx99 cc53868d27 More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 9e4f61d9d6 ETC2 feature check for metal 2020-09-01 00:03:49 +08:00
halx99 09cedf60b2 Improve images decoder 2020-08-31 21:04:47 +08:00
halx99 e96ae229dd Merge: 5ddc84bbee 539e5ca42c 
Merge pull request #189 from aismann/patch-8

Update README.md
 2020-08-31 04:27:33 -07:00
halx99 a87c0bba78 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
halx99 fa5d2d198b fix resources relative path to avoid test case crash on mobile 2020-08-31 17:39:29 +08:00
halx99 c338472df8 Move copyright notice to header [skip appveyor][skip travis] 2020-08-31 17:35:01 +08:00
halx99 477aa0c185 Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 258dfc5b4a ETC2 Metal support 2020-08-31 15:45:05 +08:00
halx99 da8f1c56fe ETC2 software decode support 2020-08-31 14:11:48 +08:00
halx99 43f464163c 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 21cb31685d Merge: 6b4d5918c0 e6108d111a 
Merge pull request #186 from halx99/fix-185

Fix ASTC bytesPerRow calculation
 2020-08-29 10:27:04 -07:00
halx99 f53ddd2c4a Update README_CN.md 2020-08-30 00:28:20 +08:00
halx99 0943e0a793 Fix ASTC bytesPerRow calculation 2020-08-30 00:11:33 +08:00
halx99 479047361d Clear vector after releaseTextures 2020-08-29 22:00:58 +08:00
halx99 9baf39823e Release old storage textures 2020-08-29 20:07:13 +08:00
halx99 b32b9b75e9 More clearly comment 2020-08-29 19:51:42 +08:00
halx99 998335b8af More clearly comment for multi-textures support 2020-08-29 17:39:17 +08:00
halx99 d147190d8a Remove unused comment [skip appveyor][skip travis] 2020-08-29 16:59:15 +08:00
halx99 32549195cf fix multi-texture2d support 2020-08-29 16:56:48 +08:00
halx99 238cd782e3 Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS 2020-08-28 12:57:00 +08:00
halx99 7ce3f4ab34 Make logical more clearly 2020-08-27 17:35:30 +08:00
halx99 e348312baa Naming style [skip appveyor] [skip travis] 2020-08-19 12:26:31 +08:00
halx99 7ff2ffa0b3 Make CustomCommand safe copyable and moveable 2020-08-19 11:42:32 +08:00
halx99 083d14f342 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 d2d656e83d Update CCColorizer.cpp 2020-08-04 01:31:32 +08:00
halx99 2e4b573e8c Update CCColorizer.cpp 2020-08-04 01:01:05 +08:00
halx99 d3cb044df2 Update CCColorizer.h 2020-08-04 00:59:02 +08:00
halx99 57a1e88533 fix compile issue 2020-08-04 00:39:48 +08:00
halx99 e638e0bd68 Tidy sources 2020-08-04 00:14:35 +08:00
halx99 6d88adb7f9 fix lua link error 2020-07-20 17:00:48 +08:00
halx99 e9fa3b4dac Merge: 7624df74f3 d20d3fd241 
Merge pull request #111 from halx99/fix-type-error

fix type error, well xxhash never generate 0 for validate draw command.
 2020-07-10 16:42:57 +08:00
halx99 3df478d5e1 Merge: 851d301574 7b82d47fcf 
Merge pull request #110 from halx99/fix-angle

Correct feature test when use angle backend
 2020-07-10 15:56:41 +08:00
halx99 26da430a2f fix type error, well xxhash never generate 0 for validate draw command. 2020-07-10 15:55:31 +08:00
halx99 e58b7c292a Support use google angle support on windows. 2020-06-12 12:42:58 +08:00
halx99 cccb66f1ae fix memory leak & correct indent 2020-03-30 14:54:13 +08:00
halx99 8822faae98 Remove unnecessary std::move semantics 2020-02-28 12:10:27 +08:00
halx99 48007c67c9 Merge: b350a7abf8 d9e6cb8e33 
Merge pull request #72 from c4games/sync-v3-pr20107

Sync v3 pr20107 & fix builtin shaders
 2020-02-24 20:59:11 +08:00
halx99 810397ebfe Merge: f0d60d4a85 a7e118ec0b 
Merge pull request #70 from c4games/remove-unused-shader

Remove unused shader
 2020-02-24 17:51:58 +08:00
halx99 825ec25a6b Sync v3 pr20107 & fix builtin shaders, see: https://github.com/cocos2d/cocos2d-x/pull/20107 2020-02-24 17:09:25 +08:00
halx99 57dd626e39 Fixup, optimize shader compile log. 2020-02-24 16:27:10 +08:00
halx99 77b1f41c85 Sync v3 pr-19256, see: https://github.com/cocos2d/cocos2d-x/pull/19256 2020-02-24 16:22:40 +08:00
halx99 07bbbe6095 Remove unused shader 2020-02-24 16:13:49 +08:00
halx99 d0ddafb424 fix indent 2020-02-23 21:31:55 +08:00
halx99 734b5bd44f fix #41 2020-02-23 21:27:14 +08:00
halx99 82808a321d Remove duplicated code 2020-02-17 20:21:43 +08:00
halx99 584ee96a89 Fix adjust issue at Texture2DGL::initWithZeros 2020-02-17 00:13:56 +08:00
halx99 78cd37f01a Sync https://github.com/cocos2d/cocos2d-x/pull/20457 2020-02-15 21:38:37 +08:00
halx99 f46c9575a4 Merge: f7330a9b3c e2c4b786b8 
Merge pull request #58 from c4games/mmt-ios

Make multi-meta-textures feature works on Apple Metal.
 2020-02-15 20:51:20 +08:00
halx99 bc343072ce Call initWithZeros at constructor once is works 2020-02-15 17:35:44 +08:00
halx99 f45bcbc723 Refine sources 2020-02-15 10:48:44 +08:00
halx99 8d0d83b2ee fix ci error 2020-02-15 03:10:01 +08:00
halx99 e065f94aa4 Remove unnecessary constructors. 2020-02-15 02:58:41 +08:00
halx99 3ebacd33e9 Refine STMGT 2020-02-15 02:36:02 +08:00
halx99 be59a192c1 Move maxTextureIdx to base texture class 2020-02-14 23:42:05 +08:00
halx99 46c8fff152 Merge: 5a83d24b2f a460438c3b 
Merge pull request #56 from c4games/astc-ios

Make astc works on ios platform.
 2020-02-14 23:23:07 +08:00
halx99 67c153f589 Make multi-meta-textures support works on Metal. 2020-02-14 21:40:33 +08:00
halx99 55f96054b7 Update deps to v29 2020-02-14 19:14:39 +08:00
halx99 72eaf595b5 Make astc works on ios platform. 2020-02-14 19:10:01 +08:00
halx99 35ca58fab2 fix compile error 2020-02-14 15:44:46 +08:00
halx99 f1df405e82 fix #53 2020-02-14 15:18:56 +08:00
halx99 bb441097e7 Merge: f6853a5852 f36d21c9bf 
Merge pull request #52 from c4games/fix-issue51

fix #51
 2020-02-12 20:58:25 +08:00
halx99 41f0869926 Merge: 2d3e162e21 5d7f58c3ad 
Merge pull request #50 from weiwest/master

add astc support (Great Job)
 2020-02-12 20:24:29 +08:00
halx99 53d784af8d fix #51 2020-02-12 20:15:09 +08:00
weiwest ee875efab0 remove test log 2020-02-12 15:52:08 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 aa4d08eb3f Merge: ffcb65fdaa e10155bef4 
Merge pull request #39 from halx99/master

Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28:33 +08:00
weiwest 2acb59d377 add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 a91953ac1a Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
weiwest 27927bbcb3 add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
coulsonwang 8c8280c7d6 fix memory leak issue (#20440) 2020-01-18 20:40:30 +08:00
coulsonwang 3541d06339 set gl framebuffer read and write back again (#20403) 
* set gl framebuffer read and write back again

* update review
 2019-12-29 23:07:19 +08:00
coulsonwang 2ed3343bea no need to convert to RGBA8888 when it is DEFAULT (#20397) 2019-12-12 23:49:08 +08:00
halx99 aaddb886c7 multi texture GPU handler for compressed image 2019-12-01 23:26:11 +08:00
coulsonwang e45693de51 fix incorrect hash structure for RenderPipeline (#20373) 
* fix incorrect hash structure for RenderPipeline
 2019-11-30 16:54:50 +08:00
halx99 1dde48bebd fix ci warnings 2019-11-26 22:37:20 +08:00
halx99 6dc19cfbae Update ProgramStateRegistry.cpp 2019-11-25 21:23:29 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-24 23:16:11 +08:00
halx99 441e1f1283 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 8706af9878 Remove unused log. 2019-11-24 21:02:41 +08:00
halx99 b9d52cc264 fix ci error 2019-11-23 21:25:17 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00