lywsvip/cocos-engine
1
0
Fork 0
mirror of https://github.com/cocos/cocos-engine.git synced 2026-09-06 15:48:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,179 Commits 111 Branches 231 Tags
develop
Commit Graph

1074 Commits

Author SHA1 Message Date
李吉林
4053badedf Gpu driven 3rd (#16400) 
GPU Driven 3rd stage
 2023-10-11 10:15:44 +08:00
minggo
5663b38e33 Merge branch 'v3.8.2' into develop-merge-v3.8.2 
Conflicts:
	cocos/3d/assets/mesh.ts
	editor/inspector/contributions/node.js
	editor/inspector/utils/prop.js
	native/cocos/3d/assets/Mesh.h
	native/cocos/engine/Engine.cpp
	native/cocos/renderer/gfx-gles3/GLES3Commands.cpp
	native/cocos/renderer/pipeline/custom/NativePipeline.cpp
	native/external-config.json
 2023-08-31 14:41:18 +08:00
zxx43
22c5bbc175 add a lot of missed functions for spine jsb (#16027) 
* add a lot of missed functions for spine jsb

* change conversion type to number

* check type is a number

* change toNumber to toDouble
 2023-08-21 11:28:56 +08:00
徐兵
006bc6254e fix planar reflection error under the native custom pipeline (#16014) 2023-08-18 10:10:38 +08:00
zxx43
7a3a4f1dfb add missed spine api (#16010) 
* add missed spine api

* readSkeletonData return point
 2023-08-18 02:08:30 +08:00
minggo
9994ba3ac4 Merge branch 'v3.8.1' into develop-merge-v3.8.1 
Conflicts:
	.github/workflows/run_test_cases.yml
	.github/workflows/run_test_cases_pr_comment.yml
	cocos/asset/asset-manager/downloader.ts
	cocos/misc/renderer.ts
	native/cocos/renderer/gfx-gles2/GLES2PrimaryCommandBuffer.cpp
	native/cocos/renderer/gfx-gles3/GLES3GPUObjects.h
	native/cocos/renderer/gfx-gles3/GLES3PrimaryCommandBuffer.cpp
	native/external-config.json
 2023-08-17 15:29:20 +08:00
Zach Lee
6e7841fbbb fixed colorTemperatureRGB jsb binding. (#15972) 2023-08-17 10:24:49 +08:00
李吉林
5299a7ca4f remove isBlend (#15971) 
* remove isBlend
 2023-08-16 12:52:22 +08:00
李吉林
7020122384 add gpu driven culling (#15953) 
* gpu driven 2nd stage: gpu culling
 2023-08-15 15:27:10 +08:00
Zhou Zhenglong
e583e37d34 Merge branch 'v3.8.1' into develop-merge 2023-08-11 14:44:30 +08:00
zxx43
60b5a7de66 3.8.1 add spine jsb apis (#15674) 
* open some spine apis

* add some apis

* add spine jsb convert

* add some manual interfaces

* fix some jsb

* fix getAttachments

* remove findAttachmentsForSlot

* manual VertexEffect::begin

* remove SkinEntry

* change some apis

* fix isObject

* use entry ptr instead of entry

* remove array.get()

* remove array.get()

* fix ci

* fix ci

* change include

* fix SWIGINTERN

* fix test-case

* use rename

* check spine instance null

* fix eslint

* fix eslint

* add some missing apis

* add getAttachmentByName

* modify jsb api

* fix eslint
 2023-08-11 14:07:30 +08:00
oahc09
5886a0066d fix:camera trackingtype/cameratype jsb attribute lost (#15867) 
(used in xr)
 2023-08-07 14:33:07 +08:00
troublemaker52025
4b26cc8784 fix PipelineStateChanged updating issue by performance optimization (#15753) 2023-08-07 11:19:41 +08:00
santy-wang
c9bd446e92 Merge branch 'v3.8.1' of github.com:cocos-creator/engine into develop 2023-08-03 18:41:12 +08:00
hyde zhou
ff32117ca6 add enable gpu driven (#15855) 
* add enable gpu driven
 2023-08-03 12:27:33 +08:00
徐兵
d97d3c655a add global post settings (#15558) 2023-07-25 15:40:55 +08:00
Zhou Zhenglong
fabb7febd1 Merge branch 'v3.8.1' into develop-merge 2023-07-19 14:41:42 +08:00
hyde zhou
979e3c9677 V3.8.1 msaa (#15584) 2023-07-18 11:55:05 +08:00
minggo
f8cc6d480e Merge branch 'v3.8.1' into merge-v3.8.1 2023-06-27 15:51:07 +08:00
troublemaker52025
98d9bf87d9 add skin JSB binding (#15464) 2023-06-19 15:16:50 +08:00
Zhou Zhenglong
8a043aabc7 Merge branch 'v3.8.0-merge' into develop 2023-06-12 10:29:55 +08:00
hyde zhou
a541d35bfd Develop pipeline merge (#15374) 2023-06-08 16:31:51 +08:00
李吉林
adbbdc2406 GPU Driven first stage: GPUScene & Indirect Draw (#15372) 
* GPU Driven first phase: GPUScene & Indirect Draw
 2023-06-08 14:50:52 +08:00
Jiujiang Liu
3898cf3d47 fix getUniform API bug (#15333) 
Co-authored-by: James Chen <dumganhar@gmail.com>
 2023-06-07 15:24:35 +08:00
Jiujiang Liu
78bb2d3e79 [Bug] Fix native scene can't get UUID bug (#15347) 2023-06-07 15:15:02 +08:00
Zach Lee
1eaa6713b1 Update indirect draw interface. (#15270) 
* Update indirect draw interface. (#15244)
 2023-06-02 09:48:15 +08:00
江战
175d8a4c7e change the return type of submodel.passes to shared_ptr (#15267) 2023-06-01 14:05:03 +08:00
Zach Lee
26e039cfcf Revert "Update indirect draw interface. (#15244)" (#15263) 
This reverts commit 98f41b83c1.
 2023-06-01 12:13:26 +08:00
Zach Lee
98f41b83c1 Update indirect draw interface. (#15244) 2023-06-01 11:06:34 +08:00
Santy-Wang
51afef29b4 remove repliated and client load (#13521) 2023-05-25 11:40:41 +08:00
Santy-Wang
d3a9b5a8b8 gradient misc optimization and add some helpful function (#15032) 
* gradient misc optimization and add some helpful function

* keep old version and add new interface

* missing .

* mark as engineInternal
 2023-05-24 13:59:29 +08:00
hyde zhou
8a7586c925 [develop pipeline] add resolve (#15121) 2023-05-23 10:11:44 +08:00
hyde zhou
34a5022096 develop pipeline interface change (#15083) 2023-05-18 13:00:23 +08:00
James Chen
0adc9e6cbf Disable some swig warnings. (#15076) 
* Disable some swig warnings.

* Add warning reference
 2023-05-17 09:51:09 +08:00
hyde zhou
ae5d25924e Develop pipeline (#15030) 2023-05-16 13:03:28 +08:00
Ling Zhan
9cd5212d18 Character Controller (#14848) 
* back.boxCCT works now. capsuleCCT not collider correctly

* refactor

* cct 事件系统初步可用。todo 碰撞filter

* init cct group and mask

* queryFilterCB

* this the first working version

* tweaks

* init bullet character controller. todo: events, autoStep bug, maxSlope bug

* bullet cct onShapehit

* physx native works now. todo: BoxCharacterController

* add physx-native BoxCharacterController

* cct filters redundant events

* cct velocity

* cct detectCollision not working

* cct detectCollisions works in physx

* Character controller supports setDetectCollisions: collision detection without calling move()

* cct center

* bt.CharacterController_setContactOffset,CharacterController_setStepOffset,CharacterController_setSlopeLimit

* bullet cct collision event use last shoot

* tweaks

* cct doc

* fix bullet box-cct hit callback

* add cct export

* feat cct setOverlapRecovery

* cct delete useless code in native physics

* tweaks: cct remove useless code

* fix cct bullet group mask: update group and mask by re-adding cct to physics world. not tested

* tweaks

* tweaks

* fix bullet-cct not emit collision: add bullet updateNeedEmitCCTEvents

* tweaks

* fix cct supports enable/disable

* add cct imp null check

* cct not to expose detectCollisions and OverlapRecovery at this moment

* physx/bullet cct支持节点缩放.todo: bullet cct(setRadius/Height)还有bug 无法运行时改变，只能在初始化的时候设定。physx c++待支持。

* c++ physx cct supports node scale

* fix cct physics c++ forgets to remove cct from scene when destroyed

* [fix] physx cct set climbing mode to PxCapsuleClimbingMode.eCONSTRAINED

* add cct unit test and multiple tweaks

* multiple tweaks and add cct center for physx c++

* tweak

* tweaks

* tweaks

* external version: develop-20

* tweaks
 2023-05-16 10:03:13 +08:00
江战
976b13adf7 fix pass property binding (#15031) 2023-05-12 10:39:32 +08:00
James Chen
13d3087d9a fixed #14351: The auto-binding code for RenderEntity::STATIC_DRAW_INFO_CAPACITY is wrong (#15024) 
* Update native/external-config.json, update swig.

* Update editor_support.i, don't bind unneeded classes.

* Update render-scene/scene/index.jsb.ts, add missing class variables.
 2023-05-11 15:55:33 +08:00
hyde zhou
6cbad38241 pipeline changes after v3.7.3 (#14998) 2023-05-10 17:46:45 +08:00
Jiujiang Liu
821041de28 support light probe sphere volume control (#14906) 
* support light probe sphere volume control
 2023-05-08 13:43:02 +08:00
troublemaker52025
64e4289ce9 Add planar-shadow pass to the built-in effects for enable instancing (#14958) 2023-05-08 11:16:34 +08:00
mmyduckx
67341c0866 fix simulator restart bug (#14962) 
* fix simulator restart bug

* fix close simulator crash due to se destroy
 2023-05-08 10:23:55 +08:00
李吉林
5ead7c61de delete batching (#14957) 
* delete batching
 2023-05-04 12:46:12 +08:00
mmyduckx
46da89a5f7 fix editor simulator resize and change landscape not work (#14908) 
* fix editor simulator resize
 2023-04-25 17:12:19 +08:00
江战
81c4e12322 revert change for genbindings.js (#14871) 2023-04-20 16:53:14 +08:00
徐兵
4d35600c7b Reflection probe support blend (#14734) 2023-04-12 19:06:21 +08:00
江战
fb1d0f2c4c Generate binding code during the build process. (#14655) 2023-03-30 16:08:28 +08:00
minggo
5bc0fe59df make _priority and _rootBufferDirty protected (#14639) 
* make _priority and _rootBufferDirty protected

* change to function
 2023-03-24 14:50:15 +08:00
minggo
bcc581dfd7 Merge branch 'v3.7.3' into develop_merge_v3.7.3 2023-03-24 10:57:28 +08:00
minggo
cbadcf20f5 Merge pull request #14576 from cocos/v3.7.2 
V3.7.2
 2023-03-15 11:05:16 +08:00