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

--[BE Week] Remove ptex support #2137

Merged
merged 3 commits into from
Jun 26, 2023
Merged

--[BE Week] Remove ptex support #2137

merged 3 commits into from
Jun 26, 2023

Conversation

jturner65
Copy link
Contributor

@jturner65 jturner65 commented Jun 26, 2023

Motivation and Context

PTEX Support is no longer desired in habitat-sim, so this support is being removed. This consists of removing cmake-driven flags intended to drive PTEX mesh handling, and PTEX-oriented classes and shaders from within the Simulator resource loading and rendering paths.

How Has This Been Tested

Current c++ and python tests pass

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.

@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Jun 26, 2023
@jturner65
Copy link
Contributor Author

jturner65 commented Jun 26, 2023

Ticket : T156829184

@0mdc
Copy link
Contributor

0mdc commented Jun 26, 2023

We'll want to either remove those PTEX enum entries, or treat/annotate them as errors:

  • SupportedMeshType::PTEX_MESH (src/esp/assets/BaseMesh.h)
  • DrawableType::PTexMesh (src/esp/gfx/Drawable.h)

@0mdc
Copy link
Contributor

0mdc commented Jun 26, 2023

Nit: PTexMeshDrawable is still being referred to in some comments:

  • src/esp/gfx/Drawable.h
  • src/esp/scene/SceneGraph.h

@jturner65
Copy link
Contributor Author

We'll want to either remove those PTEX enum entries, or treat/annotate them as errors:

* `SupportedMeshType::PTEX_MESH` (`src/esp/assets/BaseMesh.h`)

* `DrawableType::PTexMesh` (`src/esp/gfx/Drawable.h`)

Nit: PTexMeshDrawable is still being referred to in some comments:

* `src/esp/gfx/Drawable.h`

* `src/esp/scene/SceneGraph.h`

oops. missed those, thanks!

Copy link
Contributor

@0mdc 0mdc left a comment

Choose a reason for hiding this comment

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

LGTM!

@jturner65 jturner65 merged commit 017dcdb into main Jun 26, 2023
9 of 10 checks passed
@jturner65 jturner65 deleted the BE_RemovePTEX branch June 26, 2023 17:48
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.

None yet

3 participants