Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,244 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

13447 Commits

Author SHA1 Message Date
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