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

351 Commits

Author SHA1 Message Date
halx99 047206e529 Fix warnings 2022-07-01 13:47:47 +08:00
一线灵 03b01cd414
Merge pull request #690 from DelinWorks/engine-bug-fixes 
[BUG] Fix `getDefaultCamera()` returning nullptr on scene initialization.
 2022-07-01 12:17:08 +08:00
halx99 9b1edadb2f Fix #689 2022-07-01 12:14:44 +08:00
halx99 6017f90907 Improve mac fps limit 2022-07-01 11:02:31 +08:00
DelinWorks 6d8aa5e6c1 Update CCCamera.cpp [skip ci] 2022-07-01 05:59:45 +03:00
DelinWorks 4997f613de Fix overriding position when applying custom properties. [skip ci] 2022-07-01 05:58:42 +03:00
DelinWorks 8d3c2b0cdb Use CCASSERT instead. 2022-07-01 05:54:20 +03:00
DelinWorks 79d228d007 Update CCRenderer.cpp 2022-07-01 04:06:26 +03:00
DelinWorks b24f4fb520 [skip ci] 2022-07-01 03:39:27 +03:00
DelinWorks b4bac6d651 Fix get default camera nullptr on scene initialization. 2022-07-01 03:34:37 +03:00
DelinWorks 24c2550a09 Fix typos. [skip ci] 2022-06-30 23:21:21 +03:00
DelinWorks 4a0622cb3f Update BufferGL.h 2022-06-30 22:43:56 +03:00
DelinWorks 0c3f7400b0 Update BufferGL.h 2022-06-30 22:26:02 +03:00
DelinWorks 5dd0ce5d8e Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
halx99 5f02d2a656 Try fix fps 2022-07-01 01:00:18 +08:00
一线灵 9bdc6232ac
Update CCDirector.cpp 2022-06-30 21:06:39 +08:00
一线灵 bfe12be7b6
Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 3d1690cc25 Add missing autorelease call 2022-06-30 18:18:24 +08:00
halx99 7837395ea5 Fix ci 2022-06-30 18:15:43 +08:00
halx99 38f2b5ca9d Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 752d3150eb Improve code style 2022-06-30 12:05:28 +08:00
halx99 3f00332d3d Improve frame rate control 2022-06-29 17:26:22 +08:00
一线灵 de04f33b5e
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
一线灵 884a4c3b1d
Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
halx99 498747aeea Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 c6c07428bf Ensure the render target is released if it is already set, since the initWithWidthAndHeight method may be called multiple times. 2022-06-28 17:56:17 +10:00
rh101 1b21f1969b 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 01a215366f Fix ci 2022-06-28 15:03:35 +08:00
halx99 e2a9a5204d Unify fps control logical to director mainLoop 2022-06-28 12:39:05 +08:00
halx99 ab7fafea6b Improve GPUTextureFormat info enums 2022-06-27 15:37:55 +08:00
一线灵 e7f5f28931
Merge pull request #653 from DelinWorks/camera-2d-zoom-feature 
[PROPOSAL] Add camera zoom, near, far, fov, aspect features & fix camera anchoring.
 2022-06-25 10:15:31 +08:00
halx99 57ab6c184f Improve code style 2022-06-25 00:36:50 +08:00
halx99 1889180a75 Improve renderer 2022-06-24 14:18:48 +08:00
一线灵 0b19d999e9
glGetTexImage only supported by Natvie GL 2022-06-22 19:09:45 +08:00
halx99 03628930cb string_view 2022-06-20 01:49:50 +08:00
DelinWorks aa372510a4 Use the simple version of create orthographic. 2022-06-17 21:33:06 +03:00
DelinWorks 040a31f908 Modify orthographic projection rather than scale. 
Modify the orthographic projection of the camera rather than the scale of the Node when in 2D projection.
 2022-06-17 21:25:33 +03:00
DelinWorks f43f11c883 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
halx99 0bf8d9ddf3 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +08:00
Turky Mohammed 305520fd7f
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature 2022-06-17 17:16:55 +03:00
DelinWorks 101f09d912 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
DelinWorks cf770a9810 GitHub being frustrating as always :/ 2022-06-16 19:42:37 +03:00
Turky Mohammed 79ec90e898
Merge branch 'adxeproject:dev' into partical-system-animation 2022-06-16 19:41:56 +03:00
DelinWorks 610711a164 Revert "Fix things..." 
This reverts commit 038fca48e1.
 2022-06-16 19:39:58 +03:00
DelinWorks 038fca48e1 Fix things... 2022-06-16 19:38:44 +03:00
DelinWorks d35455212a Revert "Revert! dumb idea." 
This reverts commit 7969deb02a.
 2022-06-16 19:32:52 +03:00
DelinWorks 7969deb02a Revert! dumb idea. 2022-06-16 19:31:17 +03:00
DelinWorks 2f12e7692a Fix enum class confliction & clean up types. 2022-06-16 18:48:53 +03:00
DelinWorks 6d858b4b9d Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
一线灵 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
一线灵 1154fd8eb4
Update version [skip ci] 2022-06-16 19:00:51 +08:00
Turky Mohammed 26013c7d15
Update RngSeed.hpp [skip ci] 2022-06-16 05:23:41 +03:00
Turky Mohammed ce77ba4c72
Update RngSeed.hpp [skip ci] 2022-06-16 05:14:56 +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
halx99 2e412ee29f Take care glGetTexImage func pointer check 2022-06-14 15:33:42 +08:00
一线灵 7dcffeeb9a
cocos2dVersion compatible (#655) 
* cocos2dVersion compatible

* Update [skip ci]
 2022-06-14 13:33:45 +08: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 864c73154c Improve code style 2022-06-13 12:46:40 +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
一线灵 ab95092e9e
Merge pull request #650 from adxeproject/ndk-r23c 
Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
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