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

258 Commits

Author SHA1 Message Date
DelinWorks 3e98101dc4 Improve system and fix near plane zoom in. 2022-06-14 01:53:35 +03:00
DelinWorks 9ddbab21a9 Fix other platforms compilation. 2022-06-13 21:33:23 +03:00
DelinWorks a9f2e29ebf Add zoom and camera features. 2022-06-13 21:04:24 +03:00
涓€绾跨伒 010172e659 Fix typo [skip ci] 2022-06-13 15:44:25 +08:00
halx99 e3f0f29d1a Improve code style 2022-06-13 14:28:09 +08:00
halx99 2877a7eb78 Improve code style 2022-06-13 09:45:33 +08:00
halx99 aa5d3b65e0 Improve code style 2022-06-13 09:26:10 +08:00
Turky Mohammed 11c21ddde4 Merge: 31dcd4eb25 bd2cff3dfd 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-13 00:10:42 +03: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
涓€绾跨伒 faf0038a53 Update install-deps-linux.sh 2022-06-13 01:13:08 +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 f6c390296d Add in-between fill in. 2022-06-12 15:57:11 +03:00
DelinWorks 95b8cd80ef Add comments. 2022-06-12 15:36:25 +03:00
DelinWorks 8d1e3fccf4 Emplace dummy masks to container. 2022-06-12 15:15:51 +03:00
DelinWorks 4f5bcc797d Cleanup and add performance logs. 
Somehow not using const reference takes 30 fps away 馃槙
 2022-06-12 03:40:13 +03:00
DelinWorks 191d55433d what? [skip ci] 2022-06-12 03:10:49 +03:00
DelinWorks c4b2177137 Avoid unnecessary copying of memory. 2022-06-12 02:44:27 +03:00
DelinWorks 49a01563d7 Add emission mask transformations support. 2022-06-12 02:16:15 +03:00
DelinWorks 853b8601d0 Fix RANDOM_KISS rounding crash. 2022-06-12 01:39:11 +03:00
DelinWorks ce6da8c562 Fix RANDOM_KISS 1.0F Bias 2022-06-12 01:32:29 +03:00
DelinWorks c241edab27 Add emission mask support. 2022-06-12 00:58:01 +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 0462dbea43 Fix #651 2022-06-11 17:58:02 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 1e33f4ce7b Fix ci 2022-06-11 10:14:32 +08:00
halx99 9d91b7837d Fix #648, remove GB2312 charset handle, only support UNICODE font 2022-06-11 09:50:07 +08:00
halx99 8eea58226b Remove feature filename lookup dictionary 2022-06-09 16:48:59 +08:00
涓€绾跨伒 4c18771e34 Merge: 6943fb9dce 3a3b899636 
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
DelinWorks d40192ef7c Fix indentations. 2022-06-06 19:23:11 +03:00
DelinWorks 399eb0cf20 Fix rectangular torus stretched dimensions. 2022-06-02 22:26:26 +03:00
DelinWorks 905bc64cd6 Add ability to clear emission shapes. 2022-06-02 19:29:19 +03:00
DelinWorks 1157637bda Add emission shapes support. 2022-06-02 19:26:02 +03:00
DelinWorks ddd7f781ce Oops [skip ci] 2022-05-29 08:21:08 +03:00
DelinWorks b97a097486 Optimize code. 2022-05-29 08:13:22 +03:00
DelinWorks 9b0dc23742 Improve performance. 2022-05-28 20:36:04 +03:00
DelinWorks 3d731e505c Fix HSV Blending bug. 2022-05-28 20:34:19 +03:00
DelinWorks c5b50eedfe Remove useless `_isHSV` 2022-05-27 14:08:25 +03:00
DelinWorks dee4234e98 Improve allocation safety. 2022-05-27 13:36:38 +03:00
DelinWorks 47b6aad5e1 Make scale in smooth 馃構 2022-05-27 00:29:53 +03:00
DelinWorks e57f69483a Add spawn scale in feature. 2022-05-26 22:53:19 +03:00
DelinWorks 4d5d018c60 Put loops inside ifs statements not the opposite 馃ぁ 2022-05-26 21:34:15 +03:00
DelinWorks 7eba4588d6 Add spawn fade in feature. 2022-05-26 19:59:48 +03:00
DelinWorks b427bfaf74 Fix texture atlas index unintended increment bug. [skip ci] 2022-05-26 16:53:26 +03:00
DelinWorks 5f361ff58b Conserve memory allocations & Improve animation system. 
Use memory when we need it 馃槧
 2022-05-26 15:56:56 +03:00
Turky Mohammed 96d41b83e9 Fix typo in HSV/HSL classes. (#647) 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-05-26 19:25:30 +08:00
DelinWorks 726f40cda8 Add HSV support and remove frame compensation. 2022-05-26 14:00:33 +03:00
涓€绾跨伒 1e2467e6dd Merge: c6bca8ef86 ced908a1bb 
Merge pull request #646 from DelinWorks/hsv-hsl-cpp-tests

Add `cpp_tests` to HSV/HSL
 2022-05-26 04:13:01 +08:00
Turky Mohammed 554ed444c1 Merge: f0d650c6ef c6bca8ef86 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-25 22:04:13 +03: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 f23aefc182 Revert "Revert stashed changes temporarily." 
This reverts commit c3ca96bcbc.
 2022-05-25 10:46:54 +03:00
DelinWorks e6c13ac358 Revert stashed changes temporarily. 2022-05-25 10:20:35 +03:00
rh101 af0b18a54a Allow the forced reformatting of RichText contents 2022-05-25 11:42:12 +10:00
DelinWorks 84a52c519f Improve code and add frame animation independence and null indices. 2022-05-24 11:26:53 +03:00
DelinWorks 38803e0f5b Improve code and add stutter compensation. 2022-05-24 09:42:27 +03:00
DelinWorks 7bf7c10614 Stop annoying me visual studio 馃槧 ur not helping 2022-05-24 08:58:49 +03:00
DelinWorks 87ec232c10 Add fixed FPS function for particle system. 
Useful for low-end devices.
 2022-05-24 00:49:17 +03:00
DelinWorks dc4f6285d5 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
Turky Mohammed 1bcf616d44 Merge: eb8404f1fe 18f58a1925 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 18:42:36 +03:00
涓€绾跨伒 ebb11194c1 Update CMakeLists.txt (#641) 2022-05-23 23:40:37 +08:00
DelinWorks 5358cd431c Fix particle bursts when using manual emissions. 2022-05-23 18:35:36 +03:00
Turky Mohammed fe65570561 Merge: 0704503186 843d127a95 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 17:54:08 +03:00
halx99 60457300b7 Fix ci 2022-05-23 22:06:28 +08: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 6f241e1967 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 7ec3e4a184 Improve loops using std::fill_n() [skip ci] 2022-05-23 11:11:55 +03:00
DelinWorks 1a9a2540e1 Recheck code and improve it (No CI I trust it 馃ザ) [skip ci] 2022-05-22 20:51:56 +03:00
Turky Mohammed 618a4fa0db Update core/2d/CCParticleSystem.cpp 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-05-22 17:51:42 +03:00
Turky Mohammed 8f7bca37d0 Update core/2d/CCParticleSystem.cpp 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-05-22 17:42:54 +03:00
DelinWorks a063a8cc86 Use const reference vectors 馃槷 2022-05-22 17:38:43 +03:00
DelinWorks 752aa3df46 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 881e1eb2ca Add emitter animation random picking 2022-05-22 12:13:17 +03:00
DelinWorks cde0982213 Update CCParticleSystem.cpp 2022-05-22 10:09:13 +03:00
DelinWorks 362e3e6d31 Macros and random functions are pain... 2022-05-21 20:23:19 +03:00
DelinWorks b0db3df55b Fix Other Platforms Compilations 2022-05-21 17:57:21 +03:00
DelinWorks dfaaa1e93a 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 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 dae8804045 Fix #include 
Visual studio thinks it's doing something useful throwing includes all around LOL
 2022-05-21 16:51:56 +03: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
DelinWorks 5c18700fdb Correct function naming 2022-05-20 01:45:55 +03:00
DelinWorks 3b3a870c12 Update 2022-05-20 01:15:39 +03:00
halx99 85f395383b Delete unused code 2022-05-18 10:29:29 +08:00
halx99 964d82e707 Don't include freetype internal header 2022-05-14 15:16:39 +08: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
Turky Mohammed 30b9d4cb5f Update core/2d/CCMotionStreak.cpp [skip ci] 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-05-04 10:00:38 +03:00
Turky Mohammed 022686bda7 Update CCMotionStreak.cpp 2022-05-04 09:26:54 +03:00
DelinWorks 670eabbf64 Update CCMotionStreak.cpp 2022-05-03 20:54:44 +03:00
DelinWorks 371d9c7770 Update CCMotionStreak.cpp 2022-05-03 20:14:12 +03:00
DelinWorks 588b5d31ab Update CCMotionStreak.cpp 2022-05-03 20:10:26 +03:00
DelinWorks 70f3874d49 Update CCMotionStreak.cpp 2022-05-03 20:01:12 +03:00
Turky Mohammed bdd69e9d7f [Fix] Camera masking bug deep child nesting (#623) 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-04-27 16:23:57 +08:00
halx99 cc5509f23a Update copyright notices 2022-04-25 19:15:46 +08:00
Turky Mohammed a1ebd965c9 [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 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 bc1d0223c0 Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
halx99 6131b237b2 [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 beb8606e16 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 30f9bbf307 Update uthash to 2.3.0 and move to thirdparty 2022-01-04 11:18:44 +08:00
Delin 55aa56584a Update CCLabelTextFormatter.cpp 2022-01-03 08:57:40 +03:00
Delin 82a354d803 Update CCLabel.cpp 2022-01-03 08:56:25 +03:00
Delin 110e0578c4 Update CCLabel.h 2022-01-03 08:55:52 +03:00
Delin 717f5d9397 Update CCLabel.cpp 2022-01-03 08:39:18 +03:00
Delin ebd93353bb Update CCLabel.cpp 2022-01-03 08:33:00 +03:00
Delin 8806136b52 Update CCLabel.cpp 2022-01-03 08:20:34 +03:00
halx99 e8ef4eb750 Fix TTFconfig construct with nullable customGlyphCollection 2022-01-01 21:21:34 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00