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

559 Commits

Author SHA1 Message Date
halx99 345c9e11f9 Fix ci 2022-06-11 16:21:47 +08:00
halx99 5c35eda3b9 Upgrade android toolsets 
- ndk to r23c
- gradle plugin to 7.2.0
- gradle wrapper to 7.4.2
- config ndk ver at adxetools.gradle
 2022-06-11 16:16:47 +08:00
halx99 86921d2c9e Delete unused comment 2022-06-11 15:30:51 +08:00
halx99 f6f6ea126d Fix ci 2022-06-11 10:14:32 +08:00
halx99 beebd22266 Fix #648, remove GB2312 charset handle, only support UNICODE font 2022-06-11 09:50:07 +08:00
halx99 a4372fe9be Change android log debug info tag 2022-06-11 09:12:40 +08:00
halx99 384fa1056f Remove unused [skip ci] 2022-06-10 17:34:46 +08:00
halx99 6f4fe63208 Remove feature filename lookup dictionary 2022-06-09 16:48:59 +08:00
halx99 879c8bd5b7 Remove ugly feature, fix ci 2022-06-09 16:40:14 +08:00
halx99 faf4d5b42e Improve performance with string_view 2022-06-09 16:30:51 +08:00
halx99 de9a56cdaf Improve performance with string_view 2022-06-09 16:19:33 +08:00
halx99 4413728f6d Fix Value large integer storage 2022-06-08 16:38:42 +08:00
一线灵 5959b9e822
Cancel downloader with closesocket when shutdown failed 2022-06-08 12:51:46 +08:00
一线灵 0117dd5c7d
Merge pull request #637 from rh101/fix-screen-blank 
Fix Android screen blank issue after unlocking device
 2022-06-07 20:05:29 +08:00
Turky Mohammed 04630b9313
Merge branch 'adxeproject:dev' into partical-system-animation 2022-06-07 13:04:51 +03:00
DelinWorks c54b142e58 Fix indentations. 2022-06-06 19:23:11 +03:00
DelinWorks 4ab0fbd62d Fix rectangular torus stretched dimensions. 2022-06-02 22:26:26 +03:00
DelinWorks fcbd50daa8 Add ability to clear emission shapes. 2022-06-02 19:29:19 +03:00
DelinWorks 2ccd401555 Add emission shapes support. 2022-06-02 19:26:02 +03:00
DelinWorks 1640b1bbfa Oops [skip ci] 2022-05-29 08:21:08 +03:00
DelinWorks d3d30711f5 Optimize code. 2022-05-29 08:13:22 +03:00
DelinWorks b822680e3a Improve performance. 2022-05-28 20:36:04 +03:00
DelinWorks 5a74146e18 Fix HSV Blending bug. 2022-05-28 20:34:19 +03:00
DelinWorks 2e8370f61c Remove useless `_isHSV` 2022-05-27 14:08:25 +03:00
DelinWorks 5d360a61bc Improve allocation safety. 2022-05-27 13:36:38 +03:00
DelinWorks eda8c1376f Make scale in smooth 😋 2022-05-27 00:29:53 +03:00
DelinWorks 298a73c746 Add spawn scale in feature. 2022-05-26 22:53:19 +03:00
DelinWorks 6fe2541992 Put loops inside ifs statements not the opposite 🤡 2022-05-26 21:34:15 +03:00
DelinWorks 83655d2798 Add spawn fade in feature. 2022-05-26 19:59:48 +03:00
DelinWorks caa1b7594e Fix texture atlas index unintended increment bug. [skip ci] 2022-05-26 16:53:26 +03:00
DelinWorks 67098c979c Conserve memory allocations & Improve animation system. 
Use memory when we need it 😠
 2022-05-26 15:56:56 +03:00
Turky Mohammed 6943fb9dce
Fix typo in HSV/HSL classes. (#647) 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-05-26 19:25:30 +08:00
DelinWorks 7599aa29b1 Add HSV support and remove frame compensation. 2022-05-26 14:00:33 +03:00
Turky Mohammed 65233211fc
Merge branch 'adxeproject:dev' into partical-system-animation 2022-05-25 22:04:13 +03:00
Turky Mohammed c6bca8ef86
Add HSV/HSL color spaces to the engine. (#642) 
* Add HSV support.

* Do not use a reference on hsv()

* Add alpha specifier to hsv()

* Rename function hsv() to rgb()

* Update ccTypes.cpp

* Fix angle wrapping

* Fix typo.

* Added HSV & HSL Support with a much better API

* Remove parameter prefixes.

* Fix self assignment.

* Fix self assignment.

* Update core/base/ccTypes.h [skip ci]

* Update core/base/ccTypes.h [skip ci]

Co-authored-by: 一线灵 <halx99@live.com>
 2022-05-25 20:10:52 +08:00
DelinWorks f0d650c6ef Revert "Revert stashed changes temporarily." 
This reverts commit c3ca96bcbc.
 2022-05-25 10:46:54 +03:00
DelinWorks c3ca96bcbc Revert stashed changes temporarily. 2022-05-25 10:20:35 +03:00
一线灵 1cdbf8c273
Update revision 2022-05-25 12:35:30 +08:00
rh101 65b70dce36 Allow the forced reformatting of RichText contents 2022-05-25 11:42:12 +10:00
DelinWorks 30f7decf25 Improve code and add frame animation independence and null indices. 2022-05-24 11:26:53 +03:00
DelinWorks ab3854f51a Improve code and add stutter compensation. 2022-05-24 09:42:27 +03:00
DelinWorks 3c3069b4fc Stop annoying me visual studio 😠 ur not helping 2022-05-24 08:58:49 +03:00
DelinWorks 9a175cb49b Add fixed FPS function for particle system. 
Useful for low-end devices.
 2022-05-24 00:49:17 +03:00
DelinWorks 27eecf1857 Improve code and add useful functions. 
Renamed some variables and functions correctly, added the ability to simulate particles and give them a true random look.
 2022-05-24 00:46:38 +03:00
DelinWorks 355eee6aac Fix particle bursts when using manual emissions. 2022-05-23 18:35:36 +03:00
Turky Mohammed 0704503186
Merge branch 'adxeproject:dev' into partical-system-animation 2022-05-23 16:55:30 +03:00
DelinWorks 6e1d48835e 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
DelinWorks 3dff79f416 Separate quad animation loop from color loop 
This improves cache hit rate which in turn increases performance 🥶
Of course that's viable when you're using pure memory pointer arrays that use simple POD-like data types.
 2022-05-23 11:32:54 +03:00
DelinWorks 09fa4da845 Improve loops using std::fill_n() [skip ci] 2022-05-23 11:11:55 +03:00
DelinWorks ba5eb463cc Recheck code and improve it (No CI I trust it 🥶) [skip ci] 2022-05-22 20:51:56 +03:00
Turky Mohammed c006fd51c0
Update core/2d/CCParticleSystem.cpp 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-05-22 17:51:42 +03:00
Turky Mohammed 13ebf7460f
Update core/2d/CCParticleSystem.cpp 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-05-22 17:42:54 +03:00
DelinWorks 35f0368fe0 Use const reference vectors 😮 2022-05-22 17:38:43 +03:00
DelinWorks 16fe6d7963 Reimplement atlas animation system 
Reimplement atlas animations with an easier workflow and make it work with the new animation descriptor system 😍🥶🥳
 2022-05-22 15:58:36 +03:00
DelinWorks a3b7217ec0 Add emitter animation random picking 2022-05-22 12:13:17 +03:00
DelinWorks 3d666712cd Update CCParticleSystem.cpp 2022-05-22 10:09:13 +03:00
DelinWorks 4a0624a9ed Macros and random functions are pain... 2022-05-21 20:23:19 +03:00
DelinWorks 30003499bd Fix Other Platforms Compilations 2022-05-21 17:57:21 +03:00
DelinWorks 1b45bba085 Fix Other Platforms Compilations 
Somehow not including `2d/CCSpriteFrame.h` makes the other platforms fail to compile but not windows :o
 2022-05-21 17:47:44 +03:00
DelinWorks ef404fed8c Add TODO 2022-05-21 16:56:56 +03:00
halx99 036dc19614 Improve code style 2022-05-21 21:55:48 +08:00
DelinWorks f18da9f6e4 Fix #include 
Visual studio thinks it's doing something useful throwing includes all around LOL
 2022-05-21 16:51:56 +03:00
DelinWorks c9ff24e830 Add sprite frame and animation descriptors support 2022-05-21 16:48:46 +03:00
halx99 73627ac0c0 Fix uri toString 2022-05-21 20:55:25 +08:00
halx99 8f0190f7ce Remove unnecessary alGetError call 2022-05-20 17:26:33 +08:00
DelinWorks 6ca5481edf Correct function naming 2022-05-20 01:45:55 +03:00
DelinWorks 49df4d727d Update 2022-05-20 01:15:39 +03:00
halx99 f9ad35af3b Delete unused code 2022-05-18 10:29:29 +08:00
rh101 3a3b899636 Fix Android screen blank issue after unlocking device with application running. 2022-05-17 14:02:02 +10:00
halx99 21fe8df12b Fix lua template duplicate res error on mac 
Fix typo

Fix cmdline fail on new macos
 2022-05-15 16:36:06 +08:00
halx99 8ef23c7fe9 Tidy audio module code 2022-05-15 09:55:57 +08:00
一线灵 30fedb5f47
Fix high-end device always 120fps 2022-05-15 04:42:39 +08:00
halx99 80ec8f43aa Cleanup code 2022-05-14 02:47:47 -07:00
halx99 e4089b4ec8 Don't include freetype internal header 2022-05-14 15:16:39 +08:00
halx99 30a164c31a 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 810b0f563d Fix incorrect sampler for non-aligned video files 2022-05-09 10:05:33 +08:00
一线灵 e4170ffc59
Fix indent 2022-05-07 20:40:54 +08:00
halx99 eb5c7758cc Fix #627 2022-05-07 20:21:22 +08:00
Turky Mohammed f8b7f20e96
Update core/2d/CCMotionStreak.cpp [skip ci] 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-05-04 10:00:38 +03:00
Turky Mohammed 6be3ac3d50
Update CCMotionStreak.cpp 2022-05-04 09:26:54 +03:00
DelinWorks edf0f5632e Update CCMotionStreak.cpp 2022-05-03 20:54:44 +03:00
DelinWorks 646f04f1c9 Update CCMotionStreak.cpp 2022-05-03 20:14:12 +03:00
DelinWorks d042af2d99 Update CCMotionStreak.cpp 2022-05-03 20:10:26 +03:00
DelinWorks 1cf7440ca0 Update CCMotionStreak.cpp 2022-05-03 20:01:12 +03:00
DelinWorks ad88b2628b Update UIVideoPlayer-win.cpp 2022-05-02 05:35:45 +03:00
halx99 4a35a8f8ae Add setPlayRate for UIVideoPlayer for windows only 2022-04-28 12:14:08 +08:00
halx99 15cf113e75 Improve code style [skip ci] 2022-04-28 12:04:23 +08:00
halx99 2bd3ce6bf2 Improve code style 2022-04-28 12:00:32 +08:00
halx99 c9f3ca9278 Improve VS Ninja workflow 2022-04-28 11:43:59 +08:00
halx99 bf2cc6205b Improve Ninja build with visual studio ide 
a. Disable PCH for Ninja, just a workaround fix compiler always said: can't open xxx.pch files
b. Remove unnecessary definition _WINSOCKAPI_ for Ninja build
 2022-04-27 18:48:57 +08:00
halx99 fbde97c360 Rename source file name match with class name 2022-04-27 18:24:33 +08:00
Turky Mohammed ad789839ef
[Fix] Camera masking bug deep child nesting (#623) 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-04-27 16:23:57 +08:00
halx99 4db3ba63b7 Match compression test images PMA with engine settings 2022-04-26 16:38:59 +08:00
halx99 c5400fa176 Remove duplicated include 2022-04-26 16:33:04 +08:00
一线灵 9c5e935fd1
Merge pull request #622 from shatyuka/dev 
Compatible with Ninja
 2022-04-26 16:20:11 +08:00
Shatyuka d71c620fc1 Compatible with Ninja 2022-04-26 15:16:02 +08:00
halx99 bc16bb1cd3 Fix missing include 2022-04-26 12:51:01 +08:00
halx99 82ecc7c9e3 Remove duplicated macros 2022-04-25 21:39:49 +08:00
halx99 ef56d0d335 Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 014e4f20e0 Add ktxv1.1 file format for etc2/etc1 support 2022-04-25 19:11:58 +08:00
halx99 0744ee4f74 Alloc astc block_size_descriptor same with original repo 2022-04-25 10:28:34 +08:00
Turky Mohammed 04f7cd1295
[Fix] Node Camera Masking Design Flaw (#621) 
* Update CCNode.cpp

* Add a separate method for assigning mask to children

* Update CCNode.cpp

* Tidy Up Stuff
 2022-04-25 09:37:41 +08:00
一线灵 1f76edf752
MSVC compiler bug? 2022-04-24 22:25:27 +08:00
halx99 aef5450056 Reindent code [skip ci] 2022-04-24 21:44:41 +08:00
halx99 a0702dfdb6 Try fix windows ci 2022-04-24 21:23:28 +08:00
halx99 5e97f88f26 Update astcenc to v3.6 2022-04-24 19:15:08 +08:00
Turky Mohammed eb66048144
Remove annoying logs when adding multiple components to a single node (#619) 2022-04-24 10:51:37 +08:00
halx99 024253df0a Delete DEPRECATED code 2022-04-23 17:49:42 +08:00
halx99 7d7a1f3f2c All compressed image should do PMA at texture convert tools or GPU fragment shader 
such as astcenc-2.3+(https://github.com/ARM-software/astc-encoder/releases) with -pp-premultiply
 2022-04-23 17:45:07 +08:00
halx99 893134c79d Delete unused code 2022-04-05 13:58:55 +08:00
halx99 0ea2db2dfd Improve use prebuilt engine libs for windows 
a. Fix msedge webview2 include for win32
b. Fix msedeg webview2 linking for apps which use prebuilt libs
c. Improve optional libs linking for apps which use prebuilt libs
d. Auto build optional libs which not dependent by engine, such as yaml-cpp
 2022-04-02 13:50:53 +08:00
halx99 4b685e9cb8 Fix #609 2022-03-24 11:03:17 +08:00
deal e7f9d7ef76
Update CCBundle3D.h 2022-03-18 22:20:31 +08:00
halx99 36fa5ad84e Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 886a7728ed Fix #602 c++20 compile errors 2022-03-17 09:37:56 +08:00
halx99 74052fd7b0 Improve shader compatible 2022-03-13 13:07:58 +08:00
halx99 6ce9dc0b8d Fix leak 2022-03-13 12:05:22 +08:00
halx99 2baa40248f Fix #597 2022-02-25 15:04:52 +08:00
halx99 2b290bd734 Enable video player test case for windows 2022-02-24 18:30:58 +08:00
halx99 97f6b0e9a5 Move video player implementation to a unique folder 2022-02-24 18:13:01 +08:00
deal 7a89757385
Add windows video play support [render video sample to texture2d] (#577) 
* [Draft] Implement windows video player

Based on microsoft media foundation

* Delete pvd

* Shutdown MF media before release player

* Consider MFMediaPlayer ref leak

* Use Microsoft::WRL::ComPtr

* Simplify code

* Improve code and take care COM object refs

* Update UIVideoPlayer-win.cpp

* Delete unused code

* Add play from url support

* Update logic

* Rename ADXE_ENABLE_MFMEDIA to AX_ENABLE_MFMEDIA

* Rescale video render sprite to view node

* Fix warnings

* Don't shallow copy the video context, it's very dangerous

* Fix compile error CC_VIDEOPLAYER_DEBUG_DRAW=1

* Fixup

* [Window video player] play event dispatch

* support switch video file

* Update UIVideoPlayer-win.cpp

* [windows-video-player] keep aspect ratio and full screen support

* Improve code

* Update changelog [skip ci]

* Update README.md

* Update README.md

* Update README.md

* Update README_CN.md

* Update README_CN.md
 2022-02-24 17:57:08 +08:00
deal a068468333
Fixup 2022-02-23 18:56:26 +08:00
halx99 2be191e380 Fix compile error CC_VIDEOPLAYER_DEBUG_DRAW=1 2022-02-23 18:39:02 +08:00
halx99 70dc9922ef Don't shallow copy the video context, it's very dangerous 2022-02-23 17:38:21 +08:00
halx99 67c6bcec4f [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 818e563e51 Finish #578 2022-02-17 17:11:17 +08:00
halx99 3409456f3f Fix #587 
Note: New OS feature 'Beta: Use Unicode UTF-8 for worldwide language support' since win10/win11
- OFF: GetACP() equal to current system locale, such as chinese simplified is 936, english is 437
- ON: GetACP() always equal to 65001(UTF-8)

Remark:
  The macro CP_ACP for ntcvt::from_chars works for converting chraset from current code page(936,437,65001) to utf-16
 2022-02-16 11:56:33 +08:00
DelinWorks f0c91e38c1 Update UITextField.h 2022-02-15 17:19:26 +03:00
DelinWorks 696b346560 feature-expose-detach-function 2022-02-15 17:17:45 +03:00
deal 7f112b4b52
Update adxe.cpp 2022-02-08 23:22:14 +08:00
halx99 25653e1d7c Fix #580 2022-02-08 12:41:18 +08:00
halx99 0867240fe9 Fix ci 2022-02-06 13:18:27 +08:00
halx99 64e678c84a Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
halx99 722b6af026 [Android][freetype] Change streamingParsingEnabled to true 
Add noCompress config to build.gradle for all templates & tests project

Exists project, please add follow config

android {

// Other configs
// ...

// noCompress config
aaptOptions {
   noCompress 'mp3','ogg','wav','mp4','ttf','ttc'
}

}
 2022-01-29 14:54:32 +08:00
deal 9197472ef8
Update adxetools.gradle 2022-01-28 19:59:27 +08:00
deal 8270c4f5dd
Update adxetools.gradle 2022-01-28 19:51:42 +08:00
deal 2bc22e1bd1
Update adxetools.gradle 2022-01-28 19:31:42 +08:00
halx99 f0fa7780d7 Improve gradle script to find cmake 2022-01-28 18:25:50 +08:00
halx99 1721141fd7 Downloader: download file with cacert support 2022-01-20 19:15:37 +08:00
halx99 6d76dd9f6b Fix log order when create download task fail 2022-01-20 19:00:52 +08:00
deal 9c88866354
Update adxetools.gradle 2022-01-17 10:57:48 +08:00
deal 612a8db9a7
Why FMT_HEADER_ONLY doesn't works on android 2022-01-08 16:15:56 +08:00
halx99 2a6e749ad4 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 a466abfda8 Fix ci 2022-01-04 11:48:28 +08:00
halx99 a6a38679c1 Update uthash to 2.3.0 and move to thirdparty 2022-01-04 11:18:44 +08:00
halx99 e86fdf8a67 Improve linkage 2022-01-04 11:00:07 +08:00
deal 9b3233bdbf
Remove dup sources 2022-01-04 09:42:10 +08:00
halx99 3d7218a0eb Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
Delin 4d56ed2948
Update CCLabelTextFormatter.cpp 2022-01-03 08:57:40 +03:00
Delin dde46fd5ee
Update CCLabel.cpp 2022-01-03 08:56:25 +03:00
Delin 2da2cad6ad
Update CCLabel.h 2022-01-03 08:55:52 +03:00
Delin a99a842bac
Update CCLabel.cpp 2022-01-03 08:39:18 +03:00
Delin e4bc205e0f
Update CCLabel.cpp 2022-01-03 08:33:00 +03:00
Delin c443b5e466
Update CCLabel.cpp 2022-01-03 08:20:34 +03:00
halx99 00e01f17c9 Add missing files 2022-01-03 11:42:07 +08:00
halx99 a651879ee6 Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 7110de393a Fix TTFconfig construct with nullable customGlyphCollection 2022-01-01 21:21:34 +08:00
halx99 85f1f0b424 Fix isAbsolutePathInternal for string_view 2021-12-31 15:50:34 +08:00
halx99 e534dd66c0 Rename core folder name 2021-12-31 14:39:08 +08:00