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

577 Commits

Author SHA1 Message Date
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
halx99 76f00b4456 Make renderer works on opengl core profile mode 2023-07-20 20:23:56 +08:00
halx99 71c2d3a3b1 Init axslc search path at ProgramManager init 2023-07-20 10:20:06 +08:00
halx99 60bbd3b1a3 Auto pack axslc into android apk 2023-07-20 01:18:27 +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 ef51437c25 Fix cpp_tests resources load priority 2023-07-19 21:05:46 +08:00
halx99 42f666ff89 Refactor GL uniform block support 2023-07-19 19:20:06 +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 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
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 aeb6268f1c Fix cpp-tests shader loads 2023-07-11 16:40:49 +08:00
CHP 10a4fe09f6 Start AutoStart when env AXMOL_START_AUTOTEST is set (#1261) 2023-07-09 20:10:50 +08:00
RH ce590c24a0 Fix for crashes in several tests (#1259) 2023-07-09 14:45:41 +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
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
CHP f729bce152 Increment PROP_MIN_SDK_VERSION to 21 (#1236) 2023-06-20 20:49:48 +08:00
Deal(涓€绾跨伒) 0ab5023997 Update UIVideoPlayerTest.cpp 
Use mp4 url because Apple only support video container format .mp4, not support .mkv
 2023-06-19 20:20:03 +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 5d79202f49 Update VideoPlayerTest url [skip ci] 2023-06-05 21:49:33 +08:00
RH 978648e5a9 Factor in protected nodes when creating global Z node priority map for event dispatcher (#1224) 2023-06-05 17:09:50 +08:00
aismann 33405d0bc6 On "57: Node:RotateWorld" replace cocos2d with axmol logo (#1220) 2023-05-30 19:49:50 +08:00
halx99 f5526f8c42 Fix compile warnings 2023-05-27 23:21:25 +08:00
halx99 08fee88813 Fix ci 2023-05-14 19:13:49 +08:00
Tan Shjie d13d11f51c Update UnitTest.cpp (#1198) 
For getPathEth() of u4, u5, u6, adding "/" is needed to pass the test
 2023-05-07 21:16:28 +08:00
halx99 fd88e2de3b Update AGP to 7.4.2, gradle to 8.1 2023-04-20 08:54:24 +08:00
halx99 16ce534635 Update yasio to latest 2023-04-17 00:28:05 +08:00
RH 6b9d5fe32d Fix to ensure new line is correctly added to RichText (#1171) 2023-04-13 21:33:29 +08:00
halx99 2f1a4a9921 Improve HttpClient, remove unsafe API `sendSync` 2023-04-03 19:54:58 +08:00
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159) 
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
 2023-04-02 16:04:19 +08:00
Deal(涓€绾跨伒) 621c94c9e7 Enable video player(VideoTexture) based on new MediaEngine for macOS and tvos (#1154) 
* Ready for PR macOS

* Update videoTexture.frag

* Fix compile

* Fix h265 for mac [skip ci]

* Fix compile error

* Update readme [skip ci]
 2023-04-02 01:51:36 +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 42567d0c98 Update ios splash images [skip ci] 2023-03-21 19:40:55 +08:00
Sam edfacba3db Add ClippingNode Performance Test (#1122) 
* Impore Metal Renderer Dirty Detection.

Remove setTargetFlags _dirty

* Add Clipping Node Performance Test

* Fix Win UWP compile error
 2023-03-16 08:07:53 +08:00
halx99 912bf32d13 Remove UWP from PC family 2023-03-14 12:08:31 +08:00
aismann 213afaefa7 add axmol_ext.h (#1117) 2023-03-14 07:56:07 +08:00
halx99 760c59ab6e [UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets 2023-03-12 17:57:54 +08:00
RH 941ccd0d14 TiledMap sprite position fix (#1112) 
* Correctly store flags and gid with sprite created for tile
Use correct coordinates when displaying sprite for a tile

* Fix up typo and long test titles
 2023-03-12 16:15:11 +08:00
RH 3f6847ebf0 Set default project in Visual Studio for UWP (#1111) 2023-03-12 12:34:51 +08:00
halx99 517ffeedc6 Update project url in sources 2023-03-12 01:44:55 +08: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
Turky Mohammed 969c2257f8 [BUG] TileMap flipped/rotated animated tiles incorrect rendering. (#1098) 
* Add test cases

* Delete default_hrtf.txt

* Fix rotated/flipped animated tile maps

* Optimize bitwise operations

* improve bitwise operations
 2023-03-07 23:26:37 +08:00
RH 00989196af Fix incorrect content variable in cpp template (#1095) 
* Fix cpp-template-default CMakeLists.txt content folder reference
Update test project content folder variable name to match cpp template
 2023-03-04 21:25:05 +08:00
RH 14ccdfcffa [Apple] Fix for missing resources (#1092) 
* [Apple] Ensure resources are mapped to the expected directory by iOS and MacOS targets
 2023-03-03 21:53:18 +08:00
Deal(涓€绾跨伒) aaadb1752f Revert design size. 2023-02-24 04:20:14 +08:00
halx99 b6ca5716c5 Fix android assets 2023-02-23 23:48:06 +08:00
RH 9c526c81e4 [Android] Update icons to Axmol logo (#1073) 
* Update Android icons in test projects.
 2023-02-23 23:43:51 +08:00
Deal(涓€绾跨伒) 83d53ba46b Tidy project tree and full symlink support (#1072) 
* Tidy project file tree and all symlink support
 2023-02-23 21:57:30 +08:00
RH c642b3babc Better richtext word wrapping (#1071) 
* [RichText] Do not word-wrap on punctuation characters for better readability
 2023-02-23 13:55:42 +08:00
RH a8b02df98a Update app icon to Axmol logo (#1070) 
* [iOS] Axmol logo

* [Windows] Add Axmol logo as icon
Replace old logos in test resources with Axmol logo

* [tvos] Update to Axmol logo

* Update iOS and tvOS app logo

* Update cpp template app logos

* Fix resources for iOS and tvos. Update to new Axmol logo.
 2023-02-23 13:07:12 +08:00
halx99 c42d6a220f Fix ci 2023-02-23 10:14:14 +08:00
halx99 b666fe93c8 Improve cpp-tests design resolution setup 2023-02-23 09:50:36 +08:00
halx99 452754981a [CMake] Add symlink support, refer to #1005 
- Rename ax_<xxx>_copy_xxx to ax_<xxx>_sync_xxx
- Add optional arg `SYM_LINK`
 2023-02-22 23:37:32 +08:00
aismann cfcf541744 Visible artifacts on DrawNode::drawCircle() with a corresponding lineWidth > 5 (window resizing issue) (#1050) 
* Fix DrawNode::drawCircle() behavior itf the window is resizing.

* Update CCDrawNode.cpp

Tested also with
resourceSize(960, 640) or (1280, 720)
designSize(480, 320) or (400, 320);

Making a deal with the "boss"

* Update drawCircle and Tests

_lineWidth/4  is needed => the circle grow to fast without

---------

Co-authored-by: Deal(涓€绾跨伒) <halx99@live.com>
 2023-02-22 20:02:20 +08:00
RH 20dcad664b Trim leading space from wrapped lines of text in RichText (#1066) 
* Fix issue with a whitespace appearing at the start of left-aligned text in RichText when using wrapping at word boundaries.
Update RichText test.
 2023-02-21 13:15:28 +08:00
Turky Mohammed 3ebd6202cc Improve test naming (#1057) 
* add anchored sprite class

* Add feature tests

* Update SpriteTest.cpp
 2023-02-13 17:55:26 +08:00
aismann 800da490d8 drawCircle tester improved (#1054) 
* drawCircle tester improved

* add more info to the tester

* codacy fix
 2023-02-11 08:05:27 +08:00
Turky Mohammed 63263e09d2 Add Anchored Sprite Class (#1040) 
* add anchored sprite class

* Add feature tests
 2023-02-10 14:07:20 +08:00
aismann 8f63f3934f Changeable window for all "PCs on cpp_tests (#1036) 2023-01-23 19:30:13 +08:00
halx99 a370e0e602 Fix ci 2023-01-21 14:51:14 +08:00
halx99 059dafe021 Make cpp-tests window resizable 2023-01-21 14:30:17 +08:00
aismann f238e5e0ff Improve drawCircle rendering for big rings (#1013) 
* Update HelloWorldScene.cpp

replace   _director->end();  with menuCloseCallback(this);

* Rendering drawCircle
 2023-01-06 23:25:31 +08:00
halx99 95052b2961 Fix http test print 2023-01-05 23:31:39 +08:00
halx99 2410e7a782 Change HttpRequest::getTag return type from const char* to std::string_view 2023-01-04 23:37:57 +08:00
halx99 cb35a48885 Take care lambda implicit capture std::string_view 
refer to: #1002
 2023-01-03 23:02:17 +08:00
halx99 0f97e3fa3a Improve base64 API 
Move base64Encode/base64Decode to namespace `ax::utils`
 2023-01-01 18:07:18 +08:00
CHP 8d36190c98 Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08: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