Commit Graph

536 Commits

Author SHA1 Message Date
黄森斌 1e0c9b37b5 fix material pass switch checkbox bug (#8711) 2021-06-14 22:37:18 +08:00
zheng han a60337fc08 add min max pos for mesh preview (#8786) 2021-06-14 16:52:03 +08:00
黄森斌 f6a63f2c99 V3.3 set promoteSingleRootNode of fbx asset (#8756)
* texture-cube charater

(cherry picked from commit dca6ddf38571858be284a9ec6e4adcf456ffe1e1)

* revert texture-cube change

(cherry picked from commit d0cce40800d36977abeae9d43352a8890a2e1421)

* set promoteSingleRootNode of fbx asset

(cherry picked from commit d3be3c4707a5db624094e5558ae45604e0e5ae26)
2021-06-09 15:24:10 +08:00
minggo 424232493e Merge pull request #8777 from minggo/merge_v3.1.2
Merge v3.1.2
2021-06-09 14:12:21 +08:00
cary dbfcdd04e7 Merge SSPR to v3.3. (#8780) 2021-06-08 11:23:51 +08:00
minggo 9f2a83330d merge v3.1.2 2021-06-07 16:01:03 +08:00
Yun Hsiao Wu 35e4cb81ec take over native device initialization (#8767) 2021-06-07 11:10:17 +08:00
Leslie Leigh (李的序) 37d4f4aadf Add morph normals import setting (#8749) 2021-06-02 13:56:38 +08:00
黄森斌 e3c7f9c436 fix edit some assets can not record its expand state (#8696)
* texture-cube charater

* fix some asset files cache-expand bug
2021-05-20 18:30:04 +08:00
黄森斌 c0e50351dc fix edit render-pipeline bug (#8698)
* fix edit render-pipeline bug

* change marks
2021-05-20 18:28:13 +08:00
黄森斌 3c4690bdf1 fix edit material bug (#8689) 2021-05-18 17:02:43 +08:00
黄森斌 429c4a2b5c fix edit material bug (#8681) 2021-05-17 18:29:04 +08:00
黄森斌 9f66a7a2a2 fix inspector edit component (#8676) 2021-05-17 17:12:38 +08:00
黄森斌 804e540907 V3.1.1 allow create prefab asset (#8657)
* allow create prefab asset

(cherry picked from commit d26ec3d68cef0625cce3ea8f10d2e0a37d2ddd17)

* update  graphics component layer use UI_2D
2021-05-14 16:14:40 +08:00
黄森斌 13cc875172 V3.1.1 fix edit renderpipeline bug (#8668)
* fix reset material  incorrect  refresh preview

* fix edit renderpipeline bug
2021-05-14 16:13:37 +08:00
zhangxin e85aa4b1c3 add .eslintrc.js to editor ,and fix (#8653) 2021-05-12 16:36:57 +08:00
黄森斌 e5b16e3f2d V3.1 [editor] fix inspector edit some component undo bug (#8618)
* fix inspector edit some component undo bug

* update fbx meta file in internal-db
2021-04-30 17:02:30 +08:00
cary 3ba49cb35e Fix the render error of particle and spine on metal. (#8593)
* Fix the render error of particle and spine on metal.

* Move transparent render of deferred to lighting stage.
2021-04-29 18:52:15 +08:00
zheng han 59b55794d6 fix animation preview bug (#8589)
* fix animation preview bug when it's first time opened

* reuse code
2021-04-29 11:57:35 +08:00
黄森斌 da4cc3c967 V3.1 [editor] fix inspector edit particle2d bug (#8584)
* fix inspector edit particle-2d bug

* update multiple edit particle-2d

* update edit materila one style
2021-04-29 10:58:11 +08:00
zhangxin cba7bcbc17 use uuid.valuse instead of dump.values (#8587)
* use uuid.valuse instead of dump.values

* use const instead of let
2021-04-29 10:47:59 +08:00
Yun Hsiao Wu 0f0905c381 opt memory pool bound checking (#8585) 2021-04-28 21:46:41 +08:00
zhangxin 5635c24a80 fix multiple select bug (#8581)
this.meta.userData.meshOptimizerOptions may be undefined
2021-04-28 17:33:18 +08:00
黄森斌 ee4dc04318 inspector show code asset, add fault-tolerant (#8575) 2021-04-28 17:30:51 +08:00
zhangxin 849f1a400f inspector allow multiple select particle system (#8574)
- fix  ui-section's header's dump  ,
- hide invalid content
2021-04-28 10:26:46 +08:00
黄森斌 377ece22e2 fix inspector edit widget bug (#8565)
* fix inspector edit widget bug

* inspector edit fbx add resize observer
2021-04-27 09:54:53 +08:00
黄森斌 bd53bb1610 V3.1 optimise inspector edit asset (#8561)
* optimise inspector edit asset

* update internal-db meta file

* change mark
2021-04-26 22:22:16 +08:00
zhangxin c6db8bdb14 [editor] fix particle-system's inspector ui bug (#8559)
* fix particle-system

Using replacechildren function will causes event issues in the UI.
So replace it

* use while loop instead of for loop
2021-04-26 22:01:39 +08:00
zhangxin d9664f219f [Editor] fix widget inspector bug (#8562)
* vue use exports.methods ,Do not use dump.values

in order to debug,
vue use exports.methods .
 There is no dump.values now
so use the values of dump.value[key]

* update format
2021-04-26 21:59:51 +08:00
zheng han cd9c495552 fix light gizmo color (#8560) 2021-04-26 20:17:21 +08:00
zheng han 4eb07ef829 fix preview window bug (#8518)
Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-04-25 20:37:16 +08:00
jiaxin.lai 6b9778dafd refactor the splash screen to support automatic resizing (#8535)
* refactor splash screen

* update splash screen effect

* docs

* words

* flush commands before submit

* adapt for Android Vulkan

* fix logo width scale
2021-04-25 20:23:27 +08:00
黄森斌 4d26448753 optimise insepctor edit asset (#8544) 2021-04-25 16:18:19 +08:00
GengineJS d9a08ea128 [Feature] deferred rt adapter (#8542)
* [Feature] deferred rt adapter

* [Feature] change deferred quad calculation

* [Remove] Removed pipeline offscreen judgment
2021-04-25 16:17:50 +08:00
zhangxin 2221eee6ae Reuse the node according to the key (#8534)
Reuse the node according to the key
2021-04-23 21:54:16 +08:00
zhangxin d8ccc63a29 [Editor]Update particle's inspector and material's inspector (#8522)
* Update particle.js

add readonly of ui-prop

* Hide content when multiple material components are selected

* fix format and logic

* remove useless selector
2021-04-23 18:27:25 +08:00
zhangxin 7d3c4b4fc1 [Editor] fbx/preview's inspector choice first animation (#8520)
* choice first animation

use the clip info of the first animation whether or not the boardcast is received

* choice first animation

use the clip info of the first animation whether or not the boardcast is received

* Revert "Merge branch 'fixed-gltf-animation-inspector-bug' of https://github.com/chichinohaha/engine into fixed-gltf-animation-inspector-bug"

This reverts commit f4275bc52fb2d016698cffb59178d14b77fbfffd, reversing
changes made to 7a2a49493459e29019fbfb74221c2950ecc773f4.

* reuse the function of animation

add initial function to animation.js
    initAnimationNameToUUIDMap();
    initAnimationInfos();
preview will reuse the method from animation
   to get the info of first animationClip

* reuse animation.methods.getCurClipInfo
2021-04-23 18:08:23 +08:00
zhangxin 818482bcb9 fix edit-ruler bug (#8533)
now will dispatch change event when mouse up,
not mouse move
2021-04-23 17:21:03 +08:00
zhangxin f5efe292ea [Editor] fix widget's inspector bug (#8525)
* fix widget bug

1 use vue.min.js instead of  vue.js.
    - remove vue's tips.
2、 use an invisible <ui-prop> element to dispatch "change-dump"

* fix format
2021-04-23 17:04:58 +08:00
Yun Hsiao Wu f904d11935 fix fog header (#8521) 2021-04-22 16:16:08 +08:00
黄森斌 90da785348 V3.1 optimise inspector edit asset (#8513)
* optimise inspector edit fbx animation

* fix inspector render-texture edit bug

* optimise inspector edit asset

* inspector edit asset not use fs-extra

* optimise inspector asset preview
2021-04-22 10:25:54 +08:00
黄森斌 5cba31f3ec do some hack to edit inspector material (#8506)
(cherry picked from commit 4520560f1d1eddc1fcdec3a3b89044eb76afb325)
2021-04-20 19:45:25 +08:00
黄森斌 55e6be35ff V3.1 optimise some assets edit (#8505)
* disabled scene and prefab  asset editable

* fix inspector edit material  bug

* optimise material asset edit
2021-04-20 18:56:16 +08:00
zhangxin d21ee95173 Preview the animation in fbx's inspector (#8503)
* Preview the animation in fbx's inspector

* replaceChinese
2021-04-20 17:59:24 +08:00
Myway 621a039dc0 fix terrain lighting map shader compile error (#8497)
Co-authored-by: Myway3D1 <404793124@qq.com>
2021-04-20 15:39:33 +08:00
jiaxin.lai afdf5985b0 add USE_PHYSICS_PHYSX to render-config (#8496) 2021-04-20 14:31:06 +08:00
黄森斌 ec76218be2 V3.1 optimise inspector edit asset and node (#8492)
* inspector, adjust material preview

* optimise inspector edit
2021-04-20 11:25:36 +08:00
jiaxin.lai 28d62c8393 native physx (#8455)
* Stash

* add plane/capsule shape

* add syncTo/FromNativeTransform

* support trigger/collision events

* set rigid body property on enable

* group distinguish between serialized  and lowlevel

* support trimesh-shape/mass-center

* fix cone/cylinder direction

* support cylinder/cone shape

* tweaks of pmtl

* fix setMesh

* support terrain

* support raycast

* support revolute joint

* support distance joint

* tweaks

* add some API docs

* tweaks

* optimize book and unBook

* tweaks

* tweaks
2021-04-19 20:21:29 +08:00
GengineJS 8b89c3fef2 [Feature] Rt adaptation (#8483)
* [Feature] Rt adaptation

* [Feature] Effect adds CC_HANDLE_GET_CLIP_FLIP function

* update effect

* update effects
2021-04-19 20:05:48 +08:00
troublemaker52025 0649241938 Add packing && linear depth && self-shadowing && normal bias option for v3.1 (#8397) 2021-04-19 16:56:39 +08:00