Skip to content

3.x draft (for ci check only) #2204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 42 commits into from
Closed

3.x draft (for ci check only) #2204

wants to merge 42 commits into from

Conversation

halx99
Copy link
Collaborator

@halx99 halx99 commented Oct 4, 2024 •
edited
Loading

Describe your changes

  • Remove all deprecated stubs
  • Implement drawArraysInstanced and make instanced draw more common use
  • box2d-3.x
    • Make Box2dTest of cpp-tests works on box2d v3
    • Make Box2dTestBed of cpp-tests works on box2d v3
  • Remove chipmunk
    • Remove core/physics based on chipmunk
    • Remove ChipmunkTest from cpp-tests
    • Remove ChipmuniTestbed from cpp-tests
  • Change underlaying color type to Color4F aka ax::Color
  • Improve DrawNode, don't create backend::Buffer always
  • Upgrade iOS deploy target: 12.0 ==> 13.0
  • Upgrade android minsdk: 17(Android 4.2) ==> 21(Android 5.1)
  • Upgrade android ndk: r23d ==> r27c
  • Due to android,ios toolchain update to support c++20 full features, std::views::split can be use to improve performance
  • Remove 3rdparty ghc filesystem, since both ios13 and android5.1 support std::filesystem
  • Build and run wasm64 support, current need enable chrome flag: chrome://flags/#enable-webassembly-memory64
  • drop rapidjson
  • re-select json lib: yyjson > boost.json > rapidjson
    simdjson for parse only and simdjson build in-progress: https://github.com/simdjson/experimental_json_builder
    finally solution: yyjson + simdjson
  • Color4B ==> Color32
  • Remove Color3B
  • drop tolua, use sol2
  • Reimplement core/physics with box2d v3, not all API compatible with axmol-2.x

Issue ticket number and link

Checklist before requesting a review

For each PR

  • Add Copyright if it missed:
    - "Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md)."

  • I have performed a self-review of my code.

    Optional:

    • I have checked readme and add important infos to this PR.
    • I have added/adapted some tests too.

For core/new feature PR

  • I have checked readme and add important infos to this PR.
  • I have added thorough tests.

Note

Currently, the branch 3.x is in draft mode, that means it's not stable and will force-push frequently

@halx99 halx99 changed the title [WIP] Remove deprecated stubs (for ci check only) [WIP] draft 3.x (for ci check only) Oct 4, 2024
@halx99 halx99 force-pushed the 3.x branch 2 times, most recently from b28015d to d514187 Compare October 4, 2024 08:16
@halx99 halx99 changed the title [WIP] draft 3.x (for ci check only) [WIP] 3.x draft (for ci check only) Oct 4, 2024
@halx99 halx99 changed the title [WIP] 3.x draft (for ci check only) 3.x draft (for ci check only) Oct 4, 2024
@halx99 halx99 force-pushed the 3.x branch 2 times, most recently from 9a31e45 to 95147ee Compare October 4, 2024 09:30
@smilediver
Copy link
Contributor

From outside it would be easier to track changes being made to 3.x branch if they all went through PRs like in the dev branch. They would also get CI check automatically, and there would be an opportunity for reviews and comments.

@halx99
Copy link
Collaborator Author

halx99 commented Oct 4, 2024 •
edited
Loading

currently, 3.x is a draft branch or you can consider it is a temp branch, I don't like make PR one by one to waste much time. I create this PR is only for non-win32 platform ci-check, because I'm compile and test on my windows computer.

@halx99 halx99 force-pushed the 3.x branch 5 times, most recently from 630f361 to 4176cc4 Compare October 4, 2024 12:36
@aismann
Copy link
Contributor

aismann commented Oct 4, 2024

Physics should be an own test project like fairgui.
@halx99
What are you mean?

@halx99
Copy link
Collaborator Author

halx99 commented Oct 5, 2024

Physics should be an own test project like fairgui. @halx99 What are you mean?

I think physics test in cpp-tests is ok

@halx99 halx99 force-pushed the 3.x branch 2 times, most recently from df9a625 to eae98df Compare October 5, 2024 07:46
@halx99 halx99 added this to the 3.0 milestone Oct 5, 2024
@halx99 halx99 force-pushed the 3.x branch 2 times, most recently from 87f50d3 to 894840a Compare October 5, 2024 09:31
@aismann
Copy link
Contributor

aismann commented Oct 5, 2024 •
edited
Loading

@halx99
Please have a look on the Performance Candy Mix test:

  • drawOrder: true it very slow (2.2 is faster) and closing get this:

Assertion failed!
Program: ..._GIT\axmol\build\bin\cpp-tests\Debug\cpp-tests.exe
File: D:__GIT\axmol\core\renderer\CustomCommand.cpp
Line: 221
Expression: _vertexBuffer

I getting this also on other tests when I switched drawOrder: to 'true'

@halx99
Copy link
Collaborator Author

halx99 commented Oct 5, 2024

@halx99 Please have a look on the Performance Candy Mix test:

  • drawOrder: true it very slow (2.2 is faster) and closing get this:

Assertion failed!

Program: ..._GIT\axmol\build\bin\cpp-tests\Debug\cpp-tests.exe File: D:__GIT\axmol\core\renderer\CustomCommand.cpp Line: 221

Expression: _vertexBuffer

image

Tested, works well, and no assertion

@aismann
Copy link
Contributor

aismann commented Oct 5, 2024 •
edited
Loading

Click on this text plz: it switched the drawOrder
image
It raised if you switched back to false

here another example:
image

@halx99
Copy link
Collaborator Author

halx99 commented Oct 5, 2024

Click on this text plz: it switched the drawOrder image It raised if you switched back to false

here another example: image

Assertion failed was fixed.

@aismann
Copy link
Contributor

aismann commented Oct 5, 2024 •
edited
Loading

Yeah. Works now.
Please have a look on the release comparing between 2.2/3.0 on Performance Candy Mix test again:
2.2 release version drawNode true:
Seems faster (on my machine >50 FPS always)
image

3.0 release version drawNode true:
image

And the drawing looks very bad like pixel jumps around whatever on Performance Candy Mix

@halx99
Copy link
Collaborator Author

halx99 commented Oct 5, 2024

On my machine, release build, both 2.2 & 3.0 is 60fps

@aismann
Copy link
Contributor

aismann commented Oct 5, 2024 •
edited
Loading

On my machine, release build, both 2.2 & 3.0 is 60fps

Your machine is faster. You cant see this behavior.
What about the crazy drawing ? Looks it the same candy?

You have switch the drawOrder =>true (on the both release biulds)?

@halx99
Copy link
Collaborator Author

halx99 commented Oct 5, 2024

I also saw the crazy drawing

@aismann
Copy link
Contributor

aismann commented Oct 5, 2024 •
edited
Loading

On my machine, release build, both 2.2 & 3.0 is 60fps

You have switch the drawOrder =>true (on the both release biulds)?

halx99 and others added 21 commits February 9, 2025 01:10
@halx99
Still use V3F_T2F_C4B for sprite render
28c8c46
@halx99
Update lua bindings
eeb5764
@halx99
Merge axmol dev into 3.x
c9c0a33
@halx99
Update Android & iOS minmal OS support
21162d2 
Android: Android 5.1(API 21)+
iOS: 13+
@rh101 @halx99
AxmolActivity will extend AppCompatActivity
fafecfe 
Min SDK set to 21
Tests updated to support AppCompatActivity
MultiDexEnabled for cpp-tests
@halx99
Update simdjson to v3.11.4
2123edb
@halx99
Remove dependency rapidjson for JsonWriter
e538c2b
@halx99
Update openal-soft to 1.24.2
7274c9b
@halx99
Update simdjson to v3.11.5
6944b5f
@halx99
Fix #2330 and improve code style
1f03c54
@halx99
Improve code style
96e39d4
@halx99
Fix linux link error
6382bb0
@halx99
Rename Color4B to Color32
b8ab592
@halx99
Fix wasm64 build
f979987
@halx99
Fix wasm64 runtime exception for imgui glfw backend
6a94dc9
@halx99
Add wasm64 build to ci
8f69b70
@halx99
Improve Console::Utility::trim and move to StringUtils
da88a07 
    - Use c++20 reature ranges
    - Use c++20 0-GC split to instead std::getline
@halx99
Add lib: fast_float
7857247 
-  Resolve clang libc++ not support std::from_chars for floating points
@halx99
Improve c3t, c3b load
6c1b51c 
- Use simdjson to load c3t
- Use yasio::ibstream to c3b
@halx99
Fix android appcompat not set in template project
df2279a
@halx99
Fix wasm compiling warnigs and errors
e15a1af
@halx99 halx99 closed this Feb 11, 2025
@halx99 halx99 deleted the 3.x branch February 11, 2025 05:06
@halx99 halx99 restored the 3.x branch February 11, 2025 05:07
@halx99 halx99 deleted the 3.x branch February 11, 2025 05:09
@halx99 halx99 mentioned this pull request Feb 11, 2025
Draft
29 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paulocoutinhox paulocoutinhox paulocoutinhox left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.0.0
Development

Successfully merging this pull request may close these issues.
6 participants
@halx99 @smilediver @aismann @rh101 @paulocoutinhox @johnspeny