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

fix tuto-03-animated-triangle.md #1934

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Conversation

GraydenH
Copy link
Contributor

@GraydenH GraydenH commented Jun 2, 2021

Sorry, maybe i was not clear in my last PR. My changes were not working yet.

@GraydenH GraydenH changed the title Revert "Update tuto-03-animated-triangle.md" Revert and fix "Update tuto-03-animated-triangle.md" Jun 2, 2021
@GraydenH
Copy link
Contributor Author

GraydenH commented Jun 2, 2021

I got the first example working but I was not able to figure out how to pass t to the vertex shader.

@est31
Copy link
Collaborator

est31 commented Jun 2, 2021

@est31
Copy link
Collaborator

est31 commented Jun 2, 2021

Also, #1933 does not need a revert. All the PR changed was to replace poll_events with run. poll_events is gone, as is the top level glutin::Event. So that PR was an improvement of the situation, which is why I merged it. Further improvements might be needed. For that, one should orient oneself on tutorial-03.rs to keep the two in sync.

Can you remove the "revert" from the title and maybe align the inline sources in the md file with tutorial-03.rs? After that, a squash would be useful.

@GraydenH GraydenH changed the title Revert and fix "Update tuto-03-animated-triangle.md" fix tuto-03-animated-triangle.md Jun 2, 2021
@GraydenH
Copy link
Contributor Author

GraydenH commented Jun 2, 2021

I see, The .rs was working but the .md was out of date. I fixed the .md to align with the source code example in a fitting way.

@est31
Copy link
Collaborator

est31 commented Jun 2, 2021

@GraydenH thanks, is this ready for review?

@GraydenH
Copy link
Contributor Author

GraydenH commented Jun 2, 2021

yeah, good to go @est31

book/tuto-03-animated-triangle.md Outdated Show resolved Hide resolved
book/tuto-03-animated-triangle.md Outdated Show resolved Hide resolved
book/tuto-03-animated-triangle.md Outdated Show resolved Hide resolved
@GraydenH GraydenH requested a review from est31 June 2, 2021 05:04
Copy link
Collaborator

@est31 est31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@est31 est31 merged commit 2b5e64b into glium:master Jun 2, 2021
@GraydenH GraydenH deleted the revert-1933-patch-1 branch June 2, 2021 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants