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

448 Commits

Author SHA1 Message Date
一线灵 8bbcf80330
Fix logic 2022-07-10 21:22:08 +08:00
一线灵 3594b161bf
Fix ci 2022-07-10 20:47:50 +08:00
halx99 16a30c8fb8 Fix #741 2022-07-10 20:23:48 +08:00
DelinWorks 9db438a375 Update FastRNG.h 2022-07-10 10:00:02 +03:00
一线灵 3329e1b0ea
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
一线灵 04ca16125b
Merge pull request #738 from solan-solan/index_array_to_stl 
IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 9ee4181976 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
DESKTOP-16GC0B8\813658 2f8d5dd2f6 operator[] changed for better usage 2022-07-09 02:07:01 +03:00
一线灵 18076d09f0
Merge pull request #734 from solan-solan/index_array_to_stl 
IndexArray to stl
 2022-07-09 01:23:36 +08:00
Turky Mohammed 8517d0ee7f
Replace everything under `core` (#735) 
Co-authored-by: deal <halx99@live.com>
 2022-07-09 01:23:11 +08:00
DESKTOP-16GC0B8\813658 21f928c4a0 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
一线灵 86e56f304f
Update version [skip ci] 2022-07-08 16:02:51 +08:00
一线灵 590fbba6bd
Merge pull request #730 from DelinWorks/migrate-engine-name 
Fix engine setup files.
 2022-07-08 15:34:23 +08:00
halx99 fff2bd59ed Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks a27486a7f7 [skip ci] 2022-07-08 07:36:32 +03:00
DelinWorks 49b6dda016 Fix CMAKE 2022-07-08 02:10:35 +03:00
一线灵 1062a2251f
Merge pull request #720 from axis-project/improve-index-array 
Improve IndexArray
 2022-07-07 16:53:18 +08:00
halx99 698b84d7b2 Delete unused comments 2022-07-07 15:41:32 +08:00
halx99 39d40728cb The `operator[]` not good for template use, always use at instead. 2022-07-07 15:40:16 +08:00
halx99 a9be51ff72 Improve IndexArray implementation 2022-07-07 14:49:26 +08:00
DelinWorks d1d8873964 Fix shader matrix multiplication. 2022-07-07 05:38:28 +03:00
halx99 062e0d38f9 Merge branch 'dev' of https://github.com/adxeproject/adxe into improve-index-array 2022-07-07 10:06:21 +08:00
一线灵 8ff01d47c4
Fix ci 2022-07-07 09:59:21 +08:00
一线灵 fca740889d
Update CCBundle3DData.h 2022-07-07 09:52:11 +08:00
halx99 43e1a41440 Improve IndexArray 2022-07-07 09:31:34 +08:00
halx99 62b356a107 Improve code style 2022-07-07 09:30:48 +08:00
aismann 043207e9c1 Improve look of DebugDraw and feel of LogoSmash, Raycast., etc 
Its look professional now ;)
 2022-07-06 16:02:41 +02:00
一线灵 83a3011f65
Merge pull request #715 from aismann/dev 
Rename internal variable '_displayStats' to '_statsDisplay'
 2022-07-06 13:44:55 +08:00
aismann b28e6d5aa6 Rename internal variable '_displayStats' to '_statsDisplay' 
fix #709
 2022-07-06 06:58:24 +02:00
Turky Mohammed 9951bbe820
Merge branch 'adxeproject:dev' into improve-engine-types 2022-07-06 07:21:13 +03:00
DelinWorks b4d04f4df9 Update FastRNG.h 2022-07-06 07:20:40 +03:00
一线灵 83ebbfcf60
Merge pull request #710 from DelinWorks/improve-engine-types 
[IMPROVMENT] Rename `RngSeed` to `FastRNG`.
 2022-07-05 23:07:19 +08:00
halx99 71539ffd89 Compatible cocos2d.h 2022-07-05 23:03:22 +08:00
DelinWorks d1379cd5c2 Improve RngSeed. 2022-07-05 17:21:21 +03:00
halx99 701c1aa6ff Merge branch 'improve-3d-renderer' of https://github.com/DelinWorks/adxe into dev 2022-07-05 15:42:38 +08:00
Turky Mohammed fb4e263b8b
[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
DelinWorks 4f1212e655 Update CCMeshVertexIndexData.cpp [skip ci] 2022-07-04 21:15:11 +03:00
DelinWorks ad451adb4b Update CCMeshVertexIndexData.cpp [skip ci] 2022-07-04 21:14:33 +03:00
DelinWorks 15f43941e8 Update quad.frag [skip ci] 2022-07-04 21:13:29 +03:00
Turky Mohammed 995a6469d1
Update quad.frag [skip ci] 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-07-04 21:12:17 +03:00
DelinWorks 35f7bd2f76 Update CCBundle3DData.h [skip ci] 2022-07-04 21:09:54 +03:00
DelinWorks b2583b2614 Update CCBundle3DData.h [skip ci] 2022-07-04 21:07:06 +03:00
DelinWorks 74a2ed5ab1 Update CCBundle3DData.h 2022-07-04 21:05:27 +03:00
DelinWorks 293c28f6b6 Expose stride conversion functions. 2022-07-04 20:54:56 +03:00
DelinWorks 21cb99695a Update CCBundle3DData.h [skip ci] 2022-07-04 20:42:44 +03:00
DelinWorks 96a4d83700 Update CCBundle3DData.h 2022-07-04 20:41:53 +03:00
DelinWorks 0c6998cf41 Update CCBundle3DData.h 2022-07-04 20:35:31 +03:00
DelinWorks 31a2f46891 Use integral_constant rathar than bool_contant. 2022-07-04 20:32:29 +03:00
DelinWorks 5797662ca1 Update CCBundle3DData.h [skip ci] 2022-07-04 20:29:50 +03:00
DelinWorks 9057a47996 Update CCBundle3DData.h 2022-07-04 20:25:16 +03:00
DelinWorks 1ed03a41ad Separate renderer enums to their own file. 2022-07-04 19:52:17 +03:00
Turky Mohammed 94dcf63300
Merge branch 'adxeproject:dev' into improve-3d-renderer 2022-07-04 19:40:56 +03:00
一线灵 b51e50a498
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 d56731a158 Update CCBundle3D.cpp [skip ci] 2022-07-04 19:38:46 +03:00
DelinWorks 399bd7e89f Add stride functions and remove unneeded UNSPEC value. 2022-07-04 19:20:04 +03:00
halx99 7fe382ed54 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 da39a66e99 Improve function naming. 2022-07-04 17:45:23 +03:00
halx99 768a8bd5e1 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
Turky Mohammed 40e30edd58
Update CCBundle3D.cpp 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-07-04 08:22:42 +03:00
Turky Mohammed 6917430f6e
Update CCMeshVertexIndexData.cpp [skip ci] 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-07-04 08:22:06 +03:00
Turky Mohammed 1a0a06c4b5
Update CCBundle3DData.h 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-07-04 07:59:14 +03:00
Turky Mohammed dc02ea5ac5
Update CCBundle3DData.h 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-07-04 07:57:44 +03:00
DelinWorks ad189af97f Update CCBundle3DData.h 2022-07-04 07:36:42 +03:00
DelinWorks 13710ff075 Update CCBundle3DData.h 2022-07-04 07:30:16 +03:00
DelinWorks 6c242f3e35 Update CCBundle3DData.h 2022-07-04 07:27:35 +03:00
DelinWorks 3a5e8821c2 Update CCBundle3D.cpp 2022-07-04 07:25:04 +03:00
DelinWorks 13a9949c30 Update CCBundle3DData.h 2022-07-04 07:23:02 +03:00
DelinWorks dd90911e07 Add safety checks. 2022-07-04 06:34:44 +03:00
DelinWorks 5c8b5dd003 Improve function naming. 2022-07-04 06:23:49 +03:00
DelinWorks 0e355244d5 Improve function naming and add descriptions. 2022-07-04 05:55:29 +03:00
DelinWorks af4c3b0948 Revert "Update CCDirector.h" 
This reverts commit 11200dfac0.
 2022-07-04 05:12:54 +03:00
DelinWorks 11200dfac0 Update CCDirector.h 2022-07-04 04:58:13 +03:00
halx99 86a08575ba Improve class IndexArray 2022-07-04 09:13:06 +08:00
DelinWorks 210816a8bc Fix android arm64 incorrect random number generation. 2022-07-04 03:28:55 +03:00
DelinWorks 78150ff25a Revert "Update CCBundle3D.cpp [skip ci]" 
This reverts commit 07bbe4e06c.
 2022-07-03 23:25:36 +03:00
DelinWorks 07bbe4e06c Update CCBundle3D.cpp [skip ci] 2022-07-03 23:25:05 +03:00
DelinWorks 7a8b123548 Fix mobile compilation. 
Treat `CC_ENABLE_CACHE_TEXTURE_DATA` portion of code accordingly.
 2022-07-03 22:50:19 +03:00
DelinWorks bdffd39784 Fix platforms compilation. 2022-07-03 21:01:21 +03:00
DelinWorks f7b50fe836 Use enum class instead. 2022-07-03 20:55:40 +03:00
DelinWorks 9009228ef4 [skip ci] 2022-07-03 20:50:02 +03:00
DelinWorks 166ebd2ce6 Move global enums to their own file. 2022-07-03 20:43:55 +03:00
halx99 0e99b4ece0 Improve class IndexArray 2022-07-03 21:17:49 +08:00
halx99 8eea4cccdc [WIP] Wrapper IndexArray with byte_buffer 2022-07-03 17:24:10 +08:00
aismann b3726421b2 use engine global namespace 2022-07-03 07:26:37 +02:00
halx99 62e2be281b Move enum FPSPosition to engine global namespace 2022-07-03 11:24:00 +08:00
DelinWorks cb7bd4118b Improve type naming. 2022-07-02 19:46:41 +03:00
DelinWorks 27c5e9ad83 Update CCDirector.cpp [skip ci] 2022-07-02 18:26:17 +03:00
DelinWorks a7a022c48d 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 d94137be54 Remove unused variable and cleanup on windowtest.cpp 2022-07-02 11:29:26 +02:00
aismann 6c702daa3b Cleanup, last fixes, rename enum FPSPosition 2022-07-02 08:17:24 +02:00
aismann 8f5cc3ff2c fix typo 2022-07-02 06:19:47 +02:00
aismann 88fe2d7666 add 'no change' check. 2022-07-02 06:02:22 +02:00
aismann 97d7b793f7 FPS display set position should be set by API #695 2022-07-01 17:15:20 +02:00
DelinWorks 1ac8788815 Fix mesh index formatting. 2022-07-01 14:40:09 +03:00
DelinWorks b32f4d1196 Change shorts to ints 2022-07-01 14:11:00 +03:00
Turky Mohammed 66598df93f
Merge branch 'adxeproject:dev' into improve-3d-renderer 2022-07-01 13:46:04 +03:00
halx99 1a0848c95f Setup vsync for all PC platforms 2022-07-01 17:55:54 +08:00
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