Camera avoiding structures/buildings

bool RTSCamera::validatePoint(Point3F pos, bool useEnd, Point3F end)
{
   // What do we want to collide with?
   U32 mask = StaticObjectType |
	          InteriorObjectType |
			  WaterObjectType |
			  ShapeBaseObjectType |
			  StaticShapeObjectType |
			  ItemObjectType |
			  TerrainObjectType |
			  StaticTSObjectType;
   RayInfo rInfo;

   if(!useEnd){
      F32 tempXY = mCos(getPitchAngle()) * mDataBlock->getZoomStep(); // What direction do we cast?
      
      end.x = pos.x + (mCos(getYawAngle() * -1 + M_PI2) * tempXY); // M_PI2 = 1.57079632679489661923 radians = 90 degrees
      end.y = pos.y + (mSin(getYawAngle() * -1 + M_PI2) * tempXY);
      end.z = pos.z - (mSin(getPitchAngle()) * mDataBlock->getZoomStep());

      if(mCurrentContainer->castRay(pos, end, mask, &rInfo))
         return false;

      // We have the front and back collision detected, so now all we need to do is worry about left and right.
      end.x = pos.x + (mSin(getYawAngle() * -1 + M_PI2) * tempXY);
      end.y = pos.y + (mCos(getYawAngle() * -1 + M_PI2) * tempXY);
   }
   if(mCurrentContainer->castRay(pos, end, mask, &rInfo))
      return false;

   return true;
}

bool validatePoint(Point3F pos, bool useEnd = false, Point3F end = Point3F(0,0,0));

if (move){
      // Move based on our direction
      F32 tempX, tempY;
      tempX = move->x * TickSec * mDataBlock->getMovementSpeed();
      tempY = move->y * TickSec * mDataBlock->getMovementSpeed();
      mCurrPos.x += ((tempX * mCos(-1 * getYawAngle())) - (tempY * mSin(-1 * getYawAngle())));
      mCurrPos.y += ((tempY * mCos(-1 * getYawAngle())) + (tempX * mSin(-1 * getYawAngle())));

      // Need to use validatePoint two times so that a collision will still be detected when looking straight down.
      if(validatePoint(mCurrPos) && validatePoint(mPrevPos, true, mCurrPos)){

            // Position has changed, cast the ray.
            if(!posDiff && mCurrPos != mPrevPos)
                  castRay();
            mTargetPos = mCurrPos;
         
            // Tell the server what we are doing
            if(isClientObject()){
                  GameConnection *conn = GameConnection::getConnectionToServer();
                  if(conn)
                        conn->postNetEvent(new RTSCameraUpdate(this, false));
            }
      }
      else
            mCurrPos = mTargetPos;
}