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

1420 Commits

Author SHA1 Message Date
halx99 74a1ac7cfe Delete unused sources 2021-08-25 16:14:15 +08:00
rh101 0266d332e5 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 65148417b2
Fix ci 2021-07-15 23:31:49 +08:00
halx99 bc6ebd920a Improve code quality 2021-07-15 23:03:43 +08:00
halx99 f70ad053c0 Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 6864ef23b5
Fix ci error 2021-07-07 14:09:11 +08:00
halx99 cc85623d30 For doxgen happy 2021-07-06 15:22:07 +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 79b13d2372 Fix #413 2021-07-04 16:40:34 +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 de656ff773 Tidy thirdparty lib xsxml, fastlib to xsbase 2021-06-25 07:29:14 +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 d56a6f53cb Update astc [ci build] 2021-06-01 23:43:54 +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
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 34026070ab Fix warning [ci build] 2021-05-14 20:50:59 +08:00
halx99 d0426578d5 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20662 2021-04-26 19:00:43 +08:00
halx99 bc4429d449 Optimize macro posix_fsetsize, use ',' is better [ci build] 2021-04-26 17:02:28 +08: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
RH 72fc8a6f4d
Merge branch 'vfs-support' into master 2021-04-26 10:39:09 +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 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 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
halx99 63ac9904c4 Fix crash from pr: #340 2021-04-24 18:15:54 +08:00
rh101 e1a9141a00 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +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
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 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 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
halx99 5821233e45 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614 2020-11-24 18:10:28 +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