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

13385 Commits

Author SHA1 Message Date
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
minggo 60272f6b88
fix bug that SimpleAudioEngine can not change effect volume (#19605) 2019-04-14 23:52:52 -07:00
CocosRobot 212abc4ea0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19600) 2019-04-10 18:51:34 -07:00
minggo 62d20a9825
Add clear request and responses method to httpclient (#19598) 
* Added functionality to clear pending responses and requests in the http client

* Responses and Requests now are processed in similar way

* Fix for clearing the http requests

* Added tests for HttpClient::clearResponseAndRequestQueue
 2019-04-10 18:33:55 -07:00
minggo c3a0205652
ReFix bug: PremultipliedAlpha is not working for png (#19597) 2019-04-10 18:33:26 -07:00
minggo ffcf627c13
Ui video player new style looping input options 2019-04-10 18:33:05 -07:00
minggo 5c29e0066f
Add Android P cutout area support (#19595) 
* Add Android P cutout area support
Related #19285

* coding style fix

* Update AppActivity.java

Fix android build

* suppress lint new api errors
 2019-04-10 18:32:27 -07:00
minggo f7f0c48cae
Checking, does the touch is within the height of the line, not the height of the sprite? (#19394) (#19594) 2019-04-10 18:32:09 -07:00
minggo 1f7c0c9408
If path to file is tool long crash is possible. (#19593) 
* If path to file is tool long crash is possible.

If path to file is tool long crash is possible, because of chart buffer overflow.

* Incorrect replacement. Using iterator is better.

* Style fix

* Correct naming
 2019-04-10 18:31:50 -07:00
minggo 0a9e66a16c
Font atlas texture initialization delayed (#19592) 2019-04-10 18:31:29 -07:00
CocosRobot 01b9863723 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19599) 2019-04-10 18:30:29 -07:00
minggo aa8fffa2bf
Only send the ON_PERCENTAGE_CHANGED if and only if the percentage value has actually changed. (#19556) (#19589) 2019-04-10 01:54:07 -07:00
minggo bc1483dca7
Fix memory leak if invoking Texture2D::setAlphaTexture many times. (#19590) 2019-04-10 01:53:29 -07:00
minggo 195dc704e3
[Android] fix FileUtils::listFiles with path 'assets/' 2019-04-10 00:09:30 -07:00
minggo 408f6cf9da
Ability to change title position (#19587) 2019-04-09 23:21:07 -07:00
minggo 86a9e0c1b8
Fix bug: can't play video in obbfile. (#19476) (#19586) 
* Fix bug: can't play video in obbfile.

* Change check order.
 2019-04-09 22:38:32 -07:00
coulsonwang 5944857936 [MaterialSystemTest] When depth testing is disabled, writes to the depth buffer are also disabled. No need to do depth test in such case. (#19582) 2019-04-08 18:56:05 -07:00
Arnold 3bf5e84926 [bugfix] cpp-test small bugs (#19574) 2019-04-04 01:13:17 -07:00
Arnold fe14fcd4de [bugfix] fix test case crash (#19573) 
* fix depthstencil buffer format

* fix crash
 2019-04-03 18:41:17 -07:00
Arnold 9a56e6923f [bugfix] motionstreak & DrawNode3D on GL (#19564) 2019-04-03 02:27:15 -07:00
coulsonwang 4f81cd7356 [BugFix] EVENT_PROJECTION_CHANGED means trigger an event when projection type is changed instead of when projection matrix is changed. (#19568) 2019-04-02 18:30:49 -07:00
Arnold 6452d5faec [bugfix] enable depth test for all commands in 3d queue (#19565) 
* save states

* save bits

* include deque

* remove 2d default states

* remove unsused flags
 2019-04-02 00:47:55 -07:00
Arnold d6614cc0da [bugfix] fix label effects (#19554) 2019-04-01 23:56:29 -07:00
Arnold 45183919e9 [windows] use PostMessage to replace SendMessage (#19567) 
* make async

* use post message
 2019-04-01 23:41:38 -07:00
coulsonwang 688592b175 [Feature] fix mipmap issues (#19519) 2019-04-01 19:20:30 -07:00
coulsonwang bb60c173a1 add a flag to determine if need depth/stencil attachment 2019-04-01 19:05:53 -07:00
coulsonwang 147c564492 Feature/fix capture node (#19560) 
* [Feature] fix capture multi-node

* [Feature] remove unused code
 2019-03-28 19:32:13 -07:00
coulsonwang 15b8014c0b [BugFix] set layout (#19558) 2019-03-27 18:22:28 -07:00
coulsonwang d92ae4b478 [Feature] CaptureScreen works (#19547) 2019-03-27 18:09:26 -07:00
Arnold 6c4c80d977
set terrain winding to CW (#19549) 2019-03-27 13:59:10 +08:00
CocosRobot d453af8fe5 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19550) 2019-03-25 23:12:59 -07:00
Arnold aa54a6c576 enable shader tests (#19546) 2019-03-25 22:45:03 -07:00
coulsonwang 39c6359ec0 remove poll events in application loop 2019-03-25 20:01:32 -07:00
coulsonwang 4f63cc5459 [Feature] fix CaptureNode (#19539) 2019-03-24 19:23:55 -07:00
CocosRobot 6f05e57761 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19544) 2019-03-24 19:19:01 -07:00
minggo 6067d62341
adapt ClippingNodeTest (#19528) 2019-03-24 19:08:49 -07:00
Arnold 3a1b6f28b6 fix default FrontFace & Skybox DepthFunc (#19540) 2019-03-24 19:08:04 -07:00
CocosRobot b88f8e5062 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19535) 2019-03-20 14:44:46 +08:00
Arnold e1675ae67b Enable navmesh (#19530) 
* enable flags

* impl debug draw

* run tests

* remove comments

* fix mac compile error

* review fix
 2019-03-20 14:34:35 +08:00
minggo 63fdb2adf1
Merge pull request #19532 from PatriceJiang/fix_todos 
remove todos
 2019-03-20 14:34:03 +08:00
Arnold 6e063330e0
remove todos 2019-03-20 09:45:09 +08:00
CocosRobot#Set 9b567b2261 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2019-03-20 01:41:18 +00:00
patricejiang de13d1b240
fix confliction 2019-03-19 10:44:44 +08:00
patricejiang 82bbeb9b87
merge metal-support 2019-03-19 10:30:15 +08:00
minggo cb9cf672a1
Merge pull request #19517 from PatriceJiang/3d-material-test-cases 
Enable material system test cases
 2019-03-19 09:46:46 +08:00
minggo 8452b55b82
Merge pull request #19513 from Mee-gu/feature/AddDeviceInfo 
Feature/add device info
 2019-03-19 09:24:18 +08:00
coulsonwang 0825386827 fix compile error 2019-03-18 16:08:25 +08:00
Arnold 98fa7af850
fix linux compile error 2019-03-18 14:54:35 +08:00
patricejiang 926e49caf6
fix luabindings 2019-03-18 11:36:32 +08:00
patricejiang 811b66b51e
fix doc of ProgramState::AutoBindingResolver 2019-03-18 10:31:56 +08:00
patricejiang bfd390af35
auto generate luabindings 2019-03-18 10:30:11 +08:00
Arnold be579d1c4c
add doc 2019-03-18 09:41:14 +08:00
Arnold e211fd4e61
fix index 2019-03-18 09:35:36 +08:00
Arnold 40304860e6
Apply suggestions from code review 2019-03-18 09:33:43 +08:00
Arnold 5146fa3c93
Update cocos/renderer/backend/Types.cpp 2019-03-15 17:28:57 +08:00
Arnold e46e286a18
fix hash function 2019-03-15 17:19:04 +08:00
Arnold 4b5121c70b
Update cocos/renderer/backend/Types.cpp 2019-03-15 17:10:31 +08:00
Arnold c8324db21e
move compiletimedefinations to a sperate func 2019-03-15 16:43:46 +08:00
Arnold e77edfddf5
Update cocos/renderer/CCCustomCommand.h 2019-03-15 15:44:43 +08:00
Arnold c1ba0d866b
remove comments 2019-03-15 15:09:39 +08:00
Arnold e3385e0e58
revert binding 2019-03-15 14:51:33 +08:00
patricejiang 7280457fbb
add callback uniform to metal 2019-03-15 14:44:28 +08:00
patricejiang 9f55e8ee7b
fix macosx compile error 2019-03-15 14:44:28 +08:00
Arnold d75c2f3c5e
add uniform callback 2019-03-15 14:44:28 +08:00
Arnold c35c4e2347
fix ccpass 2019-03-15 14:41:59 +08:00
Arnold 069800b98c
enable test case 2019-03-15 14:41:59 +08:00
coulsonwang 3a3924f76f [Feature] fix CI test fail 2019-03-15 11:13:40 +08:00
CocosRobot#Set 16b2649ba2 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2019-03-15 02:48:36 +00:00
minggo 629eebd031
Merge pull request #19498 from PatriceJiang/texture_setTexParams 
Texture2D::TexParams fields use backend enum types
 2019-03-15 10:43:52 +08:00
coulsonwang ca93a8ba7d [Feature] fix indentation 2019-03-14 16:13:38 +08:00
coulsonwang ff6141559d [Feature] add file 2019-03-14 15:59:51 +08:00
coulsonwang b2387f13de [Feature] add DeviceInfo for querying implementation limits. 2019-03-14 15:58:55 +08:00
Arnold 7fcdf544e7
Update cocos/renderer/backend/Types.h 2019-03-14 11:00:21 +08:00
Arnold de77133821
Update cocos/renderer/CCTexture2D.cpp 2019-03-14 10:59:37 +08:00
minggo 2be80438a6
Merge pull request #19510 from Mee-gu/feature/UpdateTerrain 
[Feature] add dummy texture for metal when lightMap is nullptr
 2019-03-14 10:52:01 +08:00
minggo 63fde51dc8
Merge pull request #19508 from Mee-gu/feature/UpdateParticle3D 
[BugFix] fix particle3D
 2019-03-13 18:01:25 +08:00
minggo b91d6171c7
Merge pull request #19488 from Mee-gu/feature/UniformAlignment 
[Feature] fix uniform filled in metal
 2019-03-13 17:32:35 +08:00
coulsonwang df3637538a [Feature] add dummy texture for metal when lightMap is nullptr 2019-03-13 16:05:02 +08:00
minggo f5380f8efe
Merge pull request #19506 from minggo/rectangleclipping 
ClippingRectangleNode works
 2019-03-13 15:50:31 +08:00
Arnold 620027c54a
fix comments 2019-03-13 15:42:12 +08:00
Arnold eb771312f5
fix lua compile 2019-03-13 15:34:32 +08:00
minggo 7bae208166
Merge pull request #19505 from minggo/fix-todo 
Fix todo
 2019-03-13 15:24:49 +08:00
coulsonwang 8e6416bf87 [BugFix] fix particle3D 2019-03-13 15:12:36 +08:00
Arnold fb29eefda6
add setVertexLayout interface 2019-03-13 15:06:30 +08:00
minggo 1d9bde0520 ClippingRectangleNode works 2019-03-13 14:27:47 +08:00
minggo 7ebea45168 fix some todo 2019-03-13 14:11:40 +08:00
minggo 2795427a38 fix todo in CCGrid.cpp 2019-03-13 11:25:46 +08:00
Arnold 1d0107c087
alias backend::SamplerDescriptor 2019-03-13 10:54:26 +08:00
CocosRobot#Set 0ee2dc8c78 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2019-03-13 02:14:20 +00:00
coulsonwang 5d5eaf4be1 [feature] fix android compile error 2019-03-13 10:10:15 +08:00
patricejiang 53975ee428
fix android error 2019-03-13 09:56:29 +08:00
coulsonwang a8e54b9b53 [Feature] update attribute setting 2019-03-12 21:05:03 +08:00
Arnold fb87eec3f5
remove texture2d::setSamplerDescriptor 2019-03-12 18:59:12 +08:00
Arnold 70b9031714
fix wrapping 2019-03-12 17:03:01 +08:00
patricejiang 58c40c1cc6
fix android compile error 2019-03-12 16:53:28 +08:00
Arnold 62c6eae7c3
change Texture2D::TexParams fields type 2019-03-12 16:53:28 +08:00
Arnold 475b6e63a5 [bugfix] ClippingNode & CameraBackgroundBrush render order (#19496) 
* add groupcommand as a barrier to reorder clipping node renderring

* add comments
 2019-03-12 15:41:32 +08:00
coulsonwang d4375db34f [Feature] use glslopt_basic_type 2019-03-12 15:35:42 +08:00
coulsonwang 605975bfa0 [Feature] use references and rename the structure to a more meaningful name 2019-03-12 14:18:16 +08:00
coulsonwang c17d361e50 [Feature] float3 etc in Metal has both sizeof and alignment same as float4, need convert to correct laytout 2019-03-12 11:10:57 +08:00
Arnold a384e38e16 [bugfix] GL vertex attribute layout incorrect (#19484) 
* collect OpenGL enum convertion methods

* add testcase for lots of nots

* fix andorid compile error

* move more function to UtilsGL

* use shared pointer

* naming stuff

* move VertexLayouts to CommandBuffer

* fix android compile error

* fix android headers

* add comment

* add comment, fix
 2019-03-12 10:37:52 +08:00
coulsonwang 7c6a01affb [Feature] fix uniform filled in metal 2019-03-11 20:52:23 +08:00
Arnold 64f3f1d356 ProgressTimer cache uniforms (#19482) 
* cache uniform

* release fix

* reorder vertex attributes
 2019-03-11 10:15:33 +08:00
coulsonwang c5c6fa3396 Feature/update sprite3 d test (#19475) 
* [BugFix] fix crashed test in metal

* [Feature] add comments

* [Feature] modify ways to get max_vertex_attribute

* [Feature] make it crashed in debug mode
 2019-03-08 18:48:12 +08:00
minggo 4854f1c3e7
make travis work (#19478) 
* make travis work

* don't compile ios as needing team id
 2019-03-08 15:24:47 +08:00
Arnold 0f1e70ac8b [bugfix] add mesh command callbacks (#19477) 2019-03-08 11:06:03 +08:00
minggo e63c4d1ba6
make lua binding work (#19474) 2019-03-07 18:29:06 +08:00
Arnold 8caade49e6 [3d] add meshcommand (#19472) 2019-03-07 17:30:11 +08:00
coulsonwang e69e7e0b30 [Feature] support cubeMapping in metal (#19469) 2019-03-07 11:08:12 +08:00
Arnold f7496948fd [3d] support particle3d (#19464) 
* first commit

* fix matrix

* remove used comments

* fix compile error on mac

* self review fix 1

* litte refactor

* use reference:
 2019-03-06 17:03:16 +08:00
coulsonwang 776ab98e0b [BugFix] fix fill UnifromBuffer issues (#19462) 2019-03-05 11:19:52 +08:00
coulsonwang c18564cc44 fix depth/stencil validation failed in iPhoneX (#19458) 2019-03-04 15:09:34 +08:00
Arnold 3a55fa3dd6 [3d] add CameraBackgroundBrush (#19454) 2019-03-04 09:14:45 +08:00
Arnold b4f2ed0376 [3d] Sprite3DTest enable test cases (#19447) 2019-02-28 15:20:23 +08:00
minggo a6be522601
make hello lua work 2019-02-28 11:17:05 +08:00
Arnold 7fd82997ef [3d] terrain impl & test case (#19442) 2019-02-27 17:16:25 +08:00
coulsonwang f4170ea89a [Feature] set default scissor rectangle for metal when scissor test disabled (#19441) 2019-02-27 15:02:28 +08:00
coulsonwang cba56e5da7 Feature/save image issue (#19435) 2019-02-27 11:29:20 +08:00
minggo 301b6c5028
skeleton node adaption (#19434) 2019-02-26 14:57:12 +08:00
minggo 1e7a6f7fcf
Issue19416 (#19427) 
* use more meaningful names

* remove unneeded types
 2019-02-22 14:06:26 +08:00
minggo 2ed60f72cf
Remove gl codes (#19415) 2019-02-20 17:07:31 +08:00
Arnold edf3687af5 [3d] add motionstreak3d (#19414) 2019-02-20 16:56:35 +08:00
minggo 06d7e4eda7
remove CCGLProgram related files (#19408) 
* remove CCGLProgram related files

* remove CCGLProgram related header files
 2019-02-19 16:06:17 +08:00
Arnold bfc98c6f21 [3d] add billboard (#19407) 2019-02-19 14:56:21 +08:00
minggo 480d964039
removed duplicated shaders (#19406) 2019-02-19 11:57:13 +08:00
Arnold fd1d5d2dd7 [3D] texture cubemap GL & skybox (#19401) 2019-02-19 10:15:24 +08:00
Arnold 512a5f12c1 fix compile error (#19403) 2019-02-18 14:54:12 +08:00
coulsonwang fecac0c02c fix memory leak (#19402) 2019-02-18 13:42:11 +08:00
Arnold 483e96147f [3D] ccpass restore renderer states (#19396) 
* save matrix

* save more states
 2019-02-15 17:39:02 +08:00