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 shader replacement and sub shader #1394

Merged
merged 63 commits into from
Mar 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
3a1d326
refactor: opt code
GuoLei1990 Mar 3, 2023
ce6e423
refactor: opt code
GuoLei1990 Mar 5, 2023
4a34485
refactor: opt code
GuoLei1990 Mar 5, 2023
fb9209d
refactor: opt code
GuoLei1990 Mar 5, 2023
044f644
refactor: opt code
GuoLei1990 Mar 5, 2023
c606f95
refactor: opt code
GuoLei1990 Mar 5, 2023
9e49d31
refactor: opt code
GuoLei1990 Mar 5, 2023
81172ec
refactor: opt code
GuoLei1990 Mar 6, 2023
f8d3254
refactor: opt code
GuoLei1990 Mar 6, 2023
a091ab1
refactor: opt code
GuoLei1990 Mar 6, 2023
b28ac21
refactor: opt code
GuoLei1990 Mar 6, 2023
d92dc82
refactor: opt code
GuoLei1990 Mar 6, 2023
0b45014
refactor: opt code
GuoLei1990 Mar 6, 2023
d20abba
refactor: opt code
GuoLei1990 Mar 6, 2023
75610a1
refactor: opt code
GuoLei1990 Mar 6, 2023
8a40bd1
refactor: opt code
GuoLei1990 Mar 6, 2023
647f6aa
refactor: opt code
GuoLei1990 Mar 6, 2023
c9b783c
refactor: opt code
GuoLei1990 Mar 6, 2023
79c9b76
refactor: opt code
GuoLei1990 Mar 6, 2023
c99e723
refactor: opt code
GuoLei1990 Mar 6, 2023
95a257f
refactor: opt code
GuoLei1990 Mar 6, 2023
f3513cb
refactor: opt code
GuoLei1990 Mar 6, 2023
9fa31f6
refactor: opt code
GuoLei1990 Mar 6, 2023
5c179a6
refactor: opt code
GuoLei1990 Mar 6, 2023
470354c
refactor: fix unit test
GuoLei1990 Mar 6, 2023
38e4000
fix: sprite mask error
GuoLei1990 Mar 6, 2023
2cd9289
refactor: opt code
GuoLei1990 Mar 6, 2023
ed5027c
refactor: opt code
GuoLei1990 Mar 6, 2023
72c1536
refactor: opt code
GuoLei1990 Mar 6, 2023
8f09a8c
refactor: opt code
GuoLei1990 Mar 6, 2023
451e527
fix: replacement bug
GuoLei1990 Mar 7, 2023
af7763c
refactor: opt code
GuoLei1990 Mar 7, 2023
68e91a6
refactor: opt code
GuoLei1990 Mar 7, 2023
59ec9da
refactor: opt code
GuoLei1990 Mar 7, 2023
d41ccc4
refactor: opt code
GuoLei1990 Mar 7, 2023
dc1de59
refactor: opt code
GuoLei1990 Mar 7, 2023
1f1327b
test(Script): add dependentComponents decorator test
GuoLei1990 Mar 8, 2023
6cf6cc0
fix: shader compileVariant bug
GuoLei1990 Mar 8, 2023
0691d4e
test(Shader): add shader unit test
GuoLei1990 Mar 8, 2023
6f196a9
refactor: opt code
GuoLei1990 Mar 8, 2023
2f19354
refactor: opt code
GuoLei1990 Mar 8, 2023
8add4fb
test(Shader): improve shader unit test
GuoLei1990 Mar 8, 2023
adfc9cb
test(Shader): improve unit test
GuoLei1990 Mar 8, 2023
b2af4ef
doc(Shader): fix spell
GuoLei1990 Mar 8, 2023
05e42c9
refactor: opt ShaderPass construct
GuoLei1990 Mar 8, 2023
9ce7aa7
refactor: opt shader part
GuoLei1990 Mar 9, 2023
5056b0a
Merge branch 'pr/replace-shader' of github.com:GuoLei1990/oasis-engin…
GuoLei1990 Mar 9, 2023
f7cb7e3
refactor: opt pipelineStage by enum
GuoLei1990 Mar 9, 2023
87687ef
refactor: opt code
GuoLei1990 Mar 9, 2023
b747277
refactor: opt code
GuoLei1990 Mar 9, 2023
661c02d
test(Shader): fix shader unit test
GuoLei1990 Mar 9, 2023
a979350
Add can batch check in shader pass for 2d (#10)
singlecoder Mar 10, 2023
bb02b8e
refactor: opt code
GuoLei1990 Mar 10, 2023
b5c176f
refactor: opt code
GuoLei1990 Mar 10, 2023
569942f
refactor: opt code
GuoLei1990 Mar 10, 2023
9aa1073
refactor: opt code
GuoLei1990 Mar 10, 2023
b36f196
refactor: opt code
GuoLei1990 Mar 10, 2023
0526256
refactor: opt code
GuoLei1990 Mar 10, 2023
35e22d3
refactor: opt code
GuoLei1990 Mar 10, 2023
cb4c9af
refactor: opt code
GuoLei1990 Mar 11, 2023
3b48e80
refactor: opt code
GuoLei1990 Mar 11, 2023
9b83f1e
refactor: opt code
GuoLei1990 Mar 11, 2023
16809bc
Refactor model matrix for 2d (#11)
singlecoder Mar 13, 2023
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
refactor: opt code
GuoLei1990 committed Mar 6, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
zalegrala Zach Leslie
commit 79c9b767927aaaa1aa73491e1a70f57453edf65c
6 changes: 1 addition & 5 deletions packages/core/src/graphic/Mesh.ts
Original file line number Diff line number Diff line change
@@ -113,7 +113,6 @@ export abstract class Mesh extends RefObject {
startOrSubMesh = new SubMesh(startOrSubMesh, count, topology);
}
this._subMeshes.push(startOrSubMesh);
this._updateFlagManager.dispatch(MeshModifyFlags.SubMesh);
return startOrSubMesh;
}

@@ -127,15 +126,13 @@ export abstract class Mesh extends RefObject {
if (index !== -1) {
subMeshes.splice(index, 1);
}
this._updateFlagManager.dispatch(MeshModifyFlags.SubMesh);
}

/**
* Clear all sub-mesh.
*/
clearSubMesh(): void {
this._subMeshes.length = 0;
this._updateFlagManager.dispatch(MeshModifyFlags.SubMesh);
}

/**
@@ -239,6 +236,5 @@ export abstract class Mesh extends RefObject {
*/
export enum MeshModifyFlags {
Bounds = 0x1,
VertexElements = 0x2,
SubMesh = 0x4
VertexElements = 0x2
}