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

670 Commits

Author SHA1 Message Date
halx99 42f666ff89 Refactor GL uniform block support 2023-07-19 19:20:06 +08:00
RH 6bc2deeba8 Update Sprite::getQuad() to return const reference (#1260) 2023-07-09 19:00:12 +08:00
halx99 94b5705bd3 Improve cmake script 
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
 2023-07-06 19:21:36 +08:00
halx99 0f8c198bbd Sync lua-bindings 2023-07-05 20:22:44 +08:00
halx99 3eac3abecf Sync yasio to latest 2023-06-24 21:18:27 +08:00
Deal(涓€绾跨伒) feffe4095c Update 3rd sources (#1240) 
- llhttp: 8.1.1
- yasio: latest
- recast 1.6.0
- openal-soft: latest for official UWP support
- glad 2.0.4
- libpng 1.6.40
- astcenc 4.5.0
- Add fastlz: latest
- Disable lz4 by default
 2023-06-24 09:17:14 +08:00
halx99 2d81db7869 Fix lua bindings 2023-06-11 15:07:31 +08:00
Deal(涓€绾跨伒) abd8029f64 Remove CC prefix from code file name (#1230) 
* Add migrate sources tool

* Fix include replace regex

* Fix compile

* Migrate maually

* Disable sources-migrate tool by default

* Fix ci

* Fix ci

* Improve source migrate

* Fix ios/tvos ci

* Fix ios/tvos ci

* Fix
 2023-06-11 13:08:08 +08:00
Deal(涓€绾跨伒) bc82034ffd Improve media-engine for android, linux (#1228) 
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme

* Fix ci

* Improve code style

* Improve

* Update VlcMediaEngine.cpp

* Update AvfMediaEngine.h

* Fix ci

* Improve code style

* Enable androidx gradle.properties [skip ci]

* Improve code style

* Remove unnecessary callbacks

* Rename VideoPlayer to MediaPlayer
 2023-06-10 22:05:49 +08:00
halx99 5e9415e09c Committing genbindings changes 2023-06-05 09:19:09 +00:00
halx99 4899f00893 Committing genbindings changes 2023-05-31 12:31:31 +00:00
halx99 5511af4a47 Committing genbindings changes 2023-05-23 11:54:13 +00:00
halx99 50b9249e28 Update yasio to latest 2023-05-14 22:39:05 +08:00
halx99 d347a454a7 Update spine to 4.1-fc05ecf 2023-05-07 21:15:56 +08:00
halx99 f90b01e63f Fix fairygui bmfont scale problem 2023-05-03 17:33:42 +08:00
RH 8f56fd9e3c Update LUA constants for target platform (#1192) 2023-04-28 14:55:27 +08:00
halx99 5ae3cc6c99 Fix fairygui FUILabel stack overflow 2023-04-26 19:19:20 +08:00
halx99 43a2bbf2fc Committing genbindings changes 2023-04-05 08:27:15 +00:00
halx99 8f2a4a22ef Improve code style 2023-04-05 11:06:25 +08:00
halx99 56d0851c69 Committing genbindings changes 2023-04-02 01:37:22 +00:00
halx99 8469c86eb6 Fix lua binding 2023-04-02 09:29:12 +08:00
Deal(涓€绾跨伒) 1e6e9d4a8d Media engine video texture (#1133) 
* VideoPlayer based on new MediaEngine[Win32/UWP]

* Improve MediaEngine interface

* Update readme

* Improve pixel format

* Improve MediaEngine interface

* Ready for PR UWP/Win32

* Ready for PR UWP,Win32

* Update reademe files

* Update readme files

* Update UIVideoPlayer-android.cpp [skip ci]

* Update UIVideoPlayer-ios.mm

* Update MFUtils.cpp

* Fix ci
 2023-03-25 08:37:51 +08:00
halx99 32c32bf98a Committing genbindings changes 2023-03-14 00:03:28 +00:00
aismann 213afaefa7 add axmol_ext.h (#1117) 2023-03-14 07:56:07 +08:00
Joilnen cb140abfd5 fixing some warning messages of code not conform C++20 yet (#1113) 
* fixing some warning messages of code not conform C++20 yet

* trying to compile in C+17 because UWP
 2023-03-13 21:35:42 +08:00
halx99 48d45fe0f1 Committing genbindings changes 2023-03-11 15:01:39 +00:00
Deal(涓€绾跨伒) 277bcd44ce Windows Store UWP apps support (#1108) 
* [BIG FEATURE] Windows Store UWP apps support

* Fix ci, add uwp for pr-ci

* Fix ci

* Improve ci script

* Fix ci

* Fix ci

* Fix ci

* Fix ci

* Upload uwp appx package artifacts [skip ci]

* Use d2d draw system font text

* Fix ci

* Improve code style
 2023-03-11 22:10:18 +08:00
halx99 8bf4817ff7 Fix compile errors in c++17 2023-03-08 08:34:17 +08:00
halx99 a9f2e03c18 Committing genbindings changes 2023-03-07 15:34:03 +00:00
tkzcfc b4b25b3edd fix: type judgment error (#1084) 
* fix: type judgment error

---------

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
Co-authored-by: HYGK-PC\Administrator <tkzc@foxmail.com>
 2023-02-27 19:12:21 +08:00
halx99 ad9760aa85 Fix live2d sdk crash issue 2023-02-23 21:59:00 +08:00
halx99 b8528b920a Committing genbindings changes 2023-02-14 15:38:16 +00:00
halx99 ed9e539a85 Fix ci 2023-01-24 18:27:40 +08:00
halx99 e5cc37cd40 Fix ci 2023-01-24 17:44:54 +08:00
halx99 a46581532e Update ImGui 2023-01-24 17:20:31 +08:00
halx99 22d3f93864 Improve code style 2023-01-24 15:01:06 +08:00
solan-solan 7378af1e88 GL_RGBA32F GL backend support (#1034) 
* Added GL_RGBA32F_EXT for GL backend to support floating point textures.

* Committing genbindings changes

* Added fp texture constant to mtl.

Co-authored-by: solan-solan <solan-solan@users.noreply.github.com>
 2023-01-19 22:10:41 +08:00
halx99 32740c2d58 Remove unused from cmake script 2023-01-17 10:08:09 +08:00
halx99 ae14727dc7 Fix #1032 2023-01-17 10:06:09 +08:00
halx99 9ce1d9a3e7 Committing genbindings changes 2023-01-06 15:48:02 +00:00
halx99 58a76fe8ee Fix dll link 2023-01-06 23:21:09 +08:00
halx99 79b90a95dd Fix dll linkage 2023-01-06 18:38:16 +08:00
涓€绾跨伒|Deal 4108bdd048 Fix ci 2023-01-05 02:47:23 +08:00
halx99 98efcfe193 Update yasio to latest 2023-01-04 23:20:07 +08:00
halx99 bb01a66859 Merge: b164698459 6f08abab88 
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
 2023-01-04 23:06:18 +08:00
halx99 aeedf0daee Improve posix macro definations 2023-01-04 23:05:52 +08:00
halx99 46e33bb548 Committing genbindings changes 2023-01-04 14:59:56 +00:00
halx99 3f9cbc3c16 Committing genbindings changes 2023-01-01 10:21:43 +00:00
halx99 ff419dfc47 Committing genbindings changes 2022-12-29 09:01:26 +00:00
tkzcfc 8cd1e6f114 Fix download task creation failure Program crash (#984) 
* Support return type'ResourceData'

* Revert "Support return type'ResourceData'"

This reverts commit dd38d06350.

* Support return type'ResourceData'

* Support binary files

* Support Lua to call cc.utils: capturenode

* Support Lua to call cc.utils: capturenode

* export: sp.SkeletonAnimation:findBone sp.SkeletonAnimation:getBoundingBox

* export 'setAttachment' function to lua

* Committing genbindings changes

* search path adding repeated judgment

* add macro definition  AX_NO_DUP_SEARCH_PATH

* add macro definition  AX_NO_DUP_SEARCH_PATH

* Update core/platform/CCFileUtils.cpp

* Fix downloader crash in the lua coroutine

* fix download task creation failure Program crash

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
Co-authored-by: HYGK-PC\Administrator <tkzc@foxmail.com>
 2022-12-12 20:56:48 +08:00
halx99 850b0990c3 Fix #972 2022-12-11 15:58:55 +08:00
halx99 2fade7328a Committing genbindings changes 2022-12-07 01:31:10 +00:00
aismann 23b19d4b40 Update README.md (#976) 2022-12-02 18:58:15 +08:00
halx99 bb333ed92f Committing genbindings changes 2022-11-28 00:44:15 +00:00
RH 2e30b51ab7 Add a pool for GroupCommand rendering commands (#969) 
* Committing genbindings changes

* Use a pool of GroupCommand entries to avoid multiple entries of the same group in the render queue in certain scenarios

* Ensure captureNode works as expected.

* Set member variables to default values when init method is called on the GroupCommand

* Explicitly reset the command state when retrieving a GroupCommand from the pool
 2022-11-28 08:37:22 +08:00
Vincent Lee 5f6e1cd42d Fix warnings (implicit conversion loses and use of deprecated function) 2022-11-20 09:58:34 +09:00
halx99 ff4a796a62 Fix ci 2022-11-15 14:34:18 +08:00
halx99 1d7e0da834 Fix ci 2022-11-15 12:28:57 +08:00
halx99 5b846f66c1 Fix ci 2022-11-15 12:21:50 +08:00
halx99 6e119c16c6 Improve cmake 2022-11-15 12:08:14 +08:00
涓€绾跨伒|Deal b01d58a466 Update init.lua 2022-11-12 20:34:48 +08:00
halx99 3d1bf684a4 Fix ci 2022-11-10 22:03:40 +08:00
halx99 0279d5c158 Fix #958 2022-11-10 21:22:55 +08:00
halx99 f11daa7347 Committing genbindings changes 2022-11-07 08:04:54 +00:00
halx99 44b5b1f4bd Add missing source files 2022-11-07 15:55:05 +08:00
halx99 e12b56fd3f Update spine runtime to v4.1-c9af18e 2022-11-07 15:48:19 +08:00
halx99 a8f3863603 Fix spine RotateTimeline 2022-11-03 18:00:48 +08:00
halx99 928a44c69f All gl APIs from glad 2022-11-01 19:49:57 +08:00
halx99 65920b8f9d Fix ci 2022-11-01 16:02:13 +08:00
halx99 f00174bfcc Committing genbindings changes 2022-11-01 04:19:28 +00:00
halx99 9d2aba2b00 Fix ci 2022-11-01 12:12:13 +08:00
halx99 ea260806a9 Fix ci 2022-11-01 11:40:06 +08:00
halx99 33599119ae Committing genbindings changes 2022-11-01 01:34:53 +00:00
涓€绾跨伒|Deal a880bfc6e1 Fix ci [skip ci] 2022-11-01 09:22:19 +08:00
halx99 0749378bc8 Committing genbindings changes 2022-10-31 22:56:01 +00:00
涓€绾跨伒|Deal 29014d0ac8 Merge: f10e63c24d f1a2c04672 
Merge pull request #942 from axmolengine/remove-search-resolutions-support

Remove  FileUtils::searchResolutionsOrderArray
 2022-11-01 06:48:57 +08:00
涓€绾跨伒|Deal 6ddd6f0e05 Update CMakeLists.txt 2022-11-01 06:47:36 +08:00
halx99 cdf9e3f66a Fix ci 2022-10-31 14:45:07 +08:00
halx99 a87bf2ee4b Fix effekseer compiling [skip ci] 2022-10-31 14:30:33 +08:00
halx99 56d66aba67 Remove FileUtils::searchResolutionsOrderArray 2022-10-30 23:03:39 +08:00
halx99 b1315f0c85 Update extensions/CMakeLists.txt 2022-10-30 23:00:33 +08:00
halx99 a259aefb77 Update readme for extensions 2022-10-30 22:53:58 +08:00
halx99 5d4b821f9e Add particle effect extension 'Effekseer' support 
- By default, OFF
- Use cmake option AX_ENABLE_EXT_EFFEKSEER=TRUE to enable it
 2022-10-30 22:52:39 +08:00
halx99 54ef53f939 Committing genbindings changes 2022-10-20 12:52:19 +00:00
tkzcfc 8a2f5d6666 Fix downloader crash in the lua coroutine (#927) 2022-10-18 17:42:19 +08:00
涓€绾跨伒|Deal 30298a456e Create README.md 2022-10-17 22:15:27 +08:00
halx99 8b674f73ba Update Dear ImGui to v1.88, refer to #895 2022-10-17 21:46:16 +08:00
halx99 8f9e610713 Committing genbindings changes 2022-10-13 14:08:14 +00:00
halx99 567069236b Luabinding: Add std:🧵:id support 2022-10-12 14:22:45 +08:00
halx99 496962f762 Committing genbindings changes 2022-10-11 23:33:16 +00:00
aismann 3ef8ac63f2 rename cocos2d to axmol (#920) 
* rename cocos2d to axmol

* rename cocos2d.h to axmol.h

* Update Physics3DTest.cpp

replace Sprite3D -> MeshRenderer
 2022-10-12 00:15:09 +08:00
RH 461e7cfee6 Fix to UI touch location and add keyboard support for ImGui on Android (#910) 
* Committing genbindings changes

* Fix for X position calculation not factoring in X origin.
Reduce code duplication.

* Add keyboard input support
 2022-10-10 10:16:19 +08:00
RH 34094038d5 Enable ImGui for Android (#909) 
* Add support for ImGui usage on Android
 2022-10-10 03:53:24 +08:00
halx99 95d3fcb16a Migrate lua scripts, remove deprecated files 2022-10-07 21:24:11 +08:00
halx99 6b73bb1045 Improve code style 
Also fix compile error on c++23
 2022-10-06 21:32:20 +08:00
halx99 7343c969fa Committing genbindings changes 2022-10-04 03:15:52 +00:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
tkzcfc 5f8b96d607 export 'setAttachment' function to lua (#868) 
* export: sp.SkeletonAnimation:findBone sp.SkeletonAnimation:getBoundingBox

* export 'setAttachment' function to lua

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
 2022-09-27 19:15:11 +08:00
halx99 b087ac671f Committing genbindings changes 2022-09-26 16:13:15 +00:00
halx99 ad69ed003a Remove unnecessary APIs 2022-09-26 23:20:54 +08:00
halx99 823e6e406f Migrate ImGui source files name 2022-09-26 22:56:47 +08:00
halx99 90bcd95eec Fix ci warning 2022-09-24 12:58:28 +08:00
halx99 c4b11658cd Committing genbindings changes 2022-09-24 04:39:58 +00:00
halx99 3a9a26c743 Fix #861 2022-09-23 22:41:30 +08:00
halx99 ea1b70288d Update thirdparty libs 
fmt: 9.0.0 --> 9.1.0
llhttp: 6.0.7 --> 6.0.9
astc-encoder: 4.0.0 --> 4.1.0
webp: 1.2.2 --> 1.2.4
flatbuffers: 2.0.0 --> 2.0.8
 2022-09-15 20:15:28 +08:00
tkzcfc b051164bf2 Support Lua to call cc.utils: capturenode (#848) 2022-09-06 21:23:44 +08:00
Paulo Coutinho f5aeb5a8c2 Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
halx99 87f71ba3a9 Migrte lua script files 2022-08-15 16:28:32 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 729916c58f Committing genbindings changes 2022-08-11 03:03:29 +00:00
halx99 fc401343d8 Migrate extension 'ImGUI' 2022-08-11 10:02:30 +08:00
halx99 e3799aec91 Committing genbindings changes 2022-08-11 01:57:48 +00:00
涓€绾跨伒 2c4f0c7278 Improve performance with std::move 2022-08-09 13:21:53 +08:00
aismann 5d64474cfb rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02:00
aismann 8139894edd replace push_back() vs emplace_back() on extension (#785) 2022-08-09 09:54:53 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 ddc7d8ccd0 Merge: f40c44755f 7a7c8fe2ae 
Merge branch 'dev' of https://github.com/axis-project/axis into dev
 2022-08-06 22:03:14 +08:00
halx99 714d814288 Improve android setup tools 
- Rename ANDROID_SDK to ANDROID_SDK_ROOT, refer to: https://developer.android.google.cn/studio/command-line/variables
- CMake: Use ndk in sdk_root/ndk/xxx/
 2022-08-06 22:02:58 +08:00
halx99 64ec0587a5 Committing genbindings changes 2022-08-06 12:11:55 +00:00
Turky Mohammed 818eb3d754 [PROPOSAL] Add wireframe rendering and function classification improvements. (#778) 
* Add wireframe rendering and function classification improvements.

* Fix platform compilation.

* Update CommandBufferGL.cpp

GL_LINE and GL_FILL are no present in mobile devices, so the raw value has been used instead.

* Update CommandBufferGL.cpp

* Try fix IOS compilation

* Update CommandBufferMTL.h [skip ci]

* GLES & D3D11 wireframe

Added crude but okay wireframe mode for GLES and D3D11 devices.
 2022-08-06 16:17:55 +08:00
halx99 ca3c6fe1fd Fix #776 2022-08-04 21:05:48 +08:00
tkzcfc 8e6d06e9fe Support spine binary files (#777) 2022-08-04 20:11:11 +08:00
涓€绾跨伒 c28df20133 Merge: 654326ec5a 6c08914f74 
Merge pull request #772 from askamn/dev

Replace getSpriteFrameByName() with findFrame() in cocos-studio
 2022-08-03 09:53:53 +08:00
pietpukkel 1a6575ae52 Support for Apple Silicon / M1 
Added universal libraries where needed and changed PNG CMake file to include ARM files when generating Mac XCode project.
 2022-08-02 17:48:03 +02:00
unknown d6e6e81505 Replace getSpriteFrameByName() with findFrame() in cocos-studio 2022-08-02 20:01:44 +05:30
halx99 2f90855c0a Fix live2d_tests android build 2022-08-02 17:55:42 +08:00
halx99 752c4d1d16 Committing genbindings changes 2022-08-02 00:29:11 +00:00
halx99 dec34b4471 Sync spine=3.8 latest 2022-07-26 21:04:27 +08:00
tkzcfc 839097ed95 [Lua Binding] Support return type 'ResourceData' (#763) 2022-07-22 13:13:22 +08:00
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
halx99 07906b96e1 Fix #758 2022-07-20 18:41:33 +08:00
halx99 c4feff6e3a Committing genbindings changes 2022-07-20 00:57:28 +00:00
halx99 57a65dc8ce Committing genbindings changes 2022-07-19 10:58:12 +00:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
halx99 9c97f210df Remove check since axis allways enable string-pooling 2022-07-16 17:53:01 +08:00
涓€绾跨伒 a5e442b33c Merge: 2e0ac94240 4974d1181c 
Merge pull request #750 from axis-project/migrate-macros

Migrate macros 'CC_' to 'AX_'
 2022-07-16 12:45:47 +08:00
halx99 e90579ed96 Sync platform macros [skip ci] 2022-07-16 10:53:30 +08:00
halx99 c16a33e347 Migrate more macors 2022-07-16 10:43:05 +08:00
涓€绾跨伒 ac1872494c Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 41d2c44308 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
halx99 05805987d5 Sync docs for namespace migrate 2022-07-15 18:40:42 +08:00
halx99 11be5350f9 Fix lua templte 2022-07-12 23:21:04 +08:00
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00