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

use custom mtlloader to fix obj texture loading #4272

Merged
merged 2 commits into from
Apr 15, 2024

Conversation

sashankaryal
Copy link
Contributor

@sashankaryal sashankaryal commented Apr 15, 2024

What changes are proposed in this pull request?

MTLLoader's texture loader doesn't create correct urls, and there is no way to correct it. I copied the loader's code to our repo and changed how texture urls are resolved to suit our use case.

How is this patch tested? If it is not, please explain why.

Create a fo3d dataset with the asset attached to test.
meshes.zip

Before texture load:
Screenshot 2024-04-15 at 3 47 03 PM

After texture load:
Screenshot 2024-04-15 at 3 47 27 PM

Diff between original MTLLoader and this implementation

50c50
<           onLoad(scope.parse(text, path, url));
---
>           onLoad(scope.parse(text, path));
82c82
<   parse(text, path, url) {
---
>   parse(text, path) {
124d123
<     materialCreator.mtlUrl = url;
271c270
<     function resolveTextureUrl(baseUrl, url) {
---
>     function resolveURL(baseUrl, url) {
274,279c273,276
<       const mtlBase = decodeURIComponent(baseUrl);
<       const regex = /\/([^\/]+\.mtl)/;
<       const match = regex.exec(mtlBase);
<       const filename = match ? match[1] : "";
<       const textureUrl = mtlBase.replace(filename, url);
<       return textureUrl;
---
>       // Absolute URL
>       if (/^https?:\/\//i.test(url)) return url;
> 
>       return baseUrl + url;
286,288c283
<       const map = scope.loadTexture(
<         resolveTextureUrl(scope.mtlUrl, texParams.url)
<       );
---
>       const map = scope.loadTexture(resolveURL(scope.baseUrl, texParams.url));

Summary by CodeRabbit

  • New Features
    • Introduced a new material loader for enhanced handling and parsing of material specifications in 3D models.
  • Refactor
    • Updated the import path for material loading functionality to improve module compatibility and maintenance.

Copy link
Contributor

coderabbitai bot commented Apr 15, 2024

Walkthrough

The recent update involves a redefinition and relocation of the MTLLoader class within the Looker-3D package, enhancing the loading and processing of material files for 3D models. This change aims to improve the efficiency and customization of material properties.

Changes

File Path Change Summary
.../looker-3d/src/fo3d/mesh/Obj.tsx Updated the import path for MTLLoader to use the newly defined class in a different location.
.../looker-3d/src/overrides/MtlLoader.js Introduced a new MTLLoader class for loading and parsing .mtl files, and a MaterialCreator class for creating materials with enhanced options.

Poem

🐇✨
In the digital meadow, under the silicon sun,
A new loader springs, its task just begun.
With a hop and a skip, materials align,
Textures so vivid, oh how they shine!
Cheers to the coders, with minds so bright,
Crafting worlds of wonder, byte by byte. 🌟
🐰💻


Recent Review Details

Configuration used: .coderabbit.yaml

Commits Files that changed from the base of the PR and between 55f8c21 and 93f8ee3.
Files selected for processing (1)
  • app/packages/looker-3d/src/overrides/MtlLoader.js (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • app/packages/looker-3d/src/overrides/MtlLoader.js

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@sashankaryal sashankaryal self-assigned this Apr 15, 2024
@sashankaryal sashankaryal requested a review from a team April 15, 2024 20:52
Copy link

codecov bot commented Apr 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.24%. Comparing base (04344ae) to head (93f8ee3).
Report is 14 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff              @@
##           develop    #4272       +/-   ##
============================================
+ Coverage    28.22%   99.24%   +71.01%     
============================================
  Files          814       35      -779     
  Lines       101898    15236    -86662     
  Branches      1215        0     -1215     
============================================
- Hits         28761    15121    -13640     
+ Misses       73137      115    -73022     
Flag Coverage Δ
app ?
python 99.24% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sashankaryal sashankaryal merged commit cedf28d into develop Apr 15, 2024
14 checks passed
@sashankaryal sashankaryal deleted the bugfix/3d-obj-texture branch April 15, 2024 21:36
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