Merge pull request cocos2d#14469 from super626/terrain

fix bug: Terrain::getIntersectionPoint when there is offset
fumingxing2015 · Nov 25, 2015 · 4ba6279 · 4ba6279
2 parents 3cc3325 + 1ac82fa
commit 4ba6279
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cocos/3d/CCTerrain.cpp b/cocos/3d/CCTerrain.cpp
@@ -548,7 +548,7 @@ bool Terrain::getIntersectionPoint(const Ray & ray_, Vec3 & intersectionPoint) c
     getWorldToNodeTransform().transformPoint(&(ray._origin));
 
     std::set<Chunk *> closeList;
-    Vec2 start = Vec2(ray._origin.x,ray._origin.z);
+    Vec2 start = Vec2(ray_._origin.x,ray_._origin.z);
     Vec2 dir = Vec2(ray._direction.x,ray._direction.z);
     start = convertToTerrainSpace(start);
     start.x /=(_terrainData._chunkSize.width+1);