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

153 Commits

Author SHA1 Message Date
Yiwen
bde3cd4cc3 Add adv mesh functionalities. (#16009) 
* stage

* update

* update

* fix physics & ray cast problem

* fix default value, clean unused code, fix lint errors

* clean code

* update meta file

* update external, license

* fix tidy, circular dep

* fix type cast

* rm unit test

* fix unit test

* update comment
 2023-08-21 10:15:24 +08:00
pandamicro
9b08b34a2b Replace Renderer setMaterial with setSharedMaterial (#15980) 
* Replace Renderer setMaterial with setSharedMaterial

* Fix all usage of Renderer.setMaterial

* Soft deprecate Renderer.setMaterial

* Remove unnecessary change
 2023-08-17 13:15:21 +08:00
Canvas
1a8b9cbdd3 fix cache mode spine animation playback issue. (#15691) 
* fixed cache mode spine animation playback issue.

* remove unused code.

* fix code formatting.

* fix code formatting.

* fix editor changing animation node position doesn't refresh rendering when enable batch.

* add spine error id 7511 'Invalid input'. & fix deprecated to engineInternal. & change _uuid to uuid.

* remove invalid code & fix error map code format. & replace any to interface.

* fix setSkin invalidation on cached mode.

* remove unneeded descriptions.

* fix frame = 1 to length - 1.

* fix code format.

* revert update skeleton data on setSkin.
 2023-07-13 13:46:53 +08:00
PP
c03d4277f2 add CULL_ASM_JS_MODULE constant (#15467) 
* add CULL_ASM_JS_MODULE constant
 2023-06-19 14:59:54 +08:00
hyde zhou
e06bb6cdb4 [V3.8.0 pipeline] add deferred pipeline (#15452) 2023-06-16 17:35:18 +08:00
Yiwen
0a346b2fdd fix bufferview size limit (#15265) 
* fix bufferview size limit

* update

* update

* update error msg

* [fix] add boundary to avoid physx assert error (#15321)

* change validation method
 2023-06-07 23:01:01 +08:00
troublemaker52025
07f3dedad9 Optimize skin with post-process pipeline (#15189) 2023-06-01 18:44:48 +08:00
pandamicro
12fe7525f9 Merge pull request #15113 from cocos/develop 
Merge remote-tracking branch 'upstream/develop' into marionette-next
 2023-05-19 10:42:41 +08:00
Yiwen
78c87a09d2 add new features to 3d hinge constraint (#14447) 
* add new features to 3d hinge constraint
1. angular limit
2. angular drive

* add missing file

* fix native and bullet parameter error, tune parameters

* clean code

* update package and package lock

* stage

* update

* fix interface

* fix api, improve perf

* fix unit conversion

* fix unit conversion

* sync physx behavior
 2023-05-18 16:36:23 +08:00
Leslie Leigh
464342eb99 Merge remote-tracking branch 'upstream/develop' into marionette-next 2023-05-18 14:46:30 +08:00
Ling Zhan
1032bd9508 Sweep Test (#15068) 
* init

# Conflicts:
#	cocos/physics/physx/physx-adapter.ts

# Conflicts:
#	cocos/physics/physx/physx-adapter.ts

* init sweepBoxClosest

# Conflicts:
#	cocos/physics/physx/physx-world.ts

* back

* physx boxCastClosest works now.

* add physx sweepAll

* init bullet sweepBoxClosest. not test yet

* add bullet sweepBox

* bullet add internal functions: sweep/sweepClosest

* init physx c++ sweepBox/sweepBoxClosest

* add sweepSphere, sweepCapsule; add unit test.

* add sweep api doc

* revert physx asm/wasm loading func

* tweaks

* add error log for builtin and cannon.js

* builtin and cannon.js use warnid when calling sweep

* tweak api doc
 2023-05-17 18:37:03 +08:00
minggo
3a6e0ca2ba Merge pull request #15067 from cocos/develop 
Merge develop into marionette-next
 2023-05-17 14:06:57 +08:00
Leslie Leigh (李的序)
b119ee5bcf Optimize warn message if state machine matched too many transitions in a frame (#15016) 2023-05-10 14:22:31 +08:00
pandamicro
71a11a7a14 Merge remote-tracking branch 'origin/v3.7.3' into develop 
# Conflicts:
#	.github/workflows/run_test_cases.yml
#	cocos/rendering/planar-shadow-queue.ts
#	native/cocos/renderer/pipeline/PlanarShadowQueue.cpp
 2023-05-08 11:55:56 +08:00
Leslie Leigh (李的序)
4a183b14c0 Fix exception in material uniform animation binding (#14764) 2023-04-28 09:22:37 +08:00
Yiwen
3713957624 collider constraint (#14068) 
* collider constraint

* rm uncessary function import

* bullet doesn't prevent dynamic rigid body using simplex collider

* convex mesh with dynamic rigid body is allowed

* clear useless imports
 2023-04-20 14:32:48 +08:00
PP
fa51b804b5 remove and ban @ts-expect-error (#14572) 
* remove ts-expect-error usage in engine

* deprecate Scheduler interface

* remove JavaScriptCore

* set some engineInternal public property as getter setter

* fix build-declaration

* fix releaseManager export name conflict

* update scriptEngineType

* fix and update some comment

* remove  w_mat, w_pos, w_rot, w_scale

* update renderer

* fix setRootBufferDirty not binding on native

* optimize floatToHashString

* mark NOTE
 2023-03-20 13:48:26 +08:00
徐兵
878b7db4a5 optimize reflection probe (#14115) 2023-02-03 15:43:04 +08:00
ChiaNing
221c37a275 Protect scroll bar error when its deleted (#14041) 
* Protect scroll bar error when its deleted

* change to is Valid
 2023-02-01 17:38:53 +08:00
pandamicro
08c7fe3956 Add pre type validator for setUniform (#13462) 2022-11-23 15:26:16 +08:00
santy-wang
91c884362d Merge branch 'v3.6.2' of github.com:cocos-creator/engine into v3.6.1-sync 2022-10-11 20:12:14 +08:00
jk20012001
25c4949ce5 [fix] camera clear flag is skybox but skybox is disabled #13589 (#12964) 2022-10-11 18:56:55 +08:00
ChiaNing
2afd02e711 sorting component add (#12465) 
* sorting component add

* menu add

* change sorting layer type to enum

* import fix

* name change

* sorting init

* fix init

* update priority on editor

* add enum index

* sort fix

* api doc add

* remove export to cc

* doc change

* protect

* warn id

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
 2022-09-15 10:15:33 +08:00
ChiaNing
2f1567bb7d mask interface deprecated (#12667) 
* mask interface deprecated

* fix

* warn add

* warnid

* msic
 2022-09-09 16:34:43 +08:00
Santy-Wang
1844a35fc9 support asset-overriding (#12632) 
* support asset-overriding

* output some debug info

* refine some code

* fix typo
 2022-09-02 10:38:46 +08:00
zxx43
d8f09ea57d 3.6.1 trail buffer insufficient space fix (#12567) 
* enlarge trail buffer

* add warning information

* use warn id instead
 2022-09-01 23:49:17 +08:00
zxx43
6678c378ee V3.6.0 particle material log (#12249) 
* add warning message when change particle material

* use error id instead

* change to log

* change to warning

* Apply suggestions from code review

Co-authored-by: pandamicro <lphuabin@gmail.com>
 2022-07-28 17:44:53 +08:00
Santy-Wang
629d788596 Output friendly information about effect name (#12137) 
* Output friendly information about effect name

* Apply suggestions from code review

Co-authored-by: pandamicro <lphuabin@gmail.com>
 2022-07-21 23:05:53 +08:00
PP
7f41b05cfe support top level deprecate check (#11630) 
* support __checkObsolete__

update

update deprecate info

update

fix ci

fix ci

update

* rename interface

* cache namespace proxy

* move deprecate info to version deprecated

* consider undefined Proxy
 2022-07-01 11:55:05 +08:00
pandamicro
12072ffc62 Merge v3.5.1 zqb branch to v3.6 (#11637) 
* support asset property preview (#11017)

(cherry picked from commit 85769cf8f81459b5ad98ccab4138420009572a32)

* show mesh asset thumbnail (#10981)

* V3.5.1 noise particle (#11003)

* add cpu & gpu noise for particle

* add some params & change particle noise shader

* change shader

* add cpu noise particle

* add noise preview

* run generation when preview

* revert shaders

* remove unused statements

* add particle noise module

* change noise preview interface

* add invisible to remap

* remove get deltaTime

* set noiseModule private

* fix eslint

* feat: add noise preview (#11260)

* [Optimize] asset editing undo (#10779)

* edit render-pipeline

* support renderpipeline undo

* optimize material editing undo

* reset last record data

* temporary not support animation-mask undo

* support animation-mask edit undo

* animation mask remove _jointMasks

* Animation clip embedded players (#11320)

* Animation clip subregions

* Log

* Test

* Eval

* Update

* Update

* No longer use animation state to implement clip motion

* Clear subregions

* Fix

* Mark subregion as editor extendable

* Animation clip subregion player path

* fix isnan(0.0) with webgl1.0 (#11262)

* fix isinf(0.0)==true with webgl1.0

* code style

* fix specular params with surface toon (#11265)

* code format and add sliders for parameters (#11266)

* Broadcasting of animation state\'s speed

* Fix

* Rename

* Update

* Fix

* Revert "No longer use animation state to implement clip motion"

This reverts commit 20755f9ec5.

* Revert some exotic changes

* Update docs

Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>

* fix skinning model split (#11378)

* fix skinning model split

* rename function _resizeMaxJointForDS

Co-authored-by: zhakesi <zhakesi@foxmail.com>

* [ci skip][AUTO]: Automated genbindings update: d823cbba1f  (#11378) (#11383)

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

* use stop emitting instead (#11381)

* add stop emitting api

* use stop emitting instead

* Update cocos/particle/particle-system.ts

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

* fix: imageData fault tolerance (#11374)

* fix: imageData fault tolerance

* chore: when data is an empty array,stop the function

* material  undo updating effects list (#11409)

* modify noise module ui (#11433)

* use visible decorator to control the visibility of property (#11438)

* fix joints data with value nan (#11489)

* V3.5.2 CI Android NDK  set version to 21 (#11448) (#11492)

* Minor improvement

* Fix format

* Fix particle culler

* Improve particle culler

* Manually migrate joint data upload with texture in skinning model

* Update shaders for skinning model based on joint texture

* fis native skinning model with realtime-texture mode (#45)

Co-authored-by: zhakesi <zhakesi@foxmail.com>

* fix clangtidy (#46)

* Small tweaks

* modify code struct for skinning model (#47)

* modify code struct for skinning model

* update skinning chunk

Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: zxx43 <zxx43@hotmail.com>
Co-authored-by: 袁炜海 <35713518+dogodo-cc@users.noreply.github.com>
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>
Co-authored-by: zhakesi <liqiao@cocos.com>
Co-authored-by: zhakesi <zhakesi@foxmail.com>
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
Co-authored-by: Santy-Wang <wh19930829@qq.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
 2022-06-24 15:10:45 +08:00
Santy-Wang
5ae9dd67ce fix addPersistNode (#11689) 2022-06-24 11:25:41 +08:00
Santy-Wang
8ca3044cdf set persist node's hideFlags to DontSave when switch scene (#11627) 
* set persist node's hideFlags to DontSave when switch scene

* refine log
 2022-06-20 23:18:41 +08:00
江战
42c583665e 3.6 native template version validation (#11589) 2022-06-18 18:53:18 +08:00
troublemaker52025
387b994f91 Add CSM for v3.6.0 (#11120) 
* Add CSM for v3.6.0

* fix CI error

* fix Ci error 2

* Limit soft shadow sampling range

* update

* add soft 5x PCF

* add warn ID

* sync CSM to native engine

* fix CI error

* add Performance Mode

* fix ci error

* fix ci error 2

* fix ci error 3

* add precisely tailored

* use CC_SHADOWMAP_FORMAT

* update

* Modify default parameters

* sync to native engine

* revert config file

* fix  ci error

* modify pr problem

* fix CI error

* fix ci error

* sync to js engine

* fix ci error

* fix cc_shadowMap not binding

* fix vulkan shadow effect error

* build effect

* fix ci error

* modify review

* fix ci error

* fix ci error 2

* delete unused interfaces

* fix ci error

* update

* update 2

* fix ci error

* delete csmDebugMode

* build effect

* use csmLeve to shadowCascadeLevel

* update
 2022-06-07 14:30:49 +08:00
Leslie Leigh (李的序)
423ce5fa6b Improve error messages on animation clip track binding failure (#11224) 
* Improve error messages on animation clip track binding failure

* lint
 2022-06-06 13:34:57 +08:00
minggo
84c27e7f71 Merge branch 'v3.5.0' into v3.6.0_merge_v3.5 2022-04-24 13:41:27 +08:00
jk20012001
34711f9a65 fix #10808 Diffuse map not applied after removing env map and reset them (#10813) 
* fix #10808
show warning message when diffuse map resource is missing

* code style

* code style

* code style

* add error message

* code style
 2022-04-20 18:49:38 +08:00
jk20012001
d4fbe4f017 toggle hdr mode and without diffusemap file, show warnings and fix to… (#10805) 
* toggle hdr mode and without diffusemap file, show warnings and fix to right lighting type

* use warnID instead of plain text

* code style
 2022-04-19 17:57:11 +08:00
李吉林
f195f7dd2d add spline (#10684) 
* add spline
 2022-04-11 15:49:20 +08:00
minggo
a6bf766170 Merge branch 'v3.5.0' into v3.6_merge_v3.5 2022-03-29 18:26:40 +08:00
Leslie Leigh (李的序)
0a67669190 Animation state bugfix (#10558) 2022-03-29 11:33:47 +08:00
Yiwen
718ea8ee3f Add a method to select mipmap range for Texture2D and TextureCube. (#10500) 
* Add a feature to select mipmap range to image asset.

* fix format

* fix format

* modify comments, remove uncessary methods

* finx comments.

* fix logic problem

* fix mipmap range problems

* Add validation information incase someone wants to generate mipmap for compressed texture

* remove some validations to make gfx bakend clear

* fix a stupid typo

* Add validation information for setMipRange

* use assertID to validate the mipmap range
 2022-03-27 13:52:24 +08:00
Santy-Wang
98e52e3f16 output warning info when attached to the node has zero scaling (#10524) 
* output warning info when attached to the node has zero scaling

* use approx instead
 2022-03-26 22:23:29 +08:00
李吉林
d793157a71 add dynamic mesh (#10291) 
* add dynamic mesh

* Mesh init refactor

* fix geometry renderer bug

* dynamic mesh review update

* MeshUtils refactor

* do not export createDynamicMesh
 2022-03-16 16:55:49 +08:00
pandamicro
1446db89e7 Merge branch 'v3.4.2' into v3.5.0 
# Conflicts:
#	cocos/2d/components/sprite.ts
#	cocos/2d/framework/ui-transform.ts
#	cocos/2d/renderer/render-uniform-buffer.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/dragon-bones/ArmatureDisplay.ts
#	cocos/spine/skeleton.ts
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta
#	editor/assets/default_skybox.meta
#	editor/assets/effects/builtin-sprite-gpu.effect.meta
 2022-02-28 17:24:02 +08:00
pandamicro
2ba83f18a4 Ensure RenderData.clear won't break usability (#10177) 
* Cleanup Renderable2D onDestroy and destroyRenderData

* Ensure RenderData.clear won't break usability

* Remove quad render data

* Fix Skeleton.destroyRenderData

* Small tweak

* Fix ci

* Add protection to buffer accessor size calculation

* Cleanup spine & dragonbones code

* Improve DragonBones draw list management

* Fix currRenderData state issue
 2022-02-25 14:56:54 +08:00
santy-wang
995f5b2d41 Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5-merge 2022-01-24 15:56:49 +08:00
Zhang mingzhen
9e63a71a87 remove deprecated (#10007) 
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
 2022-01-18 14:26:43 +08:00
ChiaNing
fea3f70dbc protect meshBuffer max vertex count (#10005) 
* protect meshBuffer max vertex count

* format change
 2022-01-17 18:50:20 +08:00
pandamicro
bd3c30fd4c BufferAccessor refactor for Batcher2D (#9802) 
* VB cache add（only simple）

* sliced add

* after rebase

* Extract BufferAccessor from MeshBuffer

* Refactor for linear buffer accessor

* Support simple sprite

* Fix initialization issues

* Fix simple sprite rendering

* Rough adaptation

* tweaks

* Fix LinearBufferAccessor's appendBuffers

* Cleanup mesh buffer codes

* Reorganize ia allocation

* Middleware adaptation & Particle 2d adaptation (#31)

* Middleware adaptation

* particle-2d adaptation

* Initial implementation of static vb accessor

* Complete static vb accessor

* Improve static vb accessor

* Ensure MeshBuffer.byteOffset

* Fix record batch process in static vb accessor

* Fix vb reset

* simple & simple label add (#32)

* Meshbuffer static length (#33)

* set ib only first time

* Meshbuffer static length

* Some name refactor

* remove RenderData.vData

* Improve buffer update logics

* Use appendIndices in fillBuffers

* The quickest version（simple & label can render） (#34)

* Revert "Use appendIndices in fillBuffers"

This reverts commit 0600e26f7e.

* the quickest version

* pass renderScene

* batch

* change batcher update

Co-authored-by: pandamicro <lphuabin@gmail.com>

* Move ia record logic from accessor to batcher

* Make vertexFormat sourced from render data

* sliced & bar-filled (#35)

* radial-filled & tiled & label (#36)

* radial-filled & tiled

* bmfont & char label

* function change

* name change

* Remove uvDirty

fixes

Fix uv update for sprite

* Reduce mesh buffer setDirty

* uv fix

* Format label

* Refactor color and cascade opacity mechanism

* Fix empty render data or chunk absent issue

* fix some uv (#37)

* Fix non stop allocation issue in static vb accessor

* fix bmfont richText & remove uiComponent (#38)

* fix bmfont uv

* fix richText & remove ui Component

* Fix mesh render data batching

* Small fix

* Update for spine

* Formatting jsb spine and editor

* middle ware & particle 2d (#39)

* motion-streak

* dragon Bones add

* tiled map unsafe change

* particle-2d add

* function name change

* some function change (#40)

* Fix RenderData pool usage

* Fix merge issue

* fix misc bug (#41)

* Native adaptation for spine and dragonbones with MeshRenderData

* misc fix (#42)

* Improvements

* Fix ci and improvements

Co-authored-by: ChiaNing <sun.cloud.mo@gmail.com>
 2022-01-07 15:43:04 +08:00