View difference between Paste ID: g6fhNyeT and qX2cyWNx

-Index: Base/Header/Avionics/Sensors/avSimpleRadar.h
+Index: Header/Avionics/Sensors/avSimpleRadar.h
 ===================================================================
---- Base/Header/Avionics/Sensors/avSimpleRadar.h	(revision 91428)
+--- Header/Avionics/Sensors/avSimpleRadar.h	(revision 91428)
-+++ Base/Header/Avionics/Sensors/avSimpleRadar.h	(working copy)
++++ Header/Avionics/Sensors/avSimpleRadar.h	(working copy)
 @@ -9,6 +9,7 @@
  #include "Utilities/ccTriggerSystem.h"
  #include "Utilities/ccUtilities.h"
  #include "Avionics/avSimpleElectricSystem.h"
 +#include "edTerrain/ITerrain.h"
 
  class woSpot;
 
 @@ -137,8 +138,13 @@
  protected:
  	radar_capabilities		   basic_capabilities;
 
 +#ifndef USE_TERRAIN4
  	landscape::lPointOnSurface surf_info;
  	landscape::lPointOnSurface surf_info_2;
 +#else
 +	edterrain::PointOnSurfaceAdapter surf_info;
 +	edterrain::PointOnSurfaceAdapter surf_info_2;
 +#endif
 
  	woSpot				*spot;
 
-Index: Base/Header/Avionics/Sensors/avTVSensor.h
+Index: Header/Avionics/Sensors/avTVSensor.h
 ===================================================================
---- Base/Header/Avionics/Sensors/avTVSensor.h	(revision 91428)
+--- Header/Avionics/Sensors/avTVSensor.h	(revision 91428)
-+++ Base/Header/Avionics/Sensors/avTVSensor.h	(working copy)
++++ Header/Avionics/Sensors/avTVSensor.h	(working copy)
 @@ -3,6 +3,7 @@
  #include "ICommandsCockpitDevice.h"
  #include "viLight.h"
  #include "Avionics/Sensors/avBasicSensor.h"
 +#include "edTerrain/ITerrain.h"
 
  #ifdef  _DEBUG
  #include "Renderer/DbgGraph.h"
 @@ -125,7 +126,11 @@
 
  	class COCKPITBASE_API avTVSensor : public avBasicSensor
  	{
 +#ifndef USE_TERRAIN4
          mutable landscape::lPointOnSurface _terrain_visibility_check_pnt_;
 +#else
-+		mutable edterrain::PointOnSurface _terrain_visibility_check_pnt_;
++		mutable edterrain::PointOnSurfaceAdapter _terrain_visibility_check_pnt_;
 +#endif
  	public:
  		avTVSensor();
  	   ~avTVSensor();
-Index: Base/Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h
+Index: Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h
 ===================================================================
---- Base/Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(revision 91428)
+--- Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(revision 91428)
-+++ Base/Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(working copy)
++++ Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(working copy)
 @@ -1,6 +1,7 @@
  #pragma once
 
  #include "Avionics/Sensors/avTVSensor.h"
 +#include "edTerrain/ITerrain.h"
 
  namespace cockpit {
 
 @@ -120,6 +121,10 @@
  		bool   forceCorrelateEnabled;
          wModelTime forceCorrelateEnableTime;
 
 +#ifndef USE_TERRAIN4
  		mutable landscape::lPointOnSurface surfInfo;
 +#else
-+		mutable edterrain::PointOnSurface surfInfo;
++		mutable edterrain::PointOnSurfaceAdapter surfInfo;
 +#endif
  	};
  }
-Index: Base/SConscript
+Index: SConscript
 ===================================================================
---- Base/SConscript	(revision 91428)
+--- SConscript	(revision 91428)
-+++ Base/SConscript	(working copy)
++++ SConscript	(working copy)
 @@ -7,7 +7,6 @@
  	'edCore',
  	'edMath',
  	'edObjects',
 -	'edTerrain',
  	'World',
  	'WorldGeneral',
  	'Inter',
 @@ -30,6 +29,11 @@
  	'renderer',
  ]
 
 +if not env.has_key('TERRAIN4'):
 +	libs += [
 +		'edTerrain',
 +	]
 +
  if not env.getUserVariable('FINAL_VERSION'):
  	libs.append('JConfigurator')
 
-Index: Base/Source/Avionics/Sensors/avSimpleRadar.cpp
+Index: Source/Avionics/Sensors/avSimpleRadar.cpp
 ===================================================================
---- Base/Source/Avionics/Sensors/avSimpleRadar.cpp	(revision 91428)
+--- Source/Avionics/Sensors/avSimpleRadar.cpp	(revision 91428)
-+++ Base/Source/Avionics/Sensors/avSimpleRadar.cpp	(working copy)
++++ Source/Avionics/Sensors/avSimpleRadar.cpp	(working copy)
 @@ -7,7 +7,6 @@
  #include "viObjectManager.h"
  #include "wsType_Level4.h"
  #include "wConst.h"
 -#include "wTerrain.h"
  #include "wsInitData.h"
  #include "IwInfo.h"
  #include "Math\_math.h"
 @@ -20,6 +19,7 @@
  #include "Utilities/ccTriggerSystem.h"
  #include "woSpot.h"
  #include "wDetectable.h"
 +#include "wTerrain.h"
 
  using namespace cockpit;
 
-@@ -643,7 +643,8 @@
+@@ -643,6 +643,7 @@
  		dVector end_   = antenna_pos.p + antenna_pos.x * d
  									   + antenna_pos.y * 0.5 * h * d *rnd_y
  									   + antenna_pos.z * 0.5 * w * d *rnd_z;
--		if (surf_info.intersectSurface(start_,end_,&res_))
+
  		if (surf_info.intersectSurface(start_,end_,&res_))
-+		if (surf_info.intersectSurface(start_,end_,(cPoint*)&res_)))
+
  	}
 Index: Source/Avionics/Sensors/avTVSensor.cpp
 ===================================================================
-Index: Base/Source/Avionics/Sensors/avTVSensor.cpp
+--- Source/Avionics/Sensors/avTVSensor.cpp	(revision 91428)
 +++ Source/Avionics/Sensors/avTVSensor.cpp	(working copy)
---- Base/Source/Avionics/Sensors/avTVSensor.cpp	(revision 91428)
+
-+++ Base/Source/Avionics/Sensors/avTVSensor.cpp	(working copy)
+
  #include "Registry/RegisterManager.h"
  #include "Avionics/Sensors/avSensorRoutines.h"
 +#include "wTerrain.h"
 
  using namespace cockpit;
 
 @@ -408,7 +409,7 @@
          cVector start_ = getPlatformPosition().p;
-@@ -408,8 +409,8 @@
+
          cVector end_   = start_ + dir_ * max_dist;
 -        // из А в Б, PointOnSurface перемещается в А, тогда правильней проверять от цели в себе
 +        // из А в Б, PointOnSurface перемещается в А, тогда правильней проверять от цели в себе
          if (_terrain_visibility_check_pnt_.intersectSurface(end_,start_,&res))
--        if (_terrain_visibility_check_pnt_.intersectSurface(end_,start_,&res))
+
              gyro_stabilize_point = res;
-+        if (_terrain_visibility_check_pnt_.intersectSurface(end_,start_,(cPoint*)&res))
+
 
      dVector p = pos.p;
-             end_                 = res;
+
 -	if (_terrain_visibility_check_pnt_.intersectSurface(p,self_p,0))
 +	if (_terrain_visibility_check_pnt_.intersectSurface(p,self_p,(cPoint*)NULL))
  	{
  		return false;
  	}
-+	if (_terrain_visibility_check_pnt_.intersectSurface(end_,start_,(cPoint*)&NULL))
+
     	if (!checkTargetTVvisibility(p,maxdistance))
  	{
  		return false;
 Index: Source/Avionics/Weapon/avWeaponsBombSight.cpp
 ===================================================================
 --- Source/Avionics/Weapon/avWeaponsBombSight.cpp	(revision 91428)
 +++ Source/Avionics/Weapon/avWeaponsBombSight.cpp	(working copy)
-Index: Base/Source/Avionics/Weapon/avWeaponsBombSight.cpp
+
  #include "Utilities/ccTriggerSystem.h"
---- Base/Source/Avionics/Weapon/avWeaponsBombSight.cpp	(revision 91428)
+
-+++ Base/Source/Avionics/Weapon/avWeaponsBombSight.cpp	(working copy)
+
 +#include "wTerrain.h"
 
  using namespace cockpit;
 
 @@ -403,9 +404,13 @@
      {
          if (!ElevationIsFixed)
          {
 +#ifndef USE_TERRAIN4
              static landscape::lPointOnSurface surfInfo;
              surfInfo.set(out.p.x, out.p.z);
              lead_target_level = surfInfo.getHeight();
 +#else
 +			lead_target_level = globalLand->heightSurface(out.p.x, out.p.z);
 +#endif
          }
          else
-+			lead_target_level = surfInfo->height();
+
 @@ -456,9 +461,13 @@
      {
          if (!ElevationIsFixed)
          {
 +#ifndef USE_TERRAIN4
              static landscape::lPointOnSurface surfInfo;
              surfInfo.set(lead_human_position.p.x, lead_human_position.p.z);
              lead_target_level = surfInfo.getHeight();
 +#else
 +			lead_target_level = globalLand->heightSurface(lead_human_position.p.x, lead_human_position.p.z);
 +#endif
          }
          else
-+			lead_target_level = surfInfo.height();
+
 Index: Source/Utilities/ccLuaLoader.cpp
 ===================================================================
 --- Source/Utilities/ccLuaLoader.cpp	(revision 91428)
 +++ Source/Utilities/ccLuaLoader.cpp	(working copy)
-Index: Base/Source/LoadableEquipment/Weapon/eqTVGuidedWeapon.cpp
+
  #include "smSceneManager.h"
---- Base/Source/LoadableEquipment/Weapon/eqTVGuidedWeapon.cpp	(revision 91428)
+
-+++ Base/Source/LoadableEquipment/Weapon/eqTVGuidedWeapon.cpp	(working copy)
+
-@@ -717,7 +717,7 @@
+
- 	dVector res;
+
- 	const dPosition& platform_position = getPlatformPosition();
+
  using namespace Common;
--	if (surfInfo.intersectSurface(platform_position.p, platform_position.p + platform_position.x * max_distance, &res))
+
-+	if (surfInfo.intersectSurface(platform_position.p, platform_position.p + platform_position.x * max_distance, (cPoint*)&res))
+
  	const char * data_name     = lua_tostring(L,1);
- 		return (res - platform_position.p).length();
+
 +#ifndef USE_TERRAIN4
-Index: Base/Source/Utilities/ccLuaLoader.cpp
+
 +#else
---- Base/Source/Utilities/ccLuaLoader.cpp	(revision 91428)
+
-+++ Base/Source/Utilities/ccLuaLoader.cpp	(working copy)
+
 +
  	lua_getglobal(terrain_state,data_name);
  	{
  		ED_lua_copyindex (L,terrain_state,-1);