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

74 Commits

Author SHA1 Message Date
halx99 cc9cbcbff9 Merge: eba7fc17ba 6bbdc273f8 
Merge branch 'main' into dev
 2023-08-10 18:53:35 +08:00
halx99 46ed10dac3 Update yasio to v4.1.0 2023-08-10 18:36:45 +08:00
halx99 1ec408812f Fix cmake setup 2023-08-09 14:37:43 +08:00
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 edee8af2a6 Fix metal render issues 
- Fix metal uniform buffer alignment size
- Fix spine two color tint render for metal
- Update glslcc to 1.9.0
 2023-07-27 18:21:16 +08:00
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 42f666ff89 Refactor GL uniform block support 2023-07-19 19:20:06 +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 d347a454a7 Update spine to 4.1-fc05ecf 2023-05-07 21:15:56 +08:00
halx99 79b90a95dd Fix dll linkage 2023-01-06 18:38:16 +08:00
halx99 44b5b1f4bd Add missing source files 2022-11-07 15:55:05 +08:00
halx99 e12b56fd3f Update spine runtime to v4.1-c9af18e 2022-11-07 15:48:19 +08:00
halx99 a8f3863603 Fix spine RotateTimeline 2022-11-03 18:00:48 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
halx99 3a9a26c743 Fix #861 2022-09-23 22:41:30 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08: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
halx99 dec34b4471 Sync spine=3.8 latest 2022-07-26 21:04:27 +08:00
halx99 9c97f210df Remove check since axis allways enable string-pooling 2022-07-16 17:53:01 +08: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
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08: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
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 765d3f5332 Replace CC_ with AX_ 2022-07-08 02:17:41 +03:00
halx99 5edbfa5448 [spine] Use currentState to setup shader stubs 2022-07-05 14:40:18 +08:00
halx99 db7681bb8b [Spine] Use backend shader definations 2022-07-05 14:36:04 +08:00
halx99 ba582903fc Spine runtime can use official code 2022-07-05 14:13:15 +08: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 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
halx99 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 5a2807433e [spine] Improve RTTI compare performance when compiler string pooling enabled 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2012

Signed-off-by: halx99 <halx99@live.com>
 2022-01-05 14:10:05 +08:00
halx99 14a3a0de93 Fix ClippingAttachment doesn't work 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2011

Reported by: @kangleblue

Signed-off-by: halx99 <halx99@live.com>
 2022-01-04 22:38:02 +08:00
halx99 fb980f51ab Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
halx99 97fbec0b36 Merge: 95b9969365 80e0e3b941 
Merge pull request #485 from adxeproject/fix-spine-uniform-location-mismatch

Fix spine command pipeline state uniform location mismatch
 2021-08-30 18:57:36 +08:00
halx99 32b86c53c9 Update changelog 2021-08-30 17:55:00 +08:00
halx99 1a7d23eff5 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann 74dfe14b16 Merge: 1c05947474 7dd7422abd 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 08:33:22 +02:00
halx99 fc1c901209 Macro compatible 2021-08-27 13:54:05 +08:00
aismann 6632c5c3f6 Debug 64bit build error 
Severity        Code    Description     Project File    Line    Suppression State
Error (active)  E0075   operand of '*' must be a pointer but has type "bool"    cpp-tests       D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp   153
 2021-08-27 07:47:22 +02:00
halx99 5254edc733 Update spine-3.8 runtime to latest 
Maybe no further update until upgrade to spine-4.x
 2021-08-07 00:59:58 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00