Commit Graph

93 Commits

Author SHA1 Message Date
minggo 226d81b6bd sync logic to native 2022-05-30 10:51:27 +08:00
minggo 77701a2d84 Merge branch 'v3.5.1' into v3.6.0-merge-v3.5.1 2022-05-27 15:23:33 +08:00
troublemaker52025 7558741239 fix light flashes at instanced model for v3.5.1 (#11203) 2022-05-24 17:35:53 +08:00
minggo 7814949998 Merge branch 'v3.5.1' into v3.6.0_merge_v3.5.1 2022-05-24 11:53:57 +08:00
troublemaker52025 0dc1e9da19 Spotlight interface description change for v3.5.1 (#10964)
* Spot light interface description change for v3.5.1

* fix CI error
2022-05-11 12:00:16 +08:00
troublemaker52025 4bdfacf69f fix instanced model has not spot light shadow for v3.5.1 (#10921)
* fix instanced model has not spot light shadow for v3.5.1

* fix CI error

* fix ci error 2

* fix ci error 3

* fix ci error

* use auto
2022-05-10 19:38:39 +08:00
minggo 271cc5cf23 Remove some format rule (#10919)
* remove some rules
* format all codes with new format rule
2022-05-04 13:09:24 +08:00
minggo 444bfe31c4 Refactor CC_NEW/CC_DELETE (#10810)
* replace CC_NEW/CC_DELETE with ccnew/delete
2022-04-21 16:39:34 +08:00
minggo 1a9d49e4c6 replace std::list/std::array with ccstd::list/ccstd::array (#10560)
* replace std::list/std::array with ccstd::list/ccstd::array
2022-03-29 16:36:53 +08:00
Cocos Robot 24d84664f8 [ci skip][AUTO]: Automated clang-format update: 3de15842004cba2142ec0fecd82876d8f6a28236 (#10402) (#10424)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-21 16:04:49 +08:00
minggo 34bf14269c unify stl (#10402)
* add ccstd::vector
* replace cc::vector with ccstd::vector 
* replace std::vector with ccstd::vector
* do not include <vector>
2022-03-21 15:55:02 +08:00
troublemaker52025 e723e5aa3a Add renderMesh bias for v3.5.0 (#10102)
* Add renderMesh bias for v3.5.0

* fix ci error

* change function name

* fix merge error

* update

* update 2

* update

* update

* update 2
2022-02-24 23:27:09 +08:00
troublemaker52025 76af77d9b8 fix shadow merge error for v3.6.0 (#10073)
* fix shadow merge error for v3.6.0

* update

* fix ci error

* fix ci error 2

* fix ci error

* fix ci error 3
2022-02-16 12:12:45 +08:00
bofeng-song 7e2fce85f9 sychronize engine to native (#10099)
* sychronize engine to native according to  https://github.com/cocos-creator/engine/pull/10041
2022-02-15 10:09:53 +08:00
mmyduckx e52bb2bf06 add forward declaration for pipeline (#10082) 2022-02-14 09:31:00 +08:00
minggo e1822484de Merge branch 'v3.5.0' into v3.6_merge_v3.5 2022-02-08 17:48:25 +08:00
minggo 7f24f34b22 Merge branch 'v3.5.0' into v3.6_merge_v3.5.0 2022-01-25 19:52:06 +08:00
Yiwen 8e81f9cfdb add a new interface to query format feature info (#4169)
* create a seperated branch to solve the Issue 8203

* Add format feature for query

* fix bugs and add formatFeature info for metal backend.

* 1. fix some bugs; 2. correct some condition judgements; 3. remove some uncessary comments;

* fix a bug of textureExclusive, fix some typos.

* clean the code, correct some formatFeatures.

* fix bugs in metal backend, fix bugs found on windows.

* Use a proper log funciton in DeviceValidator. Fix code format.

* fix perfect-forwarding in CondVar interface
2022-01-25 19:02:33 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
troublemaker52025 324e722f30 shadow info mifration for v3.5.0 (#4194) 2022-01-19 13:47:45 +08:00
minggo 5410a48a58 Implement more logic in native (#4131)
Co-authored-by: bofeng.song <bofeng.song@chukong-inc.com>
Co-authored-by: dumganhar <dumganhar@gmail.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: Patrice Jiang <397136899@qq.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
2022-01-07 18:39:40 +08:00
minggo c0bdd3c0d8 Merge branch 'v3.4.1' into merge_v3.4.1
Conflicts:
	cocos/bindings/event/EventDispatcher.cpp
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridge.mm
	cocos/platform/java/jni/JniCocosOrientationHelper.cpp
	cocos/platform/win32/CanvasRenderingContext2D-win32.cpp
2022-01-07 18:36:14 +08:00
troublemaker52025 32ea1cbfbf Combing planar-shadow calculations for v3.4.1 (#4127) 2022-01-05 23:26:28 +08:00
troublemaker52025 ce1e8e6072 RenderAdditiveLightQueue exclude transparent model for v3.4.0 (#4066)
* RenderAdditiveLightQueue exclude transparent model for v3.4.0

* update
2021-11-25 15:57:38 +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
Yun Hsiao Wu 86766eaaac fix additive light queue 2021-11-11 15:56:43 +08:00
Yun Hsiao Wu 8877e4f647 restore render area semantic 2021-11-11 15:56:43 +08:00
troublemaker52025 e6b4ba89fb Using float texture function for v3.4.0 (#4002) 2021-10-22 15:37:28 +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
jk20012001 4c94f2ca56 Support HDR/LDR Light Sources v3.4.0 (#3951)
* Support HDR/LDR Light Sources

* Fix ClangTidy error

* Fix name style error

* Synchronize naming for HDR

* Fix name style and compiling errors

* Remove fpScale, make deferred and forward uniform

* Fix diffusemap binding error

Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-10-12 10:47:28 +08:00
troublemaker52025 b00ecadad6 fix spot light bug for v3.4.0 (#3933)
* fix spot light bug for v3.4.0

* fix ci error

* revert
2021-09-28 16:41:55 +08:00
minggo ea980f509c merge v3.3.2 2021-09-24 12:38:10 +08:00
江战 5074a5a826 V3.4.0 usec++14 (#3898)
This reverts commit fff4cc8fc94fb9b1a8424a2b89e9966184c6c4ce.
2021-09-18 13:53:58 +08:00
江战 1bac46bb23 Use c++14 by default (#3880) 2021-09-13 10:41:27 +08:00
Yun Hsiao Wu da2f03ff73 gfx: swapchain refactor (#3751)
* gfx: swapchain

* acquire/release/surface on swapchain

* fix swapchain texture creation

* acquire/present back on device

* formats are swapchain-specific

* swapchain: vk works

* enable device agent

* format fix

* update gfxdef

* fix enum decl

* pipeline adapt

* minor

* vk: compress attr locations directly in SPIR-V

* gles3 adjust

* InputAssembler owns an DrawInfo

* gles2 adapt

* texture keep track of its hash

* device cached states

* format

* glslang finalize

* buffer view adapt

* fg: subpass support

* minor

* 3.4 adapt

* profiler adapt

* buffer update frequency detection

* minor

* base commit

* swapchain works on metal

* spirv

* mtltexture issue

* remote test code

* depthtexture

* revert ifdef USE_METAL

* ios swapchain header

* fix some triple buffer issues

* resize accept surface transform

Co-authored-by: Zeqiang Li <Zeqiang-li@outlook.com>
2021-08-31 19:40:32 +08:00
jk20012001 36a52f932b fix spotlight shadow matrix, lineardepth, packing mode, selfbias error (#8483) (#3834)
* fix spotlight shadow matrix, lineardepth, selfbias error (#8483)
2021-08-17 17:27:46 +08:00
troublemaker52025 3e568df2ed fix shadow problem for v3.3.0 (#3674) 2021-07-14 09:26:23 +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
GengineJS 62f32d93d0 fix shadowmap (#3668) 2021-06-29 18:37:40 +08:00
GengineJS 979c0d950e AABB shared data (#3655) 2021-06-28 15:31:57 +08:00
GengineJS b8f54069c0 [Add] Native scene object update function (#3638) 2021-06-22 16:41:13 +08:00
minggo c98a1251a0 Revert "[add] Native scene object update function (#3602)" (#3634)
This reverts commit 8cc944277f.
2021-06-18 18:12:50 +08:00
GengineJS 8cc944277f [add] Native scene object update function (#3602) 2021-06-18 17:34:06 +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
Yun Hsiao Wu 655b85b708 remove ad-hoc interfaces from device (#3498) 2021-04-29 22:05:28 +08:00
troublemaker52025 730a58687b using COLOR_HALF_FLOAT (#3496)
* using COLOR_HALF_FLOAT
2021-04-29 20:14:09 +08:00
troublemaker52025 b606a52204 fix mini game platform shadow not display for v3.1 (#3456)
* fix mini game platform shadow not display for v3.1
* only use texture half float
2021-04-23 13:50:18 +08:00
cary e9178d5f5f Fix instance count error. (#3455) 2021-04-23 09:35:03 +08:00