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

486 Commits

Author SHA1 Message Date
涓€绾跨伒 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