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

Support ptex mesh - Step 2: fix the shader #194

Merged
merged 2 commits into from
Sep 6, 2019
Merged

Conversation

bigbike
Copy link
Contributor

@bigbike bigbike commented Sep 5, 2019

This PR is to
-) fix the winding of triangles in the geometry shader;
-) apply correct uv;
-) use a more standard way to read data from the buffer texture;

Motivation and Context

To support ptex mesh rendering in our simulator

How Has This Been Tested

Local on Mac and Linux. See details at #132

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes.
  • All new and existing tests passed.

-) fix the winding of triangles in the geometry shader;
-) apply correct uv;
-) use a more standard way to read data from the buffer texture;
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Sep 5, 2019
@bigbike
Copy link
Contributor Author

bigbike commented Sep 5, 2019

@ALL:

This is ready for review.

Copy link
Collaborator

@msavva msavva left a comment

Choose a reason for hiding this comment

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

Thanks @bigbike -- this minimal PR makes reviewing so easy! Left some small typo comments but otherwise LGTM. 👍

@@ -6,8 +6,12 @@ out vec2 uv;
void main() {
gl_PrimitiveID = gl_PrimitiveIDIn;

uv = vec2(1.0, 0.0);
gl_Position = gl_in[1].gl_Position;
// the triangle trip generated is (3, 0, 2, 1),
Copy link
Collaborator

Choose a reason for hiding this comment

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

typo: trip -> strip

uv = vec2(1.0, 0.0);
gl_Position = gl_in[1].gl_Position;
// the triangle trip generated is (3, 0, 2, 1),
// which is is different from replicaSDK.
Copy link
Collaborator

Choose a reason for hiding this comment

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

typo: is is -> is

@bigbike bigbike merged commit 6802617 into master Sep 6, 2019
@bigbike bigbike deleted the replica_fix_shader branch September 6, 2019 21:13
eundersander pushed a commit to eundersander/habitat-sim that referenced this pull request Aug 6, 2020
…cebookresearch#194)

* Changed Shortest Path Follower criteria to use geodesic distance
Ram81 pushed a commit to Ram81/habitat-web-sim that referenced this pull request Dec 10, 2020
…_fix_shader

Support ptex mesh - Step 2: fix the shader
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants