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

Shaderlab remove editor properties #1825

Merged
merged 9 commits into from
Oct 26, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Oct 20, 2023

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)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

rm the EditorProperties module parsing logic in ShaderLab #1803

@Sway007 Sway007 added the shader Shader related functions label Oct 20, 2023
@Sway007 Sway007 self-assigned this Oct 20, 2023
@codecov
Copy link

codecov bot commented Oct 20, 2023

Codecov Report

Attention: 51 lines in your changes are missing coverage. Please review.

Comparison is base (0ed54b2) 65.04% compared to head (ce16ae4) 65.04%.
Report is 21 commits behind head on main.

❗ Current head ce16ae4 differs from pull request most recent head 3c8b14b. Consider uploading reports for the commit 3c8b14b to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1825   +/-   ##
=======================================
  Coverage   65.04%   65.04%           
=======================================
  Files         473      472    -1     
  Lines       23762    23686   -76     
  Branches     3367     3364    -3     
=======================================
- Hits        15455    15407   -48     
+ Misses       7105     7085   -20     
+ Partials     1202     1194    -8     
Files Coverage Δ
...ges/core/src/2d/assembler/SimpleSpriteAssembler.ts 95.00% <100.00%> (-0.13%) ⬇️
...ges/core/src/2d/assembler/SlicedSpriteAssembler.ts 96.61% <100.00%> (-0.69%) ⬇️
...ages/core/src/2d/assembler/TiledSpriteAssembler.ts 98.78% <100.00%> (+0.40%) ⬆️
packages/core/src/Entity.ts 84.49% <100.00%> (+0.19%) ⬆️
packages/core/src/Renderer.ts 73.68% <ø> (ø)
packages/core/src/asset/ResourceManager.ts 60.09% <100.00%> (ø)
packages/core/src/shader/Shader.ts 15.83% <ø> (ø)
packages/loader/src/GLTFLoader.ts 100.00% <100.00%> (+14.28%) ⬆️
.../src/gltf/extensions/KHR_draco_mesh_compression.ts 4.67% <ø> (ø)
packages/loader/src/gltf/parser/GLTFMeshParser.ts 69.71% <ø> (ø)
... and 22 more

... and 6 files with indirect coverage changes

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

parseShader(shaderSource: string) {
return AstNodeUtils.parseShader(shaderSource);
const editorPropertiesRegex = /EditorProperties\s+\{[^}]*?\}/;
Copy link
Member

Choose a reason for hiding this comment

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

Why need replace to empty? just ignore is not OK?

@GuoLei1990 GuoLei1990 changed the title Feat/shaderlab/rm editor properties Shaderlab remove editor properties Oct 26, 2023
@GuoLei1990 GuoLei1990 added the enhancement New feature or request label Oct 26, 2023
@GuoLei1990 GuoLei1990 merged commit 7aea492 into galacean:main Oct 26, 2023
5 checks passed
GuoLei1990 added a commit that referenced this pull request Nov 1, 2023
* main: (29 commits)
  Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (#1855)
  feat: ParticleGenerator support simulationSpeed (#1854)
  fix: sprite destroy (#1852)
  "v1.1.0-beta.18"
  Fix quaternion to euler bug (#1851)
  Fix ColorOverLifetimeModule mode invalid bug (#1850)
  fix: no autoplay when set animatorController after enable (#1843)
  Fix material destoroy bug (#1847)
  Fix Sprite can't batch bug caused by material instance (#1830)
  "v1.1.0-beta.17"
  fix: glTF animation parse bug (#1845)
  fix: mesh decoder (#1844)
  "v1.1.0-beta.16"
  Fix blendShape crossFade bug (#1841)
  fix: ignore ambient in 2d template (#1836)
  "v1.1.0-beta.15"
  Fix blendShapeAnimation crossFade bug (#1840)
  fix: ignore case of asset url (#1809)
  `Shaderlab` remove editor properties (#1825)
  fix: ktx2 texture support (#1829)
  ...

# Conflicts:
#	packages/core/src/particle/ParticleRenderer.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request shader Shader related functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Transfer EditorProperties module parsing logic to editor and integrate shaderlab to editor
2 participants