Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict issue

This commit is contained in:
anniruddh.koppal 2015-06-09 14:04:11 -07:00
parent 7f26ccb9ba
commit 3f4d1c4ed3
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/3d/CCTerrain.cpp
View File

@ -312,10 +312,6 @@ float Terrain::getHeight(float x, float z, Vec3 * normal) const
normal->setZero();
}
return 0;
if (normal)
{
normal->setZero();
}
}else
{
float a = getImageHeight(i,j)*getScaleY();
@ -547,7 +543,7 @@ bool Terrain::getIntersectionPoint(const Ray & ray, Vec3 & intersectionPoint) co
{
lastRayPosition = rayPos;
rayPos += rayStep;
if (normal.isZero
if (normal.isZero())
{
intersectionPoint = Vec3(0, 0, 0);
return false;

2
cocos/3d/CCTerrain.h
View File

@ -354,8 +354,6 @@ public:
*/
bool getIntersectionPoint(const Ray & ray, Vec3 & intersectionPoint) const;
bool getIntersectionPoint(const Ray & ray, Vec3 & intersectionPoint);
/**
* set the MaxDetailAmount.
*/