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

708 Commits

Author SHA1 Message Date
CHP 4d54f44f62 Update CMakeLists.txt (#922) 
* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-12 07:04:01 +08:00
aismann 3ef8ac63f2 rename cocos2d to axmol (#920) 
* rename cocos2d to axmol

* rename cocos2d.h to axmol.h

* Update Physics3DTest.cpp

replace Sprite3D -> MeshRenderer
 2022-10-12 00:15:09 +08:00
CHP b3fa9381b5 Fix noisy message "Unable to resolve full path of PCH-header" (#918) 
* Update CMakeLists.txt

fix noisy message "Unable to resolve full path of PCH-header"

* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-11 08:54:02 +08:00
CHP 9c7a876970 precompile_headers all platforms (#901) 2022-10-10 03:52:04 +08:00
涓€绾跨伒|Deal e9e7de0cea Improve AutoPolygon::generateTriangles performance (#905) 2022-10-09 18:06:15 +08:00
涓€绾跨伒|Deal 6f1c8d61d7 Add reasonable comment for performance code 2022-10-08 12:26:38 +08:00
aismann 49f7406f94 Improve MeshRenderer #879 thanks @solan-solan (#904) 
* Update Physics3DTest.cpp

Improve #879  thanks @solan-solan

* Update CCMeshRenderer.cpp

#hope this is fixing #879
 2022-10-08 06:15:03 +08:00
halx99 db1df2f98a Improve code style 2022-10-07 21:48:07 +08:00
halx99 3f40f271d4 Improve performance 2022-10-07 21:36:38 +08:00
涓€绾跨伒|Deal 79925e07d6 Merge: 6cd36ab02e c26ab44880 
Merge pull request #801 from theunwisewolf/dev-richtext-scale-support

RichElementImage - Add support for scaling
 2022-10-04 11:08:49 +08:00
halx99 74ba83b711 Fix model render blend state, refer to: #879 2022-10-04 10:42:21 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
tkzcfc 6ec826dfe0 Add macro definition AX_NO_DUP_SEARCH_PATH (#874) 2022-09-30 14:40:52 +08:00
tkzcfc 5870445c87 Improve FileUtils::addSearchPath(#872) 
Avoid duplicate search path
 2022-09-29 23:10:30 +08:00
RH eed2cde7d9 Fix to ensure Component::onEnter() is called (#867) 
* Committing genbindings changes

* Ensure that Component::onEnter() is called if component is added after parent onEnter has been called.

* Code style
 2022-09-27 17:32:04 +08:00
halx99 ad69ed003a Remove unnecessary APIs 2022-09-26 23:20:54 +08:00
halx99 8f41f8355c Change Program::getActiveAttributes retun type to reference 2022-09-24 11:38:41 +08:00
halx99 5c735619f9 Improve code style 2022-09-24 11:01:45 +08:00
halx99 82acade5b9 Improve code style 2022-09-24 10:42:11 +08:00
涓€绾跨伒|Deal cae2dd7820 Fix ci 2022-09-23 23:25:01 +08:00
halx99 3a9a26c743 Fix #861 2022-09-23 22:41:30 +08:00
涓€绾跨伒|Deal c693e54265 Update CCAutoPolygon.cpp 2022-09-19 18:22:34 +08:00
aismann e571e8242d Clipper2 v1 04 (#856) 
* Clipper2 v1.04 (and small fixes)

* Update README.md
 2022-09-19 14:17:13 +08:00
halx99 ea1b70288d Update thirdparty libs 
fmt: 9.0.0 --> 9.1.0
llhttp: 6.0.7 --> 6.0.9
astc-encoder: 4.0.0 --> 4.1.0
webp: 1.2.2 --> 1.2.4
flatbuffers: 2.0.0 --> 2.0.8
 2022-09-15 20:15:28 +08:00
Paulo Coutinho f5aeb5a8c2 Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
涓€绾跨伒|Deal e0e083aa3b Merge: 6df48e9f8b baceccbb2f 
Merge pull request #837 from aismann/ISSUE_#825

#825
 2022-09-02 11:59:46 +08:00
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
aismann 68f8a2b0c7 #825 2022-09-01 13:51:19 +02:00
halx99 5298ed90cb Fix #817 2022-08-31 13:45:06 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
aismann 9cecc6341c Update CCAutoPolygon.cpp 2022-08-27 18:30:22 +02:00
aismann c58b31d382 cleanup2 2022-08-27 17:41:12 +02:00
aismann ae349db909 cleanup 2022-08-27 17:40:03 +02:00
aismann 3bbbb0b2bf Replace Clipper1 (all stuff) 2022-08-27 17:00:10 +02:00
涓€绾跨伒 101afaa855 [CMake] Mark engine pch as private 2022-08-19 12:15:49 +08:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 a9933f877c Improve code style 2022-08-16 17:15:56 +08:00
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
DESKTOP-16GC0B8\813658 ff899d5511 Fixed get writable path for android 2022-08-13 23:53:40 +03:00
涓€绾跨伒 31289482d3 Revert "Support for Apple Silicon / M1" 2022-08-12 16:39:06 +08:00
unknown d71ad17f52 RichElementImage - Add support for scaling 2022-08-12 03:58:36 +05:30
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
halx99 8a348b8342 Fix #791 really 2022-08-11 10:52:38 +08:00
DelinWorks 72ec15f3ae Remove assign dups and simplify function naming. 2022-08-11 01:52:04 +03:00
Turky Mohammed 8d1cb27616 Update CCCamera.h [skip ci] 2022-08-10 21:10:34 +03:00
DelinWorks 895d2887fb Add initialize member function. 2022-08-10 21:09:10 +03:00
DelinWorks bc11f9f5fc Update CCCamera.cpp [skip ci] 2022-08-10 20:38:59 +03:00
DelinWorks 2e22040118 Fix camera view calculation and tidy up system 2022-08-10 20:14:18 +03:00
halx99 65b0690e55 Improve code style 
Refer to: https://github.com/cocos2d/cocos2d-x/pull/20743
 2022-08-10 21:08:51 +08:00
aismann 5d64474cfb rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02: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
halx99 9ce38e060b Improve android gradle utils 2022-08-07 09:26:56 +08:00
halx99 93550405bc Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 714d814288 Improve android setup tools 
- Rename ANDROID_SDK to ANDROID_SDK_ROOT, refer to: https://developer.android.google.cn/studio/command-line/variables
- CMake: Use ndk in sdk_root/ndk/xxx/
 2022-08-06 22:02:58 +08:00
Turky Mohammed 818eb3d754 [PROPOSAL] Add wireframe rendering and function classification improvements. (#778) 
* Add wireframe rendering and function classification improvements.

* Fix platform compilation.

* Update CommandBufferGL.cpp

GL_LINE and GL_FILL are no present in mobile devices, so the raw value has been used instead.

* Update CommandBufferGL.cpp

* Try fix IOS compilation

* Update CommandBufferMTL.h [skip ci]

* GLES & D3D11 wireframe

Added crude but okay wireframe mode for GLES and D3D11 devices.
 2022-08-06 16:17:55 +08:00
涓€绾跨伒 c6ff51e3be Fix #771 2022-08-02 21:48:16 +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
halx99 5a2ac3d34b Improve gradle script 2022-08-02 17:55:00 +08:00
unknown 85a4433395 closeKeyboard() method for EditBox 2022-08-02 03:02:35 +05:30
halx99 325fc583e9 Add more compatible macros to cocos2d.h [skip ci] 2022-07-26 22:50:51 +08:00
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
DelinWorks 09bc97110b Add primitive type support for mesh materials. 2022-07-20 02:33:45 +03:00
DelinWorks 881d3e722c Fix quad vertex shader compilation. 2022-07-19 08:20:13 +03: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
涓€绾跨伒 86149489b0 Fix warning format 2022-07-12 22:57:45 +08:00
涓€绾跨伒 bbe5566dec [Gradle] Fix findNDK 2022-07-12 21:51:44 +08:00
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
halx99 5f04e88dc7 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
halx99 68e1f86168 Avoid unexpected frame refs increase 2022-07-11 19:34:31 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
halx99 cb45692a0d Update byte_buffer to fix #741 2022-07-11 09:12:40 +08:00
涓€绾跨伒 3533d574f8 Fix logic 2022-07-10 21:22:08 +08:00
涓€绾跨伒 762a208d12 Fix ci 2022-07-10 20:47:50 +08:00
halx99 611eafba7e Fix #741 2022-07-10 20:23:48 +08:00
DelinWorks 7c9b31bbb9 Update FastRNG.h 2022-07-10 10:00:02 +03:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +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
涓€绾跨伒 754d068720 Merge: 8517d0ee7f 21f928c4a0 
Merge pull request #734 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-09 01:23:36 +08: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 c10fb9a94f Add pull request template 2022-07-08 22:56:49 +08:00
DESKTOP-16GC0B8\813658 234fc8c01b Added operator[] for IndexArray to align it to stl container to protect existing code which could use IndexArray with the corresponding api; 
Added uint16_t as default template parameter for IndexArray::push_back(...)
 2022-07-08 17:08:39 +03:00
涓€绾跨伒 3896db6ab2 Update version [skip ci] 2022-07-08 16:02:51 +08:00
涓€绾跨伒 20900f2065 Merge: f02410f81b f15dc098e6 
Merge pull request #730 from DelinWorks/migrate-engine-name

Fix engine setup files.
 2022-07-08 15:34:23 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 955c42c7a2 [skip ci] 2022-07-08 07:36:32 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
DelinWorks 455be5d2ac Fix python setup file. 2022-07-07 14:37:59 +03:00
halx99 f11930eb08 Auto ignore all *.md files for ci 2022-07-07 17:42:45 +08:00
DelinWorks 9dae9ddaff Improve Readme title. 2022-07-07 12:05:04 +03:00
涓€绾跨伒 439aff8dcf Merge: df27706ad2 698b84d7b2 
Merge pull request #720 from axis-project/improve-index-array

Improve IndexArray
 2022-07-07 16:53:18 +08:00
DelinWorks cd5f676e6f Update README.md 2022-07-07 11:21:42 +03:00
halx99 d2768b9fe8 Delete unused comments 2022-07-07 15:41:32 +08:00
halx99 de2c1e576d The `operator[]` not good for template use, always use at instead. 2022-07-07 15:40:16 +08:00
halx99 cdd00c4bc5 Improve IndexArray implementation 2022-07-07 14:49:26 +08:00
DelinWorks 6ead71b72c Fix shader matrix multiplication. 2022-07-07 05:38:28 +03:00
halx99 d422dace65 Merge: fca740889d 8ff01d47c4 
Merge branch 'dev' of https://github.com/adxeproject/adxe into improve-index-array
 2022-07-07 10:06:21 +08:00
涓€绾跨伒 3cd56529fb Fix ci 2022-07-07 09:59:21 +08:00
涓€绾跨伒 269b7317e1 Update CCBundle3DData.h 2022-07-07 09:52:11 +08:00
halx99 0f5b0ec7c2 Improve IndexArray 2022-07-07 09:31:34 +08:00
halx99 222769bf59 Improve code style 2022-07-07 09:30:48 +08:00
涓€绾跨伒 3c5d1f468f Merge: f4897fe14c 043207e9c1 
Merge pull request #717 from aismann/ImprovePhysicsTest

Improve look of DebugDraw and feel of LogoSmash, Raycast., etc
 2022-07-06 23:15:07 +08:00
aismann 415c03362f Update README.md 2022-07-06 16:52:23 +02:00
aismann 4fd3d16dc7 Improve look of DebugDraw and feel of LogoSmash, Raycast., etc 
Its look professional now ;)
 2022-07-06 16:02:41 +02: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
Turky Mohammed d3c3fe9538 Merge: b4d04f4df9 1c02999878 
Merge branch 'adxeproject:dev' into improve-engine-types
 2022-07-06 07:21:13 +03:00
DelinWorks b9547e5407 Update FastRNG.h 2022-07-06 07:20:40 +03:00
涓€绾跨伒 a4fdc85c8b Merge: 71539ffd89 b8676ef52a 
Merge pull request #710 from DelinWorks/improve-engine-types

[IMPROVMENT] Rename `RngSeed` to `FastRNG`.
 2022-07-05 23:07:19 +08:00
halx99 fce00ee71d Compatible cocos2d.h 2022-07-05 23:03:22 +08:00
DelinWorks 76ba9bf760 Improve RngSeed. 2022-07-05 17:21:21 +03: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 845a1d9bd5 Update CCMeshVertexIndexData.cpp [skip ci] 2022-07-04 21:15:11 +03:00
DelinWorks 4a7466e1bb Update CCMeshVertexIndexData.cpp [skip ci] 2022-07-04 21:14:33 +03:00
DelinWorks f3bfe170c1 Update quad.frag [skip ci] 2022-07-04 21:13:29 +03:00
Turky Mohammed 2a1d28f9da Update quad.frag [skip ci] 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-07-04 21:12:17 +03:00
DelinWorks 92785c4c2c Update CCBundle3DData.h [skip ci] 2022-07-04 21:09:54 +03:00
DelinWorks 3874d05be8 Update CCBundle3DData.h [skip ci] 2022-07-04 21:07:06 +03:00
DelinWorks 3b0a7aed79 Update CCBundle3DData.h 2022-07-04 21:05:27 +03:00
DelinWorks e842aabe1a Expose stride conversion functions. 2022-07-04 20:54:56 +03:00
DelinWorks 09be9b3aa7 Update CCBundle3DData.h [skip ci] 2022-07-04 20:42:44 +03:00
DelinWorks 8a403bdb6a Update CCBundle3DData.h 2022-07-04 20:41:53 +03:00
DelinWorks bee8294040 Update CCBundle3DData.h 2022-07-04 20:35:31 +03:00
DelinWorks f8a82ad192 Use integral_constant rathar than bool_contant. 2022-07-04 20:32:29 +03:00
DelinWorks bd570ed054 Update CCBundle3DData.h [skip ci] 2022-07-04 20:29:50 +03:00
DelinWorks fb93005502 Update CCBundle3DData.h 2022-07-04 20:25:16 +03:00
DelinWorks d50d34ea3b Separate renderer enums to their own file. 2022-07-04 19:52:17 +03:00
halx99 9af6fc8c88 Committing genbindings changes 2022-07-04 16:47:16 +00:00
Turky Mohammed 106e545f1c Merge: d56731a158 b51e50a498 
Merge branch 'adxeproject:dev' into improve-3d-renderer
 2022-07-04 19:40:56 +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 cc611afbb1 Update CCBundle3D.cpp [skip ci] 2022-07-04 19:38:46 +03: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
Turky Mohammed 782e29881f Update CCBundle3D.cpp 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-07-04 08:22:42 +03:00
Turky Mohammed 527fb8968d Update CCMeshVertexIndexData.cpp [skip ci] 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-07-04 08:22:06 +03:00
Turky Mohammed 9f9a0352c3 Update CCBundle3DData.h 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-07-04 07:59:14 +03:00
Turky Mohammed 32ff9a9df4 Update CCBundle3DData.h 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-07-04 07:57:44 +03:00
DelinWorks 1c427c2199 Update CCBundle3DData.h 2022-07-04 07:36:42 +03:00
DelinWorks b1f7ab7e5d Update CCBundle3DData.h 2022-07-04 07:30:16 +03:00
DelinWorks ecb06265aa Update CCBundle3DData.h 2022-07-04 07:27:35 +03:00
DelinWorks 0180e8828f Update CCBundle3D.cpp 2022-07-04 07:25:04 +03:00
DelinWorks ee6c8f60bd Update CCBundle3DData.h 2022-07-04 07:23:02 +03:00
DelinWorks 69fc9490b9 Add safety checks. 2022-07-04 06:34:44 +03:00
DelinWorks 449e330b2f Improve function naming. 2022-07-04 06:23:49 +03: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 c529c01b9e Revert "Update CCBundle3D.cpp [skip ci]" 
This reverts commit 07bbe4e06c.
 2022-07-03 23:25:36 +03:00
DelinWorks 36bfd2b12b Update CCBundle3D.cpp [skip ci] 2022-07-03 23:25:05 +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 db36b998d2 Improve class IndexArray 2022-07-03 21:17:49 +08: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 686b74df86 Improve type naming. 2022-07-02 19:46:41 +03: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
DelinWorks d65f9cc931 Fix mesh index formatting. 2022-07-01 14:40:09 +03:00
DelinWorks 3c548943d3 Change shorts to ints 2022-07-01 14:11:00 +03:00
Turky Mohammed 8b22650ac9 Merge: 24c2550a09 8806d7bdf7 
Merge branch 'adxeproject:dev' into improve-3d-renderer
 2022-07-01 13:46:04 +03:00
halx99 2ed8c71eb5 Setup vsync for all PC platforms 2022-07-01 17:55:54 +08:00
halx99 7f9511358f Fix warnings 2022-07-01 13:47:47 +08: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 5d86a92813 Fix #689 2022-07-01 12:14:44 +08:00
halx99 f0758b7993 Improve mac fps limit 2022-07-01 11:02:31 +08:00
DelinWorks 89e4fb4b59 Update CCCamera.cpp [skip ci] 2022-07-01 05:59:45 +03: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 8cfbbd75f1 Update CCRenderer.cpp 2022-07-01 04:06:26 +03:00
DelinWorks 5d4b78f9b4 [skip ci] 2022-07-01 03:39:27 +03:00
DelinWorks b6a80ab5b6 Fix get default camera nullptr on scene initialization. 2022-07-01 03:34:37 +03:00
DelinWorks 28125465d0 Fix typos. [skip ci] 2022-06-30 23:21:21 +03:00
DelinWorks 8485ece883 Update BufferGL.h 2022-06-30 22:43:56 +03:00
DelinWorks f506e43c67 Update BufferGL.h 2022-06-30 22:26:02 +03:00
DelinWorks 35bd10e707 Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
halx99 0707b47256 Try fix fps 2022-07-01 01:00:18 +08: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
涓€绾跨伒 5ef42d4e39 Merge: 42fc96bdac 3d1690cc25 
Merge pull request #681 from adxeproject/refactor-layer-new

Use sprite to implement layer color for auto batch draw
 2022-06-30 20:13:30 +08:00
涓€绾跨伒 118c1af907 Merge: 752d3150eb f52bc9472d 
Merge pull request #682 from aismann/poly2tri

poly2tri:  Version: git 81612cb  (until May 20, 2022)
 2022-06-30 19:07:49 +08:00
halx99 adb0a67ba8 Add missing autorelease call 2022-06-30 18:18:24 +08:00
halx99 32f3777128 Fix ci 2022-06-30 18:15:43 +08:00
aismann 9f060fbd99 Version: git 81612cb (until May 20, 2022) 2022-06-30 12:13:55 +02:00
halx99 502d80ede1 Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +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
涓€绾跨伒 6d1a2e70e7 Merge: 040a64b920 884a4c3b1d 
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
涓€绾跨伒 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 75d1bf196a 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 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 7417447fc7 Fix ci 2022-06-28 15:03:35 +08:00
halx99 5db31e4125 Unify fps control logical to director mainLoop 2022-06-28 12:39:05 +08:00
halx99 cb8123e7a7 Improve GPUTextureFormat info enums 2022-06-27 15:37:55 +08:00
涓€绾跨伒 9593275451 Merge: 5ffae45e2d aa372510a4 
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 c25552c1b7 Improve code style 2022-06-25 00:36:50 +08:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +08:00
涓€绾跨伒 767126e854 glGetTexImage only supported by Natvie GL 2022-06-22 19:09:45 +08:00
halx99 4cf6c52cf4 string_view 2022-06-20 01:49:50 +08:00
DelinWorks e37d8f9cfd Use the simple version of create orthographic. 2022-06-17 21:33:06 +03:00
DelinWorks 4b2285353e 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 2de02067d3 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
halx99 61956d8dd6 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +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
DelinWorks 6f34e1d96f GitHub being frustrating as always :/ 2022-06-16 19:42:37 +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 b1b67564f1 Revert "Fix things..." 
This reverts commit 038fca48e1.
 2022-06-16 19:39:58 +03:00
DelinWorks 1be0a1c99b Fix things... 2022-06-16 19:38:44 +03:00
DelinWorks 44feb1d398 Revert "Revert! dumb idea." 
This reverts commit 7969deb02a.
 2022-06-16 19:32:52 +03:00
DelinWorks 5816529d9a Revert! dumb idea. 2022-06-16 19:31:17 +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
halx99 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +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
涓€绾跨伒 3f09748e03 Update version [skip ci] 2022-06-16 19:00:51 +08:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08:00
Turky Mohammed 233b1372de Update RngSeed.hpp [skip ci] 2022-06-16 05:23:41 +03:00
Turky Mohammed 269cc85453 Update RngSeed.hpp [skip ci] 2022-06-16 05:14:56 +03:00
DelinWorks d85aa026e0 extract RngSeed struct to it's separate class. [skip ci] 2022-06-16 05:01:35 +03: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 5c9ab14d3e Fix astc cmake simd check for windows x64 2022-06-15 21:16:51 +08:00
DelinWorks 82722eefc2 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
aismann a0dfe6e2ab SimpleSnake small updates 
- CodeCleanup
- MIT License file
- readme update
 2022-06-15 07:02:08 +02:00
Turky Mohammed db6ea424ea Remove useless code and comments. [skip ci] 2022-06-15 05:25:40 +03:00
DelinWorks a15572d08a Fix rotation update & reference deduction. 2022-06-15 05:00:17 +03:00
DelinWorks 2886ada2b6 Fix orthogonal apply custom positioning. [skip ci] 2022-06-15 03:55:57 +03:00
DelinWorks 14666d9c1f Add position rotation setters & getters override for custom behaviors. 2022-06-15 03:48:26 +03:00
halx99 ce63a440ef Take care glGetTexImage func pointer check 2022-06-14 15:33:42 +08:00
涓€绾跨伒 b9bc6b7357 cocos2dVersion compatible (#655) 
* cocos2dVersion compatible

* Update [skip ci]
 2022-06-14 13:33:45 +08:00
DelinWorks ed7f8c2929 Update CCCamera.cpp [skip ci] 2022-06-14 02:11:40 +03:00
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 864601764f Improve code style 2022-06-13 12:46:40 +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
涓€绾跨伒 03c8056078 Merge: 5138d701d6 5c35eda3b9 
Merge pull request #650 from adxeproject/ndk-r23c

Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 9bf295d8e4 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 ddc1a80420 Delete unused comment 2022-06-11 15:30:51 +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 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 8eea58226b Remove feature filename lookup dictionary 2022-06-09 16:48:59 +08:00
halx99 3816aa314d Remove ugly feature, fix ci 2022-06-09 16:40:14 +08:00
halx99 0d3e3d3fd8 Improve performance with string_view 2022-06-09 16:30:51 +08:00
halx99 f4b480576c Improve performance with string_view 2022-06-09 16:19:33 +08:00