-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
[no squash] Irrlicht import #14483
[no squash] Irrlicht import #14483
Conversation
dbd6d34
to
aa91d0a
Compare
The CI on ubuntu 20.04 is failing because of SDL2, see also: And the mingw stuff downloads dependencies from @sfan5's website. I need help here. |
one more: please amend the import commit with an author like |
Perhaps I'm missing something, but 60b1249 seems to just copy the sources? This would lose history entirely, as opposed to a subtree merge which would preserve history. |
My plan never was to do a subtree merge. |
Yes, it's just a copy. AFAIK, this is what we planned to do.
📈 🚫 |
Also remove the now useless options (like IRRLICHT_INCLUDE_DIR) and update download instructions, CI and similar. Co-authored-by: sfan5 <[email protected]>
Re-copied from current irrlichtmt master, and squashed.
This is done, btw.. Github still shows my profile picture because I'm the committer, and it doesn't know the |
cannot we import this properly in git mode keeping irrlicht mt commits ? there is a way to merge repo |
Yes, that's what I'm inquiring about: Why we aren't doing a subtree merge. There may be benefits to not doing a subtree merge, but I don't really see them yet (besides a slightly smaller repo, maybe). I think much of the Irrlicht(MT) history is probably still useful. |
Reasons for not doing a subtree merge (IMO):
For a comparison consider the clone size of irrlicht: full: Receiving objects: 100% (12904/12904), 23.20 MiB | 12.03 MiB/s, done. shallow: Receiving objects: 100% (368/368), 875.69 KiB | 7.12 MiB/s, done. |
And if it doesn't, it would instead add around 500 commits on top of our history. I also prefer the current choice of just copying it in. (Self-approving.) |
I do not think its a good idea to import this without I recognize this is not up to me but it feels a bit questionable. |
I think we want to get rid of as much of Irrlicht as we can. The history is less and less important. With all the changes we did, chances are we cannot integrate anything from/to upstream anyway - and that is assuming that Irrlicht upstream isn't mostly dead anyway. Count as in favor of just copying the files over (not history) - and then remove as much as we can of Irrlicht over time. |
For
|
Can we move ahead with this, or is there further discussion to have? |
The goal of forking Irrlicht was to fuse Minetest and irrlicht together to enable customizing the entire rendering system to suit MT's special use case which will never be Irrlicht's goal in its upstream. It doesn't seem to me like a bad time to do the repo import now - irrlichtmt is relatively problem free and has shrunk a lot from its original size. While we have had a very fluctuating availability of graphics programmers to improve, optimize and modernize the rendering, there has been enough progress to validate the sanity of the plan. Part of this is removing everything unneeded from Irrlicht to make it manageable and appetizing for new development. Irrlicht contains vast amounts of stuff that is of no use and no interest to us, and is only a burden. Not including the history of irrlichtmt in the minetest repo fits all this well enough. |
Re opinions needed: I like this 👍 |
First commit just copies irrlichtmt (as of minetest/irrlicht@1247087) to
<root>/irr/
.Second commit makes use of this irrlichtmt version, and removes a bunch of now useless stuff.
Related: #13642
Note:
lib/irrlichtmt
is still gitignored. This is good because you can still bisect this way, and also we don't mess with repos lying around there.Users can decide themselves when they want to delete it, but they have to do it manually.
Co-authored by sfan5.
To do
This PR is Ready for Review.
How to test