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

561 Commits

Author SHA1 Message Date
halx99 8a8d96e8d4 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 e58041bd46 Don't update sprite shader when it's not default 2020-10-26 13:08:02 +08:00
halx99 f49cb01e1e Finish #244 2020-10-25 16:25:08 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 97b283bc94 Optimize includes 2020-10-23 16:40:51 +08:00
halx99 fe76c658b0 fix android build 2020-10-23 16:36:24 +08:00
halx99 22bd64cd27 Support specific manually and more clearly comment 2020-10-23 15:27:03 +08:00
halx99 0830fe9c14 Only needs updateUniformID when set a unstable uniform variable 2020-10-23 15:07:18 +08:00
halx99 ad98ef54b0 Add setUniformID manually for user to avoid calculate uniformID with uniform buffer automatically 2020-10-23 12:39:30 +08:00
halx99 4f36b1bbe9 Remove default constructor of ProgramState 2020-10-23 12:17:36 +08:00
halx99 083b99112b Since we have uniformID, CUSTOM_PROGRAM also can batch 2020-10-23 12:07:37 +08:00
halx99 e4d8e60c0b Since v4, no needs callback uniform, so mark setCallbackUniform deprecated 2020-10-23 11:57:17 +08:00
halx99 119479b060 Refine ProgramState mat id 2020-10-23 11:37:52 +08:00
halx99 4394b94c31 Simply skip batch for custom program, see #245 2020-10-23 10:26:45 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 ac21c27140 Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 03527fd45b Fix CCFileStream write bits 
make it behavior same with fopen "wb"
 2020-10-21 10:58:48 +08:00
halx99 77e48ddca6 Remove unused converter functions 2020-10-21 00:35:39 +08:00
halx99 4048395cdb Refine pixel format 
a. make RGB565, RGB5A1 identical between GL and MTL backend
b. make texture internal format compatible on GLES-2.0 ONLY GPU devices
 2020-10-20 23:27:20 +08:00
halx99 630a452d01 fix rgba4444 enum for gles-2.0 only GPU 2020-10-20 20:01:18 +08:00
halx99 3d27b9615c GLES compatible 2020-10-20 19:50:34 +08:00
halx99 212148dc56 Remove unused varaibles 2020-10-20 19:38:33 +08:00
halx99 f1be86ee7a fix lua build on android 2020-10-19 19:56:48 +08:00
halx99 3741bbd7e2 Finish cpp and lua template to use env var 'COCOS2DX_ROOT' to avoid copy whole engine source when new project. 2020-10-19 18:33:10 +08:00
halx99 dcf3dbe9e6 mini changes 2020-10-18 21:43:51 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 5401bbf821 Simplfy hsv color 2020-10-16 17:23:29 +08:00
halx99 567f55d6fb 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 c594e3789c 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 a0034c48a0 fix #233 (#235) 2020-10-16 01:41:36 +08:00
halx99 880c274995 fix #233 2020-10-15 10:22:18 +08:00
halx99 958922bf6d Add setDispatchOnWorkThread support 2020-10-08 00:00:14 +08:00
halx99 257e5ce0e0 Use move assignment 2020-10-07 23:59:26 +08:00
halx99 11ffba3758 API qualifiers improments 2020-10-07 00:07:53 +08:00
halx99 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 5ef9214d19 fix warning 2020-10-06 12:31:17 +08:00
halx99 3214a76297 Refine HttpClient (#224) 2020-10-05 08:32:48 +08:00
halx99 89d80ce24f Refine HttpClient 2020-10-05 02:40:38 +08:00
halx99 3fadbb3928 fix #223 2020-10-05 00:10:31 +08:00
halx99 5b5ab83830 Change access qualifier 2020-10-05 00:09:12 +08:00
halx99 79e04aad3c Add custom hosts support for HttpReuqest 
refer to: https://curl.haxx.se/libcurl/c/CURLOPT_RESOLVE.html
 2020-10-04 23:44:52 +08:00
halx99 0e987a7a0d Move isPOT to ccUtils.h for reuse 2020-10-04 23:43:57 +08:00
halx99 3b70b21430 fix lua binding, remove unused initWithBackendTexture 2020-10-03 18:04:56 +08:00
halx99 4592656b28 UserDefault int64_t 2020-10-02 19:52:32 +08:00
halx99 a0ee504406 Delete duplicated _mv (#220) 2020-09-26 12:33:14 +08:00
halx99 a2288d08db Fix depth stencil state and pipeline state mismatch 2020-09-25 23:16:48 +08:00
halx99 2b6cb88167 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 4a35122ab0 Remove dep 2020-09-25 13:49:23 +08:00
halx99 f93a26a7de Delete file ant.properties 2020-09-25 13:17:03 +08:00
halx99 3820cffc33 Sync feature from b2a0cb5e2f 2020-09-25 13:13:54 +08:00
halx99 1c57632e51 Delete unused source files 2020-09-25 13:08:39 +08:00
halx99 cca0739793 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 ad62747456 fix #213 2020-09-22 17:34:52 +08:00
halx99 9790c31529 fix macro CC_LOG_TO_CONSOLE doesn't work for win32 2020-09-22 17:23:19 +08:00
halx99 26924879be fix AtlasNode, needs update atlas values when ignore content scale factor changed 2020-09-22 16:35:24 +08:00
halx99 3eb2d51df9 Refactor render pipeline state (#211) 
* Refactor pipeline state
* Cache DepthStencil state for MTL renderer backend
 2020-09-22 16:32:17 +08:00
halx99 7bee993bd0 Reduce depthStencil state create, don't create it at per draw call 2020-09-21 22:58:45 +08:00
halx99 c97956d28f Remove unused param for setRenderPipeline 2020-09-21 22:35:18 +08:00
halx99 6e7e117a0d RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
halx99 bb6faed0a2 fix macro 2020-09-21 11:38:21 +08:00
halx99 03ae85f2f4 Merge: 22a4586af9 03e5a1bd9a 
Merge pull request #209 from halx99/delete-copy-stubs

Explicit delete copy stubs for CustomCommand
 2020-09-16 22:45:38 -07:00
halx99 a14cb93bdc fix ci warnings 2020-09-17 12:13:59 +08:00
halx99 ac2e8e4bb6 fix ci 2020-09-17 12:10:08 +08:00
halx99 c0a61434e0 Sync pr from https://github.com/cocos2d/cocos2d-x/pull/20580 2020-09-17 12:05:31 +08:00
halx99 dc74671240 Explicit delete copy stubs for CustomCommand 2020-09-17 11:41:14 +08:00
halx99 62d7a5e220 suppressing invalid offset warning [skip appveyor][skip travis] 2020-09-16 22:57:55 +08:00
halx99 75fe464e6c Decrease pod offset 2020-09-16 21:26:14 +08:00
halx99 3fd426c481 fix #206 2020-09-16 21:22:37 +08:00
halx99 7217d16cd2 Needs recalculate max items when AtlasNode::setIgnoreContentScaleFactor 2020-09-16 13:34:20 +08:00
halx99 20d91f6566 check null also 2020-09-15 16:03:00 +08:00
halx99 05d31aa618 Take care PBO use on android 2020-09-15 16:01:44 +08:00
halx99 e91b7240e6 captureScreen compatible, saveFile at offthread 2020-09-15 14:12:00 +08:00
halx99 b956637c74 Fixup 
OpenGL: read screen pixels only works: AFTER_DRAW and BEFORE_END_FRAME
 2020-09-14 17:43:44 +08:00
halx99 c542037e7c Needs readPixels at CallbackCommand 
Avoid read dirty pixels
 2020-09-14 17:20:07 +08:00
halx99 759acc98a7 fix fbo attachment texture bind error 2020-09-13 19:17:49 +08:00
halx99 81e78573e6 Refine code 2020-09-13 19:16:59 +08:00
halx99 d333e79502 Remove unused CaptureCallbackCommand (#2) 2020-09-13 14:53:17 +08:00
halx99 e2cc3f5c90 Refine comment 2020-09-13 13:30:41 +08:00
halx99 d4887b8584 No need CaptureCommand for capture screen or node 2020-09-13 13:27:50 +08:00
halx99 89c4ab3046 Metal screen framebuffer only set/restore 2020-09-13 12:55:35 +08:00
halx99 dd0070040b Make capture API public to Renderer 2020-09-13 11:11:48 +08:00
halx99 474531fda7 UtilsGL::readPixels also use PBO if available 2020-09-12 23:26:40 +08:00
halx99 cc7d95ffef Update comment [skip appveyor] [skip travis] 2020-09-12 20:44:08 +08:00
halx99 7282a3ea3f No need enqueue, commit will do it automatically 2020-09-12 16:44:16 +08:00
halx99 3b71ea621a Refine code 2020-09-12 15:34:09 +08:00
halx99 caf9d4b761 Remove test stubs 2020-09-12 14:52:39 +08:00
halx99 4f51702b66 a. Refine captureScreen, glReadPixels shoud from glviewport's origin. 
b. Sets desktop GL min version from 2.0 to 2.1
 2020-09-12 14:50:48 +08:00
halx99 2f96108c75 Add more clearly comment [skip appveyor] 2020-09-11 20:17:31 +08:00
halx99 4fc03985d3 Use glMapBuffer if available 2020-09-11 17:32:08 +08:00
halx99 c79da1ca05 fix ci 2020-09-11 14:45:45 +08:00
halx99 a6b3fa91fd fix ci 2020-09-11 13:38:05 +08:00
halx99 378975d768 Remove comment 2020-09-11 12:39:16 +08:00
halx99 08f8177031 Renaming stubs relative capture command 2020-09-11 12:23:33 +08:00
halx99 66161f982a Remove unused comment 2020-09-11 12:14:40 +08:00
halx99 0365122f4a v4 captureScreen API compatiable, gl needs flip always for capture 2020-09-11 11:57:55 +08:00
halx99 2dd406c52e Remove todo comment [skip appveyor][skip travis] 2020-09-11 02:19:19 +08:00
halx99 065cfc77b3 Update CCRenderTexture.cpp 2020-09-11 01:46:12 +08:00
halx99 d2acbe176e finish gl backend 2020-09-11 01:19:10 +08:00
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 d784e549c6 Sync lua binding 2020-09-09 16:30:48 +08:00
halx99 0df57da33f fix compile issue[skip appveyor] 2020-09-09 15:47:41 +08:00
halx99 df8631582b Tidy, update programState texture at attachProgramState 2020-09-09 15:29:56 +08:00
halx99 6c2939d235 More clearly programState management 2020-09-09 13:03:31 +08:00
halx99 84ed7befe2 fix memory leak for ProgramStateRegistry use 2020-09-08 22:13:10 +08:00
halx99 cabc917bff Move getFileDataFromZip from FileUtils to ZipFile and mark it as deprecated 2020-09-06 17:00:20 +08:00
halx99 54f1fc26d6 fix mac compile error 2020-09-05 22:33:18 +08:00
halx99 e564a5bc25 Add CC_REDUCE_PAUSED_CPU_USAGE ccConfig.h to control whether reduce cpu usage after paused 2020-09-05 17:12:30 +08:00
halx99 e7185c1de8 fix ci warnings 2020-09-04 18:34:15 +08:00
halx99 0f078279ff Fix mac [skip appveyor] 2020-09-04 18:16:13 +08:00
halx99 714803916e Fix glviewimpl for osx 2020-09-04 17:58:34 +08:00
halx99 cd3923b553 Add utils::makeInstance and utils::newInstance 2020-09-04 11:28:16 +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 4a9b2fb9b5 Merge: f2970e72de 8cad7319f6 
Merge pull request #188 from halx99/etc2-support

Add etc2 compressed texture support
 2020-09-01 00:16:01 -07:00
halx99 bb9652f1a6 Use uint8_t instead unsigned char for byte buffer [skip appveyor][skip travis] 2020-09-01 14:57:18 +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 6f524beeb6 Remove unused comment [skip appveyor][skip travis] 2020-09-01 13:29:41 +08:00
halx99 f9ae5401ec Add copyright notice [skip appveyor][skip travis] 2020-09-01 13:24:45 +08:00
halx99 45b2ab7134 Also decode bmp to RGBA8888 directly 2020-09-01 12:06:21 +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 815c737e6b wrap fowardPixels for hardware decoder 2020-08-31 23:09:42 +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 65a7bd5360 Remove test code [skip appveyor] [skip travis] 2020-08-31 16:31:37 +08:00
halx99 086c3dee3c Add comment for etc1/etc2 compression tools [skip appveyor][skip travis] 2020-08-31 16:16:13 +08:00
halx99 258dfc5b4a ETC2 Metal support 2020-08-31 15:45:05 +08:00
halx99 b12068e1c8 Use etc2_decode_image decode etc1 to RGBA8888 [skip appveyor] [skip travis] 
This can avoid further texture data convert
 2020-08-31 15:34:20 +08:00
halx99 8749c63346 fix compile issue 2020-08-31 15:17:28 +08:00
halx99 2443e01136 fix compile issue 2020-08-31 14:50:33 +08:00
halx99 27ba2fd377 Remove unused file [skip appveyor][skip travis] 2020-08-31 14:48:10 +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 0edf05888f fix CCValue::visit 2020-08-30 17:45:21 +08:00
halx99 318c6855a3 fix #187 2020-08-30 13:03:32 +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