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

541 Commits

Author SHA1 Message Date
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
aismann b79fab0a97 Small improvemnts 2022-06-25 02:00:10 +02:00
涓€绾跨伒 d8a66d4897 Merge: 61c159d3d0 932c3bcffa 
Merge pull request #668 from adxeproject/adxe-ext-live2d

Add extension Live2D support
 2022-06-24 16:23:26 +08:00
涓€绾跨伒 0e94f96b8a Merge: 6431cd1256 e4b891e550 
Merge pull request #667 from FireStorm2012/FireStorm2012-patch-1

Fix print log format
 2022-06-24 15:46:45 +08:00
halx99 e6accc2f7e Add extension Live2D support 
Live2D sdk version: 4-r.4, reelase date: 2021/12/09
 2022-06-24 15:18:08 +08:00
FireStorm2012 9de425666b Update lua_xml_http_request.cpp 
print log bugfix
 2022-06-24 15:01:26 +08:00
halx99 52f6bcb989 Committing genbindings changes 2022-06-24 06:28:59 +00:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +08:00
halx99 1122db3ec8 Improve code style 2022-06-24 03:09:50 +08:00
halx99 6068b0389e Committing genbindings changes 2022-06-19 17:57:08 +00:00
halx99 4cf6c52cf4 string_view 2022-06-20 01:49:50 +08:00
DelinWorks 2de02067d3 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
涓€绾跨伒 19e96d53c8 Rename is64BitIOSDevice to is64BitMobileDevice 2022-06-17 22:54:52 +08:00
涓€绾跨伒 0c431fddf1 Fix ci 2022-06-17 22:50:29 +08:00
halx99 61956d8dd6 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 482df4befc Committing genbindings changes 2022-06-16 13:25:34 +00:00
涓€绾跨伒 9b50a8e8c3 Improve text rendering (#652) 
* Improve text-rendering
a. Separate outline texture data upload for GL and Metal backend
b. Fix memory leak of FontAtlas::_currentPageDataRGBA
b. Add FontFreeType::setMissingGlyphCharacter for rendering a missing char
d. Improve FontFreetype::renderCharAt with memcpy
 2022-06-13 01:44:31 +08:00
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00
halx99 1e080a0f60 Committing genbindings changes 2022-06-09 09:21:12 +00:00
halx99 7943dce776 Committing genbindings changes [skip ci] 2022-06-09 08:51:15 +00:00
涓€绾跨伒 b6790e40e4 Merge: 1cdbf8c273 d2e96534d2 
Merge pull request #645 from aismann/patch-1 [skip ci]

Update readme.md
 2022-05-25 18:17:43 +08:00
DelinWorks e6c13ac358 Revert stashed changes temporarily. 2022-05-25 10:20:35 +03:00
halx99 3123ede6b3 Committing genbindings changes [skip ci] 2022-05-25 02:36:38 +00:00
Turky Mohammed d0b551d26b Merge: 6e1d48835e 193ed82788 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 16:55:30 +03:00
DelinWorks 5239256b13 Improve particle RNG and add useful functions 
Replaced M11 RNG with KISS RNG which is better and fixes a problem with particle strafing, added the ability to pause the entire particle system (useful for pause menus) and ability to control particle system time speed multiplier 馃挭馃ザ
 2022-05-23 16:04:09 +03:00
halx99 71c27f43d8 Fix ios device install problems 
- lua template missing `CFBundleExecute`
- Use `_` instead tests project to avoid unknown error
 2022-05-23 17:03:07 +08:00
DelinWorks 4f7bbcdb48 Add TODO 2022-05-21 16:56:56 +03:00
halx99 38510615db Improve code style 2022-05-21 21:55:48 +08:00
DelinWorks 0a8035c12c Add sprite frame and animation descriptors support 2022-05-21 16:48:46 +03:00
halx99 6dfbe87c3b Fix parameter order 2022-05-20 17:03:26 +08:00
halx99 d84e14e290 Committing genbindings changes [skip ci] 2022-05-18 05:00:01 +00:00
halx99 dffaf9b8d7 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +08:00
涓€绾跨伒 1a626761a6 Fix include 2022-05-16 08:06:51 +08:00
halx99 a2fcc61a10 Committing genbindings changes [skip ci] 2022-05-13 13:15:09 +00:00
halx99 c3f40d2b36 Improvements and bug fixes 
Improve ResizableBufferAdapter style

Improve extesnion adxelua

Improve code quality

Fix lua-tests BillBoardTest

Sync texture pixel format enum values for adxelua

Fix luaval_to_vec2 parameter location

Improve windows workflow

Improve cmake scripts

Take care Texture2D::setDefaultAlphaPixelFormat use
 2022-05-13 21:06:29 +08:00
halx99 a6dbeb029e Committing genbindings changes [skip ci] 2022-04-28 04:20:11 +00:00
halx99 cc5509f23a Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 c441e517ed Committing genbindings changes [skip ci] 2022-04-25 01:43:44 +00:00
涓€绾跨伒 479c45ca9a Update README.md 2022-03-30 15:40:06 +08:00
halx99 fad7ac3258 Improve LuaObjcBridge 2022-03-25 10:35:18 +08:00
halx99 a236e9481e Committing genbindings changes [skip ci] 2022-03-18 14:27:43 +00:00
halx99 4a2cd4a4fb Committing genbindings changes [skip ci] 2022-03-18 13:52:57 +00:00
halx99 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
deal f6fa99b184 Update README.md [skip ci] 2022-02-25 19:09:06 +08:00
halx99 323ed9431b Renaming extension ImGuiEXT to ImGui 
The singleton class ImGuiEXT also was renamed to ImGuiPresenter
 2022-02-25 19:03:09 +08:00
halx99 55f656d9db Committing genbindings changes [skip ci] 2022-02-24 11:08:25 +00:00
halx99 3452ab798d Update project urls 2022-02-24 18:51:36 +08:00
halx99 5e893f3b4d Update project urls 2022-02-24 18:45:25 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 87c51c656c Update plainlua to 5.4.4, pugixml to 1.12.1 2022-02-17 18:06:19 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
halx99 bee4c310da Fix WidgetPropertiesReader::getWidgetReaderClassName incorrect 2022-02-16 11:54:48 +08:00
halx99 9b3f4c3f71 Committing genbindings changes [skip ci] 2022-02-15 23:01:37 +00:00
deal 79c8ec3431 Fix #584 2022-02-12 19:56:00 +08:00
halx99 93e250889f Improve some code for #543 2022-02-08 21:54:21 +08:00
halx99 fcbc95bd47 Done #579, update ImGui to 1.87 2022-02-08 12:43:16 +08:00
halx99 bc1d0223c0 Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
deal aca3448bc3 Fix #576 2022-02-03 15:45:58 +08:00
deal de13c4bcba Delete unused 2022-01-23 11:01:42 +08:00
halx99 5486d94646 Fix lua_xml_http_request dataSize incorrect 2022-01-18 18:39:58 +08:00
deal d8dc6c8453 hard to link fmt-header-only[skip ci] 
target_link_libraries(fairygui fmt-header-only)
 2022-01-08 15:25:50 +08:00
deal f3b3b5a0b1 Update CMakeLists.txt 2022-01-08 14:01:43 +08:00
halx99 5a2807433e [spine] Improve RTTI compare performance when compiler string pooling enabled 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2012

Signed-off-by: halx99 <halx99@live.com>
 2022-01-05 14:10:05 +08:00
halx99 14a3a0de93 Fix ClippingAttachment doesn't work 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2011

Reported by: @kangleblue

Signed-off-by: halx99 <halx99@live.com>
 2022-01-04 22:38:02 +08:00
halx99 cd98e6c880 Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 2819d4f10d Improve vec2, vec3, vec4 lua storage 
a. store as fixed size array
b. use metatable access via: x, y, z, w
c. For vec2
- vec2[0] could be access via x or w(idth) or u
- vec2[1] could be access via y or h(eight) or v
 2022-01-03 22:06:49 +08:00
halx99 74271f207b Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 8beea3967f Fix ci 2021-12-31 16:29:11 +08:00
halx99 f80ddd3505 Fix ci [skip ci] 2021-12-31 15:49:45 +08:00
deal 4044d34699 Update CMakeLists.txt 2021-12-31 14:47:57 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00
deal f32280ff42 Merge: 687d15f16e 369de31853 
Merge pull request #560 from adxeproject/ahead

Merge ahead to dev
 2021-12-31 12:12:40 +08:00
halx99 64d7b55366 Update ci branch name 2021-12-31 11:00:35 +08:00
halx99 fa199da794 Improve string_view for some file 2021-12-30 09:48:39 +08:00