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

14245 Commits

Author SHA1 Message Date
rh101 b420a33b68 Revert check for reference count, since it was correct. [skip ci] 2021-08-17 18:49:14 +10:00
rh101 188345e42a Fix incorrect reference count check in SpriteFrameCache::removeUnusedSpriteFrames 
[BaseTest] Ensure unused frames are released before attempting to free unused textures
 2021-08-17 15:26:44 +10:00
rh101 b3e045b387 Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 5199bb087a Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
RH 4716456e33
Support custom texture atlas formats (#284) 
* Allow support for custom texture atlas formats other than PLIST.

* Revert usage of emplace_back to push_back to ensure support for older compilers.

* Update test to support SpriteFrameCache::addSpriteFramesWithFile

* Re-add SpriteFrameCache::addSpriteFramesWithFileContent

* Change order of SpriteFramesFromFileContent test back to what it previously was

* Remove sprite sheet and all frames associated with it correctly

* Move sprite loader classes into their own files to clean up CCSpriteFrameCache

* Remove redundant line and update comment

* Fix formatting to match adxe code style

* Fix typo

* Add custom sprite sheet loader test using JSON-array sprite atlas format.
Simplify sprite sheet loader interface by adding identifier to the custom sprite sheet loader implementation.

* Add newline at the end of the file
 2021-08-13 14:52:58 +08:00
halx99 39eb09daad Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 5e88382a93 Fix #443 
a. HttpClient: improve request header processing
 2021-08-05 14:56:40 +08:00
halx99 cfffd35aec HttpClient: push front available channel to fix dns cache missing 2021-08-03 14:41:30 +08:00
halx99 71c17cfc9b Add HttpClient::handleNetworkStatusChanged to clear DNS cache 2021-07-31 14:39:42 +08:00
halx99 e08c9b136a
Avoid crash when http cookie enabled on android 2021-07-23 16:09:13 +08:00
halx99 cc03fc970a
Code style 2021-07-21 21:06:55 +08:00
halx99 85a1954adc Improve logic 2021-07-20 15:08:31 +08:00
halx99 ee3b08c182
Remove test code 2021-07-20 15:06:17 +08:00
halx99 8bb93fcaa0 Fix cookie match 2021-07-20 15:03:19 +08:00
halx99 e6c6c54044 Improve cookie file parse 2021-07-19 17:58:13 +08:00
halx99 8fdb279a28 Fix ci 2021-07-19 14:49:38 +08:00
halx99 04aa501cde Improve code quality 2021-07-19 14:17:51 +08:00
halx99 fc768cbd3b Improve code quality 2021-07-19 13:43:59 +08:00
halx99 e90c4cdc3d
Update HttpCookie.h 2021-07-19 12:40:22 +08:00
halx99 abd98f50aa HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 b167ffc311 Use lowercase as preferred to storage HttpResponse headers [skip ci] 2021-07-19 08:04:12 +08:00
halx99 648a5b5554 HttpClient: Improve url redirect process 2021-07-19 00:17:50 +08:00
halx99 617d2b97e0 Fix http response header processing 2021-07-18 23:20:22 +08:00
halx99 81f646783b clang-format: Set PointerAlignment to Left 2021-07-17 23:36:13 +08:00
halx99 ad035e2729 Improve code quality 2021-07-17 23:32:31 +08:00
halx99 092b24e591 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 65148417b2
Fix ci 2021-07-15 23:31:49 +08:00
halx99 a3f8cf28ed Improve code style 2021-07-15 23:10:36 +08:00
halx99 bc6ebd920a Improve code quality 2021-07-15 23:03:43 +08:00
halx99 2efeef0217 Update comment 2021-07-15 17:32:50 +08:00
halx99 ec9a50136f Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 6ca77bebb4 Use const ValueMap& for CCParticleSystem init functions 2021-07-15 12:23:50 +08:00
halx99 522de34990 Add defaultValue CCValue::asXXX for number types [skip ci] 2021-07-15 12:21:38 +08:00
halx99 c766cba275
Improve logic 2021-07-10 00:32:19 +08:00
halx99 f70ad053c0 Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 2782d993c4 Restrict detect utf-8 support 2021-07-08 00:39:22 +08:00
halx99 360e8cee94 Fix member not initialized [skip ci] 2021-07-07 22:38:58 +08:00
halx99 fae361ba02 detectNonAsciiUTF8 Don't regard null character as ascii 2021-07-07 22:35:30 +08:00
halx99 1cf4e82b80 Add API detectNonAsciiUTF8 [skip ci] 
This api will return true if any non-ascii utf-8 detected, and also return whether all chars is ascii.
 2021-07-07 21:49:57 +08:00
halx99 6864ef23b5
Fix ci error 2021-07-07 14:09:11 +08:00
halx99 ffcd4770cb Move GL macros to backend MacrosGL.h 
a. Fix box2d-testbed crash on macos and ios
b. User should avoid use them at application
 2021-07-07 13:52:56 +08:00
halx99 54a97c5820
Delete unused comment 2021-07-07 04:08:07 +08:00
halx99 dca7f95163 Code style 2021-07-06 21:15:02 +08:00
halx99 cc85623d30 For doxgen happy 2021-07-06 15:22:07 +08:00
halx99 45ad0d86fe Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 ca859645ef HttpClient: Fix crash when process redirect 2021-07-06 02:44:57 +08:00
halx99 f2b4c3d647 Fix CCValue move assignment with std::string 2021-07-06 01:44:02 +08:00
halx99 04fc722d8d HttpClient: refine User-Agent encoding 2021-07-05 20:42:22 +08:00
halx99 7405c5781b HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 a3b5315a4a Fix ci [ci build] 2021-07-04 21:59:31 +08:00
halx99 2181268139 Refine code [ci build] 2021-07-04 21:21:29 +08:00
halx99 b9e2a8b7e1 Fix #414 2021-07-04 21:18:14 +08:00
halx99 ec904ed2b2 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 79b13d2372 Fix #413 2021-07-04 16:40:34 +08:00
halx99 75e707c67a Delete unused code 2021-07-02 15:17:13 +08:00
halx99 4c2ad68c58 ASTC decompress benchmark print 2021-07-02 15:11:01 +08:00
halx99 f4757ed450 Take care memory leak 2021-07-02 14:32:22 +08:00
halx99 eb11fd9a61 Always decompress astc parallel for sotware decoder [ci build] 
a. Improve task life cycle management.
b. Fix ci
 2021-07-02 14:20:54 +08:00
halx99 26c9365a04 Fix ci [ci build] 2021-07-02 13:25:00 +08:00
halx99 4a5b281506 Always decompress astc parallel for sotware decoder [ci build] 2021-07-02 13:00:04 +08:00
halx99 36870f7aaf
Update astc.cpp 2021-07-02 00:38:02 +08:00
halx99 26027020ba
Revert profile 2021-07-02 00:23:26 +08:00
halx99 628a9e7bb6 Add decompress astc parallel support [ci build] 
a. Define macro ASTC_ENABLE_PARALLEL_DECOMPRESS to enable.
 2021-07-02 00:18:02 +08:00
halx99 bcbf8e0b30
Make astc decode profile same with render backend 2021-06-28 21:04:36 +08:00
halx99 de8334416d Improve Sprite programState update logic 2021-06-27 21:43:21 +08:00
halx99 a84067eb74 Refactor dual sampler shader [ci build] 
Since not only etc1 could use sepreate RGB, A to two texture samplers, we unify the shader name.
 2021-06-27 20:58:50 +08:00
halx99 5f33ddeee6 Improve HttpResponse interanlCode set 2021-06-25 18:29:16 +08:00
halx99 c7dd59b2ad
Simplify code 2021-06-25 08:18:32 +08:00
halx99 01f3c57e15 Optimize CCValue [ci build] 2021-06-25 07:30:47 +08:00
halx99 de656ff773 Tidy thirdparty lib xsxml, fastlib to xsbase 2021-06-25 07:29:14 +08:00
halx99 94fc8f6ee8 Fix HttpClient compatible issue 
a. should let user do urlencode manually
b. this behavior is same with previous curl implemented HttpClient
 2021-06-25 07:07:59 +08:00
halx99 a379f936d8
Reimplement HttpClient based on yasio (#390) 
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request

* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code

* [WIP] Reimplement HttpClient based on yasio [ci build]

* [WIP] Fix ci [ci build]

* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support

* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works

* Update HttpClient.cpp

* HttpClientTest: enable sslVerifaction test

* Update HttpResponse.h

* Sync luabindings [ci build]

* Add chrome UA test

* Fix ci [ci build]

* The timer for read timeout should be associated with per channel

* Remove unused function

* Update url
 2021-06-24 12:33:07 +08:00
halx99 a40c60d261
More compatible 2021-06-24 10:21:41 +08:00
halx99 581a792155 Delay scene default camera init, see also #392 
This change will make sure user can change window or design size before scene init
 2021-06-24 02:23:02 +08:00
halx99 e35d340b46 Improve Uri parse 2021-06-22 14:19:22 +08:00
halx99 b6378332eb Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 c12aa74b55 Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 bafcac20c1 Add some comment for pr #384 2021-06-17 21:56:38 +08:00
RH d052cc8a48
Use TTF scaled metrics to calculate line height (#384) 2021-06-17 21:15:50 +08:00
RH eff5d1705b
Set global Z value of label debug layer to be the same as the parent label to fix display issue (#378) 2021-06-16 09:18:43 +08:00
halx99 c0f88c46e1
Improve progress timer (#375) 2021-06-13 10:05:30 +08:00
halx99 e5af6353b6
Update CCConfiguration.cpp 2021-06-10 16:51:30 +08:00
halx99 988fea5796
Fix android astc support check 
glCompressedTexImage2D no error, regard the device support astc
 2021-06-10 16:42:57 +08:00
halx99 2dcd3d64df Fix android compile error [ci build] 2021-06-10 14:17:47 +08:00
halx99 5570b17a17
Fix ci [ci build] 2021-06-10 12:55:58 +08:00
halx99 98fda4ae1e Use 1px detect method for checking whether GPU support astc [ci build] 2021-06-10 12:44:34 +08:00
halx99 cfd471f53a Fix warnings 2021-06-09 12:28:33 +08:00
RH fe26435e06
Ensure label underline node has the same global Z value as the label node to fix visibility issue when global Z is not 0. (#373) 2021-06-09 12:09:01 +08:00
halx99 61af6d75f9 Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 73df034804 Rename external to thirdparty [ci build] 2021-06-08 20:45:55 +08:00
RH f72cd54eac
Fix to allow the correct saving of images on iOS when using a virtual file system (#369) 
* Fix to allow the correct saving of images on iOS when using a virtual file system

* Add missing import for FileUtils
 2021-06-03 02:34:02 +08:00
halx99 29015e1cd7 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 9321a65e8c Use md5 from openssl [ci build] 2021-06-02 00:44:45 +08:00
halx99 d56a6f53cb Update astc [ci build] 2021-06-01 23:43:54 +08:00
halx99 e0beb6cf27 Update ConvertUTF,poly2tri [ci build] 2021-06-01 11:47:19 +08:00
RH d17e7b442a
FileStream::size() implemented (#365) 
* Add FileStream::size()
Add ZipFile::zfsize()

* Use FileStream::size()
 2021-05-31 15:08:44 +08:00
RH 4d020f20ca
Cache stream size because Apple audio decoder requests the value too often (#364) 
* Use FileStream to handle file operations for audio files on Apple platforms

* Audio callbacks are now static methods of AudioDecoderEXT class

* Track AudioFileID and close it explicitly in case it is required

* Remove unused code

* Improve performance by caching stream size since Apple audio decoder requests the size constantly during playback
 2021-05-31 12:37:28 +08:00
RH 36968c206e
Add Apple audio virtual file system support by using FileStream (#363) 
* Use FileStream to handle file operations for audio files on Apple platforms

* Audio callbacks are now static methods of AudioDecoderEXT class

* Track AudioFileID and close it explicitly in case it is required

* Remove unused code
 2021-05-29 16:15:16 +08:00
halx99 43b0f8dd71 Fix ci [ci build] 2021-05-28 16:43:32 +08:00
halx99 8750096575 Use type GLchar for glGetShaderInfoLog 2021-05-27 14:52:09 +08:00
halx99 143a1ab1f6 Fix #360 2021-05-27 14:39:17 +08:00
halx99 80b2d4f87f Fix console output text encoding for win32. 2021-05-26 00:24:39 +08:00
halx99 adce3298de Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 2870c39fb2 Better code style 2021-05-24 13:26:56 +08:00
halx99 7f248efcee
Update CCDevice-win32.cpp 2021-05-18 23:52:25 +08:00
halx99 abc5f93c02
Fix charset process for fontName on win32 [ci build] 
Since we use freetype, never needs create ttf font by win32 API
 2021-05-18 23:50:23 +08:00
HALX99 a42f9ac25c
Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 34026070ab Fix warning [ci build] 2021-05-14 20:50:59 +08:00
halx99 6aea443282 Fix cmake issue [ci build] 
Avoid cause check_include_file return unexpected result.
 2021-05-11 23:48:15 +08:00
halx99 100f23990b Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08:00
halx99 7f1ca55a97 NavMesh Use lz4 instead fastlz [ci build] 2021-04-26 22:39:44 +08:00
halx99 d0426578d5 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20662 2021-04-26 19:00:43 +08:00
halx99 5b13927d47 Fix ci warnings [ci build] 2021-04-26 17:28:58 +08:00
halx99 bc4429d449 Optimize macro posix_fsetsize, use ',' is better [ci build] 2021-04-26 17:02:28 +08:00
rh101 19995f863b Get the raw pointer on creation of the FileStream to avoid any accidental usage of the unique_ptr. 2021-04-26 17:31:34 +10:00
rh101 c7aa1d4f00 Let the OGG function overrides handle freeing memory of the FileStream pointer. 2021-04-26 17:30:18 +10:00
rh101 6f47d44b81 Clear unique_ptr with reset(). 2021-04-26 15:46:59 +10:00
rh101 b865d9e18e Use reset() to clear unique_ptr. 
Use value initialization for unique_ptr.
Change AudioDecoderOgg override functions to use FileStream* instead of unique_ptr.
Remove redundant code.
 2021-04-26 15:43:33 +10:00
rh101 ef6bedd069 Use unique_ptr for FileUtils::openFileStream 
Fix OGG audio playback due to incorrect tell() method
Fix unzip close() override method not deleting FileStream pointer.
 2021-04-26 14:21:56 +10:00
rh101 17e1cc1d71 Minor code clean-up 2021-04-26 10:45:55 +10:00
RH 6511da1ef1
Merge branch 'master' into vfs-support 2021-04-26 10:40:16 +10:00
rh101 85c5705f48 Return error value in FileUtils::getContents if size result is an unexpected value. 2021-04-26 10:29:29 +10:00
rh101 bcafad58ea Ensure code uses FileStream::tell() to get size if required after using FileStream::seek(0, SET_END) 2021-04-26 10:28:33 +10:00
rh101 d51edf3bfa Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
rh101 bceabe87c1 Use FileStream instead of fopen to check if file can be opened in read mode 2021-04-26 01:44:50 +10:00
rh101 d76cb66e8e Convert return value to what is expected by FileStream::seek 2021-04-26 01:37:15 +10:00
rh101 434d2730d6 Initialise member variable 2021-04-26 01:05:06 +10:00
rh101 b1da56d401 Fix downloader crash due to uninitialised variables. 2021-04-25 18:20:25 +10:00
rh101 ce1a24cb15 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
HALX99 8b8b015b02
Merge pull request #341 from rh101/vfs-support 
Add support for FileStream in ZipUtils and ZipFile
 2021-04-25 14:21:19 +08:00
rh101 3d8884721f Add function comments to detail the expected parameters and return values of a FileStream 2021-04-25 15:27:25 +10:00
rh101 ed177ce084 Removed incorrect delete statement 2021-04-25 14:42:42 +10:00
rh101 521e2cad4c Verify the amount of string space we have to replace the zip extension 2021-04-25 12:15:56 +10:00
rh101 2cdd688166 Initialise member variable 2021-04-25 02:47:21 +10:00
rh101 f68521c4d0 Minor code cleanup 2021-04-25 02:45:04 +10:00
rh101 72bc0bf818 Removed redundant code 2021-04-25 02:43:03 +10:00
rh101 1238a08662 Add support for FileStream in ZipUtils and ZipFile 2021-04-25 02:39:47 +10:00
halx99 63ac9904c4 Fix crash from pr: #340 2021-04-24 18:15:54 +08:00
halx99 01f2ce3a2d Fix indent with clang-format [ci build] 2021-04-24 16:58:41 +08:00
rh101 e1a9141a00 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
rh101 5b3b0989b4 Remove redundant std::move 2021-04-23 22:00:33 +10:00
rh101 373c9262c4 Added getNativeWritableAbsolutePath() which will always return the underlying file system raw path. 
Re-enabled memory mapped UserDefault usage, since it now has access to the raw file system path.
 2021-04-23 01:00:00 +10:00
rh101 cd0c5bfcee Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support 2021-04-23 00:01:47 +10:00
rh101 2aa2d69151 Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH b7506fed0c
Merge pull request #4 from rh101/master 
Sync with master
 2021-04-22 21:49:43 +10:00
rh101 15c8f2298d Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 844119d162 Fix #339 [ci build] 2021-04-22 18:55:56 +08:00
rh101 684a0faf76 Fixed typo 2021-04-22 03:18:23 +10:00
rh101 8de1099614 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00