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

chore(web): disable PBR when material has texture #875

Merged
merged 1 commit into from Jan 22, 2024

Conversation

keiya01
Copy link
Member

@keiya01 keiya01 commented Jan 22, 2024

Overview

Before this change, texture was disappear when disabling PBR. So I fixed this issue.

Non-PBR with texture PBR with texture
Screenshot 2024-01-22 at 13 08 09 Screenshot 2024-01-22 at 13 08 37

What I've done

What I haven't done

How I tested

const id = reearth.layers.add({
    type: "simple",
    data: {
        type: "3dtiles",
        url: "https://assets.cms.plateau.reearth.io/assets/e3/a75ee8-6621-48d4-97ee-d38d10b23677/13100_tokyo23-ku_2022_3dtiles_1_2_op_bldg_13101_chiyoda-ku_lod2/tileset.json",
    },
    "3dtiles": {
        pbr: false
    }
});
setTimeout(() => reearth.camera.flyTo(id), 100);

Which point I want you to review particularly

Memo

Copy link

netlify bot commented Jan 22, 2024

Deploy Preview for reearth-web ready!

Name Link
🔨 Latest commit 73db9db
🔍 Latest deploy log https://app.netlify.com/sites/reearth-web/deploys/65adeb318bf3560008af9b97
😎 Deploy Preview https://deploy-preview-875--reearth-web.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@keiya01 keiya01 self-assigned this Jan 22, 2024
@github-actions github-actions bot added the web label Jan 22, 2024
@keiya01 keiya01 requested review from jashanbhullar, airslice and pyshx and removed request for mkumbobeaty and jashanbhullar January 22, 2024 04:12
@keiya01 keiya01 changed the title fix(web): disable PBR when material has texture chore(web): disable PBR when material has texture Jan 22, 2024
Copy link

codecov bot commented Jan 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9a1e322) 25.97% compared to head (73db9db) 25.98%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #875   +/-   ##
=======================================
  Coverage   25.97%   25.98%           
=======================================
  Files        1657     1657           
  Lines      183602   183621   +19     
  Branches     3895     3893    -2     
=======================================
+ Hits        47688    47711   +23     
+ Misses     134825   134821    -4     
  Partials     1089     1089           
Flag Coverage Δ
web 24.31% <100.00%> (+0.01%) ⬆️
web-beta 24.31% <100.00%> (+0.01%) ⬆️
web-classic 24.31% <100.00%> (+0.01%) ⬆️
web-utils 24.31% <100.00%> (+0.01%) ⬆️

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

Files Coverage Δ
...sium/Shaders/CustomShaders/NonPBRLightingShader.ts 100.00% <100.00%> (ø)

... and 5 files with indirect coverage changes

Copy link
Contributor

@pyshx pyshx left a comment

Choose a reason for hiding this comment

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

LGTM.

@keiya01 keiya01 merged commit 969a63a into main Jan 22, 2024
18 checks passed
@keiya01 keiya01 deleted the fix/pbr-with-texture branch January 22, 2024 04:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants