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

70 Commits

Author SHA1 Message Date
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
halx99 33bb9c1334 Move cmake/Modules/* to cmake/* 2023-08-28 13:47:24 +08:00
halx99 261c545a3b Improve cmake script 2023-08-27 23:21:35 +08:00
halx99 7e9e5e38e8 Use pwsh for sync_folder 2023-08-27 01:18:48 +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
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
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 ec3b06aa33 Improve cmake options 2023-08-10 13:33:22 +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 ea2124bb2e Fix ci 2023-07-25 10:18:14 +08:00
halx99 9770aaa812 Fix shader files search 2023-07-22 23:58:52 +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 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 dcd408c636 Sync compiled shaders for UWP [skip ci] 2023-07-18 00:09:00 +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 3ab3249700 Update glslcc to 1.8.1 
Add dual outputs support, this is useful to handle normal map preprocessor
 2023-07-16 14:14:41 +08:00
RH 95f352e0d0 Invert if condition checking for existence of the axmol bin path in the user path env variable (#1275) 
Make list mutable to allow for inserting new path
 2023-07-16 13:51:36 +08:00
halx99 9a384e39f2 Merge: 412e398651 1daf87c768 
Merge branch 'main' into dev
 2023-07-15 22:45:26 +08:00
Deal(涓€绾跨伒) c5a61124c0 Add chat badges [skip ci] 2023-07-15 11:25:48 +08:00
halx99 2b30d8002f Merge: 7afdd4f2c1 e5b197776c 
Merge branch 'main' into dev
 2023-07-15 01:17:32 +08:00
halx99 e34d02eb7d Fix build1k cmake setup 2023-07-15 01:17:15 +08:00
halx99 8e39354e99 Merge: 83a830d011 cfcafd517a 
Merge branch 'main' into dev
 2023-07-15 01:00:31 +08:00
halx99 177c845cc6 Don't setup glslcc and include it in main branch 2023-07-15 00:54:20 +08:00
Deal(涓€绾跨伒) 4867fc8f2e Update pull_request_template.md (#1270) 2023-07-15 00:21:23 +08:00
halx99 42fcb1f86e glslcc workflow: metal init commit 2023-07-14 23:07:47 +08:00
RH 0c17a35fa8 Fix for crash in TextureCache test (#1267) 2023-07-11 21:55:17 +08:00
halx99 5d7a86a1b9 Merge: 89a739a8ea 09a3a950ae 
Merge branch 'dev' into 1.1-dev
 2023-07-10 15:57:00 +08:00
RH ce590c24a0 Fix for crashes in several tests (#1259) 2023-07-09 14:45:41 +08:00
halx99 d0f7334476 Don't flat ubos since it doesn't work 2023-07-09 11:20:29 +08:00
halx99 7a808cd46b Improve AXGLSLCC.cmake 
By default, output compiled shader
to `${CMAKE_BINARY_DIR}/runtime/axslc`,
then link it to `$<TARGET_FILE_DIR::target_name>/axslc`
 2023-07-08 17:17:10 +08:00
halx99 17ee3e6f69 Don't add .bin for glslcc shader compile output by default 2023-07-07 19:31:46 +08:00
halx99 acc47b3281 Bump 1.1.0 2023-07-06 20:37:59 +08:00
halx99 94b5705bd3 Improve cmake script 
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
 2023-07-06 19:21:36 +08:00
halx99 1d82a9592c [CMAKE] Add shader compile function: ax_add_shader [skip ci] 
- ax_add_shader(${FILE}): output compiled shader to ${CMAKE_BINARY_DIR}/runtime/shaders/${SC_LANG}/xxx_fs.bin
- ax_add_shader(${FILE} CUSTOM): output compiled shader to ${CMAKE_BINARY_DIR}/runtime/shaders/${SC_LANG}/xxx_fs.bin
- ax_add_shader(${FILE} CVAR): the shader will compiled to c hex header for embed include by C/C++ use
 2023-07-06 14:08:16 +08:00
halx99 7cb9aac41e Rename option `AX_USE_COMPAT_GL` to `AX_USE_ANGLE` 2023-07-03 20:35:55 +08:00
halx99 0e74de43d6 Fix copy angle dll error 2023-07-03 20:28:55 +08:00