Commit Graph

9281 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) adfdb67bb8 Eliminate cc.* log functions invocation (#6845) 2020-06-10 14:19:11 +08:00
Leslie Leigh (李的序) 7b792b42d9 Type fix for inherited CCObject.destroy() (#6847)
* Type fix for inherited CCObject.destroy()

* Fix

* Fix
2020-06-10 14:03:46 +08:00
minggo 10377de263 Remove texture view (#6830)
* fix conflict

* support creating texture view

* remove GFXTextureViewType

* set texture type to cube

* set status

* fix comment

* IGFXFramebufferInfo add mipmap level element

* set mipmap levels for all attachments

* make mipmap level optional

* fix comments
2020-06-09 11:23:34 +08:00
Yun Hsiao Wu fa06dcdad3 fix additive light pass (#6829) 2020-06-08 16:39:12 +08:00
coulsonwang 46d2c3996f no need to flip render target texcoord for metal and vulkan (#6824) 2020-06-05 16:48:57 +08:00
Leslie Leigh (李的序) daee998c13 Bump tfig to ^1.2.5 (#6831) 2020-06-05 15:36:09 +08:00
Yun Hsiao Wu d4ba6cc007 fix planar shadow & instancing (#6823) 2020-06-04 16:39:57 +08:00
pandamicro 395265fc15 Merge pull request #6738 from YunHsiao/3d
merge 3d-gfx into 3d
2020-06-04 13:38:13 +08:00
ChiaNing 4775c33658 fix editbox input emoji fragment bug (#6810)
* fix editbox input emoji fragment bug

* update
2020-06-04 10:54:26 +08:00
Yun Hsiao Wu 3228b964f8 disable light pass for now 2020-06-04 10:39:14 +08:00
Yun Hsiao Wu 033226ec74 fix pass instance init 2020-06-04 10:19:37 +08:00
Yun Hsiao Wu c1b3382e06 Merge pull request #6 from minggo/patch_macro_issue
only concat not undefined patch macros
2020-06-03 18:35:29 +08:00
minggo 5f2c00dda2 Merge branch '3d' into patch_macro_issue 2020-06-03 16:34:01 +08:00
minggo 2253d8aabd return correct patch macros 2020-06-03 16:33:02 +08:00
minggo 75331d43fc only concat none undefiend patch macros 2020-06-03 16:26:05 +08:00
Yun Hsiao Wu 69db70a910 Merge remote-tracking branch 'origin/3d' into 3d 2020-06-03 16:22:00 +08:00
Yun Hsiao Wu a5ce183aa7 pipeline layout can be globally reused too 2020-06-03 15:55:01 +08:00
pandamicro 9efb595586 Merge pull request #6812 from VisualSJ/3d
Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d
2020-06-03 14:57:12 +08:00
SijieWang 83f6c572b5 cc -> legacyCC 2020-06-03 13:38:17 +08:00
SijieWang a9f3969245 Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/audio/assets/clip.ts
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/batched-skinning-model-component.ts
#	cocos/core/3d/framework/editor-camera-component.ts
#	cocos/core/3d/framework/index.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-manager.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/animation/skeletal-animation-component.ts
#	cocos/core/animation/skeletal-animation-state.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/assets/simple-texture.ts
#	cocos/core/assets/sprite-frame.ts
#	cocos/core/assets/texture-base.ts
#	cocos/core/data/class-decorator.ts
#	cocos/core/data/instantiate.ts
#	cocos/core/event/event-target.ts
#	cocos/core/game.ts
#	cocos/core/load-pipeline/CCLoader.ts
#	cocos/core/load-pipeline/plist-parser.ts
#	cocos/core/load-pipeline/unpackers.ts
#	cocos/core/load-pipeline/url.ts
#	cocos/core/math/deprecated.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/scene-graph/base-node.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	predefine.ts
2020-06-03 13:25:42 +08:00
jiaxin.lai a0a7cc2f0b fix vertex index of ray model (#6809)
* fix vertex index

* tweaks
2020-06-02 19:59:09 +08:00
Yun Hsiao Wu 69c88434a4 Merge branch '3d-gfx' into 3d 2020-06-02 17:59:07 +08:00
minggo f44822c960 Create PSO in render stage (#6732)
* record PSO in sub model

* import Pass

* create PSO dynamically in render stage

* remove debug codes

* rmeove PSO in more components

* remove unneeded codes

* add comments

* subModel.psoCreateInfos -> subModel.psoInfos

* remove unneeded \!

* remove spaces

* remove unneeded codes

* IPSOCreationInfo -> IPSOCreateInfo

* add name into hash computing

* add GFXInputState back

* concat super's macro patches
2020-06-02 17:11:22 +08:00
Myway c44bff541d model component support lighting map (#6796)
* 模型支持lighting map渲染

* change static lighting settings
2020-06-02 17:09:18 +08:00
Yun Hsiao Wu 8086fe6494 fix skybox binding layout update (#6806) 2020-06-02 16:32:35 +08:00
pandamicro def53e4c74 Restore ImageAsset destroy logic to help destroy Image (#6804) 2020-06-02 13:52:55 +08:00
jiaxin.lai 7079d5e1af Fix ray_subMesh/mesh/model (#6801)
* fix ray_subMesh/mesh/model

* tweaks

* tweaks

* tweaks

* fix ray_model

* tweaks

* tweaks

* docs

* tweaks
2020-06-02 12:54:05 +08:00
pandamicro 51ecb2f1af Fix CLEANUP_IMAGE_CACHE not working issue (#6803) 2020-06-02 11:25:40 +08:00
Yun Hsiao Wu 32efb3cf62 fix skinning shader (#6800) 2020-06-01 19:26:41 +08:00
Yun Hsiao Wu 8f9f09f119 fix skinning model instancing (#6799)
Apparently pre-calculating final offsets on CPU then pass to shader
requires more precision than what's actually provided on some devices.
Never mind, just go with the old ways.
2020-06-01 18:57:57 +08:00
yinkaile af3ae070be export ubo defines (#6791)
* export ubo defines

* export pipeline define things to cc.pipeline
2020-06-01 16:31:59 +08:00
Yun Hsiao Wu 13ec9c08f8 fix skinning model bounds (#6795)
* fix skinning model bounds

* fix instancing status query

* fix batched skinning model mesh cook
2020-06-01 16:16:51 +08:00
Yun Hsiao Wu 7198381ed9 update comments (#6793) 2020-05-31 21:58:08 +08:00
pandamicro 1cefb4e04c Fix native rAF and cAF (#6792)
* Fix native rAF and cAF

* Update version
2020-05-31 14:50:51 +08:00
pandamicro 34eab244fc Fix crash caused by event target removal on destroyed component (#6790) 2020-05-29 19:49:30 +08:00
pandamicro 99a2269436 Fix window default rAF replacing issue (#6789)
* Fix window default rAF replacing issue

* Clear rAF before change mode
2020-05-29 19:22:39 +08:00
Yun Hsiao Wu 2b05eac155 should unbind VAO before unbind VB/IBs (#6788) 2020-05-29 19:08:34 +08:00
Leslie Leigh (李的序) c7fb63b1ec Mark event-related API of AnimationState as deprecated (#6772)
* Add 'last-frame-arrived' event; Optimize animation state events

* Doc

* Rename 'last-frame-arrived' -> 'iteration-end'

* Revert refine

* Doc

* Revert `iteration-end`

* CI
2020-05-29 18:38:51 +08:00
pandamicro 0d01f9867e Fix Node & Scene incompatible issue (#6786) 2020-05-29 15:26:11 +08:00
Leslie Leigh (李的序) 2a2a56ad2b Solve the "once-off" problem (#6782)
* Solve the "once-off" problem

* Revert CallbacksInvoker

* Update

* Optimize
2020-05-29 15:20:49 +08:00
troublemaker52025 539efdee2e Add ShadowMap (#6778)
* Temporary modification that skyBox does not node

* add default Node for model

* revert
2020-05-29 15:15:47 +08:00
pandamicro 91a41a2c61 Safe emit game events to avoid editor startup failure (#6779)
* Safe emit game events so that it won't break editor startup

* Correct API

* remove useless indexof
2020-05-29 14:26:50 +08:00
jiaxin.lai afa7f892bb activate when not awake (#6781)
* activate when not awake

* cannon too
2020-05-29 14:26:34 +08:00
Leslie Leigh (李的序) ec8450459d Revert "Solve once-off problem (#6773)" (#6780)
This reverts commit a0cc2585b6.
2020-05-29 14:06:52 +08:00
Leslie Leigh (李的序) a0cc2585b6 Solve once-off problem (#6773) 2020-05-29 11:51:34 +08:00
Yun Hsiao Wu d84f5203d2 should reset cache when binding framebuffer (#6777)
* move bindpose finding outside frame loop

* should reset cache when binding framebuffer
2020-05-29 11:51:06 +08:00
Yun Hsiao Wu b108494b38 skeletal animation: handle indirect anim curve influence (#6774) 2020-05-28 19:51:57 +08:00
JoneLau 1a389cecbb Sorting UI components (#6739) 2020-05-28 19:49:59 +08:00
jiaxin.lai d328964501 revert 'optimize contact data' (#6776) 2020-05-28 19:02:23 +08:00
ChiaNing 7f4e9a4a41 invalidateChildren protect (#6775)
* invalidateChildren protect

* update
2020-05-28 17:52:00 +08:00