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

174 Commits

Author SHA1 Message Date
halx99 c37af4c38e Improve shader managment 
1. Rename uniformId to batchId, refine batch draw check logic, not use xxhash to compute uniforms id
2. Material works, not check all cpp-tests, but some 2d/3d material works fine
3. Shader load/cache API improvements.
4. BREAK compatibliity: Node::setProgramState change parameter needsRetain to ownPS and value inverted.
5. custom vertexLayout setup: add new API ProgramState::getMutableVertexLayout, mark ProgramState::setVertexAttrib deprecated.
6. ProgramManager registerCustomProgram change to gen progId by vsName, fsName
with xxhash64, if register succed, user can load it by progId with `loadProgram`
7. Add API ProgramManager::loadProgram for loading builtin by progType or
loding a custom program by id
8. Add API ProgramManager::loadProgram to load program by vsName, fsName
immediately without register as CUSTOM_PROGRAM
9. Add API Node::setProgramStateByProgramId(progTypeOrId); for set programState with
programType or programId explicit.
10. Migrate material load logic
 2023-07-25 09:40:05 +08:00
halx99 1b4c9bbec8 Auto compile app/Sources/shaders to axslc/custom 2023-07-19 23:41:16 +08:00
halx99 7bd3b57809 Improve code style 2023-07-19 21:12:25 +08:00
halx99 04c5505fa2 Fix glDisable state guard 2023-07-19 18:35:05 +08:00
Deal eae07123dc Refer to #1278 2023-07-19 09:10:46 +08:00
halx99 1c669912b5 More easy for dev 2023-07-17 20:51:28 +08:00
Deal 071d9aa8ea Remove gitter [skip ci] 
It's only bakup IM room, discord is preferred
 2023-07-17 12:39:19 +08:00
halx99 e34fe4ba98 Fix light num configure type 2023-07-16 14:38:06 +08:00
Deal(涓€绾跨伒) feffe4095c Update 3rd sources (#1240) 
- llhttp: 8.1.1
- yasio: latest
- recast 1.6.0
- openal-soft: latest for official UWP support
- glad 2.0.4
- libpng 1.6.40
- astcenc 4.5.0
- Add fastlz: latest
- Disable lz4 by default
 2023-06-24 09:17:14 +08:00
Deal(涓€绾跨伒) abd8029f64 Remove CC prefix from code file name (#1230) 
* Add migrate sources tool

* Fix include replace regex

* Fix compile

* Migrate maually

* Disable sources-migrate tool by default

* Fix ci

* Fix ci

* Improve source migrate

* Fix ios/tvos ci

* Fix ios/tvos ci

* Fix
 2023-06-11 13:08:08 +08:00
halx99 cdf65a5ef1 Fix ci 2023-05-14 18:16:24 +08:00
halx99 8bf4817ff7 Fix compile errors in c++17 2023-03-08 08:34:17 +08:00
Vincent Lee 5f6e1cd42d Fix warnings (implicit conversion loses and use of deprecated function) 2022-11-20 09:58:34 +09:00
Vincent Lee 97f8a8d544 Replace use of deprecated sprintf with snprintf 2022-11-14 16:02:16 +09:00
涓€绾跨伒|Deal 25d93bd509 Improve code quality (stage1.Oct) (#916) 
* Improve code quality

* Add env PULL_REQUEST [skip ci]

* Update build.ps1

* Fix ci [skip ci]

* Update ZipUtils.cpp

* Update build.ps1

* Resolve reviews

* Improve

* Improve code style

* Resolve reviews

* Use pod_vector

* Improve resize growth

* Update CCAnimation3D.cpp

* Update axstd.h [skip ci]
 2022-10-13 21:44:42 +08:00
halx99 ec72ebb697 Fix #873 2022-10-12 12:39:27 +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 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
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 3a9a26c743 Fix #861 2022-09-23 22:41:30 +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 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
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
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
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
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +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
涓€绾跨伒 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
涓€绾跨伒 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