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

261 Commits

Author SHA1 Message Date
halx99 1cd4bd42d3 Fix ci 2022-08-11 22:05:23 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
aismann 376c80dd2d Replace push_back() vs emplace_back() on axis/tests/cpp-tests and axis/core (#781) 
* Replace push_back() vs emplace_back() on axis\tests\cpp-tests\

D:\______\GitHub\aismann\axis\tests\cpp-tests\Classes
Replace Vector push_back() vs emplace_back() #762

* Replace push_back() vs emplace_back() on axis\core\ #781

* Update CCConsole.cpp

* Update UIWebViewImpl-android.cpp

* Update UIWebViewImpl-android.cpp
 2022-08-08 13:18:33 +08:00
涓€绾跨伒 4dc1c53da8 Merge: df2cfe1490 797a41b469 
Merge pull request #769 from askamn/dev

Crashfix in UserDefault
 2022-08-02 21:11:33 +08:00
halx99 ce2494ea35 Fix android ci 2022-08-02 18:49:19 +08:00
unknown 8610fe4b7e Missed edge case when resizing the memorymapped file in UserDefault that could cause a crash 2022-08-02 16:13:12 +05:30
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +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
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
DESKTOP-16GC0B8\813658 07bffb5df1 operator[] changed for better usage 2022-07-09 02:07:01 +03:00
Turky Mohammed 59c6611e71 Replace everything under `core` (#735) 
Co-authored-by: deal <halx99@live.com>
 2022-07-09 01:23:11 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
涓€绾跨伒 cb2b15896f Merge: 2457f80090 b28e6d5aa6 
Merge pull request #715 from aismann/dev

Rename internal variable '_displayStats' to '_statsDisplay'
 2022-07-06 13:44:55 +08:00
涓€绾跨伒 94673d72ce Merge: 1c02999878 9951bbe820 
Merge pull request #714 from DelinWorks/improve-engine-types

[IMPROVMENT] Fix & improve `FastRNG.h`
 2022-07-06 13:23:44 +08:00
aismann cabf2086e4 Rename internal variable '_displayStats' to '_statsDisplay' 
fix #709
 2022-07-06 06:58:24 +02:00
halx99 f4e524f7a2 Merge: fb4e263b8b 4f1212e655 
Merge branch 'improve-3d-renderer' of https://github.com/DelinWorks/adxe into dev
 2022-07-05 15:42:38 +08: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 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
涓€绾跨伒 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 a95fbd3fe0 Revert "Update CCDirector.h" 
This reverts commit 11200dfac0.
 2022-07-04 05:12:54 +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 3d8b597967 Fix platforms compilation. 2022-07-03 21:01:21 +03:00
DelinWorks 25283190f4 Use enum class instead. 2022-07-03 20:55:40 +03:00
DelinWorks 419435a27f [skip ci] 2022-07-03 20:50:02 +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
aismann 6209d8db4c use engine global namespace 2022-07-03 07:26:37 +02:00
halx99 addfea9ec1 Move enum FPSPosition to engine global namespace 2022-07-03 11:24:00 +08:00
halx99 508836ed44 Enable switch fps position on mobile device 2022-07-03 11:17:22 +08:00
DelinWorks b0e8017972 Update CCDirector.cpp [skip ci] 2022-07-02 18:26:17 +03:00
DelinWorks 2043e4734f Remove buffers stat and add quad mesh shaders. 
Remove drawn buffers label and Add a simple position_texture_color shader for simple primitives like quads to implement static sprite batching in the future.
 2022-07-02 18:22:31 +03:00
aismann 2c96541bef Remove unused variable and cleanup on windowtest.cpp 2022-07-02 11:29:26 +02:00
aismann 5b43f6883e Cleanup, last fixes, rename enum FPSPosition 2022-07-02 08:17:24 +02:00
aismann 375449cd72 fix typo 2022-07-02 06:19:47 +02:00
aismann cd7743f627 add 'no change' check. 2022-07-02 06:02:22 +02:00
aismann 684fb3dcee FPS display set position should be set by API #695 2022-07-01 17:15:20 +02:00
Turky Mohammed 8b22650ac9 Merge: 24c2550a09 8806d7bdf7 
Merge branch 'adxeproject:dev' into improve-3d-renderer
 2022-07-01 13:46:04 +03:00
涓€绾跨伒 5f2225662d Merge: 9b1edadb2f 6d8aa5e6c1 
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 f0758b7993 Improve mac fps limit 2022-07-01 11:02:31 +08:00
DelinWorks ec3fa15af7 Fix overriding position when applying custom properties. [skip ci] 2022-07-01 05:58:42 +03:00
DelinWorks 7b829e6cff Use CCASSERT instead. 2022-07-01 05:54:20 +03:00
DelinWorks b6a80ab5b6 Fix get default camera nullptr on scene initialization. 2022-07-01 03:34:37 +03:00
DelinWorks 35bd10e707 Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
涓€绾跨伒 b0504b4dd3 Update CCDirector.cpp 2022-06-30 21:06:39 +08:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 8314777449 Improve code style 2022-06-30 12:05:28 +08:00
halx99 644f09d5a3 Improve frame rate control 2022-06-29 17:26:22 +08:00
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08: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 5db31e4125 Unify fps control logical to director mainLoop 2022-06-28 12:39:05 +08:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +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 ae5d45a9c3 Fix enum class confliction & clean up types. 2022-06-16 18:48:53 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
涓€绾跨伒 c49442229e Merge: 7fd2fd6dac 2e3c84252d 
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 5491ca8e6e Remove useless functions. 2022-06-16 16:16:19 +03:00
DelinWorks ee6d7d374e Add fourccId support. 2022-06-16 15:25:43 +03:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08:00
DelinWorks c5eb8db573 Fix fixed fps move stuttering. 2022-06-16 03:55:46 +03:00
DelinWorks ebbafbd938 Add function versioning. [skip ci] 2022-06-16 00:47:19 +03:00
DelinWorks 73b29e235e Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
halx99 864601764f Improve code style 2022-06-13 12:46:40 +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 b7e98b0394 Change android log debug info tag 2022-06-11 09:12:40 +08:00
halx99 cb8db3c0da Remove unused [skip ci] 2022-06-10 17:34:46 +08:00
halx99 180c256732 Fix Value large integer storage 2022-06-08 16:38:42 +08:00
Turky Mohammed a30815f2bf Merge: c54b142e58 6943fb9dce 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-07 13:04:51 +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
Turky Mohammed 409e643df9 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
halx99 429918baa9 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 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 ba66918607 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 6939196d5c Match compression test images PMA with engine settings 2022-04-26 16:38:59 +08:00
halx99 cc5509f23a Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 57eefa9d12 Add ktxv1.1 file format for etc2/etc1 support 2022-04-25 19:11:58 +08:00
halx99 5c695d12bf Alloc astc block_size_descriptor same with original repo 2022-04-25 10:28:34 +08:00
涓€绾跨伒 821be105dc MSVC compiler bug? 2022-04-24 22:25:27 +08:00
halx99 cc48a75983 Update astcenc to v3.6 2022-04-24 19:15:08 +08:00
Turky Mohammed 11a3b711c5 Remove annoying logs when adding multiple components to a single node (#619) 2022-04-24 10:51:37 +08:00
halx99 4bd1163242 Delete DEPRECATED code 2022-04-23 17:49:42 +08:00
halx99 f4d493651c 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 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 d88768e865 Fix #597 2022-02-25 15:04:52 +08:00
deal 68215b792e Why FMT_HEADER_ONLY doesn't works on android 2022-01-08 16:15:56 +08:00
halx99 beb8606e16 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 12b4023db2 Fix ci 2022-01-04 11:48:28 +08:00
halx99 30f9bbf307 Update uthash to 2.3.0 and move to thirdparty 2022-01-04 11:18:44 +08:00
halx99 64a6c1b105 Improve linkage 2022-01-04 11:00:07 +08:00
halx99 74271f207b Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00