Commit Graph

17466 Commits

Author SHA1 Message Date
coulsonwang 22c95720cf revert -DANDROID_PLATFORM (#2447)
* revert -DANDROID_PLATFORM

* update external version
2020-05-14 15:10:40 +08:00
coulsonwang dd97ee7e4b use static build for CoreDef (#2449) 2020-05-14 15:10:21 +08:00
coulsonwang 6709d2894c add error log for texture and texture view (#2432)
* add error log for texture and texture view

* add error log for VkTextureView
2020-05-14 15:08:56 +08:00
江战 c2439db94e add v8 bytecode support (#2434)
* add bytecode

* update order & add comments

* Update cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp
2020-05-14 15:08:26 +08:00
coulsonwang 39311c0cfc fix metal compile issue (#2429) 2020-05-12 11:28:55 +08:00
CocosRobot 7e2d182772 [AUTO][ci skip]: updating cocos2dx_files.json (#2437)
* [ci skip][AUTO]: updating jsbinding automatically

* [AUTO][ci skip]: updating cocos2dx_files.json
2020-05-12 11:19:52 +08:00
coulsonwang e97662e27c uncomment device motion (#2431) 2020-05-12 11:11:33 +08:00
Yun Hsiao Wu 9f9f8056bf effect: shader stages (#2427)
* vk: descriptor sets

* vk: explicit device.begin

resize now works

* vk: texture & sampler

* effect: shader stages

* vk: fence pool

* vk: cmd buffer reuse
2020-05-12 11:11:05 +08:00
GengineJS 257a500cbb [Feature] Added global fog (#6675) 2020-05-11 21:18:06 +08:00
JoneLau 7e21a88b37 fixed misspellings (#6658) 2020-05-11 17:32:40 +08:00
Leslie Leigh (李的序) 759bdbac51 Optimize non-morph plain ModelComponent (#6620)
* Optimize non-morph plain ModelComponent

* Do optimize also when every sub mesh morph is null
2020-05-11 17:22:30 +08:00
jiaxin.lai 718eeff2bc fix trigger sync of node chian (#6665)
* fix trigger sync of node chian

* docs
2020-05-11 17:20:54 +08:00
ChiaNing e6b0c0a738 ui-transform isHit bug fix (#6670) 2020-05-11 17:11:10 +08:00
ChiaNing 86cb960edc components help document url update (#6669) 2020-05-11 17:09:14 +08:00
cary 2776cad230 Add normalization processing in shell mode of particle. (#6599) 2020-05-11 16:02:35 +08:00
Leslie Leigh (李的序) 8738be2de3 Optimize an edge case in cross fade (#6581)
* Optimize an edge case

* Let's be careful
2020-05-11 16:00:16 +08:00
Yun Hsiao Wu 91b6178c80 fix socket animation in real-time mode (#6671) 2020-05-11 15:56:32 +08:00
coulsonwang 2a65ceef86 fix ci compile issue (#2433)
* fix CI compil issue

* fix CI compile issue

* fix ANDROID_PLATFORM

* fix macors
2020-05-11 15:15:02 +08:00
coulsonwang 08f42dd016 set bindings for msl (#2430) 2020-05-11 15:12:36 +08:00
ChiaNing 22c13ad2fd math lib api translate (#6495)
* en api for math

* update

* update

* update

* fix

* fix

* update

* param update
2020-05-09 12:47:29 +08:00
pandamicro a0bd2dfbed Merge pull request #6657 from cocos-creator/3d-v1.1
Merge 3d v1.1
2020-05-08 18:29:12 +08:00
Yun Hsiao Wu a4ab634aff effect: shader stages (#6652)
* effect: shader stages

* update effect
2020-05-08 13:59:14 +08:00
ChiaNing 9cf4b50f41 ui-stencil bug fix (#6635) 2020-05-07 15:32:42 +08:00
Yun Hsiao Wu e39395b88c firefox bug workaround (#6651) 2020-05-07 15:16:46 +08:00
coulsonwang b0f1f3dffd remove shaderc, use glslang and spriv-cross instead (#2418)
* remove shaderc, use glslang and spriv-cross instead

* add log info
2020-05-07 11:31:40 +08:00
Yun Hsiao Wu 944f9c7d81 fix batched skinning model init (#6649) 2020-05-06 18:42:26 +08:00
CocosRobot ec60f210da [AUTO][ci skip]: updating cocos2dx_files.json (#2423)
* [ci skip][AUTO]: updating jsbinding automatically

* [AUTO][ci skip]: updating cocos2dx_files.json
2020-05-06 11:52:25 +08:00
CocosRobot 3d96fc880b [ci skip][AUTO]: updating jsbinding automatically (#2422) 2020-05-06 11:47:21 +08:00
Yun Hsiao Wu e5deaed8d9 GFX Vulkan backend (#2414)
* vk: init directories

* vk: context creation

* vk: swapchain draft

* vk: move swapchain to window

* vk: acquire - submit - present

* vk: begin/end render pass

* vk: clear op works!

* vk: validation errors cleared

* vk: first triangle!

...no uniform buffers though

* vk: update msvc project
2020-05-06 11:42:15 +08:00
pandamicro dead9b2f9a Merge pull request #6629 from pandamicro/3d-gfx
Merge v1.1
2020-04-28 18:40:11 +08:00
pandamicro 6338ed6211 Fix ci 2020-04-28 18:37:24 +08:00
pandamicro 80666c0331 Fix merge issue 2020-04-28 18:36:28 +08:00
pandamicro 0ca1546c10 Fix issues 2020-04-28 18:11:26 +08:00
pandamicro e849b7f3c6 Merge remote-tracking branch 'origin/3d-v1.1' into 3d-gfx
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/math/mat4.ts
#	cocos/core/renderer/scene/camera.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/core/splash-screen.ts
2020-04-28 17:06:07 +08:00
Leslie Leigh (李的序) c9462d94a5 Typo (#6621) 2020-04-28 14:48:48 +08:00
Leslie Leigh (李的序) db885e32d1 Warn if morph target count is overflow (#6622) 2020-04-28 14:48:01 +08:00
jiaxin.lai 1e876bcd2a fix spell for physics module (#6624) 2020-04-28 14:37:12 +08:00
ChiaNing 20346a8d1e API hidden (#6626) 2020-04-28 14:30:21 +08:00
江战 880422ad28 [bugfix] crash during global object destructuring / 3d-gfx (#2411)
* fix crash

* fix order
2020-04-28 12:03:51 +08:00
Yun Hsiao Wu f534c9d516 fix typo (#6625) 2020-04-27 18:49:23 +08:00
CocosRobot 7c4d3de63c [AUTO][ci skip]: updating cocos2dx_files.json (#2412) 2020-04-27 18:34:17 +08:00
minggo 96cbe1e971 Android adapt (#2410)
* simplify get obb file path

* not get package name throung jni

* not get sdk version from android

* remove unneeded codes

* remove convertEncoding

* remove unneeded codes'

* remove unneeded codes

* simpify codes

* simplify codes

* remove unneeded codes
2020-04-27 17:14:06 +08:00
coulsonwang d69858f020 update metal stencil descriptor (#2408) 2020-04-27 17:13:13 +08:00
coulsonwang 90dc449626 Fix metal texture (#2386)
* fix update metal texture

* fix resize metal texture

* update review

* use toMTLTextureType

* add gfx status
2020-04-27 11:37:15 +08:00
coulsonwang 9f6ec3c58d add copyBufferToTexture and updateBuffer (#2384)
* add copyBufferToTexture and updateBuffer

* use usage and flag to update buffer

* revert TRANSFER_SRC and TRANSFER_DST  modify

* fix indirects

# Conflicts:
#	cocos/renderer/gfx-metal/MTLBuffer.mm

* reset buffer when malloc failed

* revert commit#a6544ec

* update review
2020-04-27 09:53:39 +08:00
coulsonwang b78d9bf8ac set features according to Metal feature set table (#2383)
* set features according to Metal feature set table

* remove duplicate code

* add metal feature set for iOS

* update reivew

* use String instead of const char*
2020-04-27 09:51:55 +08:00
Yun Hsiao Wu 16faa76fcf fix depth texture view format (#2404)
* windows build gles2 too by default

* fix depth texture view format

* fix ci
2020-04-26 17:25:42 +08:00
zhangyiwenzyw fdf26192db move EditorCameraComponent to editor project (#6619) 2020-04-26 13:45:43 +08:00
江战 7c140824f0 [bugfix] win32/macosx add sourcemap / 3d-gfx (#2403)
* add sourcemap

* fix platform macro
2020-04-26 09:59:15 +08:00
coulsonwang 0b54a4bd14 adjust attribute order to match vertex buffer layout (#6589) 2020-04-24 18:27:49 +08:00