Commit Graph

39 Commits

Author SHA1 Message Date
minggo f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
troublemaker52025 7bf2fc0fba merge valid punctual light culling for v3.4.0 (#4048)
* merge valid punctual light culling for v3.4.0
2021-11-18 11:18:02 +08:00
李吉林 bed27fcccf V3.4.0 occlusion query2 (#3975)
* occlusion query
Co-authored-by: lijilin <jilin.li@cocos.com>
2021-10-13 18:21:03 +08:00
minggo 43c288196e Merge v3.1.2 (#3691)
* add jsb binding for v3.1.2 (#3611)

* update (#3615)

* optimize cleanTracks method (#3620)

* Fix setMaterial memory leak (#3622)

* fix RenderAdditiveLightQueue memory leaks for v3.1.2 (#3616)

* fix shadows GFXBuffer memory leaks for v3.1.2 (#3630)

* [ci skip][AUTO]: updating jsbinding automatically: dea52c7b (#3633)

Co-authored-by: cocos-robot <engine-deploy@cocos.com>

* fix erase shared body (#3635)

* Native PCF change sync to native-engine for v3.1.2 (#3652)

* support getAABB and getBoundingShpere (#3563) (#3671)

* fix compiling error

Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: wangyuzhi233 <78699242+wangyuzhi233@users.noreply.github.com>
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
Co-authored-by: jiaxin.lai <goodlaijiaxin@qq.com>
2021-07-13 09:43:25 +08:00
minggo 13d3274136 fix conflict 2021-06-11 16:01:34 +08:00
minggo 30db2bcbda merge v3.12 into v 3.3 2021-06-10 17:33:22 +08:00
troublemaker52025 b864e70d9d Add global descriptor set manager for v3.1.2 (#3606) 2021-06-10 09:49:16 +08:00
cary d77dbb3a53 implement scene management in native(#3584) 2021-06-02 17:22:33 +08:00
cary e9178d5f5f Fix instance count error. (#3455) 2021-04-23 09:35:03 +08:00
troublemaker52025 f62a4e16ae fix lightingQueue memory leak for v3.1 (#3413)
* fix lightingQueue memory leak for v3.1

* fix ci error
2021-04-16 14:45:31 +08:00
mmyduckx 5ef2ab11bf Fix more warings (#3396) 2021-04-15 09:40:29 +08:00
Yun Hsiao Wu ea88ba33c6 codebase structure update (#3289)
* structure

* fix jsb auto binding license issue
2021-03-01 12:00:10 +08:00
Yun Hsiao Wu defdc8d5b0 Merge branch 'v3.1' of https://github.com/cocos-creator/engine-native into device-proof 2021-02-07 10:33:25 +08:00
Yun Hsiao Wu d0fb6d5281 fix format 2021-02-05 16:41:01 +08:00
Yun Hsiao Wu e0fdfef054 license upgrader 2021-02-05 14:08:22 +08:00
minggo 28d170cd9e merge 3.0 2021-02-05 10:50:55 +08:00
lawrence-liuyue 5fc7a37cd1 Hw deferred pipeline (#3179) 2021-02-02 22:16:53 +08:00
troublemaker52025 dfc1731177 fix-light-index-bug (#3245) 2021-01-23 09:36:46 +08:00
cary 4c0f767d2b Extracts the shared content of the pipeline. (#3244)
* Extracts the shared content of the pipeline.

* remove ubo in forward
2021-01-23 09:35:23 +08:00
minggo a728537098 add license (#3165) 2020-12-29 11:25:30 +08:00
cary cc6aea86fd Modify the forward rendering process and remove UIFlow. (#3117) 2020-12-24 16:09:06 +08:00
troublemaker52025 4cb66eac97 Refactoring shadow ubo submit for c++ (#3049) 2020-11-20 09:34:06 +08:00
troublemaker52025 afd6b985a5 Fix GFXSampler no binding warning (#3024) 2020-11-12 17:04:41 +08:00
Yun Hsiao Wu 7384716c86 fix light pass index (#3017)
* fix light pass index

* vk: fix vertex attribute offset
2020-11-12 12:55:45 +08:00
troublemaker52025 bffaf3f395 Add spot light shadow for C++ (#2978) 2020-11-11 10:15:54 +08:00
coulsonwang 8faa1aa90f reduce getPhaseID jsb call (#2995) 2020-11-09 16:23:04 +08:00
coulsonwang 0e2d7b4694 fix lighting (#2964) 2020-10-31 09:49:27 +08:00
coulsonwang eb864cb29f fix additive light queue (#2941) 2020-10-23 20:52:20 +08:00
coulsonwang 2513f68f20 fix 2020-08-18 09:37:53 +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 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 f1632acfdc fix review 2020-08-07 11:07:48 +08:00
coulsonwang 4e95c932c8 use DefineMap 2020-08-06 17:34:19 +08:00
coulsonwang 87f98133b0 Impl forward stage 2020-08-06 17:34:19 +08:00
minggo 8851495456 Native renderer (#2662)
Refactor RenderPipeline/RenderStage/RenderFlow
2020-07-31 16:52:25 +08:00
minggo bb6ea9bec3 remove GFX prefix (#2611) 2020-06-24 10:51:14 +08:00
minggo cf60075203 move some files from renderer/core to cocos/base (#2591) 2020-06-18 13:47:25 +08:00
minggo 3b476dfe4b add some classes (#2584) 2020-06-17 18:35:02 +08:00