API tools faq
paste
View difference between Paste ID: zY1wzrag and GNfSECPm
SHOW: | | - or go back to the newest paste.
1-
Index: Header/Avionics/Sensors/avSimpleRadar.h
1+
Index: A10/A10C/Header/Avionics/avDTSAS.h
2
===================================================================
3-
--- Header/Avionics/Sensors/avSimpleRadar.h	(revision 91480)
3+
--- A10/A10C/Header/Avionics/avDTSAS.h	(revision 91480)
4-
+++ Header/Avionics/Sensors/avSimpleRadar.h	(working copy)
4+
+++ A10/A10C/Header/Avionics/avDTSAS.h	(working copy)
5
@@ -7,6 +7,7 @@
6
 #include "A10Common/Header/Avionics/avEGI.h"
7
8
 #include "FMElectricSystems/Items/Consumer.h"
9
+#include "edTerrain/ITerrain.h"
10
11
 using namespace EagleFM;
12
13
@@ -161,7 +162,11 @@
14
 	DTSAS_Status			PR_Status;			// Passive Ranging  status
15
 	DTSAS_Status			LAR_Status;			// Look Aside Ranging  status
16
 	float					OWC;				// Obstacle Warning Cue
17
+#ifndef USE_TERRAIN4
18
 	landscape::lPointOnSurface			surfInfo;
19
+#else
20
+	edterrain::PointOnSurfaceAdapter surfInfo;
21
+#endif
22
23
 	// DTSAS map
24
 	A10Common::PosInfo       Map_Center; // round area [R = Map_Side]
25
Index: A10/A10C/SConscript
26
===================================================================
27-
Index: Header/Avionics/Sensors/avTVSensor.h
27+
--- A10/A10C/SConscript	(revision 91480)
28
+++ A10/A10C/SConscript	(working copy)
29-
--- Header/Avionics/Sensors/avTVSensor.h	(revision 91480)
29+
@@ -1,11 +1,14 @@
30-
+++ Header/Avionics/Sensors/avTVSensor.h	(working copy)
30+
 Import('env')
31
32
+CPPDEFINES = [
33
+        'COCKPITA10C_EXPORTS',
34
+    ]
35
+
36
 LIBS = [
37
 	'lua',
38
 	'edCore',
39
 	'edMath',
40
 	'edObjects',
41
-	'edTerrain',
42
 	'World',
43
 	'WorldGeneral',
44
 	'Inter',
45
@@ -22,6 +25,11 @@
46
 	'Weather',
47
 ]
48
49
+if not env.has_key('TERRAIN4'):
50
+	LIBS += [
51-
Index: Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h
51+
52
+	]

53-
--- Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(revision 91480)

53+
54-
+++ Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(working copy)

54+
 env.edDCSModule(

55
 	modulePaths = ["aircrafts/A-10C"],

56
     target = 'Cockpit_A10C',

57
@@ -61,9 +69,7 @@

58
         '../../../offshore/Include/',

59
     ],

60
 

61
-    CPPDEFINES = [

62
-        'COCKPITA10C_EXPORTS',

63
-    ],

64
+    CPPDEFINES = CPPDEFINES,

65
     

66
     LIBS = LIBS

67
 );

68
Index: A10/A10C/Source/Avionics/avDTSAS.cpp

69
===================================================================

70
--- A10/A10C/Source/Avionics/avDTSAS.cpp	(revision 91480)

71
+++ A10/A10C/Source/Avionics/avDTSAS.cpp	(working copy)

72
@@ -226,7 +226,11 @@

73
 	if (DTSAS_Function == DTSAS_ON)

74-
Index: SConscript

74+
75
 		surfInfo.set(x, z);

76-
--- SConscript	(revision 91480)

76+
77-
+++ SConscript	(working copy)

77+
 		return surfInfo.getHeight();

78
+#else

79
+		return surfInfo.height();

80
+#endif

81
 	}

82
 	

83
 	return 0.0;

84
Index: Base/Header/Avionics/Sensors/avSimpleRadar.h

85
===================================================================

86
--- Base/Header/Avionics/Sensors/avSimpleRadar.h	(revision 91480)

87
+++ Base/Header/Avionics/Sensors/avSimpleRadar.h	(working copy)

88
@@ -9,6 +9,7 @@

89
 #include "Utilities/ccTriggerSystem.h"

90
 #include "Utilities/ccUtilities.h"

91
 #include "Avionics/avSimpleElectricSystem.h"

92
+#include "edTerrain/PointOnSurfaceAdapter.h"

93
 

94
 class woSpot;

95
 

96
@@ -137,8 +138,13 @@

97
 protected:

98-
Index: Source/Avionics/Sensors/avTVSensor.cpp

98+
99
 

100-
--- Source/Avionics/Sensors/avTVSensor.cpp	(revision 91480)

100+
101-
+++ Source/Avionics/Sensors/avTVSensor.cpp	(working copy)

101+
102
 	landscape::lPointOnSurface surf_info_2;

103
+#else

104
+	edterrain::PointOnSurfaceAdapter surf_info;

105-
     // из А в Б, PointOnSurface перемещается в А, тогда правильней проверять от цели в себе

105+
106
+#endif

107
 

108
 	woSpot				*spot;

109
 

110
Index: Base/Header/Avionics/Sensors/avTVSensor.h

111-
Index: Source/Avionics/Weapon/avWeaponsBombSight.cpp

111+
112
--- Base/Header/Avionics/Sensors/avTVSensor.h	(revision 91480)

113-
--- Source/Avionics/Weapon/avWeaponsBombSight.cpp	(revision 91480)

113+
+++ Base/Header/Avionics/Sensors/avTVSensor.h	(working copy)

114-
+++ Source/Avionics/Weapon/avWeaponsBombSight.cpp	(working copy)

114+
115
 #include "ICommandsCockpitDevice.h"

116
 #include "viLight.h"

117
 #include "Avionics/Sensors/avBasicSensor.h"

118
+#include "edTerrain/PointOnSurfaceAdapter.h"

119
 

120
 #ifdef  _DEBUG

121
 #include "Renderer/DbgGraph.h"

122
@@ -125,7 +126,11 @@

123
 

124
 	class COCKPITBASE_API avTVSensor : public avBasicSensor

125
 	{

126
+#ifndef USE_TERRAIN4

127
         mutable landscape::lPointOnSurface _terrain_visibility_check_pnt_;

128
+#else

129
+		mutable edterrain::PointOnSurfaceAdapter _terrain_visibility_check_pnt_;

130
+#endif

131
 	public:

132
 		avTVSensor();

133
 	   ~avTVSensor();

134
Index: Base/Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h

135
===================================================================

136
--- Base/Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(revision 91480)

137
+++ Base/Header/LoadableEquipment/Weapon/eqTVGuidedWeapon.h	(working copy)

138
@@ -1,6 +1,7 @@

139
 #pragma once

140
 

141
 #include "Avionics/Sensors/avTVSensor.h"

142
+#include "edTerrain/PointOnSurfaceAdapter.h"

143
 

144
 namespace cockpit {

145
 

146
@@ -120,6 +121,10 @@

147
 		bool   forceCorrelateEnabled;

148
         wModelTime forceCorrelateEnableTime;

149
 

150
+#ifndef USE_TERRAIN4

151-
Index: Source/Utilities/ccLuaLoader.cpp

151+
152
+#else

153-
--- Source/Utilities/ccLuaLoader.cpp	(revision 91480)

153+
154-
+++ Source/Utilities/ccLuaLoader.cpp	(working copy)

154+
155
 	};

156
 }

157
Index: Base/SConscript

158
===================================================================

159
--- Base/SConscript	(revision 91480)

160
+++ Base/SConscript	(working copy)

161
@@ -7,7 +7,6 @@

162
 	'edCore',

163
 	'edMath',

164
 	'edObjects',

165
-	'edTerrain',

166
 	'World',

167
 	'WorldGeneral',

168
 	'Inter',

169
@@ -30,6 +29,11 @@

170
 	'renderer',

171
 ]

172
 

173
+if not env.has_key('TERRAIN4'):

174-
 		ED_lua_copyindex (L,terrain_state,-1);
174+
175
+		'edTerrain',

176
+	]

177
+

178
 if not env.getUserVariable('FINAL_VERSION'):

179
 	libs.append('JConfigurator')

180
 

181
Index: Base/Source/Avionics/Sensors/avTVSensor.cpp

182
===================================================================

183
--- Base/Source/Avionics/Sensors/avTVSensor.cpp	(revision 91480)

184
+++ Base/Source/Avionics/Sensors/avTVSensor.cpp	(working copy)

185
@@ -494,7 +494,7 @@

186
 

187
     dVector p = pos.p;

188
     // из А в Б, PointOnSurface перемещается в А, тогда правильней проверять от цели в себе

189
-	if (_terrain_visibility_check_pnt_.intersectSurface(p,self_p,0))

190
+	if (_terrain_visibility_check_pnt_.intersectSurface(p,self_p,(dPoint*)0))

191
 	{

192
 		return false;

193
 	}

194
Index: Base/Source/Avionics/Weapon/avWeaponsBombSight.cpp

195
===================================================================

196
--- Base/Source/Avionics/Weapon/avWeaponsBombSight.cpp	(revision 91480)

197
+++ Base/Source/Avionics/Weapon/avWeaponsBombSight.cpp	(working copy)

198
@@ -15,6 +15,7 @@

199
 #include "Utilities/ccTriggerSystem.h"

200
 #include "mathDebug.h"

201
 #include "unit_converter.h"

202
+#include "wTerrain.h"

203
 

204
 using namespace cockpit;

205
 

206
@@ -403,9 +404,13 @@

207
     {

208
         if (!ElevationIsFixed)

209
         {

210
+#ifndef USE_TERRAIN4

211
             static landscape::lPointOnSurface surfInfo;

212
             surfInfo.set(out.p.x, out.p.z);

213
             lead_target_level = surfInfo.getHeight();

214
+#else

215
+			lead_target_level = globalLand->heightSurface(out.p.x, out.p.z);

216
+#endif

217
         }

218
         else

219
             lead_target_level = target_level;

220
@@ -456,9 +461,13 @@

221
     {

222
         if (!ElevationIsFixed)

223
         {

224
+#ifndef USE_TERRAIN4

225
             static landscape::lPointOnSurface surfInfo;

226
             surfInfo.set(lead_human_position.p.x, lead_human_position.p.z);

227
             lead_target_level = surfInfo.getHeight();

228
+#else

229
+			lead_target_level = globalLand->heightSurface(lead_human_position.p.x, lead_human_position.p.z);

230
+#endif

231
         }

232
         else

233
             lead_target_level = target_level;

234
Index: Base/Source/Utilities/ccLuaLoader.cpp

235
===================================================================

236
--- Base/Source/Utilities/ccLuaLoader.cpp	(revision 91480)

237
+++ Base/Source/Utilities/ccLuaLoader.cpp	(working copy)

238
@@ -37,6 +37,7 @@

239
 #include "smSceneManager.h"

240
 #include "Oculus.h"

241
 #include "IwWorld.h"

242
+#include "wTerrain.h"

243
 

244
 using namespace cockpit;

245
 using namespace Common;

246
@@ -307,7 +308,11 @@

247
 	}

248
 	const char * data_name     = lua_tostring(L,1);

249
 

250
+#ifndef USE_TERRAIN4

251
 	lua_State  * terrain_state =  GetTerraDispatch()->getTerrainCfg();

252
+#else

253
+	lua_State  * terrain_state =  globalLand->getTerrainCfg();

254
+#endif

255
 	lua_getglobal(terrain_state,data_name);

256
 	{

257
 		ED_lua_copyindex (L,terrain_state,-1);

258
Index: Ka50/Header/Avionics/ABRIS/avABRIS.h

259
===================================================================

260
--- Ka50/Header/Avionics/ABRIS/avABRIS.h	(revision 91480)

261
+++ Ka50/Header/Avionics/ABRIS/avABRIS.h	(working copy)

262
@@ -23,6 +23,7 @@

263
 #include "Randomizer/RandomObject.h"

264
 #include "Avionics/avMovingMap.h"

265
 #include "Utilities/ccString32.h"

266
+#include "edTerrain/PointOnSurfaceAdapter.h"

267
 

268
 class	ABRIS_Waypoint_Checker;

269
 

270
@@ -762,9 +763,13 @@

271
     private:

272
         double              post_update_time;

273
 

274
-

275
+#ifndef USE_TERRAIN4

276
         landscape::lPointOnSurface     surfInfo_cursor;

277
         landscape::lPointOnSurface     surfInfo_marker;

278
+#else

279
+		edterrain::PointOnSurfaceAdapter     surfInfo_cursor;

280
+        edterrain::PointOnSurfaceAdapter     surfInfo_marker;

281
+#endif

282
         void                update_point_under_cursor();

283
 

284
         EagleFM::ProbabilityChecker * blue_screen_checker;

285
Index: Ka50/SConscript

286
===================================================================

287
--- Ka50/SConscript	(revision 91480)

288
+++ Ka50/SConscript	(working copy)

289
@@ -1,5 +1,28 @@

290
 Import('env')

291
 

292
+LIBS = [

293
+        'edCore',

294
+        'edMath',

295
+        'edObjects',

296
+        'World',

297
+        'WorldGeneral',

298
+        'Inter',

299
+        'Flight',

300
+        'FMBase',

301
+        'GraphicsXP',

302
+        'wRadio',

303
+		'WeaponsBase',

304
+        'CockpitBase',

305
+        'Ka50',

306
+        'lua',

307
+		'Weather',

308
+    ]

309
+

310
+if not env.has_key('TERRAIN4'):

311
+	LIBS += [

312
+		'edTerrain',

313
+	]

314
+

315
 env.edDCSModule(

316
 	modulePaths = ["aircrafts/Ka-50"],

317
     target = 'CockpitKa50',

318
@@ -39,22 +62,5 @@

319
         'COCKPITKA50_EXPORTS',

320
     ],

321
 

322
-    LIBS = [

323
-        'edCore',

324
-        'edMath',

325
-        'edObjects',

326
-        'edTerrain',

327
-        'World',

328
-        'WorldGeneral',

329
-        'Inter',

330
-        'Flight',

331
-        'FMBase',

332
-        'GraphicsXP',

333
-        'wRadio',

334
-		'WeaponsBase',

335
-        'CockpitBase',

336
-        'Ka50',

337
-        'lua',

338
-		'Weather',

339
-    ]

340
+    LIBS = LIBS

341
 );

342
Index: P51/P51Common/CommonD/Header/Avionics/avTailWarningRadar_AN_APS13.h

343
===================================================================

344
--- P51/P51Common/CommonD/Header/Avionics/avTailWarningRadar_AN_APS13.h	(revision 91480)

345
+++ P51/P51Common/CommonD/Header/Avionics/avTailWarningRadar_AN_APS13.h	(working copy)

346
@@ -7,6 +7,7 @@

347
 #include "FMElectricSystems/Items/Consumer.h"

348
 #include "FMElectricSystems/Items/Lamp.h"

349
 #include "FMElectricSystems/Items/Switch.h"

350
+#include "edTerrain/PointOnSurfaceAdapter.h"

351
 

352
 #ifdef _DEBUG

353
 	#include "Renderer/DbgGraph.h"

354
@@ -66,7 +67,11 @@

355
 

356
 	DECLARE_DEV_LINKPTR(P51Common::avElectricInterface_P51,ElecInterface);

357
 

358
+#ifndef USE_TERRAIN4

359
 	mutable landscape::lPointOnSurface terrain_intersect_check_;

360
+#else

361
+	mutable edterrain::PointOnSurfaceAdapter terrain_intersect_check_;

362
+#endif

363
 	void search();

364
 

365
 	float		MaxSearchRange_;

366
Index: P51/P51Common/SConscript

367
===================================================================

368
--- P51/P51Common/SConscript	(revision 91480)

369
+++ P51/P51Common/SConscript	(working copy)

370
@@ -1,5 +1,26 @@

371
 Import('env')

372
 

373
+LIBS = [

374
+        'edCore',

375
+        'edMath',

376
+		'edObjects',

377
+		'World',

378
+		'WorldGeneral',

379
+        'Inter',

380
+        'FMBase',

381
+		'GraphicsXP',

382
+        'CockpitBase',

383
+        'lua',

384
+		'P51Base',

385
+		'wRadio',	

386
+		'Weather',

387
+    ]

388
+	

389
+if not env.has_key('TERRAIN4'):

390
+	LIBS += [

391
+		'edTerrain',

392
+	]

393
+

394
 env.edDCSModule(

395
 	modulePaths = ["aircrafts/P-51D","aircrafts/TF-51D"],

396
     target = 'Cockpit_P51Common',

397
@@ -34,20 +55,5 @@

398
         'COCKPITP51COMMON_EXPORTS',

399
     ],

400
 

401
-    LIBS = [

402
-        'edCore',

403
-        'edMath',

404
-		'edObjects',

405
-		'edTerrain',

406
-		'World',

407
-		'WorldGeneral',

408
-        'Inter',

409
-        'FMBase',

410
-		'GraphicsXP',

411
-        'CockpitBase',

412
-        'lua',

413
-		'P51Base',

414
-		'wRadio',	

415
-		'Weather',

416
-    ]

417
+    LIBS = LIBS

418
 );
        

    


            


                                


        

            



                
    

        Public Pastes
    

    
            

    

                    

        

    





    


    
    
    
    
    
    
    
    




    


    



                

            We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.             OK, I Understand
        

    
                

            

                
                    
                
            

            

                Not a member of Pastebin yet?

                Sign Up, it unlocks many cool features!