Refactor shaderlab #2737

GuoLei1990 · 2025-06-13T02:29:56Z

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, ...)

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

… into refactor-shaderlab

* refactor: opt lexer

… into refactor-shaderlab

coderabbitai · 2025-06-13T02:30:03Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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>, please review it.
- Explain this complex logic.
- 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 explain this code block.
- @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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

codecov · 2025-06-13T02:32:31Z

Codecov Report

Attention: Patch coverage is 92.31939% with 202 lines in your changes missing coverage. Please review.

Project coverage is 79.25%. Comparing base (f7ae27c) to head (4763541).
Report is 24 commits behind head on main.

Files with missing lines	Patch %	Lines
e2e/case/shaderlab-pbr.ts	0.00%	53 Missing and 1 partial ⚠️
.../shader-lab/src/sourceParser/ShaderSourceParser.ts	91.40%	44 Missing ⚠️
packages/shader-lab/src/preprocessor/PpLexer.ts	91.35%	28 Missing ⚠️
packages/shader-lab/src/lexer/Lexer.ts	86.70%	23 Missing ⚠️
packages/shader-lab/src/preprocessor/PpParser.ts	93.76%	20 Missing ⚠️
packages/shader-lab/src/common/BaseLexer.ts	95.35%	11 Missing ⚠️
packages/core/src/shader/Shader.ts	71.42%	8 Missing ⚠️
packages/shader-lab/src/parser/AST.ts	82.14%	5 Missing ⚠️
packages/shader-lab/src/codeGen/GLESVisitor.ts	94.23%	3 Missing ⚠️
...ackages/shader-lab/src/sourceParser/SourceLexer.ts	99.06%	2 Missing ⚠️
... and 4 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2737      +/-   ##
==========================================
+ Coverage   78.95%   79.25%   +0.30%     
==========================================
  Files         842      844       +2     
  Lines       89866    90159     +293     
  Branches     8781     8951     +170     
==========================================
+ Hits        70953    71460     +507     
+ Misses      18777    18559     -218     
- Partials      136      140       +4

Flag	Coverage Δ
unittests	`79.25% <92.31%> (+0.30%)`	⬆️

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.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

GuoLei1990 and others added 23 commits June 9, 2025 18:13

refactor: opt code

0dda43f

refactor: rename ShaderContent to ShaderSource

01f2d38

refactor: opt code

4b016fd

refactor: rename scanner to lexer

2b5665f

refactor: opt code

13afff3

fix: delete Attribute keyword

725f70f

fix: scan world error

b4056c6

refactor: opt code

f61a87b

Merge branch 'refactor-shaderlab' of https://github.com/galacean/engine…

80ea5a8

… into refactor-shaderlab

refactor: opt code

e229a95

refactor: opt lexer

ba53527

refactor: opt lexer (#2732)

606658a

* refactor: opt lexer

Merge branch 'refactor-shaderlab' of https://github.com/galacean/engine…

62c3686

… into refactor-shaderlab

refactor: opt code

5986d76

refactor: opt code

624a832

refactor: opt code

3d59987

refactor: opt code

e50aa15

refactor: opt code

efd219e

refactor: opt code

c1cb0eb

refactor: rename ShaderContentParser to ShaderSourceParser

a90303b

test: add logger

a7589a8

refactor: opt code

f28317c

fix: render queue declaration (#2736)

01c5eb3

GuoLei1990 marked this pull request as draft June 13, 2025 02:30

fix: lint error

b19e2f0

refactor: fix bug

15f4c33

GuoLei1990 force-pushed the refactor-shaderlab branch from eb56cd0 to 15f4c33 Compare June 13, 2025 04:24

refactor: clear code

a9f50d0

GuoLei1990 and others added 30 commits June 22, 2025 20:16

refactor: opt code

ad29540

refactor: opt code

bfadedb

refactor: optimize function and variable naming

26acf92

refactor: merge getShaderPosition and getCurPosition

692ca2a

refactor: fix and clear scanWord

2d37f4b

refactor: reduce this._getExpandSegments().pop()

5718570

refactor: merge ExpandSegments

314178f

refactor: reduce repeat code

cee3751

refactor: reduce duplication of code

7c8341b

refactor: educe duplication of code

c834f4f

refactor: reduce duplication of code

4f47561

refactor: improve performance

11793d0

refactor: opt variable Name

a7d1acf

refactor: opt code

22b2579

refactor: merge ifndef and ifdef logic

80c2f2a

refactor: delete _parseIf function

631dbfd

fix: parseDefine bug when has multi-line comments

de844b4

refactor: opt func name

4d185d1

chore: delete unused method

cb759e8

fix: need scan float suffix after dot

acff7a8

fix: shader position error

9b476a6

refactor: opt code

2c2c9d4

chore: opt repeat code

e317862

chore: opt code

35ca221

refactor: opt _parseUndef

bd182b4

refactor: opt code

2e42cce

refactor: opt code

711bc6f

refactor: simplify Macro body expand

1118859

refactor: opt _expandMacroBody

b524e14

refactor: opt code

4763541

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Refactor shaderlab #2737

Refactor shaderlab #2737

Uh oh!

Uh oh!

Review skipped

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Refactor shaderlab #2737

Are you sure you want to change the base?

Refactor shaderlab #2737

Uh oh!

Conversation

Please check if the PR fulfills these requirements

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

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

Uh oh!

Uh oh!

Review skipped

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

Uh oh!

Codecov Report

Uh oh!

Uh oh!

CodeRabbit Configuration File (`.coderabbit.yaml`)