Skip to content
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

Update docs page introduction_to_3d to accurately explain Transform3D #9174

Merged
merged 1 commit into from
Apr 5, 2024

Conversation

Skyefre
Copy link
Contributor

@Skyefre Skyefre commented Apr 2, 2024

As mentioned in Issue #8904, a Transform3D is a 3x4 matrix, not a 4x3. This simply updates line 35 in introduction_to_3d.rst to match.

edit: I did not mean to try to merge 99 commits, I only wanted to request merge the one that I was making, and I'm afraid that I messed up.

@mhilbrunner
Copy link
Member

mhilbrunner commented Apr 2, 2024

You probably started your PR branch from either an outdated version of the repo's master branch or another branch entirely. Fetching the updated upstream branches and then rebasing your PR branch on the current master commit should fix this (and will a force-push afterwards). Make a backup of your changes before, just to be safe. If you need assistance, feel free to poke us on the #documentation channel on the contributor Rocketchat (link, we are happy to help and Git can be a bit of a, well git. :)

@AThousandShips AThousandShips added enhancement needs work Needs additional work by the original author, someone else or in another repo. area:manual Issues and PRs related to the Manual/Tutorials section of the documentation topic:3d labels Apr 3, 2024
@Skyefre
Copy link
Contributor Author

Skyefre commented Apr 4, 2024

I followed your instructions and believe that I fixed the issue, thank you! Please let me know if there is anything further I need to do

@AThousandShips
Copy link
Member

You haven't fixed it fully, there's still incorrect commits in it, please do git rebase -i master and put "drop" in front of bc4d39d and 19952ec :)

As pointed out in Issue godotengine#8904, a Transform3D is a 3x4 transformation matrix, not a 4x3. While that issue does point out other areas of concern on this specific page, this update is simply to fix that error. The change can be found on line 35.
@Skyefre
Copy link
Contributor Author

Skyefre commented Apr 4, 2024

Ok ok I believe it should finally be good now, unless 3b877c8 is getting in the way of anything. Thank you!

@AThousandShips
Copy link
Member

Still got the wrong versions, you need to do the git rebase again and then do git push -f, you merged your local branch into the upstream

@Skyefre
Copy link
Contributor Author

Skyefre commented Apr 4, 2024

how about now?

@AThousandShips AThousandShips removed the needs work Needs additional work by the original author, someone else or in another repo. label Apr 5, 2024
@mhilbrunner
Copy link
Member

Thank you, it indeed looks perfect now :) Congrats on your first merged contribution to Godot's docs! 🎉

@mhilbrunner mhilbrunner merged commit 3a577ea into godotengine:master Apr 5, 2024
1 check passed
@Skyefre
Copy link
Contributor Author

Skyefre commented Apr 5, 2024

thank you for your assistance :)

@mhilbrunner
Copy link
Member

Cherry-picked to 4.2 in #9648.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:manual Issues and PRs related to the Manual/Tutorials section of the documentation enhancement topic:3d
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants