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

132 Commits

Author SHA1 Message Date
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
涓€绾跨伒 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
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 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 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 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 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
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 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 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
涓€绾跨伒 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 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 35bd10e707 Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +08:00
deal fc03414f37 Update CCBundle3D.h 2022-03-18 22:20:31 +08:00
halx99 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 beb8606e16 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00