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

14209 Commits

Author SHA1 Message Date
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
halx99 e8c1d7bc2c Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 9aebfd4b0d 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 41f5307d36 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
HALX99 138781151a
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 04b87dfe5d Fix #318 2021-01-27 12:03:42 +08:00
halx99 169c13ad6f Fix warnings 2021-01-26 19:00:04 +08:00
HALX99 46fad08e4c
Revert "Fix #313" 2021-01-21 12:41:01 +08:00
halx99 ab8cde3e95 Fix ParticleBatchNode texture not bind [ci build] 2021-01-19 23:53:22 +08:00
halx99 ae0c3eddef 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 208d07697f Fix next drawable maybe nil crash[ci build] (#310) 2020-12-17 15:31:16 +08:00
halx99 c44d94a2b2 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 03b605dcee Sync yasio [ci build] 2020-12-15 18:58:04 +08:00
halx99 c95e0466e1 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 bb9b40689c
Merge pull request #295 from aismann/master 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 f713ca6baa fix ci 2020-12-02 03:33:53 -08:00
halx99 108399ede3 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann 72be372699 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
aismann 5e249bf6f8 Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
HALX99 7fd68a77dc
Merge pull request #286 from rh101/add-center-vertical-layout-support 
Add support for center vertical layout
 2020-11-26 23:43:25 -08:00
HALX99 4c1ff6bd01
Merge pull request #285 from rh101/fix-listview-dimensions 
Fix ListView dimensions when child elements are scaled
 2020-11-26 23:08:30 -08:00
HALX99 74add84559
Merge pull request #282 from rh101/fix-editbox-globalz 
Ensure global Z is correctly set on all child items of EditBox
 2020-11-26 23:00:14 -08:00
rh101 17f3959a13 Allow user to set custom program type value 2020-11-27 17:26:02 +11:00
rh101 369bef3614 Add support for center vertical layout 2020-11-27 17:24:07 +11:00
rh101 f113e1f2ed Fix ListView dimensions when child elements are scaled. 2020-11-27 17:02:31 +11:00
rh101 ee996a5cfb Ensure global Z is correctly set on all child items of EditBox 2020-11-27 16:59:34 +11:00
halx99 f543356bb7 Sync yasio to 3.33.4 [ci build] 2020-11-25 19:07:21 +08:00
halx99 5821233e45 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614 2020-11-24 18:10:28 +08:00
HALX99 0d04e20b50
fix metal znear range for viewport 
https://developer.apple.com/documentation/metal/mtlrendercommandencoder/1515527-setviewport?language=objc
 2020-11-23 09:30:51 +08:00
halx99 1bd6f5680f Refine jni param types 2020-11-18 18:19:14 +08:00
halx99 eeafffe2f1 jni match natvie API param types 2020-11-18 18:17:55 +08:00
halx99 ca42ef08ba Refine jni methods decls [ci build] 2020-11-18 13:25:00 +08:00
halx99 53122216ee Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
HALX99 5ff9f4786e
fix UserDefault plain mode stack overflow 2020-11-17 19:50:58 +08:00
halx99 64c5c4612d fix ci warnings 2020-11-15 21:34:53 -08:00
halx99 57c767a66d fix #260 [ci build] 2020-11-16 12:21:27 +08:00
halx99 a71788d942 Delete unused buitin shaders 2020-11-16 11:20:12 +08:00