Commit Graph

161 Commits

Author SHA1 Message Date
pandamicro b162e21a93 Update license and API language declaration (#7750)
* Update licenses

* Update license for audio

* Update license for core/3d

* Update license for animation, assets, asset-manager, components, data

* update license for event, geometry, gfx

* update license for core modules

math, memop, pipeline, platform, primitive, renderer, scene-graph, utils, value-types

* Update license for core

* Update license for particle and particle-2d

* Update license for particle part2

* Update license for physics and physics-2d

* Update license for all modules in cocos

* Update license for exports

* Fix API doc language declaration
2020-11-10 17:36:31 +08:00
troublemaker52025 a91c502082 fix merge lost for 3.0 (#7742) 2020-11-09 19:50:34 +08:00
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +08:00
pandamicro 3068956648 Refactor gfx module naming convention (#7663)
* Remove GFX prefix in gfx module

* Full deprecation for old GFX APIs

* export gfx module

* Fix issues and make deprecated exports backward compatible

* Adaptation in engine modules for gfx

* Fix ci

* fix ci
2020-11-02 09:49:50 +08:00
coulsonwang 66b8c25574 fix lighting for native (#7637) 2020-10-31 09:49:00 +08:00
Jare Guo e2b740dd15 Finally merge runtime deserializer & asset manager (#7648)
* sync asset-manager

refine

refine

refine

* change director

* refine

* fix bugs

* commit

* refine and fix bugs

* refine docs

* fix bugs

* merge

* fix bugs

* fix bugs

* merge

* sync jsb-adapter

* fix ci

* adapt preloading process for new Deserializer

* adapt preloading process for new Deserializer

* fix bugs

* minor fix

* dump dependency of SpriteFrame explicitly (sync #6938)

* dump dependency of SpriteFrame explicitly (sync #6938)

* remove unused variable

* exporting should trigger uuid compression in serializer

* refine

* fix ci

Co-authored-by: Santy-Wang <wh19930829@qq.com>
2020-10-30 20:51:58 +08:00
Yun Hsiao Wu 7591bbbb20 misc bug fixes (#7644) 2020-10-30 20:33:04 +08:00
SijieWang a79b3f6641 在 material 被销毁的情况下,防止报错 (#7639) 2020-10-30 16:40:02 +08:00
JoneLau 351b6480e4 add image stencil in mask (#7598)
* add image stencil in mask

* update
2020-10-28 12:13:53 +08:00
Yun Hsiao Wu 40d959e718 gfx: pre-rotation on android (#7586) 2020-10-26 10:31:17 +08:00
Jare Guo 0319477911 fix decorator warning of ValueTypes (#7553)
* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
2020-10-21 16:31:41 +08:00
Yun Hsiao Wu d61330ee03 discrete descriptor set layout bindings (#7536)
* allow discrete descriptor set layout bindings

* specialize local DS layout

* fix binding indices mapping

* fix shadows

* UI: update buffer after device.acquire

* update shadow phase name

* ext blend minmax support

* fix splash screen on native
2020-10-20 15:08:17 +08:00
Jare Guo 2cdc3d1b8b Refine EngineErrorMap and sync 2D changes (#7542)
* refine Color.toCSS/toHex (sync #6216 #6207)

* refine component.resetInEditor (sync #6244)

* Revert "Improve error maps (#5527)"

This reverts commit 224cea23ab.

# Conflicts:
#	EngineErrorMap.md
#	cocos/core/assets/sprite-frame.ts

* Revert "Component rename for new standard and 2d compatibility (#7103)"

This reverts commit 3240dba206.

# Conflicts:
#	EngineErrorMap.md

* Remove some old deprecations (sync #6271)
2020-10-16 10:55:32 +08:00
minggo 17493631e9 initialize again before being reused (#7527) 2020-10-14 15:16:11 +08:00
minggo df0efdc74a clip more JS codes on native (#7520) 2020-10-14 09:42:32 +08:00
minggo 8c93b9e890 clip shader.js/input-assembler.js/buffer.js (#7516) 2020-10-13 15:11:57 +08:00
minggo 249d4cd6fb use native Device (#7511) 2020-10-12 18:30:08 +08:00
Yun Hsiao Wu 9bba200429 array pool refactor (#7496)
* refactor array pool

* ModelView.INSTANCED_BUFFER

* MRT feature flag

* minor
2020-10-12 14:25:36 +08:00
pandamicro 7481303268 Merge branch '3d-v1.2' into 3d
# Conflicts:
#	cocos/core/3d/framework/camera-component.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/components/component-event-handler.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/pipeline/define.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-pipeline.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/scene/skybox.ts
#	cocos/core/splash-screen.ts
#	cocos/ui/components/button.ts
#	cocos/ui/components/editbox/edit-box-impl.ts
#	editor/assets/primitives.fbx
#	package-lock.json
#	package.json
2020-09-30 18:01:33 +08:00
Yun Hsiao Wu f7ddf5a041 fix camera.clearColor (#7462) 2020-09-28 17:05:46 +08:00
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
Yun Hsiao Wu c2e3de2caa GFX: public interfaces (#7444)
* public interfaces: render pass, IA, PSO

* public interfaces: Queue, Sampler, Shader, DSLayout

* public interfaces: DS, CB, Texture, Buffer, Device

* public interfaces: other supporting structs

* fix framebuffer state cache
2020-09-28 11:32:47 +08:00
troublemaker52025 76ad9d115e fix camera disable error for v1.2 (#7376)
* fix camera disable error

* update

* Revert "update"

This reverts commit 0af3eabdddc55932b8e69ff8416de240bea82135.

* delete camera-Component onSceneChange()
2020-09-15 14:39:34 +08:00
Yun Hsiao Wu b2d9249dae fix circular refs (#7354) 2020-09-10 15:19:38 +08:00
Yun Hsiao Wu 331ec76790 fix blend target (#7308)
* fix blend target

* GFXColor now compatible with Color
2020-09-04 15:04:09 +08:00
pandamicro 3539945cf4 Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2
# Conflicts:
#	tests/general/sealed-global-variables.json
2020-09-03 11:30:28 +08:00
pandamicro bfc472f2db Fix some issues 2020-09-02 19:54:25 +08:00
Leslie Leigh (李的序) 4e56acb851 Fix missed cc.* (#7282)
* Fix missed `cc.*`

* Fix
2020-09-02 19:04:38 +08:00
pandamicro 1d2a82d957 Merge branch '3d-v1.2' into merge1.2
# Conflicts:
#	cocos/core/3d/framework/mesh-renderer.ts
#	cocos/core/components/ui-base/ui-renderable.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/forward/scene-culling.ts
#	cocos/core/pipeline/render-additive-light-queue.ts
#	cocos/core/pipeline/render-stage.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/core/renderer/core/memory-pools.ts
#	cocos/core/renderer/scene/camera.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/render-scene.ts
#	cocos/core/root.ts
#	cocos/particle/billboard.ts
#	cocos/terrain/terrain.ts
#	cocos/ui/components/button.ts
#	package-lock.json
#	package.json
#	tests/general/sealed-global-variables.json
2020-09-02 18:39:09 +08:00
pandamicro 3240dba206 Component rename for new standard and 2d compatibility (#7103)
* Rename ui related components

* Rename files

* Remove Useless errors

* Fix sealed names

* Fix sealed global variables

* Fix circular reference

* Refactor more component names

* Rename particle and animation related component

* export scene and models sub module in renderer

* Rename ModelComponents to Model

* Refactor LightComponents to Light

* Refactor CameraComponent to Camera

* Refactor ConstraintComponents to Constraint and rename physics comps

* Cleanup and fix issues

* Small fixes

* Refactor Model to MeshRenderer

* Final touch

* Fix data class export

* Better deprecation to cover all old usage

* Simpler and better deprecation with js.setClassAlias

* Fix ci

* Fix editor issue
2020-09-02 15:31:49 +08:00
Leslie Leigh (李的序) bc5b531191 Add decorator @editable @serializable (#7178) 2020-09-02 11:44:12 +08:00
Yun Hsiao Wu b4671b5980 fixed instancing for real-time skeletal animation (#7265) 2020-09-01 15:15:03 +08:00
minggo 909fde2dc9 move RenderWindow to renderer/core (#7216) 2020-08-25 14:35:40 +08:00
minggo 035a632abb invoke Model.initialize() before being resued (#7201) 2020-08-24 11:43:43 +08:00
minggo b01997250c Add array pool and add more elements into shared memory (#7197)
* Add array pool and add more elements into shared memory

* use template parameter

* use template parameter

* don't use shared memory for director
2020-08-21 17:04:36 +08:00
Leslie Leigh (李的序) 4f2eff842d Full optimize decorators (#7166)
* Full optimize decorators

* Conflicts

* Rename immutable -> readOnly

* Update

* Update

* Update
2020-08-18 19:10:34 +08:00
Leslie Leigh (李的序) fbe2a06a76 Change type of Mesh.prototype.data as non-nullable (#7131)
* Change type of`Mesh.prototype.data` as non-nullable

* Optimize

* Optimize

* Optimize

* Optimize

* Optimize

* Lint
2020-08-18 14:38:02 +08:00
Leslie Leigh (李的序) 2c72cd0eab Fix decorator problems carried by PR 7002 (#7157) 2020-08-18 11:04:19 +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
JoneLau 9740818fda modify description (#7106) 2020-08-13 11:53:16 +08:00
pandamicro bc06db685c Merge remote-tracking branch 'origin/3d-v1.2' into 3d-v1.2 2020-08-13 11:24:00 +08:00
pandamicro 3b66332823 Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d-v1.2
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-instanced-queue.ts
#	cocos/core/platform/event-manager/input-manager.ts
#	cocos/core/platform/view.ts
#	cocos/core/renderer/core/pass.ts
#	cocos/core/renderer/scene/planar-shadows.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/core/utils/profiler/profiler.ts
#	cocos/particle/renderer/trail.ts
#	cocos/terrain/terrain.ts
#	package-lock.json
#	package.json
#	predefine.ts
#	scripts/build-engine/package-lock.json
#	scripts/build-engine/package.json
#	scripts/build-engine/src/index.ts
2020-08-12 15:53:52 +08:00
SB f0882d6272 Optimize some documents 2020-08-06 17:23:06 +08:00
Leslie Leigh (李的序) 26df6fb1c0 Optimize editor decorators (#7002) 2020-08-05 10:36:52 +08:00
Myway 77186a5c5b lightmap instancing (#7070)
* lightmap instancing

* fix planar shadow instancing
2020-08-04 16:58:47 +08:00
Yun Hsiao Wu afeb83e9a6 native pools (#7028) 2020-08-04 14:14:56 +08:00
Yun Hsiao Wu 606c5d21fa fix gfx texture info naming (#6998)
* fix gfx texture info naming

* move instanced/bathced buffer out from pass
2020-07-24 11:31:43 +08:00
troublemaker52025 d26ce6b78b Add Shadow map (#6972)
* add easy shadow

* update

* update

* manage pso

* manage psoCI array

* solve a bug

* Optimization

* depth test is not accurate

* Conflict resolution

* Conflict resolution

* solve pr

* optimization

* update

* optimization

* optimization
2020-07-21 18:42:33 +08:00
Yun Hsiao Wu 2777122b1f refactor render texture (#6942) 2020-07-10 14:23:22 +08:00
Yun Hsiao Wu 2bc580976f fix material hash calculation (#6965) 2020-07-09 18:32:22 +08:00