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

fix(ies): light ies has bug #109

Merged
merged 62 commits into from
May 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
06b085d
chore: update issue template (#12)
lslzl3000 Apr 22, 2023
1f56021
feat(math) : base math
ZenderJK Apr 23, 2023
6908c87
Merge branch 'dev' of https://github.com/Orillusion/orillusion into main
ZenderJK Apr 23, 2023
922d18a
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 23, 2023
0517be4
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
a848417
chore(bound): change bound folder
ZenderJK Apr 27, 2023
2ff31e6
fix(Matrix): fix Matrix4*4 bug
ZenderJK Apr 27, 2023
622affd
fix(componnets): fix components strart
ZenderJK Apr 27, 2023
5d48542
chore: folder error
ZenderJK Apr 27, 2023
d8d0f89
fix(component): remove old regist
ZenderJK Apr 27, 2023
10f6271
chore: change vs config
ZenderJK Apr 27, 2023
2780e99
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
a06093f
Merge branch 'camera' of https://github.com/SirXuNian/orillusion into…
ZenderJK Apr 27, 2023
682025a
feat(events): add events
ZenderJK Apr 27, 2023
c9ee938
feat(shader): add shader
ZenderJK Apr 27, 2023
be32717
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
1b8c665
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
0aef533
feat(Mesh): add InstanceMesh
ZenderJK Apr 27, 2023
7736820
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
843f7bc
chore(import): update import url
ZenderJK Apr 27, 2023
888d0b3
docs: update docs
ZenderJK Apr 27, 2023
54ccb03
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
f0dfa1f
feat(clusterLighting): add cluster lighting shader
ZenderJK Apr 27, 2023
add8452
docs: update docs
ZenderJK Apr 27, 2023
03becd0
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
b923ba0
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 27, 2023
337ab71
feat(ComputeShader): add cs shader
ZenderJK Apr 27, 2023
da60f64
feat(shader): add shader resource
ZenderJK Apr 27, 2023
ad9e94e
docs: update docs
ZenderJK Apr 27, 2023
4f7084e
docs: update docs
ZenderJK Apr 27, 2023
d73e94a
feat(math): add math
ZenderJK Apr 27, 2023
972a864
chore(folder): update folder
ZenderJK Apr 28, 2023
876953e
chore(folder): update folder
ZenderJK Apr 28, 2023
1e6e1db
style: Removes all non-ASCII characters
Codeboy-cn Apr 28, 2023
82a3e4d
feat(parser): add gltf parser
Codeboy-cn Apr 28, 2023
8af468c
test: add gltf loader test sample
Codeboy-cn Apr 28, 2023
1d243b7
fix(skeleton): fix SkinMeshRender not work
ZenderJK Apr 28, 2023
8239bd7
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 28, 2023
528b315
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK Apr 28, 2023
7e80b45
Merge branch 'dev' of https://github.com/SirXuNian/orillusion into dev
ZenderJK Apr 28, 2023
3538d33
Merge branch 'dev' of https://github.com/SirXuNian/orillusion into dev
ZenderJK Apr 28, 2023
920677f
Merge branch 'dev' of https://github.com/SirXuNian/orillusion into dev
ZenderJK Apr 29, 2023
9c314ff
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 4, 2023
b6318bd
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 4, 2023
7359a95
chore: change wgsl file
ZenderJK May 4, 2023
9c396ee
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 4, 2023
4a26e43
fix(mousePick): mouse pick bug
ZenderJK May 4, 2023
e13c4b3
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 4, 2023
6ce37bf
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 5, 2023
74948b2
fix(AtmosphericComponent): fix AtmosphericComponent Update
ZenderJK May 5, 2023
f601d28
fix(engine): fix engine pause and resume
ZenderJK May 5, 2023
f3dfebc
fix(engine): engine shadow lights collect init bug
ZenderJK May 6, 2023
61c541f
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 6, 2023
efbb73a
Merge branch 'dev' of https://github.com/Orillusion/orillusion into dev
ZenderJK May 7, 2023
cf80e7d
fix(MatrixDO): MatrixDO Buffer
ZenderJK May 7, 2023
ad1a335
fix(MatrixDO): MatrixDO Buffer
ZenderJK May 7, 2023
f2942cf
Merge branch 'dev' of https://github.com/Orillusion/orillusion into M…
ZenderJK May 7, 2023
45d76f2
Merge branch 'MatrixDO' of https://github.com/sirbignian/orillusion i…
ZenderJK May 7, 2023
776ee09
Merge branch 'MatrixDO' of https://github.com/sirbignian/orillusion i…
ZenderJK May 7, 2023
6bbaa23
Merge branch 'MatrixDO' of https://github.com/sirbignian/orillusion i…
ZenderJK May 7, 2023
dc10630
fix(ies): light ies has bug
ZenderJK May 7, 2023
7b4a01f
Merge branch 'dev' of https://github.com/Orillusion/orillusion into l…
ZenderJK May 7, 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
12 changes: 6 additions & 6 deletions src/components/lights/LightBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class LightBase extends ComponentBase implements ILight {

protected _castGI: boolean = false;
protected _castShadow: boolean = false;
private _iesPofiles: IESProfiles;
private _iesProfiles: IESProfiles;

constructor() {
super();
Expand Down Expand Up @@ -106,15 +106,15 @@ export class LightBase extends ComponentBase implements ILight {
EntityCollect.instance.removeLight(this.transform.scene3D, this);
}

public set iesPofile(iesPofiles: IESProfiles) {
this._iesPofiles = iesPofiles;
this.lightData.iesPofiles = iesPofiles.index;
public set iesProfiles(iesProfiles: IESProfiles) {
this._iesProfiles = iesProfiles;
this.lightData.iesIndex = iesProfiles.index;
IESProfiles.use = true;
this.onChange();
}

public get iesPofile(): IESProfiles {
return this._iesPofiles;
public get iesProfile(): IESProfiles {
return this._iesProfiles;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/components/lights/LightData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ export class LightData extends Struct {
/**
* Whether to use lighting ies
*/
public iesPofiles: number = -1;
public iesIndex: number = -1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ export class LightEntries {
memory.writeInt32(light.castShadowIndex);

memory.writeVector3(light.lightTangent);
memory.writeFloat(-1);
memory.writeFloat(light.iesIndex);
}
}