Merge v1.2 to 3d #7281
Merged
Merge v1.2 to 3d #7281
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
* update internal db file * update primitive.fbx.meta
* Merge planar shadow and shadow map. * fix comment * modify shadows name * fix ci
* improve scroll view component * improve pagel view component
* change "cc.PlanarShadowInfo" to "cc.ShadowsInfo" * change "planarShadow" to "shadows"
* Remove the dependency of the pipeline on the model. * fix api error
* Update gulp/build-engine * Fix npx
* bindless textures * unified pass UBOs * remove gl.getActiveUniform in WebGL2
* calculate sphere * calculate shadowCamera matirx * update * add pcf shadow * update * Modify shadowUI style * Solve the error * use else if * add pcf sampler to x25 times
* fix IBL mip level * fix decode include order * better UBO size calc * fix PSO manager hashing
* fixed single touch，always keeping only one finger message * updated
* using physics group * tweaks * rename * remove time reset * rename * change emit events order
* fix IA reuse * better instanced/batched buffer submission * UI: don't destroy IA every frame! * passes need to be updated regardless of model.node * restore splash screen workaround * use class to declare draw info * even even more type checks for object pools * should bind an envmap regardless of activeness of skybox
* optimizate instanced shadow * update
* fix auto simulation * sync only once if accumulator not enough * tweaks
当帧率设置为非30或60的时候，如果玩家修改了手机时间（例如提前了一个小时），将导致currTime - legacyCC.game._lastTime为一个很大的负值，间接造成timeToCall很大，director.mainLoop将在一个小时后才会被调用。
* fix particle ia reuse * useless remove * fix trail & line Co-authored-by: ArthurWang <810612483@qq.com>
* Fix morph issue on platforms with shader >= 300 && having not float texture * Fix * Update * Optimize * Typo
* add update & updateList to Enum * auto update list if __enums__ is array
* Rename ui related components * Rename files * Remove Useless errors * Fix sealed names * Fix sealed global variables * Fix circular reference * Refactor more component names * Rename particle and animation related component * export scene and models sub module in renderer * Rename ModelComponents to Model * Refactor LightComponents to Light * Refactor CameraComponent to Camera * Refactor ConstraintComponents to Constraint and rename physics comps * Cleanup and fix issues * Small fixes * Refactor Model to MeshRenderer * Final touch * Fix data class export * Better deprecation to cover all old usage * Simpler and better deprecation with js.setClassAlias * Fix ci * Fix editor issue
# Conflicts: # cocos/core/3d/framework/mesh-renderer.ts # cocos/core/components/ui-base/ui-renderable.ts # cocos/core/pipeline/forward/forward-pipeline.ts # cocos/core/pipeline/forward/scene-culling.ts # cocos/core/pipeline/render-additive-light-queue.ts # cocos/core/pipeline/render-stage.ts # cocos/core/pipeline/shadow/shadow-flow.ts # cocos/core/renderer/core/memory-pools.ts # cocos/core/renderer/scene/camera.ts # cocos/core/renderer/scene/model.ts # cocos/core/renderer/scene/render-scene.ts # cocos/core/root.ts # cocos/particle/billboard.ts # cocos/terrain/terrain.ts # cocos/ui/components/button.ts # package-lock.json # package.json # tests/general/sealed-global-variables.json
2youyou2
added a commit
to 2youyou2/engine
that referenced
this pull request
Sep 14, 2020
commit c4606c8 Author: JoneLau <32630749+JoneLau@users.noreply.github.com> Date: Sun Sep 13 23:33:07 2020 +0800 adjust the Graphics structure to support continuous data filling (cocos#7359) commit 66f9b20 Merge: 896b22e 2e6c9b6 Author: minggo <nudtzxm@gmail.com> Date: Fri Sep 11 11:13:59 2020 +0800 Merge pull request cocos#7356 from YunHsiao/3d dynamic state cache capacity commit 896b22e Author: minggo <nudtzxm@gmail.com> Date: Fri Sep 11 11:09:45 2020 +0800 fix memory leak (cocos#7362) commit 2e6c9b6 Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> Date: Thu Sep 10 14:34:19 2020 +0800 dynamic state cache capacity commit b2d9249 Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> Date: Thu Sep 10 15:19:38 2020 +0800 fix circular refs (cocos#7354) commit c85ab01 Author: minggo <nudtzxm@gmail.com> Date: Thu Sep 10 14:44:20 2020 +0800 fix logic error (cocos#7353) commit ae99249 Merge: 9cebf67 6e71962 Author: minggo <nudtzxm@gmail.com> Date: Thu Sep 10 11:44:35 2020 +0800 Merge pull request cocos#7352 from minggo/merge_1.2 Merge 1.2 commit 6e71962 Merge: 9cebf67 9dc5a20 Author: minggo <nudtzxm@gmail.com> Date: Thu Sep 10 11:41:20 2020 +0800 merge v1.2 commit 9cebf67 Author: coulsonwang <coulsonwang@126.com> Date: Thu Sep 10 11:24:03 2020 +0800 Revert "add setTarget adapter (cocos#7342)" (cocos#7351) This reverts commit edbf237. commit 5f0687a Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> Date: Thu Sep 10 11:23:30 2020 +0800 more type check on GFX public interfaces (cocos#7350) * more type check on GFX public interfaces * more general vector types commit edbf237 Author: coulsonwang <coulsonwang@126.com> Date: Thu Sep 10 10:02:08 2020 +0800 add setTarget adapter (cocos#7342) commit b44ce3a Author: coulsonwang <coulsonwang@126.com> Date: Thu Sep 10 09:58:20 2020 +0800 add renderWindow adapter (cocos#7343) commit d0c300a Author: coulsonwang <coulsonwang@126.com> Date: Thu Sep 10 09:57:13 2020 +0800 fix pipeline import (cocos#7344) commit a91f97b Author: coulsonwang <coulsonwang@126.com> Date: Thu Sep 10 09:56:41 2020 +0800 rename shaderID (cocos#7347) commit 093436d Author: coulsonwang <coulsonwang@126.com> Date: Thu Sep 10 09:56:10 2020 +0800 hack buffer pool flag to 20 bits (cocos#7349) commit 9dc5a20 Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> Date: Wed Sep 9 18:02:02 2020 +0800 fix pass handle type check (cocos#7348) commit 8fffa7f Author: cary <39078800+caryliu1999@users.noreply.github.com> Date: Wed Sep 9 11:37:35 2020 +0800 Change skybox and shadow to buffer pool. (cocos#7306) commit a34a125 Author: pandamicro <lphuabin@gmail.com> Date: Wed Sep 9 10:36:25 2020 +0800 Fix texture reset process (cocos#7338) * Fix texture reset process * refine (#30) Co-authored-by: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> commit 0b73aff Author: ChiaNing <sun.cloud.mo@gmail.com> Date: Wed Sep 9 10:13:34 2020 +0800 imageAsset data bug fix (cocos#7337) * imageAsset data bug fix * update commit 4671f65 Author: minggo <nudtzxm@gmail.com> Date: Wed Sep 9 10:06:40 2020 +0800 do not use pipeline adapter (cocos#7339) commit 6694d74 Author: Leslie Leigh (李的序) <leslieleigh@outlook.com> Date: Tue Sep 8 15:05:16 2020 +0800 Add morph name field (cocos#7332) commit 3422c13 Author: Leslie Leigh (李的序) <leslieleigh@outlook.com> Date: Tue Sep 8 14:55:37 2020 +0800 Bump gift@2.0.7 (cocos#7331) commit 2d1acb5 Author: Knox <knox.h@qq.com> Date: Tue Sep 8 14:19:42 2020 +0800 sync 2d webview (cocos#7318) commit a333b0b Author: Leslie Leigh (李的序) <leslieleigh@outlook.com> Date: Tue Sep 8 14:08:20 2020 +0800 Handle WebGL context lost event (cocos#7291) * Handle WebGL context lost event * Fix commit 8873c62 Author: ChiaNing <sun.cloud.mo@gmail.com> Date: Tue Sep 8 13:56:52 2020 +0800 compressed texture bug fix (cocos#7328) commit f756be4 Author: Santy-Wang <wh19930829@qq.com> Date: Tue Sep 8 10:36:11 2020 +0800 fix loading failure when asset is recursively referenced (cocos#7327) commit 43cc9ec Author: minggo <nudtzxm@gmail.com> Date: Tue Sep 8 10:05:00 2020 +0800 add jsb adapter (cocos#7323) commit d8b2f63 Author: Knox <knox.h@qq.com> Date: Tue Sep 8 10:02:37 2020 +0800 rename video-player-impl-web (cocos#7310) * rename video-player-impl-web * refine code * refine code commit 9719191 Author: minggo <nudtzxm@gmail.com> Date: Mon Sep 7 18:33:49 2020 +0800 record correct shared data (cocos#7326) commit a1beac8 Author: minggo <nudtzxm@gmail.com> Date: Mon Sep 7 11:36:51 2020 +0800 fix typo (cocos#7321) commit d2a8714 Author: minggo <nudtzxm@gmail.com> Date: Mon Sep 7 10:56:11 2020 +0800 Override some classes in jsb (cocos#7319) commit 736e13a Author: minggo <nudtzxm@gmail.com> Date: Fri Sep 4 17:59:23 2020 +0800 sync from 1.2 (cocos#7314) * sync from 1.2 * delete unneeded codes commit 12dbd38 Author: minggo <nudtzxm@gmail.com> Date: Fri Sep 4 17:38:52 2020 +0800 fix binding index (cocos#7312) commit e4bd687 Author: minggo <nudtzxm@gmail.com> Date: Fri Sep 4 16:10:42 2020 +0800 update build engine to ignore wedding out engine codes (cocos#7309) commit fbcd5be Author: Knox <knox.h@qq.com> Date: Fri Sep 4 15:54:59 2020 +0800 improve video player (cocos#7304) commit 331ec76 Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> Date: Fri Sep 4 15:04:09 2020 +0800 fix blend target (cocos#7308) * fix blend target * GFXColor now compatible with Color commit 876ce03 Author: minggo <nudtzxm@gmail.com> Date: Fri Sep 4 14:41:48 2020 +0800 record correct submodule handle (cocos#7307) commit 39eac46 Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com> Date: Fri Sep 4 14:07:49 2020 +0800 texture unit opt (cocos#7298) * texture unit opt * type checks * circular ref fix * plane as vec4 compatible * cache IA cross render passes commit acdcd87 Author: minggo <nudtzxm@gmail.com> Date: Thu Sep 3 20:03:26 2020 +0800 invoke function to set blend target (cocos#7299) commit 9ffff43 Author: minggo <nudtzxm@gmail.com> Date: Thu Sep 3 17:47:09 2020 +0800 add submodle into array pool (cocos#7280) * add submodule handle into shared memory * set clearColor to pool (#3) * invoke super destroy at end Co-authored-by: coulsonwang <coulsonwang@126.com> commit cfdb88b Author: minggo <nudtzxm@gmail.com> Date: Thu Sep 3 12:39:37 2020 +0800 update build engine version to 3.1.0-alpha.2 (cocos#7288) * update build engine version to 3.1.0-alpha.2 * update build engine verson commit 7c160fc Merge: ba049f2 8172574 Author: pandamicro <lphuabin@gmail.com> Date: Thu Sep 3 11:41:41 2020 +0800 Merge pull request cocos#7289 from pandamicro/merge1.2 Merge v1.2 commit 8172574 Author: pandamicro <lphuabin@gmail.com> Date: Thu Sep 3 11:37:15 2020 +0800 Fix ci commit e9780cd Author: pandamicro <lphuabin@gmail.com> Date: Thu Sep 3 11:33:09 2020 +0800 Fix sealed global variables commit 3539945 Merge: 9bb07a6 8b42093 Author: pandamicro <lphuabin@gmail.com> Date: Thu Sep 3 11:30:28 2020 +0800 Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2 # Conflicts: # tests/general/sealed-global-variables.json commit 9bb07a6 Author: pandamicro <lphuabin@gmail.com> Date: Thu Sep 3 11:29:53 2020 +0800 Fix issue commit ba049f2 Merge: 3d9cd31 31e8d0f Author: pandamicro <lphuabin@gmail.com> Date: Thu Sep 3 11:28:04 2020 +0800 Merge pull request cocos#7281 from pandamicro/merge1.2 Merge v1.2 to 3d commit 31e8d0f Author: pandamicro <lphuabin@gmail.com> Date: Wed Sep 2 23:43:36 2020 +0800 Fix issues commit bfc472f Author: pandamicro <lphuabin@gmail.com> Date: Wed Sep 2 19:54:25 2020 +0800 Fix some issues commit 938b701 Author: pandamicro <lphuabin@gmail.com> Date: Wed Sep 2 18:40:09 2020 +0800 Update package-lock commit 1d2a82d Merge: 3d9cd31 6b43a2d Author: pandamicro <lphuabin@gmail.com> Date: Wed Sep 2 18:39:09 2020 +0800 Merge branch '3d-v1.2' into merge1.2 # Conflicts: # cocos/core/3d/framework/mesh-renderer.ts # cocos/core/components/ui-base/ui-renderable.ts # cocos/core/pipeline/forward/forward-pipeline.ts # cocos/core/pipeline/forward/scene-culling.ts # cocos/core/pipeline/render-additive-light-queue.ts # cocos/core/pipeline/render-stage.ts # cocos/core/pipeline/shadow/shadow-flow.ts # cocos/core/renderer/core/memory-pools.ts # cocos/core/renderer/scene/camera.ts # cocos/core/renderer/scene/model.ts # cocos/core/renderer/scene/render-scene.ts # cocos/core/root.ts # cocos/particle/billboard.ts # cocos/terrain/terrain.ts # cocos/ui/components/button.ts # package-lock.json # package.json # tests/general/sealed-global-variables.json commit 6b43a2d Author: pandamicro <lphuabin@gmail.com> Date: Wed Aug 26 13:47:08 2020 +0800 Update primitives with second uvs commit 3d9cd31 Author: Knox <knox.h@qq.com> Date: Wed Sep 2 15:42:33 2020 +0800 add video player component (cocos#7226) * add video player component * refine code * refine code * refine code * refine code * refine code * refine code * refine code commit 2edd136 Author: coulsonwang <coulsonwang@126.com> Date: Wed Sep 2 14:50:41 2020 +0800 add render window pool handler (cocos#7273) commit b738d9b Author: PP <chinese1236@qq.com> Date: Mon Aug 31 12:26:08 2020 +0800 sync bug fix for Button component from 2d branch (cocos#7179) * reset to normal data when change button transition * support color changed event on Editor update # Conflicts: # cocos/core/components/ui-base/ui-render-component.ts * refine button target update * refine button zoomScale tip * unregister event listeners on old target when target changed * check button._originalScale validity * update originalScale when target transform chanaged * do finishing transition after update finished * fix button state setting * udpate commit e0df589 Author: cary <39078800+caryliu1999@users.noreply.github.com> Date: Mon Aug 31 11:48:33 2020 +0800 export _Deserializer for adapter (cocos#7256) commit 95ab036 Author: cary <39078800+caryliu1999@users.noreply.github.com> Date: Mon Aug 31 11:34:06 2020 +0800 Add serialized data synchronization for pipeline. (cocos#7236) * Add pipeline jsb binding. * Add serialized data synchronization for pipeline. * fix ci * delete legacy * fix ci * delete legacy forwardPipeline commit 4f21401 Author: minggo <nudtzxm@gmail.com> Date: Mon Aug 31 09:56:40 2020 +0800 import pipeline instead (cocos#7218) * import pipeline instead * simplify codes * add jsb index.ts * simplify codes * fix circular dependency * change build engine version * change build-engine version * jsb -> nr commit 07d4798 Author: minggo <nudtzxm@gmail.com> Date: Fri Aug 28 17:32:56 2020 +0800 get global/local descriptor set layout from define.ts (cocos#7243) commit b8d0026 Author: Knox <knox.h@qq.com> Date: Thu Aug 27 19:51:43 2020 +0800 sync #3d-tasks/issues/3962 (cocos#7232) * sync #3d-tasks/issues/3962 cocos#5598 cocos#6575 cocos#6333 cocos#4003 cocos#4240 cocos#5444 cocos#5178 cocos#5656 cocos#5672 cocos#3515 cocos#3617 cocos#3802 cocos#4152 * refine code commit 700c67f Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com> Date: Thu Aug 27 10:53:51 2020 +0800 sync cocos#6710 (cocos#7165) commit ec566ce Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com> Date: Thu Aug 27 10:53:09 2020 +0800 sync cocos#6076 (cocos#7161) commit 7256f34 Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com> Date: Thu Aug 27 10:51:40 2020 +0800 sync cocos#6002 (cocos#7160) commit 3048de3 Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com> Date: Thu Aug 27 10:51:10 2020 +0800 sync cocos#5952 (cocos#7158) commit 85a6f2a Author: minggo <nudtzxm@gmail.com> Date: Wed Aug 26 11:46:35 2020 +0800 make model is intialized before reused (cocos#7221) commit 951deef Author: cary <39078800+caryliu1999@users.noreply.github.com> Date: Tue Aug 25 15:00:14 2020 +0800 Remove the dependency of the pipeline on the model. (cocos#7207) commit 909fde2 Author: minggo <nudtzxm@gmail.com> Date: Tue Aug 25 14:35:40 2020 +0800 move RenderWindow to renderer/core (cocos#7216) commit 035a632 Author: minggo <nudtzxm@gmail.com> Date: Mon Aug 24 11:43:43 2020 +0800 invoke Model.initialize() before being resued (cocos#7201) commit cd03651 Author: PP <chinese1236@qq.com> Date: Fri Aug 21 18:50:28 2020 +0800 remove jsb module declaration in engine repo (cocos#7143) * remove jsb module declaration in engine repo * ignore jsb check * space commit b019972 Author: minggo <nudtzxm@gmail.com> Date: Fri Aug 21 17:04:36 2020 +0800 Add array pool and add more elements into shared memory (cocos#7197) * Add array pool and add more elements into shared memory * use template parameter * use template parameter * don't use shared memory for director commit 2618dc6 Author: pandamicro <lphuabin@gmail.com> Date: Fri Aug 21 14:19:06 2020 +0800 Bump tfig@2.0.3 (cocos#7198) (cocos#7199) Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com> commit 12a1dda Merge: da5c216 bfe63f4 Author: pandamicro <lphuabin@gmail.com> Date: Fri Aug 21 10:59:03 2020 +0800 Merge pull request cocos#7196 from pandamicro/merge1.2 Merge v1.2 commit bfe63f4 Merge: 2fb448c f289fa7 Author: pandamicro <lphuabin@gmail.com> Date: Fri Aug 21 10:48:52 2020 +0800 Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2 # Conflicts: # cocos/core/game.ts commit 2fb448c Author: pandamicro <lphuabin@gmail.com> Date: Fri Aug 21 10:45:49 2020 +0800 Fix commit da5c216 Author: yinkaile <501251991@qq.com> Date: Wed Aug 19 17:42:41 2020 +0800 sync cocos#5195 (cocos#7150) commit e68cd34 Author: PP <chinese1236@qq.com> Date: Sun Aug 16 23:05:25 2020 +0800 ban runninng engine main loop in editor (cocos#7098) * ban runninng engine main loop in editor * update
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.
No description provided.