halx99
888a1e7d78
Merge: c469e8ac6e
5b2645501f
...
Merge branch '1.x' into dev
2023-09-02 19:51:42 +08:00
halx99
8f8418c15d
Merge: c8bfa8cdf1
062b510c38
...
Merge 1.x WASM support into 'dev'
2023-09-02 19:47:18 +08:00
halx99
3875b2c1df
Committing genbindings changes
2023-09-01 11:25:21 +00:00
nowasm
03f007fdbe
Add webgl aka wasm build support ( #1315 )
2023-09-01 16:31:14 +08:00
halx99
4c0c328b80
Merge: 6d82d3a76c
5e3cba78a6
...
Merge branch '1.x' into dev
2023-09-01 16:29:02 +08:00
halx99
396313de47
consle-next: Looking both powershell 7.x and 5.x
2023-09-01 16:28:34 +08:00
iAndyHD3
ed39cf3996
Update AXBuildHelpers.cmake ( #1316 )
...
fix find_program call
2023-09-01 16:09:58 +08:00
halx99
b1ddb2fcce
Sync #1316
2023-09-01 16:09:27 +08:00
halx99
a000ccbab5
Update site build
2023-09-01 14:49:03 +08:00
halx99
ada7deb002
Sync docs [skip ci]
2023-09-01 14:48:42 +08:00
halx99
310c5868ec
Merge: 8f8814532d
bdbbc55909
...
Merge branch '1.x' into dev
2023-09-01 13:36:38 +08:00
halx99
e5d984a4f8
Auto deploy wasm demo to gh pages
2023-09-01 13:36:23 +08:00
halx99
5fe4e6d61f
Merge: 89955d901a
279ea746cc
...
Merge branch '1.x' into dev
2023-09-01 10:37:57 +08:00
halx99
e565645443
Auto get release list for doc build
2023-09-01 10:31:34 +08:00
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
halx99
cce6c2f8e1
Improve code style
2023-08-30 19:35:38 +08:00
halx99
e6a48e8f86
Update ImGui to 1.89.8
2023-08-26 11:24:11 +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
c230ed8c2c
Improve renderer backend choosing
2023-08-23 20:09:06 +08:00
halx99
66d68707f1
Improve GLES2 compatibility
2023-08-22 19:34:28 +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
c359bea0dd
Update LuaStack.cpp
2023-08-11 23:51:15 +08:00
halx99
79187cf9f6
Improve ZipUtils
2023-08-11 20:52:15 +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
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
802a56eb4e
Update lua bindings
2023-08-04 11:03:39 +08:00
halx99
2d0a63660f
Improve custom program draw batch
2023-08-02 10:31:52 +08:00
halx99
805b115719
Update lua bindings
2023-07-29 21:30:35 +08:00
halx99
51cbc84aaf
Fix android imgui
2023-07-28 15:22:07 +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
cf69428746
Use macro for shader location binding
2023-07-25 19:06:12 +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
756e860794
Fix state for multi gl context
...
Solve imgui multi-viewport afterimage problem
2023-07-21 19:32:44 +08:00
halx99
76f00b4456
Make renderer works on opengl core profile mode
2023-07-20 20:23:56 +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
RH
6bc2deeba8
Update Sprite::getQuad() to return const reference ( #1260 )
2023-07-09 19:00:12 +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
0f8c198bbd
Sync lua-bindings
2023-07-05 20:22:44 +08:00
halx99
3eac3abecf
Sync yasio to latest
2023-06-24 21:18:27 +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
halx99
2d81db7869
Fix lua bindings
2023-06-11 15:07:31 +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
Deal(涓€绾跨伒)
bc82034ffd
Improve media-engine for android, linux ( #1228 )
...
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme
* Fix ci
* Improve code style
* Improve
* Update VlcMediaEngine.cpp
* Update AvfMediaEngine.h
* Fix ci
* Improve code style
* Enable androidx gradle.properties [skip ci]
* Improve code style
* Remove unnecessary callbacks
* Rename VideoPlayer to MediaPlayer
2023-06-10 22:05:49 +08:00
halx99
5e9415e09c
Committing genbindings changes
2023-06-05 09:19:09 +00:00
halx99
4899f00893
Committing genbindings changes
2023-05-31 12:31:31 +00:00
halx99
5511af4a47
Committing genbindings changes
2023-05-23 11:54:13 +00:00
halx99
50b9249e28
Update yasio to latest
2023-05-14 22:39:05 +08:00
halx99
d347a454a7
Update spine to 4.1-fc05ecf
2023-05-07 21:15:56 +08:00
halx99
f90b01e63f
Fix fairygui bmfont scale problem
2023-05-03 17:33:42 +08:00
RH
8f56fd9e3c
Update LUA constants for target platform ( #1192 )
2023-04-28 14:55:27 +08:00
halx99
5ae3cc6c99
Fix fairygui FUILabel stack overflow
2023-04-26 19:19:20 +08:00
halx99
43a2bbf2fc
Committing genbindings changes
2023-04-05 08:27:15 +00:00
halx99
8f2a4a22ef
Improve code style
2023-04-05 11:06:25 +08:00
halx99
56d0851c69
Committing genbindings changes
2023-04-02 01:37:22 +00:00
halx99
8469c86eb6
Fix lua binding
2023-04-02 09:29:12 +08:00
Deal(涓€绾跨伒)
1e6e9d4a8d
Media engine video texture ( #1133 )
...
* VideoPlayer based on new MediaEngine[Win32/UWP]
* Improve MediaEngine interface
* Update readme
* Improve pixel format
* Improve MediaEngine interface
* Ready for PR UWP/Win32
* Ready for PR UWP,Win32
* Update reademe files
* Update readme files
* Update UIVideoPlayer-android.cpp [skip ci]
* Update UIVideoPlayer-ios.mm
* Update MFUtils.cpp
* Fix ci
2023-03-25 08:37:51 +08:00
halx99
32c32bf98a
Committing genbindings changes
2023-03-14 00:03:28 +00:00
aismann
213afaefa7
add axmol_ext.h ( #1117 )
2023-03-14 07:56:07 +08:00
Joilnen
cb140abfd5
fixing some warning messages of code not conform C++20 yet ( #1113 )
...
* fixing some warning messages of code not conform C++20 yet
* trying to compile in C+17 because UWP
2023-03-13 21:35:42 +08:00
halx99
48d45fe0f1
Committing genbindings changes
2023-03-11 15:01:39 +00:00
Deal(涓€绾跨伒)
277bcd44ce
Windows Store UWP apps support ( #1108 )
...
* [BIG FEATURE] Windows Store UWP apps support
* Fix ci, add uwp for pr-ci
* Fix ci
* Improve ci script
* Fix ci
* Fix ci
* Fix ci
* Fix ci
* Upload uwp appx package artifacts [skip ci]
* Use d2d draw system font text
* Fix ci
* Improve code style
2023-03-11 22:10:18 +08:00
halx99
8bf4817ff7
Fix compile errors in c++17
2023-03-08 08:34:17 +08:00
halx99
a9f2e03c18
Committing genbindings changes
2023-03-07 15:34:03 +00:00
tkzcfc
b4b25b3edd
fix: type judgment error ( #1084 )
...
* fix: type judgment error
---------
Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
Co-authored-by: HYGK-PC\Administrator <tkzc@foxmail.com>
2023-02-27 19:12:21 +08:00
halx99
ad9760aa85
Fix live2d sdk crash issue
2023-02-23 21:59:00 +08:00
halx99
b8528b920a
Committing genbindings changes
2023-02-14 15:38:16 +00:00
halx99
ed9e539a85
Fix ci
2023-01-24 18:27:40 +08:00
halx99
e5cc37cd40
Fix ci
2023-01-24 17:44:54 +08:00
halx99
a46581532e
Update ImGui
2023-01-24 17:20:31 +08:00
halx99
22d3f93864
Improve code style
2023-01-24 15:01:06 +08:00
solan-solan
7378af1e88
GL_RGBA32F GL backend support ( #1034 )
...
* Added GL_RGBA32F_EXT for GL backend to support floating point textures.
* Committing genbindings changes
* Added fp texture constant to mtl.
Co-authored-by: solan-solan <solan-solan@users.noreply.github.com>
2023-01-19 22:10:41 +08:00
halx99
32740c2d58
Remove unused from cmake script
2023-01-17 10:08:09 +08:00
halx99
ae14727dc7
Fix #1032
2023-01-17 10:06:09 +08:00
halx99
9ce1d9a3e7
Committing genbindings changes
2023-01-06 15:48:02 +00:00
halx99
58a76fe8ee
Fix dll link
2023-01-06 23:21:09 +08:00
halx99
79b90a95dd
Fix dll linkage
2023-01-06 18:38:16 +08:00
涓€绾跨伒|Deal
4108bdd048
Fix ci
2023-01-05 02:47:23 +08:00
halx99
98efcfe193
Update yasio to latest
2023-01-04 23:20:07 +08:00
halx99
bb01a66859
Merge: b164698459
6f08abab88
...
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
2023-01-04 23:06:18 +08:00
halx99
aeedf0daee
Improve posix macro definations
2023-01-04 23:05:52 +08:00
halx99
46e33bb548
Committing genbindings changes
2023-01-04 14:59:56 +00:00
halx99
3f9cbc3c16
Committing genbindings changes
2023-01-01 10:21:43 +00:00
halx99
ff419dfc47
Committing genbindings changes
2022-12-29 09:01:26 +00:00
tkzcfc
8cd1e6f114
Fix download task creation failure Program crash ( #984 )
...
* Support return type'ResourceData'
* Revert "Support return type'ResourceData'"
This reverts commit dd38d06350
.
* Support return type'ResourceData'
* Support binary files
* Support Lua to call cc.utils: capturenode
* Support Lua to call cc.utils: capturenode
* export: sp.SkeletonAnimation:findBone sp.SkeletonAnimation:getBoundingBox
* export 'setAttachment' function to lua
* Committing genbindings changes
* search path adding repeated judgment
* add macro definition AX_NO_DUP_SEARCH_PATH
* add macro definition AX_NO_DUP_SEARCH_PATH
* Update core/platform/CCFileUtils.cpp
* Fix downloader crash in the lua coroutine
* fix download task creation failure Program crash
Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
Co-authored-by: HYGK-PC\Administrator <tkzc@foxmail.com>
2022-12-12 20:56:48 +08:00
halx99
850b0990c3
Fix #972
2022-12-11 15:58:55 +08:00
halx99
2fade7328a
Committing genbindings changes
2022-12-07 01:31:10 +00:00
aismann
23b19d4b40
Update README.md ( #976 )
2022-12-02 18:58:15 +08:00
halx99
bb333ed92f
Committing genbindings changes
2022-11-28 00:44:15 +00:00
RH
2e30b51ab7
Add a pool for GroupCommand rendering commands ( #969 )
...
* Committing genbindings changes
* Use a pool of GroupCommand entries to avoid multiple entries of the same group in the render queue in certain scenarios
* Ensure captureNode works as expected.
* Set member variables to default values when init method is called on the GroupCommand
* Explicitly reset the command state when retrieving a GroupCommand from the pool
2022-11-28 08:37:22 +08:00
Vincent Lee
5f6e1cd42d
Fix warnings (implicit conversion loses and use of deprecated function)
2022-11-20 09:58:34 +09:00
halx99
ff4a796a62
Fix ci
2022-11-15 14:34:18 +08:00
halx99
1d7e0da834
Fix ci
2022-11-15 12:28:57 +08:00
halx99
5b846f66c1
Fix ci
2022-11-15 12:21:50 +08:00
halx99
6e119c16c6
Improve cmake
2022-11-15 12:08:14 +08:00
涓€绾跨伒|Deal
b01d58a466
Update init.lua
2022-11-12 20:34:48 +08:00
halx99
3d1bf684a4
Fix ci
2022-11-10 22:03:40 +08:00
halx99
0279d5c158
Fix #958
2022-11-10 21:22:55 +08:00
halx99
f11daa7347
Committing genbindings changes
2022-11-07 08:04:54 +00: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
halx99
928a44c69f
All gl APIs from glad
2022-11-01 19:49:57 +08:00
halx99
65920b8f9d
Fix ci
2022-11-01 16:02:13 +08:00
halx99
f00174bfcc
Committing genbindings changes
2022-11-01 04:19:28 +00:00
halx99
9d2aba2b00
Fix ci
2022-11-01 12:12:13 +08:00
halx99
ea260806a9
Fix ci
2022-11-01 11:40:06 +08:00
halx99
33599119ae
Committing genbindings changes
2022-11-01 01:34:53 +00:00
涓€绾跨伒|Deal
a880bfc6e1
Fix ci [skip ci]
2022-11-01 09:22:19 +08:00
halx99
0749378bc8
Committing genbindings changes
2022-10-31 22:56:01 +00:00
涓€绾跨伒|Deal
29014d0ac8
Merge: f10e63c24d
f1a2c04672
...
Merge pull request #942 from axmolengine/remove-search-resolutions-support
Remove FileUtils::searchResolutionsOrderArray
2022-11-01 06:48:57 +08:00
涓€绾跨伒|Deal
6ddd6f0e05
Update CMakeLists.txt
2022-11-01 06:47:36 +08:00
halx99
cdf9e3f66a
Fix ci
2022-10-31 14:45:07 +08:00
halx99
a87bf2ee4b
Fix effekseer compiling [skip ci]
2022-10-31 14:30:33 +08:00
halx99
56d66aba67
Remove FileUtils::searchResolutionsOrderArray
2022-10-30 23:03:39 +08:00
halx99
b1315f0c85
Update extensions/CMakeLists.txt
2022-10-30 23:00:33 +08:00
halx99
a259aefb77
Update readme for extensions
2022-10-30 22:53:58 +08:00
halx99
5d4b821f9e
Add particle effect extension 'Effekseer' support
...
- By default, OFF
- Use cmake option AX_ENABLE_EXT_EFFEKSEER=TRUE to enable it
2022-10-30 22:52:39 +08:00
halx99
54ef53f939
Committing genbindings changes
2022-10-20 12:52:19 +00:00
tkzcfc
8a2f5d6666
Fix downloader crash in the lua coroutine ( #927 )
2022-10-18 17:42:19 +08:00
涓€绾跨伒|Deal
30298a456e
Create README.md
2022-10-17 22:15:27 +08:00
halx99
8b674f73ba
Update Dear ImGui to v1.88, refer to #895
2022-10-17 21:46:16 +08:00
halx99
8f9e610713
Committing genbindings changes
2022-10-13 14:08:14 +00:00
halx99
567069236b
Luabinding: Add std: 🧵 :id support
2022-10-12 14:22:45 +08:00
halx99
496962f762
Committing genbindings changes
2022-10-11 23:33:16 +00:00