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 glTF materials remap #1034

Merged
merged 43 commits into from
Sep 23, 2022
Merged

Support glTF materials remap #1034

merged 43 commits into from
Sep 23, 2022

Conversation

gz65555
Copy link
Collaborator

@gz65555 gz65555 commented Sep 13, 2022

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Related: https://github.com/oasis-engine/editor/issues/901

gz65555 and others added 30 commits September 26, 2021 16:32
@codecov-commenter
Copy link

Codecov Report

Merging #1034 (a3537d0) into main (3e1428c) will decrease coverage by 0.05%.
The diff coverage is 5.55%.

@@            Coverage Diff             @@
##             main    #1034      +/-   ##
==========================================
- Coverage   33.67%   33.62%   -0.06%     
==========================================
  Files         334      335       +1     
  Lines       14454    14470      +16     
  Branches     2215     2219       +4     
==========================================
- Hits         4868     4865       -3     
- Misses       9060     9076      +16     
- Partials      526      529       +3     
Impacted Files Coverage Δ
packages/loader/src/gltf/parser/MaterialParser.ts 1.35% <0.00%> (-0.08%) ⬇️
packages/loader/src/gltf/parser/SceneParser.ts 1.03% <0.00%> (-0.11%) ⬇️
...oader/src/gltf/extensions/OASIS_materials_remap.ts 33.33% <33.33%> (ø)
packages/core/src/DisorderedArray.ts 15.00% <0.00%> (-10.00%) ⬇️
packages/math/src/Color.ts 89.28% <0.00%> (-3.58%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Member

@zhuxudong zhuxudong left a comment

Choose a reason for hiding this comment

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

+1

@zhuxudong zhuxudong merged commit a6ddd00 into galacean:main Sep 23, 2022
GuoLei1990 added a commit to GuoLei1990/galacean-engine that referenced this pull request Oct 17, 2022
* commit 'b391c7441fc934139bf74d997424627b33ea9779':
  Fix physics lite raycast bug (galacean#999) (galacean#1104)
  fix: resource parser error (galacean#1105)
  v0.8.0-beta.31
  feat: add release action (galacean#1102)
  Fix `Compoment`/`Script` `onDisable` and  `onEnable` bug  (galacean#1087)
  Revert "fix: onDisable() call back scene is null bug (galacean#1098)" (galacean#1101)
  fix: onDisable() call back scene is null bug (galacean#1098)
  Add AnimatorController loader  for AniamtorController Editor (galacean#1078)
  v0.8.0-beta.30
  fix: pointer moving delta bug (galacean#1083)
  v0.8.0-beta.29
  fix: texture load bug in miniprogram (galacean#1077)
  v0.8.0-beta.28
  v0.8.0-beta.27
  Fix Material Resolved with Texture References (galacean#1076)
  Support glTF materials remap (galacean#1034)
  Fix wrong word recieveShadow to receiveShadow (galacean#1065)

# Conflicts:
#	lerna.json
#	packages/core/package.json
#	packages/core/src/shadow/Extension.ts
#	packages/core/src/shadow/ShadowFeature.ts
#	packages/design/package.json
#	packages/draco/package.json
#	packages/loader/package.json
#	packages/loader/src/index.ts
#	packages/loader/src/resource-deserialize/index.ts
#	packages/loader/src/resource-deserialize/resources/animatorController/type.ts
#	packages/math/package.json
#	packages/oasis-engine/package.json
#	packages/physics-lite/package.json
#	packages/physics-physx/package.json
#	packages/rhi-webgl/package.json
#	tests/package.json
@gz65555 gz65555 added glTF resource Resource-related functions labels Jan 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
glTF resource Resource-related functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants