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

869 Commits

Author SHA1 Message Date
halx99 fa1f2f2d33 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 860400cb8c Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 6dd878a90f Delete unused sources 2021-08-25 16:14:15 +08:00
halx99 1e36900153 Merge: ce5ecfcdbe 219c253c84 
Merge pull request #471 from rh101/dynamic-lib-fix

Fix for dynamic library issue
 2021-08-20 14:22:52 +08:00
rh101 f488de7d6c Fix for dynamic library issue 2021-08-20 14:43:19 +10:00
halx99 961c2d1895 Update version id [skip ci] 2021-08-20 12:19:26 +08:00
halx99 99099dc08f Merge: 11434287cd 0266d332e5 
Merge pull request #469 from rh101/filestream-64bit

Update FileStream seek, tell and size to support files greater than 4GB files
 2021-08-20 01:20:17 +08:00
halx99 825a87685f Update thirdparty libs 2021-08-19 22:53:54 +08:00
rh101 cb696b06ac Update FileStream seek, tell and size to support files greater than 4GB, and max size is 2^63. 2021-08-20 00:53:02 +10:00
halx99 426aa0db93 Merge: b48133e9c6 c9ebafe501 
Merge pull request #466 from rh101/fix-sprite-test-crashes

Fixes for crashes in sprite and sprite cache tests
 2021-08-19 14:35:44 +08:00
rh101 ad3e3380e2 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
aismann 288941a63f cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 14a1556c6c Revert check for reference count, since it was correct. [skip ci] 2021-08-17 18:49:14 +10:00
rh101 e558b3c976 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 c60f66c9bb Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 7a6734408d Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +08:00
RH 2c0f04c99b 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 1452e698e3 Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 f02e0a7b87 Fix #443 
a. HttpClient: improve request header processing
 2021-08-05 14:56:40 +08:00
halx99 410d3b41af HttpClient: push front available channel to fix dns cache missing 2021-08-03 14:41:30 +08:00
halx99 981b3a9a79 Add HttpClient::handleNetworkStatusChanged to clear DNS cache 2021-07-31 14:39:42 +08:00
halx99 622c22c47b Avoid crash when http cookie enabled on android 2021-07-23 16:09:13 +08:00
halx99 21af858b20 Code style 2021-07-21 21:06:55 +08:00
halx99 f37be8f5c2 Improve logic 2021-07-20 15:08:31 +08:00
halx99 b793ff123e Remove test code 2021-07-20 15:06:17 +08:00
halx99 c74a12baf5 Fix cookie match 2021-07-20 15:03:19 +08:00
halx99 bc2ef65ba7 Improve cookie file parse 2021-07-19 17:58:13 +08:00
halx99 cf2b577a25 Fix ci 2021-07-19 14:49:38 +08:00
halx99 5bb5d43733 Improve code quality 2021-07-19 14:17:51 +08:00
halx99 0af95a3fbb Improve code quality 2021-07-19 13:43:59 +08:00
halx99 ee327238fa Update HttpCookie.h 2021-07-19 12:40:22 +08:00
halx99 d76a43406c HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 ce13dc075f Use lowercase as preferred to storage HttpResponse headers [skip ci] 2021-07-19 08:04:12 +08:00
halx99 cc0bb3230f HttpClient: Improve url redirect process 2021-07-19 00:17:50 +08:00
halx99 4e3a2355ba Fix http response header processing 2021-07-18 23:20:22 +08:00
halx99 5dcc4f557a clang-format: Set PointerAlignment to Left 2021-07-17 23:36:13 +08:00
halx99 f0a2bd416a Improve code quality 2021-07-17 23:32:31 +08:00
halx99 4b7e098e65 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 40a70806cb Fix ci 2021-07-15 23:31:49 +08:00
halx99 0d4aec88d1 Improve code style 2021-07-15 23:10:36 +08:00
halx99 ec5ef59474 Improve code quality 2021-07-15 23:03:43 +08:00
halx99 d8ad4ab8db Update comment 2021-07-15 17:32:50 +08:00
halx99 36042fdb55 Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 1699dcc93d Use const ValueMap& for CCParticleSystem init functions 2021-07-15 12:23:50 +08:00
halx99 2870cd86b8 Add defaultValue CCValue::asXXX for number types [skip ci] 2021-07-15 12:21:38 +08:00
halx99 465440d689 Improve logic 2021-07-10 00:32:19 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 f3f43ffb89 Restrict detect utf-8 support 2021-07-08 00:39:22 +08:00
halx99 f9ecb53623 Fix member not initialized [skip ci] 2021-07-07 22:38:58 +08:00
halx99 bb79db77c2 detectNonAsciiUTF8 Don't regard null character as ascii 2021-07-07 22:35:30 +08:00
halx99 8ce2947a0e 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 c94e6739bf Fix ci error 2021-07-07 14:09:11 +08:00
halx99 ed3a0d05ec 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 9048db93a7 Delete unused comment 2021-07-07 04:08:07 +08:00
halx99 d5f6714534 Code style 2021-07-06 21:15:02 +08:00
halx99 1292003e83 For doxgen happy 2021-07-06 15:22:07 +08:00
halx99 0c74a94525 Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 f4969ee388 HttpClient: Fix crash when process redirect 2021-07-06 02:44:57 +08:00
halx99 af0a0f1598 Fix CCValue move assignment with std::string 2021-07-06 01:44:02 +08:00
halx99 f895690b9d HttpClient: refine User-Agent encoding 2021-07-05 20:42:22 +08:00
halx99 3df92d56de HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 34d51633ad Fix ci [ci build] 2021-07-04 21:59:31 +08:00
halx99 14b24ed14b Refine code [ci build] 2021-07-04 21:21:29 +08:00
halx99 dabdb1315d Fix #414 2021-07-04 21:18:14 +08:00
halx99 43f25d5ad7 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 97425dc655 Fix #413 2021-07-04 16:40:34 +08:00
halx99 169d15943a Delete unused code 2021-07-02 15:17:13 +08:00
halx99 ea014d2924 ASTC decompress benchmark print 2021-07-02 15:11:01 +08:00
halx99 e2c213e0bd Take care memory leak 2021-07-02 14:32:22 +08:00
halx99 be7c037cd9 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 f6cbe606fd Fix ci [ci build] 2021-07-02 13:25:00 +08:00
halx99 71a0abf11c Always decompress astc parallel for sotware decoder [ci build] 2021-07-02 13:00:04 +08:00
halx99 8a904f72fa Update astc.cpp 2021-07-02 00:38:02 +08:00
halx99 9cac9491ed Revert profile 2021-07-02 00:23:26 +08:00
halx99 b6610a242f 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 2986c9d248 Make astc decode profile same with render backend 2021-06-28 21:04:36 +08:00
halx99 7d635e2a37 Improve Sprite programState update logic 2021-06-27 21:43:21 +08:00
halx99 10c1ed15ef 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 44677f1a3b Improve HttpResponse interanlCode set 2021-06-25 18:29:16 +08:00
halx99 3ea793f11e Simplify code 2021-06-25 08:18:32 +08:00
halx99 81ece6d061 Optimize CCValue [ci build] 2021-06-25 07:30:47 +08:00
halx99 f5c9bfc38f Tidy thirdparty lib xsxml, fastlib to xsbase 2021-06-25 07:29:14 +08:00
halx99 d12c614f99 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 72d1ba9ea6 Merge: df58dd753c 2397d54daf 
Merge branch 'dev' into Chipmunk2D
 2021-06-24 17:04:04 +08:00
aismann dbcb5816fe Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 14dc7f05f9 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 f4871674df More compatible 2021-06-24 10:21:41 +08:00
halx99 36d258f589 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 8d0f8de1f4 Improve Uri parse 2021-06-22 14:19:22 +08:00
halx99 9ed3be94c0 Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 e5237503fb Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 3c9a18675c Add some comment for pr #384 2021-06-17 21:56:38 +08:00
RH 7d8fe551cc Use TTF scaled metrics to calculate line height (#384) 2021-06-17 21:15:50 +08:00
RH 621a6a16f5 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 382a12f181 Improve progress timer (#375) 2021-06-13 10:05:30 +08:00
halx99 9705ef7f11 Update CCConfiguration.cpp 2021-06-10 16:51:30 +08:00
halx99 123a6555c9 Fix android astc support check 
glCompressedTexImage2D no error, regard the device support astc
 2021-06-10 16:42:57 +08:00
halx99 c53038448d Fix android compile error [ci build] 2021-06-10 14:17:47 +08:00
halx99 705ddf323c Fix ci [ci build] 2021-06-10 12:55:58 +08:00
halx99 0d492c5f76 Use 1px detect method for checking whether GPU support astc [ci build] 2021-06-10 12:44:34 +08:00
halx99 0439bb54c3 Fix warnings 2021-06-09 12:28:33 +08:00
RH 429215ee85 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 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 d526527c9d Rename external to thirdparty [ci build] 2021-06-08 20:45:55 +08:00
RH 3c49c07465 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 5a6045ab19 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 42fdfe5565 Use md5 from openssl [ci build] 2021-06-02 00:44:45 +08:00
halx99 20bfeb26bf Update astc [ci build] 2021-06-01 23:43:54 +08:00
halx99 1d10a42cfa Update ConvertUTF,poly2tri [ci build] 2021-06-01 11:47:19 +08:00
RH 56fc4513ef FileStream::size() implemented (#365) 
* Add FileStream::size()
Add ZipFile::zfsize()

* Use FileStream::size()
 2021-05-31 15:08:44 +08:00
RH 5e18a87849 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 a74c61c218 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 d0bb2a38a2 Fix ci [ci build] 2021-05-28 16:43:32 +08:00
halx99 571f639f0b Use type GLchar for glGetShaderInfoLog 2021-05-27 14:52:09 +08:00
halx99 7d0395ee26 Fix #360 2021-05-27 14:39:17 +08:00
halx99 026c3ab7c5 Fix console output text encoding for win32. 2021-05-26 00:24:39 +08:00
halx99 84a8ec8e2e Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 6ff9a28f78 Better code style 2021-05-24 13:26:56 +08:00
halx99 4ebc4e48c7 Update CCDevice-win32.cpp 2021-05-18 23:52:25 +08:00
halx99 ba7e7ff84a 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 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 dba89b7362 Fix warning [ci build] 2021-05-14 20:50:59 +08:00
halx99 64a1d68d6f Fix cmake issue [ci build] 
Avoid cause check_include_file return unexpected result.
 2021-05-11 23:48:15 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 7cbfd84f95 Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08:00
halx99 0511520281 Merge: 7f1ca55a97 1efe0091a8 
Merge pull request #347 from rh101/imgui-fix

ImGUI font crash fix when using virtual file system
 2021-04-27 23:29:22 -07:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
halx99 d734599c1c NavMesh Use lz4 instead fastlz [ci build] 2021-04-26 22:39:44 +08:00
halx99 0f12e59e3b Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20662 2021-04-26 19:00:43 +08:00
halx99 68a40694a8 Fix ci warnings [ci build] 2021-04-26 17:28:58 +08:00
halx99 ff24bdf192 Optimize macro posix_fsetsize, use ',' is better [ci build] 2021-04-26 17:02:28 +08:00
rh101 0583f9a4e0 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 13115cc789 Let the OGG function overrides handle freeing memory of the FileStream pointer. 2021-04-26 17:30:18 +10:00
rh101 3281c7349a Clear unique_ptr with reset(). 2021-04-26 15:46:59 +10:00
rh101 b923b1a678 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 668e96cadd 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 23301e563e Minor code clean-up 2021-04-26 10:45:55 +10:00
RH ba6f6dfcfa Merge: 85c5705f48 ce6117fa65 
Merge branch 'master' into vfs-support
 2021-04-26 10:40:16 +10:00
RH 5b168e3bb6 Merge: 03bb24f313 85c5705f48 
Merge branch 'vfs-support' into master
 2021-04-26 10:39:09 +10:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 ff60724c9e Return error value in FileUtils::getContents if size result is an unexpected value. 2021-04-26 10:29:29 +10:00
rh101 833f27f499 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 e6990d0b36 Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
halx99 be9bd61131 Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 4745016bc2 Use FileStream instead of fopen to check if file can be opened in read mode 2021-04-26 01:44:50 +10:00
rh101 3eb42e00c7 Convert return value to what is expected by FileStream::seek 2021-04-26 01:37:15 +10:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
halx99 87be236932 Merge: 8b8b015b02 b1da56d401 
Merge pull request #343 from rh101/curl-fix-filestream

Fix for downloader crash due to uninitialised variables
 2021-04-25 18:34:29 +08:00
rh101 5509d0f80d Update usage of createDownloadFileTask 2021-04-25 18:36:20 +10:00
rh101 abb27ce2f3 Fix downloader crash due to uninitialised variables. 2021-04-25 18:20:25 +10:00
RH c8c4c2d703 Merge: 6fbebe9617 8b8b015b02 
Merge pull request #6 from c4games/master

Sync with primary
 2021-04-25 18:14:50 +10:00
rh101 c26a5e7bd8 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
halx99 964e515f48 Merge: 2a1459b27b 3d8884721f 
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 0867aa48a9 Add function comments to detail the expected parameters and return values of a FileStream 2021-04-25 15:27:25 +10:00
rh101 5cc21f52ba Removed incorrect delete statement 2021-04-25 14:42:42 +10:00
rh101 3dbdd7b5ee Verify the amount of string space we have to replace the zip extension 2021-04-25 12:15:56 +10:00
rh101 8703cad209 Initialise member variable 2021-04-25 02:47:21 +10:00
rh101 84be1fa014 Minor code cleanup 2021-04-25 02:45:04 +10:00
rh101 a819f310b2 Removed redundant code 2021-04-25 02:43:03 +10:00
rh101 cce67f688e Add support for FileStream in ZipUtils and ZipFile 2021-04-25 02:39:47 +10:00
halx99 da1038b147 Fix crash from pr: #340 2021-04-24 18:15:54 +08:00
halx99 5484825229 Fix indent with clang-format [ci build] 2021-04-24 16:58:41 +08:00
rh101 155fe98406 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
rh101 e1ce966be2 Remove redundant std::move 2021-04-23 22:00:33 +10:00
rh101 6502627714 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 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff 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 dd5f77c3d5 Merge: 15c8f2298d 0886473e1b 
Merge pull request #4 from rh101/master

Sync with master
 2021-04-22 21:49:43 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 6effb1642f Fix #339 [ci build] 2021-04-22 18:55:56 +08:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 57e2d5dea8 Fixed typo 2021-04-22 03:18:23 +10:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 4f0f713977 Merge: 6a868299f5 9aebfd4b0d 
Merge pull request #331 from c4games/cmake-improve

Improve cmake scripts
 2021-03-13 18:46:32 +08:00
halx99 b8892e446b Merge: 91bfb7c8ff a5cf017e0f 
Merge pull request #330 from c4games/lua54-compat

Lua 5.4 compatible
 2021-03-13 18:46:13 +08:00
halx99 d7610b8c77 Improve cmake scripts 
a. rename project 'plainluac' to 'luac'
b. add executable project 'lua'
c. unify cmake runtime directory to bin
 2021-03-13 18:18:40 +08:00
halx99 fce0f9caf0 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
halx99 6904b9f3f3 Fix depth stencil state/desc (#321) 
* Fix ds state

* fix 3d object not render

* Update DepthStencilStateGL.cpp

* fix ds, not complete

* fix image ref incorrect

* Fix metal captureScreen

* Share ds desc
needs restore properly after non-default render target destroy.

* fix gl compile

* Sync ds desc

* Only set vertex & index buffer once for batch draw

* Add set/get ds desc for renderer

* Refine code style

* Fix RenderTextureTest
a. should restore stencil desc properly

* Sync gl captureNode

* Sync GL
 2021-01-31 22:22:52 +08:00
halx99 472266c25c Fix #318 2021-01-27 12:03:42 +08:00
halx99 53bbf7368c Fix warnings 2021-01-26 19:00:04 +08:00
halx99 03e130a19f Revert "Fix #313" 2021-01-21 12:41:01 +08:00
halx99 be79c908c5 Fix ParticleBatchNode texture not bind [ci build] 2021-01-19 23:53:22 +08:00
halx99 734602069e Fix #313 
a. error: depthAttachment PixelFormat (MTLPixelFormatInvalid) and stencilAttachment PixelFormat (MTLPixelFormat Depth32Float_Stencil8) must match.
b. Because we only support D24S8(D32FS8) combined format, so needs check
TargetBuffferFlags::DEPTH_AND_STENCIL when setup depth and stencil
format, otherwise newRenderPipelineWithDescriptor will crash.
 2021-01-16 00:01:21 +08:00
halx99 984c164c57 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00
aismann f38b271650 Update controller.cpp 
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)

Maybe a Wiki entry is also usefull?
 2020-12-20 07:11:13 +01:00
halx99 3ebb1f57c0 Fix next drawable maybe nil crash[ci build] (#310) 2020-12-17 15:31:16 +08:00
halx99 b92c3d30c4 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 86e0340b9d Sync yasio [ci build] 2020-12-15 18:58:04 +08:00
halx99 3a49f0e064 Merge: c3ad19df96 c95e0466e1 
Merge pull request #308 from c4games/refactor-android-run-on-gl-thread

Refactor android runOnGLThread
 2020-12-10 16:56:14 +08:00
halx99 78aaf568c6 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
halx99 ca4597a1ff Refactor android runOnGLThread 
Ensure the callback run engine core mainLoop,
This commit can solve any weird behaviors, such as:
a. text render maybe missing charactors when bring from back to frontend
b. some renderer objects alpha may present black at sdk callback call
c. some other things
All above behavior is caused gl state not ready when go back to game activity from sdk activity
 2020-12-09 15:13:57 +08:00
halx99 04db04ad93 Merge: 3f4178cc27 dbf81d7511 
Merge pull request #295 from aismann/master

CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 571adc605a fix ci 2020-12-02 03:33:53 -08:00