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

feat(web): add an option to disable default PBR to 3dtiles and model features in NLS #517

Merged
merged 4 commits into from Jun 23, 2023

Conversation

keiya01
Copy link
Member

@keiya01 keiya01 commented Jun 23, 2023

Overview

CustomShader: https://cesium.com/learn/cesiumjs/ref-doc/CustomShader.html
The original implementation: https://github.com/takram-design-engineering/plateau-view/blob/00fc34eda3d0b22eb7a115a948a6901f0926f860/libs/datasets/src/LambertDiffuseShader.ts#L8

PBR Non PBR
Screenshot 2023-06-23 at 16 39 01 Screenshot 2023-06-23 at 16 46 56

What I've done

  • Added pbr property to 3dtiles and model appearance.

What I haven't done

How I tested

  1. Add 3dtiles as follow
reearth.layers.add({
  type: "simple",
  data: {
    type: "3dtiles",
    url: "https://assets.cms.plateau.reearth.io/assets/4f/702958-5009-4d6b-a2e0-157c7e573eb2/13100_tokyo23-ku_2022_3dtiles%20_1_1_op_bldg_13101_chiyoda-ku_lod2_no_texture/tileset.json",
  },
  "3dtiles": {
      pbr: false
  }
});
  1. PBR should be used in default.

Which point I want you to review particularly

Memo

@keiya01 keiya01 self-assigned this Jun 23, 2023
@netlify
Copy link

netlify bot commented Jun 23, 2023

Deploy Preview for reearth-web ready!

Name Link
🔨 Latest commit 3241213
🔍 Latest deploy log https://app.netlify.com/sites/reearth-web/deploys/649564b786f0af00070b0d9b
😎 Deploy Preview https://deploy-preview-517--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 settings.

@github-actions github-actions bot added the web label Jun 23, 2023
@github-actions github-actions bot requested a review from nina992 June 23, 2023 07:56
@keiya01 keiya01 requested a review from airslice June 23, 2023 07:56
@keiya01 keiya01 enabled auto-merge (squash) June 23, 2023 09:24
@codecov
Copy link

codecov bot commented Jun 23, 2023

Codecov Report

Merging #517 (3241213) into main (b815a96) will increase coverage by 0.01%.
The diff coverage is 85.71%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #517      +/-   ##
==========================================
+ Coverage   26.65%   26.66%   +0.01%     
==========================================
  Files        1336     1337       +1     
  Lines      144639   144666      +27     
  Branches     3483     3483              
==========================================
+ Hits        38555    38579      +24     
- Misses     104962   104965       +3     
  Partials     1122     1122              
Flag Coverage Δ
web 24.00% <85.71%> (+0.01%) ⬆️
web-beta 24.00% <85.71%> (+0.01%) ⬆️
web-classic 24.00% <85.71%> (+0.01%) ⬆️
web-utils 24.00% <85.71%> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
...ta/lib/core/engines/Cesium/Feature/Model/index.tsx 20.93% <33.33%> (+0.29%) ⬆️
.../lib/core/engines/Cesium/Feature/Tileset/index.tsx 25.80% <33.33%> (+0.53%) ⬆️
...gines/Cesium/CustomShaders/NonPBRLightingShader.ts 100.00% <100.00%> (ø)
web/src/beta/lib/core/mantle/types/appearance.ts 100.00% <100.00%> (ø)

@keiya01 keiya01 merged commit 29083d8 into main Jun 23, 2023
17 checks passed
@keiya01 keiya01 deleted the feat/custom-shaders branch June 23, 2023 09:38
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