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

13204 Commits

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