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(AtmosphericComponent): fix AtmosphericComponent Update #99

Merged
merged 51 commits into from
May 5, 2023

Conversation

X-OldGentleMan
Copy link
Collaborator

fix AtmosphericComponent Update
fix sky light color use gamma
fix timeInterpolator add remove use list

lslzl3000 and others added 30 commits April 22, 2023 23:42
Adding Mathematical Matrix4*4 for 3D Computing
Adding Mathematical Matrix3*3 for 2D Computing
Adding Mathematical Quaternion for 2D/3D Rotation  Computing
fix components  auto bind check error
change folder
Replace the new registration method
change vscode setting
add UIEvents
add PointEvent3D
add Object3DEvent
add LoaderEvent
add KeyEvent
add compute shader
add render shader
update class import url
check lost class and add
clear not use class
add some class docs
update docs
update docs
update docs
Codeboy-cn and others added 17 commits April 28, 2023 17:37
fix SkinMeshRender not work.
# Conflicts:
#	src/assets/shader/ShaderLib.ts
#	src/assets/shader/materials/compute/BLUR_CsShader.wgsl
#	src/assets/shader/materials/compute/DepthOfView_CsShader.wgsl
#	src/assets/shader/materials/compute/ErpImage2CubeMapCreateCube_compute.wgsl
#	src/assets/shader/materials/compute/ErpImage2CubeMapRgbe2rgba_compute.wgsl
#	src/assets/shader/materials/compute/GTAOCs.wgsl
#	src/assets/shader/materials/compute/IBLEnvMapCreator_compute.wgsl
#	src/assets/shader/materials/compute/MergeRGBA_Cs.wgsl
#	src/assets/shader/materials/compute/MultiBouncePass_Shader.wgsl
#	src/assets/shader/materials/compute/OutLineBlendColor.wgsl
#	src/assets/shader/materials/compute/OutlineCalcOutline.wgsl
#	src/assets/shader/materials/compute/OutlineCs.wgsl
#	src/assets/shader/materials/compute/Picker_CsShader.wgsl
#	src/assets/shader/materials/compute/SSAO_CsShader.wgsl
#	src/assets/shader/materials/compute/SSR_BlendColor_Shader.wgsl
#	src/assets/shader/materials/compute/SSR_IS_Shader.wgsl
#	src/assets/shader/materials/compute/SSR_RayTrace_Shader.wgsl
#	src/assets/shader/materials/compute/TAACopyTex.wgsl
#	src/assets/shader/materials/compute/TAASharpTex.wgsl
#	src/assets/shader/materials/compute/TAAcs.wgsl
#	src/assets/shader/materials/core/base/Common_frag.wgsl
#	src/assets/shader/materials/core/base/Common_vert.wgsl
#	src/assets/shader/materials/core/common/BrdfLut_frag.wgsl
#	src/assets/shader/materials/core/common/EnvMap_frag.wgsl
#	src/assets/shader/materials/core/common/GlobalUniform.wgsl
#	src/assets/shader/materials/core/common/InstanceUniform.wgsl
#	src/assets/shader/materials/core/common/WorldMatrixUniform.wgsl
#	src/assets/shader/materials/core/inline/Inline_vert.wgsl
#	src/assets/shader/materials/graphic/Graphic3DShader_fs.wgsl
#	src/assets/shader/materials/graphic/Graphic3DShader_vs.wgsl
#	src/assets/shader/materials/materials/GlassShader.wgsl
#	src/assets/shader/materials/materials/LitShader.wgsl
#	src/assets/shader/materials/materials/OutlinePass.wgsl
#	src/assets/shader/materials/materials/PBRLItShader.wgsl
#	src/assets/shader/materials/materials/UnLit.wgsl
#	src/assets/shader/materials/materials/sky/AtmosphericScatteringSky_shader.ts
#	src/assets/shader/materials/materials/sky/CubeSky_Shader.ts
#	src/assets/shader/materials/math/FastMathShader.wgsl
#	src/assets/shader/materials/post/FSAAShader.wgsl
#	src/assets/shader/materials/sky/AtmosphericScatteringSky_shader.ts
#	src/assets/shader/materials/sky/CubeSky_Shader.ts
#	src/assets/shader/materials/utils/BRDFLUT.wgsl
#	src/assets/shader/materials/utils/ColorUtil.wgsl
#	src/assets/shader/materials/utils/GenerayRandomDir.wgsl
#	src/engine/assets/shader/sky/AtmosphericScatteringSky_shader.ts
#	src/engine/assets/shader/sky/CubeSky_Shader.ts
# Conflicts:
#	src/assets/shader/ShaderLib.ts
#	src/assets/shader/materials/compute/BLUR_CsShader.wgsl
#	src/assets/shader/materials/compute/DepthOfView_CsShader.wgsl
#	src/assets/shader/materials/compute/ErpImage2CubeMapCreateCube_compute.wgsl
#	src/assets/shader/materials/compute/ErpImage2CubeMapRgbe2rgba_compute.wgsl
#	src/assets/shader/materials/compute/GTAOCs.wgsl
#	src/assets/shader/materials/compute/IBLEnvMapCreator_compute.wgsl
#	src/assets/shader/materials/compute/MergeRGBA_Cs.wgsl
#	src/assets/shader/materials/compute/MultiBouncePass_Shader.wgsl
#	src/assets/shader/materials/compute/OutLineBlendColor.wgsl
#	src/assets/shader/materials/compute/OutlineCalcOutline.wgsl
#	src/assets/shader/materials/compute/OutlineCs.wgsl
#	src/assets/shader/materials/compute/Picker_CsShader.wgsl
#	src/assets/shader/materials/compute/SSAO_CsShader.wgsl
#	src/assets/shader/materials/compute/SSR_BlendColor_Shader.wgsl
#	src/assets/shader/materials/compute/SSR_IS_Shader.wgsl
#	src/assets/shader/materials/compute/SSR_RayTrace_Shader.wgsl
#	src/assets/shader/materials/compute/TAACopyTex.wgsl
#	src/assets/shader/materials/compute/TAASharpTex.wgsl
#	src/assets/shader/materials/compute/TAAcs.wgsl
#	src/assets/shader/materials/core/base/Common_frag.wgsl
#	src/assets/shader/materials/core/base/Common_vert.wgsl
#	src/assets/shader/materials/core/common/BrdfLut_frag.wgsl
#	src/assets/shader/materials/core/common/EnvMap_frag.wgsl
#	src/assets/shader/materials/core/common/GlobalUniform.wgsl
#	src/assets/shader/materials/core/common/InstanceUniform.wgsl
#	src/assets/shader/materials/core/common/WorldMatrixUniform.wgsl
#	src/assets/shader/materials/core/inline/Inline_vert.wgsl
#	src/assets/shader/materials/graphic/Graphic3DShader_fs.wgsl
#	src/assets/shader/materials/graphic/Graphic3DShader_vs.wgsl
#	src/assets/shader/materials/materials/GlassShader.wgsl
#	src/assets/shader/materials/materials/LitShader.wgsl
#	src/assets/shader/materials/materials/OutlinePass.wgsl
#	src/assets/shader/materials/materials/PBRLItShader.wgsl
#	src/assets/shader/materials/materials/UnLit.wgsl
#	src/assets/shader/materials/materials/sky/AtmosphericScatteringSky_shader.ts
#	src/assets/shader/materials/materials/sky/CubeSky_Shader.ts
#	src/assets/shader/materials/math/FastMathShader.wgsl
#	src/assets/shader/materials/post/FSAAShader.wgsl
#	src/assets/shader/materials/sky/AtmosphericScatteringSky_shader.ts
#	src/assets/shader/materials/sky/CubeSky_Shader.ts
#	src/assets/shader/materials/utils/BRDFLUT.wgsl
#	src/assets/shader/materials/utils/ColorUtil.wgsl
#	src/assets/shader/materials/utils/GenerayRandomDir.wgsl
#	src/engine/assets/shader/sky/AtmosphericScatteringSky_shader.ts
#	src/engine/assets/shader/sky/CubeSky_Shader.ts
# Conflicts:
#	index.html
#	samples/index.ts
#	tsconfig.json
change wgsl file to ts
fix mouse pick compute bug
fix AtmosphericComponent Update
fix sky light color use gamma
fix timeInterpolator add remove use list
@X-OldGentleMan X-OldGentleMan added bug Something isn't working feature New feature or request labels May 5, 2023
@X-OldGentleMan X-OldGentleMan added this to the 0.6 milestone May 5, 2023
@X-OldGentleMan X-OldGentleMan requested review from hellmor and Codeboy-cn and removed request for hellmor May 5, 2023 12:48
fix engine pause and resume
@X-OldGentleMan X-OldGentleMan merged commit d70bba0 into Orillusion:dev May 5, 2023
1 check failed
@lslzl3000 lslzl3000 mentioned this pull request Aug 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working feature New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants