Merge branch 'main' into exports-check

OVP/D3D9Client/D3D9Client.cpp

@@ -989,6 +989,14 @@ void D3D9Client::clbkDestroyRenderWindow (bool fastclose)
 
 }
 
+// ==============================================================
+
+void D3D9Client::clbkDebugString(const char* str)
+{
+	D3D9DebugLog("%s", str);
+}
+
+
 // ==============================================================
 
 void D3D9Client::PushSketchpad(SURFHANDLE surf, D3D9Pad *pSkp) const

OVP/D3D9Client/D3D9Client.h

@@ -208,6 +208,8 @@ class D3D9Client : public GraphicsClient
      */
 	void clbkOptionChanged(DWORD cat, DWORD item);
 
+	void clbkDebugString(const char* str);
+
 	/**
 	 * \brief Texture request
 	 *

Orbitersdk/include/GraphicsAPI.h

@@ -468,6 +468,12 @@ class OAPIFUNC GraphicsClient: public Module {
 	 */
 	virtual void clbkOptionChanged(DWORD cat, DWORD item) {}
 
+	/**
+	 * \brief Print multiple debug strings onto a screen, will be cleared when printed on screen.
+	 * \param str Text string to print
+	 */
+	virtual void clbkDebugString(const char *str) {}
+
 	/**
 	 * \brief Texture request
 	 *

Orbitersdk/include/OrbiterAPI.h

@@ -2446,6 +2446,13 @@ OAPIFUNC void oapiRegisterModule (oapi::Module *module);
 OAPIFUNC char *oapiDebugString ();
 
 
+/**
+* \brief Print multiple debug strings onto a screen, will be cleared when printed on screen.
+* \param str Text string to print
+*/
+OAPIFUNC void oapiDebugString(const char*);
+
+
 // ======================================================================
 /**
  * \defgroup ObjectAccess Object access functions

Src/Orbiter/MfdUser.cpp

@@ -13,7 +13,7 @@
 #include "Psys.h"
 #include "Nav.h"
 #include <stdio.h>
-#include <strstream>
+#include <sstream>
 #include <iomanip>
 #include "Log.h"
 #include "Util.h"
@@ -397,11 +397,11 @@ void GraphMFD::Plot (HDC hDC, int g, int h0, int h1, const char *title)
 		}
 	}
 	if (gf.absc_title[0]) {
-		ostrstream oss(cbuf, 64);
+		ostringstream oss(cbuf, 64);
 		oss << gf.absc_title;
 		if (gf.absc_tickscale != 1.0f) oss << " x " << 1.0/gf.absc_tickscale;
 		oss << '\0';
-		TextOut (hDC, (x0+x1)/2, y0+(3*ch)/4, oss.str(), strlen(oss.str()));
+		TextOut (hDC, (x0+x1)/2, y0+(3*ch)/4, oss.str().c_str(), strlen(oss.str().c_str()));
 	}
 
 	// ordinate ticks/labels
@@ -430,11 +430,11 @@ void GraphMFD::Plot (HDC hDC, int g, int h0, int h1, const char *title)
 	SetTextAlign (hDC, TA_CENTER);
 	if (gf.data_title[0]) {
 		SelectDefaultFont (hDC, 2);
-		ostrstream oss(cbuf, 64);
+		ostringstream oss(cbuf, 64);
 		oss << gf.data_title;
 		if (gf.data_tickscale != 1.0f) oss << " x " << 1.0/gf.data_tickscale;
 		oss << '\0';
-		TextOut (hDC, 0, (y0+y1)/2, oss.str(), strlen(oss.str()));
+		TextOut (hDC, 0, (y0+y1)/2, oss.str().c_str(), strlen(oss.str().c_str()));
 	}
 
 	// plot frame

Src/Orbiter/OptionsPages.cpp

@@ -528,16 +528,170 @@ BOOL OptionsPage_Visual::OnInitDialog(HWND hPage, WPARAM wParam, LPARAM lParam)
 
 BOOL OptionsPage_Visual::OnCommand(HWND hPage, WORD ctrlId, WORD notification, HWND hCtrl)
 {
-	switch (ctrlId) {
-	case IDC_OPT_VIS_CLOUD:
-	case IDC_OPT_VIS_REFWATER:
-		if (notification == BN_CLICKED) {
-			VisualsChanged(hPage);
-			return TRUE;
-		}
-		break;
+	switch (ctrlId)
+	{
+		case IDC_OPT_VIS_CLOUD:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_CLOUD, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bClouds = check;
+				VisualsChanged( hPage );
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_CSHADOW:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_CSHADOW, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bCloudShadows = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_HAZE:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_HAZE, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bHaze = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_FOG:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_FOG, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bFog = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_REFWATER:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_REFWATER, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bWaterreflect = check;
+				VisualsChanged( hPage );
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_RIPPLE:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_RIPPLE, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bSpecularRipple = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_LIGHTS:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_LIGHTS, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bNightlights = check;
+				VisualsChanged( hPage );
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_LTLEVEL:
+			if (notification == EN_CHANGE)
+			{
+				char cbuf[16];
+				double d;
+				GetWindowText( GetDlgItem( hPage, IDC_OPT_VIS_LTLEVEL ), cbuf, 16 );
+				if (!sscanf( cbuf, "%lf", &d )) d = 0.5;
+				else if (d < 0) d = 0.0;
+				else if (d > 1) d = 1.0;
+				Cfg()->CfgVisualPrm.LightBrightness = d;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_ELEV:
+			if (notification == BN_CLICKED)
+			{
+				int elevmode = SendDlgItemMessage( hPage, IDC_OPT_VIS_ELEV, BM_GETCHECK, 0, 0 ) != BST_CHECKED ? 0 : (SendDlgItemMessage( hPage, IDC_OPT_VIS_ELEVMODE, CB_GETCURSEL, 0, 0 ) + 1);
+				Cfg()->CfgVisualPrm.ElevMode = elevmode;
+				VisualsChanged( hPage );
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_ELEVMODE:
+			if (notification == CBN_SELCHANGE)
+			{
+				int elevmode = SendDlgItemMessage( hPage, IDC_OPT_VIS_ELEV, BM_GETCHECK, 0, 0 ) != BST_CHECKED ? 0 : (SendDlgItemMessage( hPage, IDC_OPT_VIS_ELEVMODE, CB_GETCURSEL, 0, 0 ) + 1);
+				Cfg()->CfgVisualPrm.ElevMode = elevmode;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_MAXLEVEL:
+			if (notification == EN_CHANGE)
+			{
+				char cbuf[16];
+				DWORD i;
+				GetWindowText( GetDlgItem( hPage, IDC_OPT_VIS_MAXLEVEL ), cbuf, 16 );
+				if (!sscanf( cbuf, "%lu", &i )) i = SURF_MAX_PATCHLEVEL2;
+				Cfg()->CfgVisualPrm.PlanetMaxLevel = max((DWORD)1, min((DWORD)SURF_MAX_PATCHLEVEL2, i));
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_VSHADOW:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_VSHADOW, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bVesselShadows = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_REENTRY:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_REENTRY, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bReentryFlames = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_SHADOW:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_SHADOW, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bShadows = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_PARTICLE:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_PARTICLE, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bParticleStreams = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_SPECULAR:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_SPECULAR, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bSpecular = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_LOCALLIGHT:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_VIS_LOCALLIGHT, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgVisualPrm.bLocalLight = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_VIS_AMBIENT:
+			if (notification == EN_CHANGE)
+			{
+				char cbuf[16];
+				DWORD i;
+				GetWindowText( GetDlgItem(hPage, IDC_OPT_VIS_AMBIENT ), cbuf, 16 );
+				if (!sscanf( cbuf, "%lu", &i )) i = 15;
+				else if (i > 255) i = 255;
+				Cfg()->SetAmbientLevel( i );
+				return FALSE;
+			}
+			break;
 	}
-	return FALSE;
+	return TRUE;
 }
 
 //-----------------------------------------------------------------------------
@@ -548,6 +702,9 @@ void OptionsPage_Visual::VisualsChanged(HWND hPage)
 		SendDlgItemMessage(hPage, IDC_OPT_VIS_CLOUD, BM_GETCHECK, 0, 0) == BST_CHECKED);
 	EnableWindow(GetDlgItem(hPage, IDC_OPT_VIS_RIPPLE),
 		SendDlgItemMessage(hPage, IDC_OPT_VIS_REFWATER, BM_GETCHECK, 0, 0) == BST_CHECKED);
+	EnableWindow( GetDlgItem( hPage, IDC_OPT_VIS_ELEVMODE ), SendDlgItemMessage( hPage, IDC_OPT_VIS_ELEV, BM_GETCHECK, 0, 0 ) == BST_CHECKED );
+	EnableWindow( GetDlgItem( hPage, IDC_OPT_VIS_LTLEVEL ), SendDlgItemMessage( hPage, IDC_OPT_VIS_LIGHTS, BM_GETCHECK, 0, 0 ) == BST_CHECKED );
+	return;
 }
 
 // ======================================================================
@@ -612,6 +769,48 @@ BOOL OptionsPage_Physics::OnInitDialog(HWND hPage, WPARAM wParam, LPARAM lParam)
 	return TRUE;
 }
 
+// ----------------------------------------------------------------------
+
+BOOL OptionsPage_Physics::OnCommand( HWND hPage, WORD ctrlId, WORD notification, HWND hCtrl )
+{
+	switch (ctrlId)
+	{
+		case IDC_OPT_PHYS_DISTMASS:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_PHYS_DISTMASS, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgPhysicsPrm.bDistributedMass = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_PHYS_COMPLEXGRAV:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_PHYS_COMPLEXGRAV, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgPhysicsPrm.bNonsphericalGrav = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_PHYS_RPRESSURE:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_PHYS_RPRESSURE, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgPhysicsPrm.bRadiationPressure = check;
+				return FALSE;
+			}
+			break;
+		case IDC_OPT_PHYS_WIND:
+			if (notification == BN_CLICKED)
+			{
+				bool check = (SendDlgItemMessage( hPage, IDC_OPT_PHYS_WIND, BM_GETCHECK, 0, 0 ) == BST_CHECKED);
+				Cfg()->CfgPhysicsPrm.bAtmWind = check;
+				return FALSE;
+			}
+			break;
+	}
+	return TRUE;
+}
+
 // ======================================================================
 
 OptionsPage_Instrument::OptionsPage_Instrument(OptionsPageContainer* container)

Src/Orbiter/OptionsPages.h

@@ -268,6 +268,7 @@ class OptionsPage_Physics : public OptionsPage {
 
 protected:
 	BOOL OnInitDialog(HWND hPage, WPARAM wParam, LPARAM lParam);
+	BOOL OnCommand( HWND hPage, WORD ctrlId, WORD notification, HWND hCtrl );
 };
 
 /************************************************************************

Src/Orbiter/Orbiter.cpp

@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <fstream>
-#include <strstream>
 #include <iomanip>
 #include <io.h>
 #include "cmdline.h"

Src/Orbiter/OrbiterAPI.cpp

@@ -2500,6 +2500,14 @@ DLLEXPORT char *oapiDebugString ()
 	return DBG_MSG;
 }
 
+DLLEXPORT void oapiDebugString(const char* str)
+{
+#ifndef INLINEGRAPHICS
+	oapi::GraphicsClient* gc = g_pOrbiter->GetGraphicsClient();
+	if (gc) gc->clbkDebugString(str);
+#endif // !INLINEGRAPHICS
+}
+
 DLLEXPORT double oapiRand ()
 {
 	static double irmax = 1.0/(double)RAND_MAX;

Src/Orbiter/Vessel.cpp

@@ -4834,8 +4834,9 @@ void Vessel::UpdatePassive ()
 	proxybody = prnt->proxybody;
 	proxyplanet = prnt->proxyplanet;
 	fstatus = prnt->fstatus;
+
+	if (proxybody) UpdateSurfParams();
 	if (fstatus != FLIGHTSTATUS_LANDED) {
-		if (proxybody) UpdateSurfParams();
 		bSurfaceContact = false;
 	}
 	UpdateMass(); // register fuel consumption
@@ -5553,10 +5554,10 @@ bool Vessel::VCRedrawEvent (int id, int event, SURFHANDLE surf) const
 
 bool Vessel::VCMouseEvent (int id, int event, Vector &p) const
 {
-	if (modIntf.v && modIntf.v->Version() >= 1) {
-		VECTOR3 v = _V(p.x,p.y,p.z);
-		return ((VESSEL2*)modIntf.v)->clbkVCMouseEvent (id, event, v);
-	}
+	if (modIntf.v && modIntf.v->Version() >= 1) {
+		VECTOR3 v = _V(p.x,p.y,p.z);
+		return ((VESSEL2*)modIntf.v)->clbkVCMouseEvent (id, event, v);
+	}
 	else
 		return false;
 }
@@ -8850,4 +8851,4 @@ bool VESSEL4::UnregisterMFDMode (int mode)
 int VESSEL4::clbkNavProcess (int mode)
 {
 	return mode;
-}
+}