Commit Graph

110 Commits

Author SHA1 Message Date
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +08:00
jianglong0156 dcda083efa rename the initTerrain to initWithTerrainData 2015-07-31 18:35:47 +08:00
jianglong0156 4439b02a84 rename the init function name 2015-07-31 15:21:54 +08:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +08:00
tangziwen e4cf89e1c4 terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing. 2015-07-29 13:24:12 +08:00
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite.
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
yangxiao 77f1af91f9 opt getIntersectionPoint 2015-06-24 15:49:09 +08:00
yangxiao 086b01321c code simplify 2015-06-24 14:10:38 +08:00
yangxiao d1baacdf8a fix terrain ray trace 2015-06-24 10:49:18 +08:00
yangxiao bfdb06e31b add empty line 2015-06-23 18:31:20 +08:00
tangziwen 5b857f7d66 fix some bug 2015-06-23 16:11:00 +08:00
tangziwen 1e016dc6d8 Always get the minimum distance intersect point. 2015-06-23 14:41:20 +08:00
tangziwen f71ca4f179 Using ray-triangle intersect test instead of the newton method 2015-06-23 14:27:19 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
tangziwen e9c95229e0 fix camera position 2015-06-17 15:58:17 +08:00
tangziwen 60115b1ce1 update 2015-06-16 17:46:21 +08:00
tangziwen 0eaf9b5acc Fix camera's incorrect position in chunks' LOD calculating. 2015-06-16 17:29:43 +08:00
子龙山人 c5ba7eef8b Merge pull request #12019 from super626/v3
getIntersectionPoint failed when there is no intersection on the terrain
2015-06-08 11:26:19 +08:00
yangxiao a5976a43f7 code style 2015-05-27 18:19:44 +08:00
Vincent Yang 8105e9c714 Fix bug: terrain can't move to other position except origin point. 2015-05-26 17:51:26 +08:00
tangziwen fb1a7f1e8b fix Terrain::getIntersectionPoint 2015-05-22 09:07:57 +08:00
Ricardo Quesada 5924a917a1 Terrain uses StateBlock
cleaner code, conforms to new way of setting the state
2015-05-19 17:18:44 -07:00
yangxiao 0f0f85b33c terrain to 3d render queue 2015-05-14 10:29:50 +08:00
yangxiao 4d71175318 resove conflict 2015-05-12 12:12:29 +08:00
songchengjiang f25c02f230 fix bugs of terrain 2015-05-11 12:02:32 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
Vladimir Perminov 4c33050536 Optimize Vec2
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
tangziwen 380d829548 move reset draw polygon state in corresponding position 2015-04-13 10:14:03 +08:00
tangziwen a7aed360a1 update terrain 2015-04-10 14:22:07 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
tangziwen 3ab4e75a71 update 2015-04-08 10:10:05 +08:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
tangziwen 8a7b318c1a Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment 2015-04-03 13:49:07 +08:00
lvlong 60bed4f461 revert alpha map minFilter 2015-04-02 15:10:51 +08:00
lvlong c3cc8b917c fix bug: about minFilter and magFilter 2015-04-02 15:01:14 +08:00
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain
update terrain
2015-04-02 10:19:11 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain
update Terrain, support skirt
2015-03-31 09:14:27 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
yangxiao c6a86ac287 move shader to shaders 2015-03-30 13:45:50 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00
tangziwen 5a76a628d3 add some utility functions 2015-03-27 11:46:02 +08:00
tangziwen 8b376e511c update Terrain 2015-03-27 10:12:24 +08:00
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
tangziwen 89cff149fc add new ray intersection method ,add new Doc to explain the terrain 2015-01-29 18:06:00 +08:00
tangziwen 9ec366a130 update terrain test add new method to get normal 2015-01-27 15:18:59 +08:00
tangziwen d6c3320d49 fix memory leak 2015-01-23 18:14:44 +08:00
tangziwen d04b3feb50 add new test, fix memory leak 2015-01-23 18:09:54 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
tangziwen 130c18bde0 fix LOD indices capacity,refactor the code ,add some comments 2015-01-15 15:54:12 +08:00
tangziwen 201ae6f321 add terrain 2015-01-15 11:45:06 +08:00