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

1460 Commits

Author SHA1 Message Date
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
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 043d139669 Now, the lua binding generator should works [ci build] 2020-11-02 16:47:33 +08:00
halx99 f27b1201c8 fix userdefault getBoolForKey incorrect 2020-10-27 17:27:52 +08:00
halx99 a0805f52df GLES ios compile 2020-10-27 01:42:05 -07:00
halx99 975ef2ff61 Lock name 2020-10-24 21:57:36 +08:00
halx99 b8834bc086 Finsih rename 2020-10-22 10:58:10 +08:00
HALX99 0a1af78a0e
Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 3b6545b4b4 Fix CCFileStream write bits 
make it behavior same with fopen "wb"
 2020-10-21 10:58:48 +08:00
HALX99 90ecc475f0
Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 e28a292ec3 API qualifiers improments 2020-10-07 00:07:53 +08:00
halx99 ec6b9c650a Remove dep 2020-09-25 13:49:23 +08:00
halx99 cba91e085a Delete file ant.properties 2020-09-25 13:17:03 +08:00
halx99 f9c70bc1e9 Sync feature from b2a0cb5e2f 2020-09-25 13:13:54 +08:00
halx99 64e5cde97d Delete unused source files 2020-09-25 13:08:39 +08:00
HALX99 235f09f635
Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
HALX99 5a32bcfdaf
RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
HALX99 f6d51583a8
fix macro 2020-09-21 11:38:21 +08:00
halx99 5d5c948218 fix ci 2020-09-11 14:45:45 +08:00
halx99 874946fccb Tidy code 2020-09-11 00:10:44 +08:00
halx99 556e0d05d3 Move getFileDataFromZip from FileUtils to ZipFile and mark it as deprecated 2020-09-06 17:00:20 +08:00
halx99 81e4c28d24 Fix mac [skip appveyor] 2020-09-04 18:16:13 +08:00
halx99 53509b8833 Fix glviewimpl for osx 2020-09-04 17:58:34 +08:00
HALX99 7a2f91e514
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 2539e78774
Merge pull request #188 from halx99/etc2-support 
Add etc2 compressed texture support
 2020-09-01 00:16:01 -07:00
halx99 8cad7319f6 Use uint8_t instead unsigned char for byte buffer [skip appveyor][skip travis] 2020-09-01 14:57:18 +08:00
halx99 5bfce4bed4 Add copyright notice [skip appveyor][skip travis] 2020-09-01 13:24:45 +08:00
halx99 6c129165f5 Also decode bmp to RGBA8888 directly 2020-09-01 12:06:21 +08:00
halx99 f3c17427aa More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 5e0e017b2a wrap fowardPixels for hardware decoder 2020-08-31 23:09:42 +08:00
halx99 dffbad412a Improve images decoder 2020-08-31 21:04:47 +08:00
halx99 aa9e5130e4 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
halx99 18037c44de Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 5cfc6fe7ed Remove test code [skip appveyor] [skip travis] 2020-08-31 16:31:37 +08:00
halx99 201b91e242 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 3426d03745 ETC2 software decode support 2020-08-31 14:11:48 +08:00
halx99 e7811e707a 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 1975ad1f94 Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS 2020-08-28 12:57:00 +08:00
halx99 9ae19df7e0 Improve listFiles for win32, use std::move avoid string deep copy 2020-08-28 11:05:32 +08:00
halx99 0fd2364429 fix #179 2020-08-28 11:04:14 +08:00
halx99 bf3a608c01 freetype stream parsing support, reduce memory use on FontCache 2020-08-27 11:35:55 +08:00
halx99 c3b823586b Refine code style 2020-08-27 10:19:21 +08:00
halx99 fe4d26cea1 Rename PXFileStream to CCFileStream 2020-08-27 00:21:44 +08:00
halx99 a567820461 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 37ddd1cbfa Consider mutex use, which object dou you want guard? 2020-08-18 12:48:16 +08:00
halx99 98bdeef044 Sync fix from https://github.com/cocos2d/cocos2d-x/pull/20518 2020-08-18 12:09:56 +08:00
halx99 9d9067dec4 Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 185934c45e Make android listFiles behavior same with other platforms 2020-08-17 12:09:31 +08:00
aismann b7b2687758
OpenGL 'works' better... 2020-08-07 08:10:12 +02:00
halx99 428ff263b3 Add missing optimize from v3 2020-08-05 13:10:37 +08:00
halx99 421cf7b1ad win32 cover wide API use, remove unused long getFieSize(const std::string&) 2020-08-05 12:24:31 +08:00
halx99 66a198ab2b utf-8 file path 2020-08-05 12:17:57 +08:00
HALX99 8e72fe24b4
Merge pull request #135 from halx99/unify-plist-ops 
Unify plist implementation, remove apple specific sources.
 2020-08-02 20:22:36 -07:00
halx99 3e95b8ccf3 Unify plist implementation, remove apple specific sources. 2020-08-03 10:48:26 +08:00
halx99 6fd4d6e4ab Adapte multi monitors 2020-08-03 10:33:04 +08:00
halx99 f396ba9983 Unnecessary space lilne [skip appveyor] [skip travis] 2020-08-02 17:00:35 +08:00
halx99 99432aa171 Optimize param use. 2020-08-02 16:48:19 +08:00
halx99 a624babd09 vidMode need moniter 2020-08-02 16:36:58 +08:00
halx99 020b0ff79c Update comment [skip appveyor] [skip travis] 2020-08-02 16:24:30 +08:00
halx99 6a133fa1e5 check isFullscreen 2020-08-02 16:22:41 +08:00