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

873 Commits

Author SHA1 Message Date
halx99 f3f91147a3 Merge: 2a6e84aa15 2969a5b4ff 
Merge branch '1.x' into dev
 2023-09-01 03:35:30 +08:00
halx99 fe60bf0a1b Fix cmake setup for linux 2023-09-01 01:17:49 +08:00
halx99 ec9b7f6e42 Merge: 1d4deae63a 7399ac41a6 
Merge branch '1.x' into dev
 2023-09-01 01:07:15 +08:00
halx99 0094c6bbb2 keep files for site build [skip ci] 2023-08-31 22:08:50 +08:00
halx99 2566feff5a Merge: 6e1be139bd 1d26aa28a5 
Merge branch '1.x' into dev
 2023-08-31 21:20:23 +08:00
halx99 12bb1eb62a Improve axmol site build 2023-08-31 21:20:01 +08:00
halx99 b50c629307 Merge: bdf976681e 82679fca74 
Merge branch '1.x' into dev
 2023-08-31 19:56:21 +08:00
Deal c8d0fb85ea Fix linux build 2023-08-31 18:59:12 +08:00
halx99 0952acea6a Merge: 4fe5dd55e7 cc826cb6ae 
Merge branch '1.x' into dev
 2023-08-31 18:14:46 +08:00
halx99 b97b1a5630 Fix ci 2023-08-31 18:14:26 +08:00
halx99 06d51ac961 Merge: d3f55e0472 8e723b0cc9 
Merge branch '1.x' into dev
 2023-08-31 18:09:23 +08:00
halx99 4a52c781a2 Fix ci 2023-08-31 18:07:23 +08:00
halx99 09db3594f2 Merge: 3d97d1bcc1 0a63a8e364 
Merge branch '1.x' into dev
 2023-08-31 17:57:36 +08:00
halx99 a3a117ad2d Update script permision 2023-08-31 17:57:19 +08:00
halx99 449a596f3e Merge: fd2cbdc331 a816a8ac64 
Merge branch '1.x' into dev

# Conflicts:
#       README.md
#       README_CN.md
#       install-pwsh.sh
#       tools/console/axmol
 2023-08-31 17:56:09 +08:00
halx99 c2e55c4cdc Merge console-next from dev into 1.x 2023-08-31 17:48:39 +08:00
Deal 6d52b97ae8 By default, use ANGLE on win32 2023-08-31 12:33:29 +08:00
halx99 cce6c2f8e1 Improve code style 2023-08-30 19:35:38 +08:00
halx99 6f10f5bbc9 Improve CMakeLists.txt 2023-08-30 18:34:28 +08:00
halx99 acdc28f566 Improve CMakeLists.txt 2023-08-30 17:29:53 +08:00
halx99 68611e902d Remove linux dependent: libbsd 2023-08-30 15:13:35 +08:00
halx99 0021a69d03 Remove early feature mark 2023-08-26 22:50:18 +08:00
halx99 48209e9203 Improve FileStream API qualifier 2023-08-26 16:53:01 +08:00
halx99 6c881e59d1 Explicit set source charset to utf-8 for windows targets 2023-08-26 11:07:44 +08:00
Deal 307e7b084e Update CommandBufferMTL.mm 2023-08-25 17:56:25 +08:00
halx99 5183995a36 Merge: f9b6553e57 94be720d3f 
Merge branch '1.x' into dev
 2023-08-25 16:57:54 +08:00
halx99 2bf41d7d31 Fix ci 2023-08-25 16:57:38 +08:00
halx99 46f668b01b Remove render backend setLineWidth [skip ci] 
Due to not all of GL and Metal support it, so remove it unify behavior
developers shouldn't relay on it
 2023-08-25 16:49:08 +08:00
halx99 f525d6c726 Update docs 2023-08-25 16:46:32 +08:00
Deal 26fc5c9de6 Update CommandBufferGLES2.cpp 2023-08-24 19:30:00 +08:00
halx99 c230ed8c2c Improve renderer backend choosing 2023-08-23 20:09:06 +08:00
halx99 549f347e0a Improve GLES version detection 2023-08-23 01:25:33 +08:00
halx99 ac60f9de43 Fix ci 2023-08-22 20:25:54 +08:00
halx99 01c883b6dc Improve code style 2023-08-22 20:11:30 +08:00
halx99 66d68707f1 Improve GLES2 compatibility 2023-08-22 19:34:28 +08:00
halx99 66c65ff6bb Fix desktop GLES profile setup 2023-08-21 21:43:27 +08:00
halx99 e49d02d5b6 Improve code style 2023-08-18 10:25:56 +08:00
halx99 05c59dd126 Improve code style 2023-08-18 10:22:53 +08:00
Deal f4a2a3f04b Fix ci 2023-08-17 22:13:23 +08:00
halx99 3d6068ef70 Improve vertex attribs state update 2023-08-17 21:48:57 +08:00
halx99 5ceb1e9350 Allow instancing featrue on GLES2 with instace draw EXT 2023-08-17 20:22:24 +08:00
halx99 b16e430353 ASTC hardware detection: restrict check render result color 2023-08-17 00:36:08 +08:00
halx99 0273431bc8 Enable instancing draw when device support 2023-08-16 19:24:55 +08:00
halx99 b14a102ecb Improve ASTC detection 2023-08-16 13:04:48 +08:00
halx99 af98934992 Fix ci 2023-08-15 18:21:17 +08:00
halx99 d427fd8767 Improve DeviceInfoGL 2023-08-15 18:02:02 +08:00
Deal 7052dd4475 Improve astc support detection 2023-08-15 00:37:16 +08:00
halx99 95737f3440 Fix astc detection 2023-08-14 23:33:02 +08:00
halx99 69c13a905f Improve code style 2023-08-14 23:07:13 +08:00
halx99 bfe167121e Add cmake option AX_GLES_PROFILE 
Valid value of AX_GLES_PROFILE: 0, 200, 300

By default, the AX_GLES_PROFILE is:

- android: 200, allow axmol apps runs on: API 17 Android 4.2+ devices
- winuwp: 300
- Win32/linux/osx/ios/tvos: 0

For ios/tvos, will forcing AX_GLES_PROFILE to 300 if AX_GLES_PROFILE not 0
 2023-08-14 20:40:05 +08:00
Deal 9dc9e9adc7 Update android.yml 2023-08-13 23:58:18 +08:00
halx99 bd0e1fef4b Fix compile error 2023-08-13 22:09:02 +08:00
Deal 572bb2f700 Test use glad on android 2023-08-13 00:24:35 +08:00
Deal 371340b19e Update version to 2.x 2023-08-12 00:41:15 +08:00
halx99 79187cf9f6 Improve ZipUtils 2023-08-11 20:52:15 +08:00
halx99 433f459787 Fix ci 2023-08-11 17:05:39 +08:00
halx99 72558c6c2d Fix crash when digital envelope routines::unsupported 2023-08-11 16:19:15 +08:00
halx99 6b58db0eb2 Move posix defines to FileStream.cpp 2023-08-11 15:25:19 +08:00
halx99 bf31f7b77d Fix ci 2023-08-11 15:04:33 +08:00
halx99 cdc8bb0b4c Refactor FileStream implementation 2023-08-11 14:42:41 +08:00
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 fb5aabff79 Fix android build 2023-08-10 14:06:49 +08:00
halx99 ec3b06aa33 Improve cmake options 2023-08-10 13:33:22 +08:00
halx99 f63932bb91 Update ios GLES to GLES3 2023-08-09 22:25:15 +08:00
halx99 7a40c94e2a Check vao creation 2023-08-09 21:46:03 +08:00
halx99 615cfa5bb2 Update mac GL to 330 2023-08-09 21:39:01 +08:00
halx99 065332b718 Improve code style 2023-08-09 16:00:20 +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 9452e88272 Fix label outline effect 2023-08-09 13:26:57 +08:00
halx99 238457af4d Improve code style [skip ci] 2023-08-09 13:25:20 +08:00
halx99 e6039273f5 Reset texture binding state when deleteTexture 2023-08-05 23:08:37 +08:00
halx99 28150610be Improve code style 2023-08-02 11:34:06 +08:00
halx99 2d0a63660f Improve custom program draw batch 2023-08-02 10:31:52 +08:00
halx99 30306ad316 Delete glsl-optimizer due to new shader workflow only require offline tool glslcc 2023-08-01 12:12:10 +08:00
halx99 ae3bcb77da Fix navmesh debug draw vertex layout incorrect 2023-08-01 12:08:13 +08:00
halx99 5a68442d1e Improve code style 2023-08-01 12:00:31 +08:00
Turky Mohammed 1b2c651daa [BUG] Instancing memory leak fix (#1288) 
* Implement Uniform Buffer Objects in OpenG

* Revert "Implement Uniform Buffer Objects in OpenG"

This reverts commit 7d32372ef4.

* Update Mesh.cpp
 2023-08-01 06:21:42 +08:00
halx99 1a3a4fa0eb Implement metal instancing draw 2023-07-31 10:03:24 +08:00
halx99 805b115719 Update lua bindings 2023-07-29 21:30:35 +08:00
halx99 bba3818829 Fix gray shader name 2023-07-29 17:46:10 +08:00
halx99 d2dda873c4 Improve code style 2023-07-29 15:46:04 +08:00
halx99 9624ec4663 Fix android image reference issue 2023-07-28 15:21:56 +08:00
halx99 a04c2d6945 Merge pull request #1253 from DelinWorks/instancing-support 
Co-authored-by: Turky Mohammed <45469625+DelinWorks@users.noreply.github.com>
 2023-07-28 14:24:58 +08:00
Deal ec4e5e1258 Fix ProgramGL uniform stage 2023-07-28 13:45:52 +08:00
halx99 0f642ddb2e Improve shader module and empty texture managment 2023-07-28 11:46:34 +08:00
halx99 d882208b8b Improve code style 2023-07-28 10:37:27 +08:00
halx99 2191b51499 [WIP] Not convert mat3 to mat3x4 in engine 
Because both metal and GLSL3/ESSL3 mat3 is identical to mat3x4, so provide a
class Mat3 to handle GPU mat3x3
 2023-07-27 22:36:51 +08:00
halx99 c8464ed5db Remove unnecessary uniform convert 2023-07-27 20:37:06 +08:00
halx99 286ff503c5 Improve sgs binary reflect info read 2023-07-27 19:13:09 +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 a3548bbe3d Fix metal uniform block member offset and size 2023-07-26 20:05:16 +08:00
halx99 cf69428746 Use macro for shader location binding 2023-07-25 19:06:12 +08:00
halx99 ea2124bb2e Fix ci 2023-07-25 10:18:14 +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 5a0838e52b Migrate materials 2023-07-23 21:43:25 +08:00
halx99 0d4a274d41 Fix incorrect ubo upload 
because ubo was share in ProgramGL
 2023-07-21 20:49:06 +08:00
halx99 756e860794 Fix state for multi gl context 
Solve imgui multi-viewport afterimage problem
 2023-07-21 19:32:44 +08:00
halx99 1434b1a6c9 Add optimizing comment[skip ci] 2023-07-21 08:37:21 +08:00