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.

Sign up for GitHub

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

PBR shader support Iridescence #2425

Merged
merged 44 commits into from
Nov 19, 2024
Merged

PBR shader support Iridescence #2425

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5a26f3d
fix(shader-lab): compatible with empty macro
Sway007 Sep 20, 2023
5ecc318
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Sep 20, 2023
cafc24f
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Sep 20, 2023
dc69489
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Sep 21, 2023
221b7b6
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Sep 21, 2023
0d45d9c
fix(shader-lab): add break and continue syntax
Sway007 Sep 21, 2023
0f14c3f
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Sep 27, 2023
8871d9b
fix: typo
Sway007 Oct 11, 2023
3b4ffd7
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Nov 1, 2023
f649a58
fix(shader-lab): Make usepass compatible with buitin shader
Sway007 Nov 1, 2023
598fc56
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Nov 2, 2023
e33a66f
fix(shader-lab): compatible with no varying variable
Sway007 Nov 2, 2023
41ef06f
feat(shader-lab): detect mismatch return type
Sway007 Nov 6, 2023
b5214fc
fix(shader-lab): renderState assignment
Sway007 Nov 7, 2023
f36ce02
feat: extend material loader data type
Sway007 Nov 13, 2023
ff8b7c2
Merge branch 'main' of https://github.com/galacean/engine
Sway007 Nov 13, 2023
634236f
fix(shader-lab): glsl type pattern
Sway007 Nov 13, 2023
91e6fa4
fix(shader-lab): glsl type pattern
Sway007 Nov 13, 2023
3932448
fix: switch case break
Sway007 Nov 15, 2023
671cace
fix: array index loss
Sway007 Jun 11, 2024
92b972e
feat: merge
Sway007 Jun 11, 2024
9226d38
fix: test-case
Sway007 Jun 11, 2024
ff6a69a
fix: test-case
Sway007 Jun 12, 2024
0838968
feat: support GLTF_Iridescence
hhhhkrx Nov 6, 2024
82d5a8f
Merge branch 'main' of github.com:galacean/engine into gltf_iridescence
hhhhkrx Nov 6, 2024
39043a2
fix: merge
hhhhkrx Nov 6, 2024
ad61eed
Merge branch 'dev/1.4' of github.com:galacean/engine into gltf_irides…
hhhhkrx Nov 6, 2024
2b308ec
fix: vector3
hhhhkrx Nov 6, 2024
2c1604f
fix: vector3
hhhhkrx Nov 6, 2024
0be9f2a
fix: texture name
hhhhkrx Nov 6, 2024
88f89f2
Merge branch 'dev/1.4' into gltf_iridescence
hhhhkrx Nov 6, 2024
b5b9a0a
fix: material uniform
hhhhkrx Nov 7, 2024
d7a82de
fix: enable iridescence
hhhhkrx Nov 7, 2024
d1547d4
Merge branch 'dev/1.4' of github.com:galacean/engine into gltf_irides…
hhhhkrx Nov 11, 2024
76c5423
fix: iridescence name
hhhhkrx Nov 11, 2024
aa41aaf
fix: add }
hhhhkrx Nov 11, 2024
f4b16fd
ci: prettier code
hhhhkrx Nov 12, 2024
9fb543f
fix: iridescence name
hhhhkrx Nov 18, 2024
647b8a9
fix: irisdescence value
hhhhkrx Nov 19, 2024
e70ee42
fix: iridescenceRange value
hhhhkrx Nov 19, 2024
8f41f62
fix: iridescenceRange value
hhhhkrx Nov 19, 2024
499bd70
fix: issue
hhhhkrx Nov 19, 2024
e644dff
fix: iridescence
hhhhkrx Nov 19, 2024
6f418fa
Merge branch 'dev/1.4' of github.com:galacean/engine into gltf_irides…
hhhhkrx Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of https://github.com/galacean/engine
  • Loading branch information
@Sway007
Sway007 committed Nov 13, 2023
commit ff8b7c2f3fb9c7b1eff3e0d99af1c7553e779a82

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.