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
c476f8b117
Add cmake option AX_ENABLE_EARLY_FEATURES
2023-07-15 01:02:13 +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
c6b575e666
Revert define on shader, not suitable glslcc
2023-07-14 23:21:51 +08:00
halx99
42fcb1f86e
glslcc workflow: metal init commit
2023-07-14 23:07:47 +08:00
halx99
9f4d142802
Improve build scripts
2023-07-12 12:15:27 +08:00
RH
0c17a35fa8
Fix for crash in TextureCache test ( #1267 )
2023-07-11 21:55:17 +08:00
Deal(涓€绾跨伒)
4307d42452
Fix missing flag `--lang` for metal
2023-07-11 17:06:20 +08:00
halx99
aeb6268f1c
Fix cpp-tests shader loads
2023-07-11 16:40:49 +08:00
halx99
17a3e6408b
Re-enable flat-ubos
2023-07-11 15:43:50 +08:00
halx99
c064124802
[GLSLCC] Remove spec defines, because the behavior incorrect
2023-07-10 17:02:20 +08:00
halx99
5d7a86a1b9
Merge: 89a739a8ea
09a3a950ae
...
Merge branch 'dev' into 1.1-dev
2023-07-10 15:57:00 +08:00
halx99
c50710b25c
[build1k] Create differ build folder for cross target platforms
...
rules:
- host target: build_${buildArch}
- cross target: build_${buildTarget}_{buildArch}
2023-07-10 14:24:08 +08:00
j-jorge
fcdbd9968e
Add missing include guards. ( #1265 )
2023-07-10 08:47:20 +08:00
aismann
9f386c19df
Update DevSetup.md ( #1264 )
...
Example: How to build the tetst projects
2023-07-10 00:36:50 +08:00
halx99
235d8cb1ef
Fix android sdk setup in plain new machine
2023-07-09 23:27:24 +08:00
Deal(涓€绾跨伒)
cba35d2b77
[build1k] Fix ndk parent detect
2023-07-09 20:51:43 +08:00
halx99
c3823e8247
[build1k] Fix ndk parent folder detect
2023-07-09 20:42:51 +08:00
CHP
10a4fe09f6
Start AutoStart when env AXMOL_START_AUTOTEST is set ( #1261 )
2023-07-09 20:10:50 +08:00
RH
6bc2deeba8
Update Sprite::getQuad() to return const reference ( #1260 )
2023-07-09 19:00:12 +08:00
RH
ce590c24a0
Fix for crashes in several tests ( #1259 )
2023-07-09 14:45:41 +08:00
halx99
ed6ec7a32d
[GLSLCC] Suppression macro not defined errors
2023-07-09 12:04:58 +08:00
halx99
d0f7334476
Don't flat ubos since it doesn't work
2023-07-09 11:20:29 +08:00
halx99
7c410f8b25
Bump new shader workflow
...
1. Add compiled shader dir `axslc` to search path for win32,linux
2. ProgramManager: register shader program by shader name
3. modify all shader define from sources to name in Shader.cpp/Shader.hpp
4. Remove shader version define and precision decls for GLES
2023-07-08 18:47:06 +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
b1e50c43f0
Fix cmake find_package GLX warning for linux
2023-07-08 17:13:30 +08:00
halx99
c6828a368e
Improve setup script [skip ci]
2023-07-08 12:37:02 +08:00
Deal(涓€绾跨伒)
82a40314c9
Remove migrate source inseted by axmol-migrate:
...
https://github.com/axmolengine/axmol-migrate
2023-07-07 20:51:04 +08:00
halx99
2e3a0c8b70
[build1k] Allow overwrite manifest by script manifest.ps1
2023-07-07 19:32:57 +08:00
halx99
17ee3e6f69
Don't add .bin for glslcc shader compile output by default
2023-07-07 19:31:46 +08:00
halx99
25077669c8
For bot happy
2023-07-07 04:05:56 +08:00
Deal(涓€绾跨伒)
1612f3bc33
Update DevSetup.md [skip ci]
2023-07-06 21:47:16 +08:00
Deal(涓€绾跨伒)
850b84ddb8
Update DevSetup.md [skip ci]
2023-07-06 21:45:20 +08:00
Deal(涓€绾跨伒)
c891130a79
Update DevSetup.md [skip ci]
2023-07-06 21:34:50 +08:00
Deal(涓€绾跨伒)
8d0d46b180
Update DevSetup.md [skip ci]
2023-07-06 21:27:40 +08:00
halx99
b21735a9bb
[CMake] Add find shader sources function:
...
Syntax: ax_find_shaders(dir shader_sources [RECURSE])
examples:
- ax_find_shaders("${CMAKE_CURRENT_LIST_DIR}/core/renderer/shaders" runtime_shader_sources)
- ax_find_shaders("${CMAKE_CURRENT_LIST_DIR}/Source" custom_shader_sources RECURSE)
2023-07-06 21:15:28 +08:00
halx99
acc47b3281
Bump 1.1.0
2023-07-06 20:37:59 +08:00
Deal(涓€绾跨伒)
7771d4f7b1
Fix ci
2023-07-06 19:36:27 +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
0d5addaf39
Update setup.py to setup.ps1 in cmake [skip ci]
2023-07-06 14:00:21 +08:00
halx99
df6aaeb0f1
Fix linux setup
2023-07-06 13:20:56 +08:00
halx99
5df972fc59
Fix linux setup
2023-07-06 13:15:54 +08:00
halx99
d3232a2fad
Fix linux ci
2023-07-06 12:22:41 +08:00
halx99
0aef470146
Migrate setup.py to setup.ps1
2023-07-06 12:18:33 +08:00
halx99
0f8c198bbd
Sync lua-bindings
2023-07-05 20:22:44 +08:00
halx99
1ba0d44449
Update yasio to 4.0.0
2023-07-05 20:22:11 +08:00