minggo
041729dc30
fix misusage of SelectObject and DeleteObject ( #1766 )
...
* fix misusage of SelectObject and DeleteObject
* revert coordination convertion
* add comment back
2019-07-05 15:35:20 +08:00
Cocos Robot
25b7911e92
Sync branch v2.3.0 to develop
2019-07-05 14:44:31 +08:00
Cocos Robot
22bd625ce0
Sync branch v2.1.3 to v2.2.0
2019-07-05 14:43:48 +08:00
caryliu
c93c0d87a7
delete mesh binding
2019-07-05 14:26:49 +08:00
caryliu
b69aab18cd
Fix allert crash when texture is null
2019-07-05 11:28:02 +08:00
owen
c96f164786
Simple Sprite Multiply Thread
2019-07-04 19:57:23 +08:00
caryliu
25aa11d458
delete code
2019-07-04 18:09:38 +08:00
caryliu
934a3a1ba0
Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-youyou-mesh
...
# Conflicts:
# cocos/scripting/js-bindings/manual/jsb_conversions.cpp
2019-07-04 17:06:03 +08:00
caryliu
0fd739e216
Fix the processing error of Property in jsb-bindings.
2019-07-03 18:37:04 +08:00
owen
7d138409f5
Update binding file
2019-07-03 11:21:42 +08:00
caryliu
11dfa785b8
Support mesh renderer
2019-07-03 09:50:17 +08:00
owen
930b14b174
default project
2019-07-02 20:17:20 +08:00
owen
683a811851
Merge commit 'aeda325f76663ad4c1e4d8087109b1897413ac23' into v2.3.0-fix-template-issue
2019-07-02 16:31:11 +08:00
owen
ed12e82812
Fix android compile
2019-07-02 16:28:18 +08:00
minggo
875acde984
native returns unpremultiplied data ( #1765 )
...
* unpremultiply alpha on ios/mac
* unpremultiply alpha on Android and windows
2019-07-02 15:00:15 +08:00
owen
ff1158d0a4
Fix InputAssembler not clear bug
2019-07-02 14:40:41 +08:00
Jare Guo
9eb2af918f
improve convert draw y point calculate for 2d-tasks/issues/1378 ( #1739 ) ( #1764 )
...
* improve convert draw y point calculate for 2d-tasks/issues/1378
* update comment
* improve convert draw y point calculate for android
* improve convert draw y point calculate for win32
2019-07-01 15:11:44 +08:00
owen
987066e0b4
native post render flag
2019-07-01 14:39:41 +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
owen
036b2fd81a
Optimize assembler enable disable logic
2019-07-01 11:22:15 +08:00
cary
ef58614dfd
Merge branch 'v2.3.0' into v2.3.0-forward-renderer
2019-07-01 11:05:46 +08:00
caryliu
74bc2caffc
Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-forward-renderer
...
# Conflicts:
# cocos/renderer/scene/ModelBatcher.cpp
# cocos/renderer/scene/ModelBatcher.hpp
# tools/tojs/renderer.ini
2019-06-29 14:39:57 +08:00
caryliu
45e223775d
modify by comments
2019-06-28 10:40:47 +08:00
caryliu
97a2bb2cfa
modify return value
2019-06-28 09:43:56 +08:00
caryliu
b7c55d0617
optimize recycle float array.
2019-06-28 00:29:29 +08:00
owen
dad9b052ce
refine code
2019-06-27 20:43:57 +08:00
caryliu
dd8a8246b7
Optimize the code by PR comments.
2019-06-27 18:15:41 +08:00
owen
eec0bace41
修复透明度bug
2019-06-27 16:20:33 +08:00
owen
2c1b1482c6
Native optimize
2019-06-26 18:59:49 +08:00
2youyouo2
2bd5935110
add effect.copy bindings
2019-06-26 17:21:20 +08:00
caryliu
fef37c1a58
Synchronize forward-renderer.
2019-06-26 16:34:51 +08:00
caryliu
54d177aff8
Fix default blend factor.
2019-06-25 10:54:21 +08:00
owen
a7f5d9c150
Native optimize
2019-06-24 16:47:13 +08:00
owen
9c29059a62
no message
2019-06-24 13:55:35 +08:00
owen
0cfb84d88d
Native optimize
2019-06-24 10:48:18 +08:00
owen
d9a9ec10b7
Native optimize
2019-06-23 23:14:24 +08:00
owen
33db747c1a
Native optimize
2019-06-21 22:30:28 +08:00
owen
a463eb1eed
Fix 2.3 performance bug
2019-06-20 17:55:42 +08:00
owen
ff813753c8
Fix 2.3 performance bug
2019-06-20 17:41:09 +08:00
caryliu
e56bfbb084
Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-youyou-effect
...
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
2019-06-20 15:04:24 +08:00
owen
9fbb349dc4
Memory pool
2019-06-19 14:45:35 +08:00
owen
88c1b2162d
Merge commit '70666b528aca1bc1c2f38445be9f988b3ca58d31' into v2.3.0-fix-big-map-render-error
2019-06-18 19:21:40 +08:00
owen
8b6b84ec94
Memory pool
2019-06-18 18:53:52 +08:00
owen
86234f75b4
Memory pool
2019-06-18 18:53:42 +08:00
caryliu
c9548d8fa1
Modify the effect implementation of the native-renderer.
2019-06-17 12:14:33 +08:00
owen
d836929117
Assembler extend
2019-06-12 10:41:49 +08:00
owen
49c491dba7
tile map bug
2019-06-10 20:15:37 +08:00
owen
cc0077e7fe
spine
2019-06-10 15:53:59 +08:00