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

447 Commits

Author SHA1 Message Date
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
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 8f448b517c fix ci 2020-08-28 17:26:30 +08:00
halx99 2197bb52cd Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 4674b1e89d Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 81b038c18d Code improvement 2020-08-28 15:01:25 +08:00
minggo 1934eb5ac9 close keyboard when Done is pressed (#20341) 
* close keyboard when Done is pressed
 2020-08-28 14:50:52 +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