Commit Graph

779 Commits

Author SHA1 Message Date
coulsonwang b5749ac0fa manual bind GFXSubPass (#2141)
* manual bind GFXSubPass

* update review

* update bindings-generator

* fix namespace
2020-02-18 14:10:43 +08:00
Arnold defe8b5c95 update submodule (#2135) 2020-02-17 12:11:19 +08:00
coulsonwang 1478da7a42 add gfx structure to gfx.ini (#2133) 2020-02-17 11:09:02 +08:00
Arnold 3df9e582b7 export structure & support reference (#2120)
* regenerate

* revert change

* update submodle
2020-02-14 11:51:00 +08:00
minggo 445a2c883e fix compiling error (#2113)
id is a keyword in objective-c
2020-02-11 14:48:20 +08:00
coulsonwang 61b2267478 [GFX] fix gfx naming (#2105)
* rename Initialize to initialize

* rename Resize to resize

* rename Update to update

* rename device_ to _device

* rename title_ to _title

* rename GFXWindow members naming

* name width & height

* name width & height

* rename native width & height

* rename format

* rename some class members

* rename GFXWindow some members

* rename GFXWindow function name and add skip functions

* fix GFXContext naming

* fix GFXBindingLayout renaming

* fix GFXBuffer renaming

* fix GFXCommandBuffer renaming

* fix GFXFramebuffer renaming

* fix GFXInputAssembler renaming

* fix GFXPipelineLayout renaming

* fix GFXPipelineState renaming

* fix GFXRenderPass renaming

* fix GFXSampler renaming

* fix GFXShader renaming

* fix GFXTexture renaming

* fix GFXTextureView renaming

* add skip
2020-02-10 11:28:26 +08:00
coulsonwang 12d202333c fix GFX naming issue (#2098)
* fix GFX naming issue

* use const reference for string

* fix

* fix GFXDevice naming

* fix GFXCommandAllocator naming

* fix GFXCommandPool naming

* apply GFXCommandPool naming

* fix MTLDevice naming

* fix MTLCommandAllocator naming

* add skip

* fix compile issue
2020-01-20 17:50:40 +08:00
minggo 1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
minggo c3d8ea6242 Gfx binding (#2096)
* add sdkwrappter back

* add gfx binding codes back

* revert some debug code

* revert some debug code
2020-01-19 14:30:57 +08:00
minggo 2448fc74b2 refactor iOS codes (#2075) 2020-01-13 15:29:27 +08:00
minggo 1f0019b76c ios integrate gfx (#2072) 2020-01-13 09:57:50 +08:00
Yun Hsiao Wu 2531a1bd9a gfx-gles2 js binding (#2066) 2020-01-10 09:18:48 +08:00
pandamicro 4d75340e30 Import 3d gfx and generate auto bindings 2019-10-29 14:10:11 +08:00
吴智明 74f9db7ec0 update sub module cocos2d-console to latest version (#1883) 2019-10-15 16:12:14 +08:00
PP 0ab1197c27 refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"

This reverts commit 7a24ee3377.

* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
cary 70a2134fb4 Fix the display error of the 3D node in the native platform. (#1868)
* Fix the display error of the 3D node in the native platform.

* Modify the matrix calculation of 3D nodes.
2019-10-12 11:29:48 +08:00
cary 887eec1f4d Modify the 3D sprite to use AssemblerSprite. (#1861) 2019-09-30 09:56:45 +08:00
owen 0cd71aefb9 V2.2.0 native Spine and DragonBones cache mode (#1844)
* Spine cache

* fix dragonbones yDown bug

* Spine cache mode and fix dragonBones yDown bug

* spine cache mode

* dragonbones cache mode

* dragonbones cache mode

* dragonbones cache mode

* spine dragonbones binding

* dragonbones cache mode

* spine dragonbones binding

* optimize dragonbones event

* update dragonbones binding

* dragonbones remove cache

* dragonbones cache mode

* update dragonbones binding

* dragonbones cache mode

* Fix some cache bug

* fix some cache mode bug

* optimize cache mode

* Fix update list order bug

* Fix indent issue

* revert bindings-generator

* Fix intent issue
2019-09-23 10:19:13 +08:00
Arnold 7a24ee3377 Pause music when app enter background (#1849)
invoke AudioEngine::pauseAll when app enter background
2019-09-18 13:52:28 +08:00
cary 34159f3c30 Fix bugs of the model orientation on the native platform. (#1836)
* Fix bugs of the model orientation on the native platform.

* Add camera api export.

* add android change

* modify liensence
2019-09-16 15:02:37 +08:00
Arnold 5dddbcf4d0 fix travis push failed (#1834)
* add scripts

* --no-recurse-submodules
2019-09-05 15:58:30 +08:00
Jare Guo dcf8ca4199 Merge remote-tracking branch 'fireball/v2.1.3' into v2.2.0-release
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
2019-09-04 13:44:23 +08:00
owen 2c31d09fa5 Fix 213 spine auto file generate error (#1828) 2019-09-04 11:11:27 +08:00
Arnold 1914ef6d17 update binding generator (#1819) 2019-08-30 18:42:51 +08:00
Arnold e29a43baff fix travis (#1818) 2019-08-30 18:07:24 +08:00
Arnold 079a0587d6 fix travis (#1810)
* add liclang libraries & update script

* update submodule bindings-generator
2019-08-29 10:52:37 +08:00
Cocos Robot 99bec00fd5 Sync branch v2.2.0 to develop 2019-08-02 18:17:55 +08:00
2youyouo2 1bfcda6c19 update jsbinding 2019-07-26 16:40:46 +08:00
cary 88dd29cbb4 fix shadow error of 3d-model. (#1777)
* fix shadow error of 3d-model.

* add node judgement
2019-07-24 15:26:12 +08:00
caryliu d623ac7e65 fix program error on mac 2019-07-17 18:57:49 +08:00
owen d36d15a101 Fix spine texture index missing bug 2019-07-16 15:31:56 +08:00
minggo 0df822e1f8 update submodule to latest (#1771) 2019-07-12 15:22:30 +08:00
Cocos Robot ce8a94eb8d Sync branch v2.3.0 to develop 2019-07-12 13:47:53 +08:00
minggo 53de07c319 update submodule to latest (#1771) 2019-07-12 10:13:47 +08:00
owen 6f0333ffd7 Add se object ptr conversion (#1769) 2019-07-10 14:17:31 +08:00
owen d0e192c1b8 Add se object ptr conversion 2019-07-10 12:11:27 +08:00
yinkaile b0fa215a00 Merge pull request #23 from 2youyou2/v2.3.0-submodule
update bindings-generator
2019-07-10 11:28:54 +08:00
2youyouo2 8e4a5f32fd update bindings-generator 2019-07-10 11:25:46 +08:00
caryliu 6c96b973b5 Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-mesh-fix
# Conflicts:
#	cocos/renderer/renderer/Model.cpp
#	cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp
#	tools/tojs/renderer.ini
2019-07-09 10:47:04 +08:00
owen e64a491b31 remove multiply thread calc sprite 2019-07-08 20:48:03 +08:00
caryliu 34cb81ca5b Fix the error of dynamic material scane. 2019-07-08 20:04:40 +08:00
owen 963f6f6aaa Merge commit '955cfbf69eba92a444455e280b8b50a17b1ab250' into v2.3.0-all-platform
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	tools/tojs/renderer.ini
2019-07-08 13:56:44 +08:00
owen ce9b88983e Fix Multiply Threads bug 2019-07-08 13:53:37 +08:00
caryliu 3a114d4d12 delete mesh assembler 2019-07-05 16:01:37 +08:00
caryliu c93c0d87a7 delete mesh binding 2019-07-05 14:26:49 +08:00
owen c96f164786 Simple Sprite Multiply Thread 2019-07-04 19:57:23 +08:00
caryliu 11dfa785b8 Support mesh renderer 2019-07-03 09:50:17 +08:00
owen a21314dd86 roll back 2019-07-01 14:08:36 +08:00
owen 60fb8ab0bb Optimize assembler enable disable logic 2019-07-01 13:58:55 +08:00
owen b9334e5f57 Merge commit '9e9541917cab4ecfdd29b54120995931ab04c3ed' into v2.3.0-fix-render-bug4
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	tools/tojs/renderer.ini
2019-07-01 11:30:09 +08:00