update_hdr_skybox #9230
Merged
update_hdr_skybox #9230
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pandamicro
approved these changes
Sep 30, 2021
SantyWang
pushed a commit
that referenced
this pull request
Oct 11, 2021
* NewGenAnim * Fix/Optimize simple directional blending * Class transition by type (#29) * Transition & Gradient transition (#30) * The default ExitCondition should be 1.0 * Do correct graph eval * Fix PoseSubgraph connect() signature order (#31) * Graph defaults test (#32) * Conditions (#33) * Trigger (#34) * Transition should only be considered when satemachine exited (#35) * Add layer.name (#36) * Fix some behaviours; add API to query poses and transition (#37) Fix single frame exit condition behaviours; Fix pose -> subgraph behaviours * Support self transition; refactor sub state machine implementation (#38) * Temp * Flat whole layer statemachine * Add test for test reset triggers * Allow self transition * Self transition test * Fix deserialize (#39) * update animgraph template (#40) * The inheritance of any state (#41) * StateMachine events (#42) * Fix state machine events; Allow multiple transitions between two nodes (#43) * Transition priority test (#44) * Optimize variable bind (#45) * Fix variable bind errors (#46) * Expose blend algorithm to editor (#47) * Cont (#48) * update animgraph template (#49) * update animgraph template * update animgraph template * Pose speed (#50) * blend tree add EditorExtendable data (#51) * Correct pose blend duration (#52) * Export some types (#53) * animation pose EditorExtendable (#54) (cherry picked from commit d5dd5f3) * Implement clone() (#55) * Fix trigger condition serialization (#56) * Add variable type: integer (#57) * Optimize 0 weight case (#58) * Relative duration (#59) * update_hdr_skybox (#9230) * Rename.. (#60) * Optimize animation blend item export (#61) * Fix Type (#62) * modify aniamtion graph template data (#63) * modify aniamtion graph template data * add animation graph component template * Fix serialize issue (#64) * Optimize (#65) * Remove MotionState.startRatio, loop (#66) * Update (#67) * Fix circular reference (#68) * CR (#69) * Fix exit time greater than 1 (#70) Co-authored-by: 黄森斌 <arsen2010@126.com> Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com>
minggo
pushed a commit
that referenced
this pull request
Oct 12, 2021
* Added base rendering logic * Hide using decorators Diffuse reflection map control and ApplyDiffuseMap whenever IBL is disabled * Added HDR toggle to scene globals * Fix bug when ApplyDiffuseMap is left checked when envmap is deleted & disable IBL when envmap is deleted * Add changes to allow rendering the diffuse convolution map * Added functions to permit setting sky and ground color (hemispheric lighting) from irradiance calculated from a set envmap. That is, when a diffuse reflection irradiance convolution is not used. Also code to discern LDR from HDR * Various mods * Permit independent Hemispheric Lighting parameters to be serialized for LDR/HDR * Add HDR normalization * Set HDR shader macro * Modify Illiminance based on global LDR/HDR setting * Add LDR/HDR versions for luminous flux * Add distinct LDR/HDR for SpotLight/SphereLight luminous flux * Adding LDR as the new serialized value, as HDR is assumed by default in previous versions * Modified hemisphericc ambient light to assume HDR as default removing the necesesity for migration code * HDR is on by default * Fix directional light constructor removal * HDR/LDR fixes for sphere, spot, and directional lights * Fix the HDR/LDR mode switching on UseHDR toggle * Switch UI to and from LDR/HDR envmap depending on HDR toggle state * Make LDR envmap and diffusemap's serializable * Partial Float32Array->Vec4 conversion * Fixed passed Vec4() into UBO for skycolor and groundalbedo * Fixed copy/paste error * Fix ambient illumination passing into global UBO * Modify UBOs to call correct luminance functions * Modification to punctual lights * Add missing dependency * Fix HDR/LDR envmap/diffuse map initialization bug * Add support for native engine * update_hdr_skybox (#9230) * update material preview when custom panel change (#9340) * update material preview when custom panel change fixed https://github.com/cocos-creator/3d-tasks/issues/8663 * update material preview when custom panel change fixed https://github.com/cocos-creator/3d-tasks/issues/8663 * Update material.js * Fix native light function invoke error * Unify API naming in light * Improve scene-globals code organization * Update jsb apis * Reverse getter setter for spotLight luminance * Fix unexpectable result of toggle HDR and ApplyDiffuseMap options * Remove fpScale, make deferred and forward uniform * Fix skybox macro recompiling error * Fix shader compiling errors Fix unlit shader in HDR/LDR output Co-authored-by: Jamie Anthony Morris <Jamie.Morris@cocos.com> Co-authored-by: Jamie Anthony Morris <47879963+Jacksparrow2525@users.noreply.github.com> Co-authored-by: jk20012001 <jkregister@163.com> Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com> Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
pandamicro
pushed a commit
that referenced
this pull request
Oct 14, 2021
* NewGenAnim * Fix/Optimize simple directional blending * Class transition by type (#29) * Transition & Gradient transition (#30) * The default ExitCondition should be 1.0 * Do correct graph eval * Fix PoseSubgraph connect() signature order (#31) * Graph defaults test (#32) * Conditions (#33) * Trigger (#34) * Transition should only be considered when satemachine exited (#35) * Add layer.name (#36) * Fix some behaviours; add API to query poses and transition (#37) Fix single frame exit condition behaviours; Fix pose -> subgraph behaviours * Support self transition; refactor sub state machine implementation (#38) * Temp * Flat whole layer statemachine * Add test for test reset triggers * Allow self transition * Self transition test * Fix deserialize (#39) * update animgraph template (#40) * The inheritance of any state (#41) * StateMachine events (#42) * Fix state machine events; Allow multiple transitions between two nodes (#43) * Transition priority test (#44) * Optimize variable bind (#45) * Fix variable bind errors (#46) * Expose blend algorithm to editor (#47) * Cont (#48) * update animgraph template (#49) * update animgraph template * update animgraph template * Pose speed (#50) * blend tree add EditorExtendable data (#51) * Correct pose blend duration (#52) * Export some types (#53) * animation pose EditorExtendable (#54) (cherry picked from commit d5dd5f3) * Implement clone() (#55) * Fix trigger condition serialization (#56) * Add variable type: integer (#57) * Optimize 0 weight case (#58) * Relative duration (#59) * update_hdr_skybox (#9230) * Rename.. (#60) * Optimize animation blend item export (#61) * Fix Type (#62) * modify aniamtion graph template data (#63) * modify aniamtion graph template data * add animation graph component template * Fix serialize issue (#64) * Optimize (#65) * Remove MotionState.startRatio, loop (#66) * Update (#67) * Fix circular reference (#68) * CR (#69) * Fix exit time greater than 1 (#70) Co-authored-by: 黄森斌 <arsen2010@126.com> Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com>
pandamicro
added a commit
that referenced
this pull request
Oct 14, 2021
* Added base rendering logic * Hide using decorators Diffuse reflection map control and ApplyDiffuseMap whenever IBL is disabled * Added HDR toggle to scene globals * Fix bug when ApplyDiffuseMap is left checked when envmap is deleted & disable IBL when envmap is deleted * Add changes to allow rendering the diffuse convolution map * Added functions to permit setting sky and ground color (hemispheric lighting) from irradiance calculated from a set envmap. That is, when a diffuse reflection irradiance convolution is not used. Also code to discern LDR from HDR * Various mods * Permit independent Hemispheric Lighting parameters to be serialized for LDR/HDR * Add HDR normalization * Set HDR shader macro * Modify Illiminance based on global LDR/HDR setting * Add LDR/HDR versions for luminous flux * Add distinct LDR/HDR for SpotLight/SphereLight luminous flux * Adding LDR as the new serialized value, as HDR is assumed by default in previous versions * Modified hemisphericc ambient light to assume HDR as default removing the necesesity for migration code * HDR is on by default * Fix directional light constructor removal * HDR/LDR fixes for sphere, spot, and directional lights * Fix the HDR/LDR mode switching on UseHDR toggle * Switch UI to and from LDR/HDR envmap depending on HDR toggle state * Make LDR envmap and diffusemap's serializable * Partial Float32Array->Vec4 conversion * Fixed passed Vec4() into UBO for skycolor and groundalbedo * Fixed copy/paste error * Fix ambient illumination passing into global UBO * Modify UBOs to call correct luminance functions * Modification to punctual lights * Add missing dependency * Fix HDR/LDR envmap/diffuse map initialization bug * Add support for native engine * update_hdr_skybox (#9230) * update material preview when custom panel change (#9340) * update material preview when custom panel change fixed https://github.com/cocos-creator/3d-tasks/issues/8663 * update material preview when custom panel change fixed https://github.com/cocos-creator/3d-tasks/issues/8663 * Update material.js * Fix native light function invoke error * Unify API naming in light * Improve scene-globals code organization * Update jsb apis * Reverse getter setter for spotLight luminance * Fix unexpectable result of toggle HDR and ApplyDiffuseMap options * Remove fpScale, make deferred and forward uniform * Fix skybox macro recompiling error * Fix shader compiling errors Fix unlit shader in HDR/LDR output Co-authored-by: Jamie Anthony Morris <Jamie.Morris@cocos.com> Co-authored-by: Jamie Anthony Morris <47879963+Jacksparrow2525@users.noreply.github.com> Co-authored-by: jk20012001 <jkregister@163.com> Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com> Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: cocos-creator/3d-tasks#
Changelog:
*