minggo
c3e28f4f07
Merge pull request #2698 from Mee-gu/fixUBOGlobal
...
apply UBOGlobal modify
2020-08-18 14:27:21 +08:00
coulsonwang
ab9a7bca3a
apply UBOGlobal modify
2020-08-18 11:51:57 +08:00
Leslie Leigh (李的序)
2c72cd0eab
Fix decorator problems carried by PR 7002 ( #7157 )
2020-08-18 11:04:19 +08:00
minggo
1e5a2f7dcf
Merge pull request #2696 from CocosRobot/update_js_bindings_1597716264
...
[ci skip][AUTO]: updating jsbinding automatically
2020-08-18 10:41:46 +08:00
CocosRobot
dafa869f1d
[AUTO][ci skip]: updating cocos2dx_files.json
2020-08-18 02:10:07 +00:00
CocosRobot
3549bf136c
[ci skip][AUTO]: updating jsbinding automatically
2020-08-18 02:04:44 +00:00
minggo
e4d74ddc99
Impl forward stage ( #2677 )
2020-08-18 10:01:37 +08:00
coulsonwang
2513f68f20
fix
2020-08-18 09:37:53 +08:00
cary
a6c536ec38
Move global data of scene to pipeline. ( #7109 )
...
* Move global data of scene to pipeline.
* fix some code judgments.
* fix pipeline save error
* refine skybox and fog info
* fix planer shadow
* fix fog error
* delete setter of skybox and fog
2020-08-17 23:08:59 +08:00
JoneLau
173b1a52f5
ui vertex pixel alignment processing ( #7138 )
2020-08-17 23:05:03 +08:00
jiaxin.lai
f3e7549628
Fix constant force ( #7153 )
...
* add reset accumulator to physics system
* fix constant force
* don`t initPhysicsSystem in EDITOR
2020-08-17 23:03:43 +08:00
pandamicro
07798f4068
@cocos/build-engine@3.0.4: force to make "cc.wait-for-ammo-instantiation" to be standalone ( #7154 )
2020-08-17 23:02:58 +08:00
SijieWang
519814d615
修复一些渲染相关的 bug ( #7155 )
2020-08-17 23:02:33 +08:00
cary
9d00a52c9c
Add fault-tolerant handling for renderPipeline startup. ( #7156 )
2020-08-17 22:59:47 +08:00
SB
00a5d3a6ca
@cocos/build-engine@3.0.4: force to make "cc.wait-for-ammo-instantiation" to be standalone
2020-08-17 19:20:31 +08:00
troublemaker52025
591be73b57
Shadow switch for 3d-v1.2 ( #7142 )
2020-08-17 18:43:58 +08:00
coulsonwang
c43ee5b54f
fix
...
# Conflicts:
# cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp
# cocos/renderer/pipeline/RenderAdditiveLightQueue.h
# cocos/renderer/pipeline/RenderPipeline.cpp
# cocos/renderer/pipeline/forward/ForwardStage.cpp
2020-08-17 18:24:24 +08:00
coulsonwang
a388e63369
add scene culling
...
# Conflicts:
# cocos/renderer/pipeline/forward/ForwardPipeline.h
# cocos/renderer/pipeline/helper/SharedMemory.h
2020-08-17 18:23:25 +08:00
coulsonwang
b5bb1487ca
fix SubModelView and PassView
...
# Conflicts:
# cocos/renderer/pipeline/BatchedBuffer.cpp
# cocos/renderer/pipeline/BatchedBuffer.h
# cocos/renderer/pipeline/InstancedBuffer.cpp
# cocos/renderer/pipeline/InstancedBuffer.h
# cocos/renderer/pipeline/PipelineStateManager.cpp
# cocos/renderer/pipeline/PipelineStateManager.h
# cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp
# cocos/renderer/pipeline/RenderAdditiveLightQueue.h
# cocos/renderer/pipeline/RenderInstancedQueue.cpp
# cocos/renderer/pipeline/RenderQueue.cpp
# cocos/renderer/pipeline/forward/ForwardStage.cpp
# cocos/renderer/pipeline/helper/SharedMemory.h
# cocos/renderer/pipeline/ui/UIFlow.cpp
# cocos/renderer/pipeline/ui/UIFlow.h
# cocos/renderer/pipeline/ui/UIStage.cpp
# cocos/renderer/pipeline/ui/UIStage.h
# cocos/scripting/dop/BufferPool.h
2020-08-17 18:22:34 +08:00
coulsonwang
103d4eb50f
fix forward pipeline and forward flow
...
# Conflicts:
# CMakeLists.txt
# cocos/renderer/pipeline/Define.cpp
# cocos/renderer/pipeline/RenderFlow.cpp
# cocos/renderer/pipeline/RenderPipeline.cpp
# cocos/renderer/pipeline/RenderWindow.h
# cocos/renderer/pipeline/forward/ForwardFlow.cpp
# cocos/renderer/pipeline/forward/ForwardFlow.h
# cocos/renderer/pipeline/forward/ForwardPipeline.cpp
# cocos/renderer/pipeline/forward/ForwardPipeline.h
# cocos/renderer/pipeline/forward/ForwardStage.cpp
# cocos/renderer/pipeline/helper/SharedMemory.h
# cocos/renderer/pipeline/shadow/ShadowFlow.cpp
# cocos/renderer/pipeline/shadow/ShadowFlow.h
# cocos/renderer/pipeline/ui/UIFlow.h
2020-08-17 18:19:16 +08:00
Yun Hsiao Wu
742989cce9
keep pipeline layouts for effect overrides ( #7152 )
2020-08-17 17:33:26 +08:00
Myway
fd777b6a02
lighting map support instancing ( #7149 )
...
Co-authored-by: Myway3D1 <404793124@qq.com >
2020-08-17 16:32:15 +08:00
ChiaNing
1df7992abb
runtime bug fix & vivo loadRuntime function remove ( #7151 )
2020-08-17 16:31:21 +08:00
ChiaNing
1cdc95853e
UI sharedMaterial ( #7112 )
...
* ui update pass
* change UI default mat
* builtin effect fallback
* MaterialType fallback
* fix blendfunc
* updateBlendFunc for custom material
* fix mask & graphics comp
* useless code remove
* update code
* update stencil
* useless code remove
* useless remove
* graphics useless remove
* rebase
* UI sprite texture becomes local descriptor
* rename & add chunk
* update effect
2020-08-17 16:30:00 +08:00
coulsonwang
d1002a34f0
Merge branch '3d-gfx' into ForwardStage
2020-08-17 15:04:09 +08:00
Knox
85209df78e
sync 2d richt text component ( #7085 )
2020-08-17 11:28:16 +08:00
Knox
1114adb909
update default-assets meta to v1.0.31 ( #7148 )
2020-08-17 10:23:18 +08:00
Jare Guo
1f056e586f
Merge pull request #7136 from knoxHuang/3d-scrollview
...
sync 2d scrollview-view component
2020-08-17 09:57:17 +08:00
PP
fceab6782d
remove platform related code from engine ( #7140 )
2020-08-16 23:05:34 +08:00
PP
e68cd34dbf
ban runninng engine main loop in editor ( #7098 )
...
* ban runninng engine main loop in editor
* update
2020-08-16 23:05:25 +08:00
JoneLau
7ce7f6854e
Revert "fixed multi-touch finger number distribution error ( #7134 )" ( #7144 )
...
This reverts commit 02c6fbd083 .
2020-08-15 17:11:58 +08:00
Yun Hsiao Wu
f45ea7928e
fix shadow map generation ( #7141 )
2020-08-14 23:09:51 +08:00
ChiaNing
bdb39fbe65
runtime platform fix ( #7139 )
2020-08-14 15:17:02 +08:00
troublemaker52025
359e864750
solve shadow culling for 3D-v1.2 ( #7115 )
...
* solve shadow culling
* Conflict resolution
2020-08-14 10:37:12 +08:00
pandamicro
28b5b6dd3c
Revert "sync 2d scrollview-view component ( #7068 )" ( #7135 )
...
This reverts commit 73279104fc .
2020-08-14 10:32:14 +08:00
Knox
73279104fc
sync 2d scrollview-view component ( #7068 )
...
* sync 2d scrollview-view component
* refine code
2020-08-14 10:30:45 +08:00
JoneLau
02c6fbd083
fixed multi-touch finger number distribution error ( #7134 )
2020-08-14 10:24:40 +08:00
CocosRobot
bde183ed4d
[AUTO][ci skip]: updating cocos2dx_files.json ( #2693 )
2020-08-14 09:54:53 +08:00
minggo
ecaff068a1
Native array pool ( #2686 )
2020-08-14 09:41:13 +08:00
cary
79f0f3fd0a
Keep the WrapMode of curve and animation consistent. ( #7133 )
2020-08-13 22:27:58 +08:00
Leslie Leigh (李的序)
7d944f0813
Optimize physics selector ( #7082 )
...
* Optimize physics selector
* CI
* Update
2020-08-13 18:32:31 +08:00
Arnold
36760821de
recompile
2020-08-13 18:25:43 +08:00
Yun Hsiao Wu
dfc3d141f2
GFX Descriptor Set ( #7101 )
...
* gfx: descriptor sets
* gfx: descriptor set, singular
* better structure
* adapt upper layers: first pass
finally all compiler errors cleared.
OKAY IT'S HAPPENING EVERYBODY STAY THE ****ING CALM
* adapt upper layers: second pass
THERE AND BACK AGAIN
* unified light pass & shadow shader
* gfx: descriptor set & pipeline layout
* light pass: better structure
* light pass: dynamic uniform
* even more type checking for memory pools
* Fix particleSystem and lineComponent.
* delete comment
* guard pool init param
* Fix trail module error.
* delete space
* light pass: instancing & batching support
* don't polyfill gfx stuff inside EffectAsset
* better light pass structure
* fix spot light culling
Co-authored-by: caryliu <caryliu1999@gmail.com >
2020-08-13 18:21:15 +08:00
troublemaker52025
0a24b1f5ee
change Internal cut spotFrustum to external cut spotFrustum ( #7130 )
2020-08-13 16:43:18 +08:00
Leslie Leigh (李的序)
1cdacdee80
@cocos/build-engine 3.0.3(1.2 + ByteDance support) ( #7129 )
2020-08-13 15:56:14 +08:00
cary
349c316c36
delete addRenderPass api of forward pipeline. ( #7076 )
2020-08-13 12:15:48 +08:00
黄森斌
ce45efdae0
update internal assets meta ( #7107 )
2020-08-13 11:55:13 +08:00
JoneLau
9740818fda
modify description ( #7106 )
2020-08-13 11:53:16 +08:00
pandamicro
dd2434f9b3
Merge pull request #7124 from pandamicro/3d-v1.2
...
Merge 3d v1.1.x
2020-08-13 11:38:41 +08:00
pandamicro
613495d5b8
Fix ci
2020-08-13 11:36:09 +08:00