Deal
213f788f75
Merge backend Device, DeviceInfo to DriverBase ( #1499 )
...
* backend::Device ==> backend::DriverBase
* backend::DeviceInfo ==> backend::DriverBase
* code style: remove unnecessary virtual function marks
2023-12-11 21:59:25 +08:00
aismann
f19c8f89ae
Replace 'CCAssert' with 'AXASSERT' ( #1485 )
2023-12-08 16:30:34 +08:00
Lich
0f114baf8c
Improve ActionCoroutine callback style ( #1481 )
2023-12-08 12:46:46 +08:00
halx99
affcf05b69
Prepare 2.1.0 release
...
* Update copyright notice
* Remove prebuilt libs from SCM
* Remove optional thirdparty sources/repo from SCM
* Remove tests resources folder 'Content' from SCM
2023-12-08 01:04:43 +08:00
aismann
41c65eb28e
Add DrawNode::drawPie ( #1474 )
2023-12-05 17:20:31 +08:00
Lich
d84d527362
Add support for ActionCoroutine like Unity ( #1473 )
2023-12-05 00:28:50 +08:00
Paulo Coutinho
0aab228acc
Rename glview to correct representative name ( #1467 )
2023-12-01 09:04:51 +08:00
CHP
13ec866867
Update android API to 34 ( #1469 )
...
* Update gradle.properties
* Update android api to from 33 to 34
2023-12-01 08:08:37 +08:00
RH
5374e6ecc0
Add support for Richtext vertical alignment ( #1466 )
...
* Add vertical alignment support for RichText
* Simplify RichTextTest implementation by reducing code duplication.
Add vertical alignment button to all RichText tests.
* Remove duplicate include
* [RichText] Vertical alignment support when ignoring size
2023-12-01 00:05:11 +08:00
RH
575daa3c37
Fix large number of generated warnings ( #1465 )
2023-11-30 15:52:29 +08:00
halx99
ec507ec874
Update mac icons
2023-11-27 20:18:10 +08:00
halx99
8d1f801b54
Fix typo [skip ci][skip appveyor]
...
refer #1453
2023-11-26 23:56:38 +08:00
Deal
b062eb3dc2
Improve linux deps ( #1441 )
2023-11-19 09:38:12 +08:00
aismann
c7be9816d9
Fix/enhancement for issue #1319 ( #1434 )
...
Fix/enhancement for issue #1319 (draw filled complex polygons (concave/convex)
Co-authored-by: eismpesd <peter.eismann@siemens-healthineers.com>
2023-11-16 12:06:39 +08:00
RH
1f5f8c182a
Update Live2D to work with Axmol 2.x ( #1405 )
...
* Ensure Live2D extension is enabled for Live2D test
* Update Live2D to work with Axmol 2.x
* [skip ci] Remove commented out shader code
2023-10-25 19:25:42 +08:00
RH
fc67e58646
Imgui and Inspector enhancements ( #1396 )
...
* [imgui] Add support for displaying images correctly that are rotated in texture atlas
[imgui] Add parameter to select if displayed image maintains aspect ratio
[imgui] Move static methods to anonymous namespace
[imgui] Minor code clean-up
* [imgui] Add support for displaying SpriteFrame
* [imgui] Update test to show usage of ImGuiPresenter::image helper methods
* [Inspector] Show image of selected sprite
2023-10-20 19:22:49 +08:00
halx99
4d91ed6ca3
Fix dll build, make JSONDefault as static library
2023-10-19 23:27:59 +08:00
Saroop Technologies
f2ae7f9759
Add JSONDefault extension ( #1393 )
2023-10-19 15:30:39 +08:00
RH
a503004418
[Android] Restrict temporary and generated files to build folder ( #1368 )
...
* [Android] Restrict temporary and generated files to build folder
* Fix temporary axslc folder path
2023-10-02 09:47:11 +08:00
RH
ef635f0649
Fix for missing scripts and resources in lua tests project ( #1357 )
...
* [MacOS] Several linker flags removed to fix executable
* Fix both Apple and Windows missing resources and scripts folders.
* Fix for lua project with prebuilt engine
* Remove usage of _AX_TOP_LEVEL for lua-tests project
2023-09-26 20:07:13 +08:00
halx99
2f1efe5a51
Add preload ttf SDF font atlas support
...
A extension SDFGen tool also available, see ImGuiTest
2023-09-26 01:33:06 +08:00
Deal
b892461a2b
UWP: Migrating from C++/CX to C++/WinRT ( #1355 )
2023-09-26 00:11:33 +08:00
halx99
079586d060
Fix #1336
2023-09-19 22:00:17 +08:00
Deal
4f4f07ddc4
Add enable global TTF SDF rendering support ( #1333 )
2023-09-18 07:18:57 +08:00
halx99
f2470b99aa
Android: Update AGP to 8.1.1
...
- jdk-17.x+ required
- gradle-bin 8.3
- Build-Tools 33.0.1
- Delete package name from AndroidManifest.xml
- Add namespace "org.axmol.xxx" in 'app/build.gradle'
- Rename compileSdkVersion ==> compileSdk in 'app/build.gradle'
- Use rootProject.layout.buildDirectory instead rootProject.buildDir
- Android Studio 2022.3.1+
2023-09-12 01:13:06 +08:00
iAndyHD3
810c909e67
Add extension Inspector (Experimental) ( #1324 )
...
* node explorer
* fix some crash, add to tests
* change tabs to spaces
* remove node explorer from hello template
* change name to Inspector + add readme
* minor fix
* fix minor things
* fix minor thing...
* fix build on ios, android
* Apply suggestions from code review
* fix typename for gcc/clang, add font
* include cxxabi outside ax namespace
2023-09-12 01:06:28 +08:00
halx99
5bf03c47ac
Build more tests for wasm
2023-09-11 20:31:57 +08:00
halx99
2db687b422
Enable dpi scale for ImGuiTest
2023-09-11 00:05:53 +08:00
halx99
766d79a73f
Revert cmake module folder to `cmake/Modules`
2023-09-09 00:36:49 +08:00
halx99
45cb0d82dc
Add cmake option 'AX_WASM_SHELL_FILE'
...
Specify the wasm shell file, by default use
`${_AX_ROOT}/core/platform/wasm/shell_minimal.html`
2023-09-07 21:09:36 +08:00
halx99
8cbe447974
Fix ci
2023-09-06 11:14:11 +08:00
halx99
0c42b9370b
Enable more tests for wasm
...
- box2d test beds
- chipmunk test beds
2023-09-06 10:11:48 +08:00
halx99
d7a72ea587
WASM: Fix .html file not generated
2023-09-05 22:40:25 +08:00
halx99
5a528b46e5
WASM: use shorten target platform name 'wasm' instead 'emscripten'
...
For examples:
- win32 app build by msvc/clang and runs on windows
- wasm app build by emscripten/emcc and runs on web browsers
2023-09-05 22:17:18 +08:00
halx99
0a56810af5
Improve wasm support
...
- Enable thread support
- Improve emcc flags
- Enable webp support
- axmol run now support wasm by emrun
- Rebuild openssl by pthread support
- Extension: effekseer support
2023-09-05 21:10:25 +08:00
halx99
80f1e0952f
Update wasm persist path
2023-09-03 18:25:39 +08:00
halx99
c67cd64ffc
Use axmol embeded freetype for wasm
2023-09-03 13:12:59 +08:00
halx99
cbb23108cb
Merge: e1f3c5d76f
c21736c0d6
...
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
2023-09-03 11:47:36 +08:00
halx99
7abad49137
Appveyor CI: build wasm release mode
2023-09-03 11:47:33 +08:00
halx99
692688accf
Fix tvos ci
2023-09-03 09:46:21 +08:00
halx99
c66ac9dedc
Merge: 41714a04fd
2631c8405b
...
Merge branch '1.x' into dev
2023-09-02 19:56:50 +08:00
halx99
b21fcb0272
Fix gendocs.ps1
2023-09-02 19:56:33 +08:00
halx99
8f8418c15d
Merge: c8bfa8cdf1
062b510c38
...
Merge 1.x WASM support into 'dev'
2023-09-02 19:47:18 +08: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
33bb9c1334
Move cmake/Modules/* to cmake/*
2023-08-28 13:47:24 +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
69c222795e
Update cpp-tests shaders [skip ci]
2023-08-22 19:22:53 +08:00
halx99
a7011c2bcd
Fix axslc sync
2023-08-21 13:39:56 +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
15888b2444
Fix ci
2023-08-11 21:14:03 +08:00
halx99
bf31f7b77d
Fix ci
2023-08-11 15:04:33 +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
f63932bb91
Update ios GLES to GLES3
2023-08-09 22:25:15 +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
2d0a63660f
Improve custom program draw batch
2023-08-02 10:31:52 +08:00
halx99
bba3818829
Fix gray shader name
2023-07-29 17:46:10 +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
halx99
1d0c79b697
Fix glsl attrib location out of range
2023-07-28 11:48:59 +08:00
halx99
0f642ddb2e
Improve shader module and empty texture managment
2023-07-28 11:46:34 +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
0c400fcf4b
Improve example_LensFlare.fsh
2023-07-26 13:50:13 +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
c675e15a92
Migrate cpp_tests shaders
2023-07-22 23:59:17 +08:00