Commit Graph

17466 Commits

Author SHA1 Message Date
jiaxin.lai d6d2910b91 deprecated optimize (#6339)
* add costom suggest to deprecated

* tweaks

* format
2020-03-17 16:46:51 +08:00
Yun Hsiao Wu a2379c8ce5 fix profiler region (#6350) 2020-03-17 16:43:48 +08:00
Leslie Leigh (李的序) 58b998f3f8 Refactor cross-fade implementation (#6326)
* Cross fade

* Bug fix

* Fix CI

* Update 1

* Update 2

* Update 3

* Rename BlendState -> BlendStateBuffer
2020-03-17 16:33:39 +08:00
Leslie Leigh (李的序) e23ddb23f1 Provide .d.ts file for illustration of DebugInfos.json (#6340) 2020-03-17 16:20:42 +08:00
Myway d049b259f2 Lightmap and LightComponent refine (#6342)
* 增加修改lightmap接口

* light-component增加bake参数

* 修改LightBakeType名字
2020-03-17 16:19:45 +08:00
coulsonwang 45ebc21ee8 add getWindow to fetch NSWindow on mac 2020-03-17 14:42:41 +08:00
coulsonwang 11371063df fix windowHander nullptr issue on mac 2020-03-17 14:10:24 +08:00
CocosRobot fd76a6999a [ci skip][AUTO]: updating jsbinding automatically (#2281) 2020-03-17 11:36:08 +08:00
coulsonwang bef04c6fc3 fix device pixel ratio (#2269)
* set device pixel ratio

* fix

* fix devicePixelRatio

* update review

* fix dpr

* remove unneeded code

* remove unneeed code

* fix

* remove getScrenScale
2020-03-17 11:29:48 +08:00
coulsonwang 89cab4c3bc Retina issue (#6276)
* update pixel ratio in native

* fix dpr issue

* reset camera attribute

* update reivew

* fix dpr issue

* update review

* fix

* fix

* fix text format

* fix CI compile fail

Co-authored-by: Jone <350791117@qq.com>
2020-03-17 09:51:57 +08:00
CocosRobot ef690a483b [AUTO][ci skip]: updating cocos2dx_files.json (#2277) 2020-03-16 14:34:21 +08:00
minggo 925a0a2d32 add GFXObject (#2276) 2020-03-16 14:26:55 +08:00
Leslie Leigh (李的序) 808ca091ab Small fixes (#6272) 2020-03-16 11:58:04 +08:00
Myway a33c516c89 增加修改lightmap接口 (#6330) 2020-03-15 20:23:15 +08:00
coulsonwang c2fe40dda2 fix device pixel ratio (#6320)
* fix device pixel ratio

* fix device pixel ratio
2020-03-15 20:16:15 +08:00
jiaxin.lai e517b38f1f en api docs for primitives (#6306)
* fix onLoaded of cc.Primitive

* en api docs for primitives

* fix
2020-03-15 20:14:03 +08:00
jiaxin.lai a4af34630f integrate trimesh shape of ammo & cannon (#6232)
* stash

* cannon impl

* ammo mesh collider

* finish ammo mesh collider

* cannon trimesh shape

* tweaks

* tweaks

* tweaks

* update @cocos/ammo &  @cocos/cannon

* fix ci

* naming norm

* use config object

* renaming

* naming norm

* naming norm

* tweaks

* stash

* stash

* stash

* add error map

* export impl

* update package-lock

* export impl of world

* tweaks
2020-03-15 19:41:16 +08:00
minggo 6ac071b6a5 convert to RGBA8 (#2274) 2020-03-13 17:40:20 +08:00
CocosRobot 00856bb2f6 [ci skip][AUTO]: updating jsbinding automatically (#2273) 2020-03-13 10:50:17 +08:00
minggo 57b11c32c3 remove auto bind property InputAssembler::vertexBuffers (#2272) 2020-03-13 10:30:29 +08:00
CocosRobot e0a89213dd [ci skip][AUTO]: updating jsbinding automatically (#2271) 2020-03-13 10:16:31 +08:00
Arnold eebc0bf051 [bugfix] use after free & fix travis (#2268)
* fix use after free

* fix travis

* fix log
2020-03-13 09:35:16 +08:00
Yun Hsiao Wu a07ddb4bb1 Frame ID should be synced regardless of dirty flag (#6321) 2020-03-12 19:17:15 +08:00
Leslie Leigh (李的序) 284e2102e2 Vertex index channel (#6318)
* Vertex index channel

* Typo

* Typo
2020-03-12 17:01:04 +08:00
Yun Hsiao Wu 45d182308b GPU instancing support (#6300)
* instancing works

* misc opts

* material.setproperty typing

* baked skinning model instancing works

* fix isNormalized

* custom chunk rules injection framework

* profiler instance count

* seperate custom joint textures

* fix joint mapped buffers

* WebGL 1 doesn't allow int attributes

* should rebuild instances after pso change

* set instance attribute

* constants naming
2020-03-12 10:21:19 +08:00
minggo 60bcebefd6 Manual bind gfx input assember functions (#2267)
* add missing function

* manual binding some functions
2020-03-11 18:24:56 +08:00
ChiaNing e120dfaa45 spriteframe uv change (#6262)
* spriteframe uv change

* fix uv bug in ios-wechat
2020-03-11 16:36:01 +08:00
jiaxin.lai c889dee142 geometry en api (#6283) 2020-03-11 16:08:49 +08:00
jiaxin.lai 905716cecd add hit normal to ray result (#6258)
* add hit normal to ray result

* tweaks
2020-03-11 15:59:33 +08:00
jiaxin.lai 50d6264086 fix reset of array collision matrix (#6299)
* fix reset of array collision matrix

* reuse array
2020-03-11 14:31:42 +08:00
Leslie Leigh (李的序) 284aa38d25 Build time constants (#6256)
* consts

* Bump @cocos/build-engine version

* Fix

* Upload @cocos/build-engine

* Rm scripts/build-engine/.gitignore
2020-03-11 14:05:22 +08:00
minggo b879561220 fix typo (#2266) 2020-03-11 10:21:45 +08:00
minggo a2615f9745 use v8 for all platforms (#2265) 2020-03-11 09:54:04 +08:00
coulsonwang 5dcf10c53d fix texture mipmap width and height (#2260)
* fix texture mipmap width and height

* fix
2020-03-10 15:53:03 +08:00
minggo d694a4297a fix gles3 viewport setting (#2263) 2020-03-10 15:50:05 +08:00
minggo 90a50812f5 fix wrong logic of setting viewport (#2259) 2020-03-10 13:58:49 +08:00
Yun Hsiao Wu 2d431f7ec4 SubModel level joint data (#6260)
* submodel joints data

* map VB joint indices on demand

* fix joint mapping

* fix shadows

* minor
2020-03-09 21:45:37 +08:00
minggo 292b87d4f7 Ios adapt (#2257)
* use correct OpenGL ES SDK

* make sure View is created
2020-03-09 17:39:00 +08:00
CocosRobot af9b6192b1 [ci skip][AUTO]: updating jsbinding automatically (#2254) 2020-03-09 12:13:31 +08:00
minggo 80bc6f3928 update binding generator to fix typo (#2253) 2020-03-09 12:08:47 +08:00
CocosRobot 117f2b80e3 [ci skip][AUTO]: updating jsbinding automatically (#2252) 2020-03-09 11:57:18 +08:00
minggo b220ff2c5a Window handler type (#2251)
* change window handler type to uintptr_t

* convert uintptr_t to JS
2020-03-09 11:51:46 +08:00
minggo f88dc441c9 use uintptr_t for window handler (#2249) 2020-03-09 11:32:25 +08:00
minggo fa511447e3 Android issue (#2247)
* change window handler to uintptr_t

* fix compiling error
2020-03-09 11:21:07 +08:00
coulsonwang 4e3270eb9e fix gfx jsb binding (#2246) 2020-03-09 10:28:20 +08:00
pandamicro 3329c133b8 Native GFX engine adaptation (#6267)
* Remove profiler in jsb

* GFX JSB initialization

* Report error when root initialization failed

* Fix define inconsistance with native
2020-03-06 23:15:46 +08:00
cary e4789f44f0 Fix a problem of Burst for 3d particle. (#6269) (#6270) 2020-03-06 22:15:28 +08:00
pandamicro b8d0b2d921 Merge pull request #6298 from cocos-creator/3d-v1.0.4
Merge 3d v1.0.4
2020-03-06 22:08:17 +08:00
Arnold e3edc8fabc reduce warning (#2245) 2020-03-06 15:43:04 +08:00
CocosRobot 7056fbf641 [ci skip][AUTO]: updating jsbinding automatically (#2244) 2020-03-06 15:12:21 +08:00