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

519 Commits

Author SHA1 Message Date
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
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 765d3f5332 Replace CC_ with AX_ 2022-07-08 02:17:41 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
Turky Mohammed d3c3fe9538 Merge: b4d04f4df9 1c02999878 
Merge branch 'adxeproject:dev' into improve-engine-types
 2022-07-06 07:21:13 +03:00
DelinWorks b9547e5407 Update FastRNG.h 2022-07-06 07:20:40 +03:00
halx99 a5e957de9f Fix ci 2022-07-05 23:47:25 +08:00
halx99 e1757a275f Merge: 3a070cd801 9d2ed962e6 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2022-07-05 15:53:50 +08:00
halx99 6aaff5cda8 Delete *.obj to avoid missing 3d model .obj 
a. build_xxx, out_xxx in .gitignore is enough ignore code .obj
 2022-07-05 15:53:33 +08:00
halx99 36caefd1d0 Committing genbindings changes 2022-07-05 07:53:11 +00:00
Turky Mohammed 656babac78 [IMPROVMENT] Change class name `Sprite3D` to `MeshRenderer` (#705) 
* First draft [skip ci]

* Improve comments [skip ci]

* Rename MeshRendererMaterial to MeshMaterial [skip ci]

* Update dependent classes.

* Replace occurrences of Sprite3D with MeshRenderer.

* Update cpp-tests and extensions.

* Fix compilation.

* Try fixing lua-bindings

* Try fixing lua-bindings

* Update lua_cocos2dx_3d_manual.cpp [skip ci]

* Create RENAMED_TYPES.md
 2022-07-05 14:48:46 +08:00
halx99 5edbfa5448 [spine] Use currentState to setup shader stubs 2022-07-05 14:40:18 +08:00
halx99 db7681bb8b [Spine] Use backend shader definations 2022-07-05 14:36:04 +08:00
halx99 ba582903fc Spine runtime can use official code 2022-07-05 14:13:15 +08:00
DelinWorks d50d34ea3b Separate renderer enums to their own file. 2022-07-04 19:52:17 +03:00
halx99 9af6fc8c88 Committing genbindings changes 2022-07-04 16:47:16 +00:00
涓€绾跨伒 e6ae7c44b3 Merge: 555f847c1f 6dd8b2c74a 
Merge pull request #702 from DelinWorks/improve-engine-types

[PROPOSAL] Move global enums to their own file.
 2022-07-05 00:39:20 +08:00
DelinWorks 96158090db Add stride functions and remove unneeded UNSPEC value. 2022-07-04 19:20:04 +03:00
DelinWorks 7e199cce21 Update lua_cocos2dx_auto.cpp 2022-07-04 18:34:50 +03:00
halx99 a31ba3caae Improve meshdata load 
- Avoid GC alloc when store indices
- Fix indices iterator by IndexArray::for_each
 2022-07-04 23:23:33 +08:00
DelinWorks 49508bd13c Improve function naming. 2022-07-04 17:45:23 +03:00
halx99 0b4363bfc0 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
DelinWorks a8d704babe Improve function naming and add descriptions. 2022-07-04 05:55:29 +03:00
DelinWorks 6a7a77c604 Update CCDirector.h 2022-07-04 04:58:13 +03:00
halx99 38743291e2 Improve class IndexArray 2022-07-04 09:13:06 +08:00
DelinWorks c97042be2e Fix android arm64 incorrect random number generation. 2022-07-04 03:28:55 +03:00
DelinWorks 35d3df7075 Fix mobile compilation. 
Treat `CC_ENABLE_CACHE_TEXTURE_DATA` portion of code accordingly.
 2022-07-03 22:50:19 +03:00
DelinWorks a4be3feda6 Update lua_cocos2dx_auto.cpp 2022-07-03 21:40:51 +03:00
DelinWorks 0ff762b835 Move global enums to their own file. 2022-07-03 20:43:55 +03:00
halx99 5f4e2c0463 [WIP] Wrapper IndexArray with byte_buffer 2022-07-03 17:24:10 +08:00
halx99 e0e7b2a6c5 Committing genbindings changes 2022-07-03 07:36:16 +00:00
halx99 7ef1ab7eb0 Committing genbindings changes 2022-06-30 13:51:59 +00:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 18f7def462 Committing genbindings changes 2022-06-30 12:22:46 +00:00
涓€绾跨伒 5ef42d4e39 Merge: 42fc96bdac 3d1690cc25 
Merge pull request #681 from adxeproject/refactor-layer-new

Use sprite to implement layer color for auto batch draw
 2022-06-30 20:13:30 +08:00
涓€绾跨伒 118c1af907 Merge: 752d3150eb f52bc9472d 
Merge pull request #682 from aismann/poly2tri

poly2tri:  Version: git 81612cb  (until May 20, 2022)
 2022-06-30 19:07:49 +08:00
halx99 32f3777128 Fix ci 2022-06-30 18:15:43 +08:00
aismann 9f060fbd99 Version: git 81612cb (until May 20, 2022) 2022-06-30 12:13:55 +02:00
halx99 502d80ede1 Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 f48be5bf4a Committing genbindings changes 2022-06-28 09:42:02 +00:00
涓€绾跨伒 6d1a2e70e7 Merge: 040a64b920 884a4c3b1d 
Merge pull request #675 from adxeproject/unify-fps-limit

Unify frame rate control logical to director mainLoop
 2022-06-28 17:33:00 +08:00
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
halx99 0acbfdb35a Committing genbindings changes 2022-06-28 08:51:45 +00:00
涓€绾跨伒 614397d0f4 Merge: 7f795d7a6c c6c07428bf 
Merge pull request #677 from rh101/rendertarget-fix

Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00
halx99 f8c036e621 Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 62af2299a6 Allow the selection of a shared or new render target for each instance of RenderTexture 
Add a method to check if the RenderTexture is using a shared render target
 2022-06-28 17:42:33 +10:00
halx99 6d9c4ea327 Fix ci 2022-06-28 14:53:39 +08:00
halx99 7591ed14cd Committing genbindings changes 2022-06-25 07:30:20 +00:00
涓€绾跨伒 79a1399b7c [CMake] Remove dup link 2022-06-25 15:23:40 +08:00
aismann b4a7e3823f Revert "Small improvemnts" 
This reverts commit 945b65716f.
 2022-06-25 02:06:31 +02:00