coulsonwang
9ee9917047
fix Physics3DDebugDrawer ( #20160 )
...
Since drawing type is ARRAY, should use instead.
2019-09-24 14:28:44 +08:00
coulsonwang
03a4ddf764
fix warning ( #20146 )
...
* fix warning
fix warning
* remove integer type constructor for Vec2
2019-09-24 11:31:35 +08:00
minggo
b3dba7b93e
Merge pull request #20131 from Mee-gu/checkMemoryLeak
...
fix memory leak on metal app
2019-09-20 14:37:02 +08:00
minggo
965ea379a7
Merge pull request #20139 from Mee-gu/fixWarning
...
fix warning
2019-09-20 14:36:36 +08:00
coulsonwang
0dbe3419d2
fix warning
...
fix warning
2019-09-20 11:20:07 +08:00
coulsonwang
fb39795d27
fix warning
2019-09-19 18:43:31 +08:00
coulsonwang
e9a33903f0
fix memory leak for metal app
2019-09-19 15:31:05 +08:00
coulsonwang
c17417f3cb
set the right position of uniform location
2019-09-17 17:15:16 +08:00
coulsonwang
dc910efee7
fix uniformLocation
2019-09-17 15:09:44 +08:00
minggo
f3b09563f8
Mac label v4 ( #20125 )
...
* fix system font issue on macOS Catalina
2019-09-17 13:35:19 +08:00
minggo
9df47ef6fd
use WKWebview instead ( #20103 )
...
UIWebView is removed in iOS 13.
2019-09-06 09:57:38 +08:00
Arnold
eed319938d
[lua tests] MaterialSystemTest update u_Time uniform ( #20083 )
2019-09-05 15:56:39 +08:00
coulsonwang
816289ccf5
fix clipping node issue ( #20100 )
...
Children are not correctly clipped.
2019-09-05 09:17:43 +08:00
minggo
d1abfd8aa2
use AVPlayerController instead ( #20099 )
2019-09-04 20:45:51 +08:00
coulsonwang
5ab04a7001
set default color attachment format ( #20073 )
2019-09-04 10:07:31 +08:00
Arnold
55f6f6d6e7
[bugfix] Fileutils iOS isDirectory ( #20079 )
2019-09-04 10:03:38 +08:00
coulsonwang
4d04b64a3a
add specific define for metal ( #20084 )
2019-09-04 09:58:40 +08:00
coulsonwang
f97717265b
fix shader header defines ( #20077 )
2019-09-04 09:56:28 +08:00
coulsonwang
48e0d7d3a6
resize metal drawable ( #20074 )
2019-08-31 20:10:32 +08:00
coulsonwang
73ad115702
fix FastTMXLayer ( #20065 )
2019-08-29 22:30:03 +08:00
coulsonwang
66c4892b22
fix attribute location ( #20064 )
2019-08-29 18:15:03 +08:00
coulsonwang
de3f252794
generate project for cocos2d ( #20056 )
2019-08-26 10:01:50 +08:00
minggo
50df439e87
update changelog and version ( #20053 )
2019-08-21 10:45:45 +08:00
minggo
5e40f5e6a5
remove tiff ( #20047 )
2019-08-20 15:15:40 +08:00
coulsonwang
1e8f6d24ac
fix render pipeline ( #20041 )
2019-08-19 10:12:00 +08:00
John
3c08471bab
don't convert const char* to char* ( #20039 )
...
* C++ forbids conversion from const char* string to char*, so we change
function signature from char* to const char* in lua basic conversion
functions.
2019-08-16 15:29:49 +08:00
CocosRobot
a8d07022d6
[ci skip][AUTO]: updating luabinding & cocos_file.json automatically ( #20036 )
2019-08-15 17:01:11 +08:00
coulsonwang
c4e6ede197
move VertexLayout to ProgramState ( #20029 )
...
* move VertexLayout to ProgramState
* fix lua
2019-08-15 16:51:49 +08:00
minggo
8913c30fc0
fix compile warnings ( #20028 )
2019-08-13 18:19:32 +08:00
minggo
1444263612
remove app from recent apps when exit ( #19961 ) ( #20020 )
2019-08-13 17:31:29 +08:00
minggo
b606f2a79d
Fix divide by zero in ui::Slider ( #19957 ) ( #20019 )
...
* Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA.
Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public.
Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA.
Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file.
Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving.
* [CCImage-ios.mm] Fixed indentation.
* [UISlider.cpp] Divide by 0 error if _maxPercent is equal to 0, which is an allowed value.
2019-08-13 17:29:31 +08:00
minggo
ba2f9ac165
sync #19996 and #19972 : refactor DrawNode ( #20021 )
...
* sync #19996 and #19972 : refactor DrawNode
* fix compiling error
2019-08-13 17:28:53 +08:00
coulsonwang
935af58e1d
remove arrays of vertex layout ( #20023 )
2019-08-13 13:58:16 +08:00
coulsonwang
23732ab889
remove arrays of vertex buffer ( #20022 )
2019-08-13 09:46:20 +08:00
coulsonwang
3c693c7fd9
fix crash issue when egl context lost ( #20025 )
2019-08-13 09:45:39 +08:00
CocosRobot
28bc31aac6
[ci skip][AUTO]: updating luabinding & cocos_file.json automatically ( #20014 )
2019-08-06 14:14:59 +08:00
coulsonwang
320b9b4e67
Feature/sprite optimized ( #19998 )
...
Optimize sprite creation speed
2019-08-06 09:37:49 +08:00
sgosztyla
0be2a1e80a
Fixing memory leak. ( #19993 )
...
Library should be released after calling "newLibraryWithSource".
2019-07-30 15:51:38 +08:00
CocosRobot
b758f626eb
[ci skip][AUTO]: updating luabinding & cocos_file.json automatically ( #19991 )
2019-07-26 17:33:42 +08:00
rh101
e574e4984f
Added support for saving non-premultiplied alpha images from RenderTexture. ( #19990 )
2019-07-26 17:09:00 +08:00
CocosRobot
17ee8f0082
[ci skip][AUTO]: updating luabinding & cocos_file.json automatically ( #19987 )
2019-07-25 14:28:26 +08:00
coulsonwang
5dd5d084b6
fix glfw3.3 no respond issue. ( #19965 )
2019-07-23 17:40:37 +08:00
coulsonwang
e64f2af25b
fix header define for shader. ( #19934 )
2019-07-22 10:45:41 +08:00
minggo
0d121d7913
remove void in function declaration ( #19954 )
2019-07-22 09:38:46 +08:00
minggo
7a6c115b2f
fix ZipUtils memory-malloc succ check error. ( #19923 ) ( #19953 )
2019-07-22 09:38:28 +08:00
minggo
29ce64b123
Fix cocos2d-js issue: Font height was not getting calculated properly in iOS. ( #19926 ) ( #19952 )
2019-07-22 09:38:15 +08:00
minggo
c283d4b939
sync 19759: fix: FastTMXLayer does not reflect opacity and anchor point ( #19950 )
2019-07-22 09:38:01 +08:00
minggo
c8d13184f8
sync 19893: fix Wformat warnings ( #19949 )
2019-07-22 09:37:48 +08:00
minggo
b7a6b77789
fix memory leak in CCUserDefault ( #19853 ) ( #19947 )
...
fastSet makes the Data object managing a new memory area in
[bytes, bytes + size), but it doesn't releasing the old data
it managed. Failure to release the old data causes memory leak.
The default constructed Data manages null memory, so calling
fastSet on it is fine.
Because `Data ret = defaultValue;` malloc new memory, we might
have better performance without it.
2019-07-22 09:37:21 +08:00
minggo
3e6b1ffe92
refactor AudioEngine-Linux ( #19822 ) ( #19946 )
...
* refactor AudioEngine and AudioEngine-linux
* map::erase() can handle case if key doesn't exist.
* use map::iterator when it has already obtained.
* mapChannelInfo[id].channel is nullptr befor resume(). Don't
dereference it.
* FMOD::System::release() calls close, so calling close before release
is not necessary.
* use std::map::insert properly.
* remove unnecessary null check on _audioEngineImpl
* add comment on nullptr dereference
2019-07-22 09:37:07 +08:00
minggo
77a72052c8
sync 19811: android_allowBackup2 ( #19945 )
2019-07-22 09:36:51 +08:00
minggo
6e0c4872c5
refactor CCScene ( #19767 ) ( #19944 )
...
* refactor-CCScene
prefer in-class initialization
* in-class initialization of pointer to nullptr
2019-07-22 09:36:38 +08:00
minggo
7cea351cec
sync 19756: refactor CCBundle3DData ( #19942 )
2019-07-22 09:36:24 +08:00
minggo
b3424a535f
[Change] the CC_64BITS macro to 64-bit decision. ( #19723 ) ( #19941 )
2019-07-22 09:36:10 +08:00
minggo
0427381e06
sync 19722: fix assign nullptr to std::string ( #19940 )
2019-07-22 09:35:57 +08:00
minggo
a4fb692f36
fix for #19713 ( #19714 ) ( #19939 )
...
#19713
2019-07-22 09:35:44 +08:00
minggo
956fd85401
sync 19661: Clear the scene stack in the expected order ( #19935 )
2019-07-19 16:53:20 +08:00
minggo
838c285696
sync 19655 ( #19932 )
2019-07-19 13:45:08 +08:00
minggo
e47d6b664f
sync 19649 and fix conflict ( #19931 )
2019-07-19 13:43:20 +08:00
minggo
ad54a24cf0
sync 19634 and fix conflict ( #19930 )
2019-07-19 11:57:11 +08:00
minggo
e93d4cb1d6
fix outdated documentation [ci skip] ( #19618 ) ( #19929 )
2019-07-19 10:19:13 +08:00
coulsonwang
7b7cf55efb
remove vertex step mode ( #19921 )
2019-07-17 13:59:37 +08:00
coulsonwang
cb07f599f8
add api comments ( #19922 )
2019-07-17 09:26:15 +08:00
coulsonwang
03ea495fd6
add API comments ( #19919 )
2019-07-16 10:01:23 +08:00
coulsonwang
f0f9cf612c
add api comments ( #19916 )
2019-07-15 09:28:38 +08:00
coulsonwang
de8cf4c45b
set default frameBufferOnly to false for ios ( #19915 )
2019-07-15 09:28:18 +08:00
coulsonwang
b96c467318
fix stencil issue ( #19910 )
2019-07-10 09:56:55 +08:00
coulsonwang
77b1535a9d
add api document ( #19909 )
2019-07-09 09:43:45 +08:00
coulsonwang
a92ab26096
remove unUsed member ( #19906 )
2019-07-05 10:11:12 +08:00
coulsonwang
f72dbd28d0
add copyright ( #19903 )
2019-07-04 17:47:24 +08:00
minggo
67d43ca591
Update CMakeLists.txt
2019-07-04 09:48:45 +08:00
Arnold
097a4a74dc
[Lua] Export ccexp.AudioEngine on linux ( #19898 )
...
* export ccexp.AudioEngine on linux
* revert auto bindings
* gen bindings
2019-07-03 18:57:18 +08:00
minggo
96534de260
fix warnings ( #19891 )
2019-07-03 10:43:10 +08:00
Arnold
888cd9b159
fix lua ( #19888 )
2019-07-02 09:29:20 +08:00
Arnold
2eb4625cbc
regenerate ( #19887 )
2019-07-01 13:51:02 +08:00
coulsonwang
7f96375871
Feature/fix tile map ( #19883 )
2019-06-30 11:36:52 +08:00
minggo
e0200eaa54
should unbind prebound attachments to avoid error on some android devcies ( #19875 )
2019-06-28 08:56:13 +08:00
coulsonwang
e8839cefbe
Feature/lua drawing node ( #19863 )
...
* fix DrawInRect in lua
* fix
* rename
2019-06-27 17:44:07 +08:00
Arnold
76edaa0993
[bugfix] fix TextureInfo copy constructor ( #19865 )
...
* fix copy
* fix compile error
* Update cocos/renderer/backend/ProgramState.cpp
2019-06-27 17:42:32 +08:00
Arnold
75ba0f91d1
add break statement ( #19867 )
2019-06-27 09:40:53 +08:00
coulsonwang
bbc6a88c51
optimize the uniform buffer ( #19845 )
...
* optimize the uniform buffer
* update review
2019-06-26 10:26:49 +08:00
Arnold
3620633fd8
[lua] remove simulator code from template project ( #19862 )
...
* update template'
* fix compile error
2019-06-25 18:14:50 +08:00
Arnold
abd7ffddc6
[lua] remove TODO in LuaBasicConversions.cpp ( #19848 )
...
* remove todos
* merge
2019-06-25 10:22:03 +08:00
Arnold
a0e114a07f
remove cc.SimpleAudioEngine ( #19859 )
2019-06-25 09:41:19 +08:00
coulsonwang
ab749c69ec
fix setBlendFunc ( #19858 )
2019-06-24 15:30:15 +08:00
coulsonwang
22e8a651d2
Feature/lua render texture test ( #19827 )
...
* fix render texture test in lua
* remove unnecessary code
* fix CI compile error
2019-06-18 22:45:14 -07:00
coulsonwang
1b6c3a7173
setFrameBufferOnly to false when necessary ( #19843 )
2019-06-18 18:05:22 -07:00
coulsonwang
2c5fc38297
add test case ( #19830 )
...
* add test case
* comment meaningless test case
2019-06-18 18:04:56 -07:00
coulsonwang
7a94e66a14
Feature/fix alpha test ( #19824 )
2019-06-18 00:25:26 -07:00
coulsonwang
7486fe89dc
fix flip issue ( #19831 )
...
* fix flip
* fix flip issue
2019-06-18 00:20:29 -07:00
Arnold
7851f212bf
Rename backend::Texture2D ( #19821 )
...
* compile on windows
* compile on mac
* rename to Texture2DBackend
* compile on mac
2019-06-12 00:01:15 -07:00
coulsonwang
fef1752cfe
fix TODO ( #19793 )
2019-06-11 23:58:07 -07:00
Arnold
3c93c3d3dd
swap shader source arguments ( #19823 )
2019-06-11 23:54:15 -07:00
minggo
1273fb305d
Remove simple audio engine ( #19802 )
2019-06-11 18:23:16 -07:00
patricejiang
85b72ca88a
pollEvents in loop
2019-06-11 10:16:20 +08:00
minggo
261cf5b82a
Merge pull request #19810 from minggo/change-version
...
change version to beta
2019-06-09 18:31:11 -07:00
minggo
07959475de
Merge pull request #19808 from minggo/fix-warnings
...
fix warnings
2019-06-09 18:30:24 -07:00
minggo
e1a10faa9c
change version to beta
2019-06-06 18:16:55 +08:00
minggo
0a85432d02
remove unneeded codes
2019-06-06 18:00:45 +08:00
minggo
d6cbaa44e0
fix warnings
2019-06-06 17:53:16 +08:00
Arnold
60deaa60ca
run genbindings.py ( #19805 )
2019-06-06 02:49:33 -07:00
coulsonwang
9dc04bf228
remove opengl codes ( #19797 )
2019-06-05 02:58:33 -07:00
coulsonwang
9bea7a3255
fix crash when using compressed pixel format ( #19794 )
2019-06-04 18:30:16 -07:00
coulsonwang
655d0d3404
[TileMapTest] Depth write state setting should not depended on the depth test flag ( #19792 )
2019-06-04 03:09:47 -07:00
coulsonwang
59d5f97d30
fix compile error ( #19788 )
2019-06-03 19:52:16 -07:00
coulsonwang
7c29811c81
vertex shader does not need header define ( #19785 )
2019-06-03 19:43:19 -07:00
coulsonwang
bf93892ec9
bind texture target ( #19786 )
2019-06-03 18:25:32 -07:00
coulsonwang
89ba801628
add compressed format for metal ( #19762 )
2019-06-03 03:34:28 -07:00
coulsonwang
10b2799051
Feature/fix mipmap issues ( #19753 )
...
* fix mipmap
* fix mipmap issues
* remove unneeded code
* fix
* remove Texture2D::PixelFormat, add backend::PixelFormat
* fix lua compile error
* reset *.tps files
* fix compile error
* fix compile error
2019-06-02 18:39:51 -07:00
coulsonwang
a67f729610
fix drawNode ( #19773 )
2019-05-29 19:06:43 -07:00
coulsonwang
8faf4a758f
get supported depthStencil pixel format ( #19774 )
2019-05-28 19:46:55 -07:00
coulsonwang
9b0d36c6a9
[Node::Light] fix no light effects on iPhone6 and iPhone6s ( #19751 )
...
* [Node::Light] fix no light effects on iPhone6 and iPhone6s
* add TODO
2019-05-27 22:59:37 -07:00
coulsonwang
000a5e124b
fix location ( #19764 )
2019-05-27 19:14:55 -07:00
minggo
23a21ef298
Remove jsb related ( #19729 )
...
* remove jsb related codes
* update 3rd party
2019-05-24 00:00:51 -07:00
coulsonwang
a61e408189
set render target flag correcttly ( #19730 )
2019-05-21 18:53:15 -07:00
coulsonwang
97431b1197
[ParticleSpriteFrameTest] remove getName() in Texture2D ( #19740 )
2019-05-21 18:49:11 -07:00
minggo
9cb539e0d0
fix base/CMakeLists.txt ( #19575 ) ( #19728 )
2019-05-17 01:34:49 -07:00
minggo
39a051a58d
use CC_SAFE_DELETE_ARRAY instead of CC_SAFE_DELETE ( #19580 ) ( #19727 )
2019-05-17 00:42:51 -07:00
coulsonwang
9c0033e1e7
Feature/draw in rect ( #19664 )
...
* Texture2D draw in point and draw in rectangle tests work
* optimize code
* fix compile error
* make initProgam() private
2019-05-16 18:14:14 -07:00
coulsonwang
2deea28f49
fix scissor rectangle setting
2019-05-16 13:48:44 +08:00
coulsonwang
2d02e23fbd
Feature/update device info ( #19712 )
...
* update DeviceInfo
* remove unneeded code
* fix indentation
* add FeatureSet enum for metal
* revert code
2019-05-15 18:26:00 -07:00
coulsonwang
2a0ded38a2
[Texture2D Test17/18] add methods to convert BGRA8888 format ( #19716 )
...
* [Texture2D Test17/18] add methods to convert BGRA8888 format
* use size_t and ssize_t when necessary
* fix compile error
2019-05-15 18:17:26 -07:00
minggo
a572d088d1
check metal support ( #19710 )
2019-05-14 01:38:14 -07:00
Arnold
3d314f29ea
rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* ( #19695 )
2019-05-13 17:59:29 -07:00
coulsonwang
ac0f9286bf
fix lineColor.vert shader ( #19684 )
2019-05-09 20:30:37 -07:00
coulsonwang
cacdc4f140
fix buffer usage ( #19685 )
2019-05-09 20:30:06 -07:00
Arnold
6dc547080f
[cpp-tests] fix fileutils list file, reject empty paths ( #19681 )
...
* protect empty string
* enable tests cases
2019-05-08 19:21:25 -07:00
Arnold
d6b8e994a4
fix mac retina support ( #19672 )
2019-05-07 18:07:52 -07:00
Arnold
62dc64a8d1
[cpp-tests] camera3dtests adjust button position ( #19673 )
...
* reduce log 1
* fix camera3d test/2 button position
2019-05-07 18:07:37 -07:00
minggo
1a68f6c4b6
Shader precision ( #19668 )
2019-05-07 00:48:51 -07:00
minggo
70fed45ed8
Merge pull request #19650 from Mee-gu/feature/ReloadBuffer
...
add methods for reloading buffer data outside the buffer when necessary
2019-05-06 00:39:04 -07:00
Arnold
ceb8fa1166
re-run genbindings
2019-05-06 09:52:17 +08:00
Arnold
401ce1ee1c
run genbinding
2019-05-06 09:43:40 +08:00
Arnold
460c9d2edd
rename restore
2019-05-06 09:43:40 +08:00
Arnold
58722a5c3d
fix state block
2019-05-06 09:43:40 +08:00
Arnold
98d5f37a30
fix lua-tests errors ( #19646 )
...
* enable test case
* save
* generate enum classes
* save
* autobindg backend interface
* safe
* fix typos
* fix setUniform
* enable draw primitives and fast tmx tiled map
* save all
* update
* fix compile error on mac
* fix locations
* fix locations
* deduce vertexlayout
* clean
* compile on mac
* fix resource path
* save
* update bindings-generator
* remove unused code
* rename ccbackend to ccb
* remove todo
2019-05-05 00:26:34 -07:00
coulsonwang
35951d6952
add private specifier
2019-05-05 14:34:44 +08:00
Arnold
1ac3af6c90
compile & run on linux ( #19651 )
2019-05-04 19:57:53 -07:00
coulsonwang
c97a8a953c
add support non-pow of two for metal ( #19654 )
2019-05-04 19:45:06 -07:00
coulsonwang
7ca39dd08e
remove unneeded function and rename function to more readable
2019-04-30 15:19:53 +08:00
coulsonwang
375f52fc87
rename
2019-04-30 13:39:38 +08:00
coulsonwang
8414db94ec
make sure to store data once
2019-04-30 11:11:03 +08:00
coulsonwang
5771b4236d
add methods for reloading buffer data outside the buffer when necessary
2019-04-30 10:31:22 +08:00
coulsonwang
7ee0b65bb6
[Feature] fix spirte, label test when EGL context lost ( #19612 )
...
* [BugFix] fix compile error
* [Feature] fix spirte, label test when EGL context lost
* [Feature] map uniform location
* [Feature] remove unneeded codes
* [Feature] add BufferManager
* [Feature] fix compile error
* [Feature] add files
* [Feature] remove unneeded codes
* [Feature] no need to release opengl resource
* [Feature] update BufferManager
* 1. reCreate frame buffer when needed.
2. initial texture when come back to foreground
* [Feature] add Program and Buffer event listener
* [FixTerrain] need check location had used before
* fix compile error
* add updateTextureDescrptor function for TextureMTL, since TextureMTL creation was move to Texture2D constructor.
* [FixDrawNode] record buffer data when needed
* [FixShaderTest] add nullptr judgement
* [FixShaderText] no need to reCreate ProgramState when come back to foreground
* [FixRenderTexture] retain the render texture image
* [Feature] optimize buffer memory
* fix compile error
* fix CI test fail
2019-04-29 18:51:45 -07:00
John
c259918d03
Optimize cases where loop variable is unecessarily copied in a range-for loop. ( #19637 ) ( #19640 )
...
Pass by const reference when appropriate.
2019-04-27 18:20:22 -07:00
John
d89f1d04b4
remove redundant user-defined copy constructor and destructor, ( #19638 )
...
as compiler auto-generated ones are working fine.
2019-04-25 17:59:25 -07:00
John
22a43fbc83
rewrite parseIntegerList with better performance ( #19629 )
2019-04-21 18:51:23 -07:00
minggo
fd792813d2
Optimize calls to std::string::find() and friends ( #19624 )
2019-04-21 18:44:19 -07:00
minggo
34517748c7
prefer delegate constructor over new(this) ( #19623 )
2019-04-19 03:20:15 -07:00
minggo
e8993c9860
Remove jsb/h5 ( #19621 )
...
* remove h5 engine
* remove jsb codes
* remove js tests
* remove js templates and tojs
* remove h5 submodule
2019-04-18 23:56:12 -07:00