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

208 Commits

Author SHA1 Message Date
一线灵 dc8650d7f6
Merge pull request #639 from DelinWorks/partical-system-animation 
[PROPOSAL] Add Particle System Animations And Improvements
 2022-06-16 21:18:57 +08:00
DelinWorks 3ad75970ee Remove useless functions. 2022-06-16 16:16:19 +03:00
DelinWorks 2e3c84252d Add fourccId support. 2022-06-16 15:25:43 +03:00
Turky Mohammed 2b2a57e8ce
Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
DelinWorks ca4d1524dc extract RngSeed struct to it's separate class. [skip ci] 2022-06-16 05:01:35 +03:00
DelinWorks ee711032a7 Fix fixed fps move stuttering. 2022-06-16 03:55:46 +03:00
DelinWorks 16a4dab9d0 Add function versioning. [skip ci] 2022-06-16 00:47:19 +03:00
DelinWorks 0a1fe16b33 Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
DelinWorks 730700cf10 Fix rotation override and node base class calls. 
Make sure Node class calls it's base functions and NOT the ones overridden when changing position, and make sure the rotation set for the camera isn't altered when calling applyCustomProperties().
 2022-06-15 16:10:47 +03:00
Turky Mohammed 0e7a8a8ae8
Remove useless code and comments. [skip ci] 2022-06-15 05:25:40 +03:00
DelinWorks 8d614ada98 Fix rotation update & reference deduction. 2022-06-15 05:00:17 +03:00
DelinWorks c43880d991 Fix orthogonal apply custom positioning. [skip ci] 2022-06-15 03:55:57 +03:00
DelinWorks 81a6c508d1 Add position rotation setters & getters override for custom behaviors. 2022-06-15 03:48:26 +03:00
DelinWorks e9ce8da4ef Update CCCamera.cpp [skip ci] 2022-06-14 02:11:40 +03:00
DelinWorks a9a29c2a40 Improve system and fix near plane zoom in. 2022-06-14 01:53:35 +03:00
DelinWorks 61337ff5f4 Fix other platforms compilation. 2022-06-13 21:33:23 +03:00
DelinWorks 6d5c1a446a Add zoom and camera features. 2022-06-13 21:04:24 +03:00
一线灵 d6bfe25f76
Fix typo [skip ci] 2022-06-13 15:44:25 +08:00
halx99 6c63c55abb Improve code style 2022-06-13 14:28:09 +08:00
halx99 1339c325ba Improve code style 2022-06-13 09:45:33 +08:00
halx99 de069f201c Improve code style 2022-06-13 09:26:10 +08:00
Turky Mohammed c950c4ed1e
Merge branch 'adxeproject:dev' into partical-system-animation 2022-06-13 00:10:42 +03:00
一线灵 bd2cff3dfd
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 31dcd4eb25
Merge branch 'adxeproject:dev' into partical-system-animation 2022-06-12 17:26:54 +03:00
DelinWorks a2bea19e1e Add in-between fill in. 2022-06-12 15:57:11 +03:00
DelinWorks eff782dfb4 Add comments. 2022-06-12 15:36:25 +03:00
DelinWorks 83f801c544 Emplace dummy masks to container. 2022-06-12 15:15:51 +03:00
DelinWorks 61b3de52a3 Cleanup and add performance logs. 
Somehow not using const reference takes 30 fps away 😕
 2022-06-12 03:40:13 +03:00
DelinWorks 2836420fb3 what? [skip ci] 2022-06-12 03:10:49 +03:00
DelinWorks b670066756 Avoid unnecessary copying of memory. 2022-06-12 02:44:27 +03:00
DelinWorks 503a5bb1e4 Add emission mask transformations support. 2022-06-12 02:16:15 +03:00
DelinWorks 224bcf3397 Fix RANDOM_KISS rounding crash. 2022-06-12 01:39:11 +03:00
DelinWorks d28e92aa45 Fix RANDOM_KISS 1.0F Bias 2022-06-12 01:32:29 +03:00
DelinWorks 4d3f7ab92d Add emission mask support. 2022-06-12 00:58:01 +03:00
DelinWorks 6b133b68a2 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 3ac444efa6 Fix #651 2022-06-11 17:58:02 +08:00
halx99 345c9e11f9 Fix ci 2022-06-11 16:21:47 +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 6f4fe63208 Remove feature filename lookup dictionary 2022-06-09 16:48:59 +08: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
DelinWorks 7599aa29b1 Add HSV support and remove frame compensation. 2022-05-26 14:00:33 +03: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
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
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
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
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
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
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
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 ef56d0d335 Update copyright notices 2022-04-25 19:15:46 +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
halx99 36fa5ad84e Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +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
halx99 2a6e749ad4 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 a6a38679c1 Update uthash to 2.3.0 and move to thirdparty 2022-01-04 11:18:44 +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 7110de393a Fix TTFconfig construct with nullable customGlyphCollection 2022-01-01 21:21:34 +08:00
halx99 e534dd66c0 Rename core folder name 2021-12-31 14:39:08 +08:00