# include <simgear/compiler.h>
#endif
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
#include <simgear/magvar/magvar.hxx>
#include <simgear/timing/sg_time.hxx>
#include <simgear/misc/sg_path.hxx>
+#include <simgear/scene/material/matlib.hxx>
#include <simgear/sound/soundmgr.hxx>
#include STL_IOSTREAM
#else
# include <Environment/environment.hxx>
#endif // FG_WEATHERCM
-#include <Objects/matlib.hxx>
#include <GUI/gui.h>
#include "globals.hxx"
-#include "fgfs.hxx"
#include "fg_props.hxx"
SG_USING_STD(istream);
return;
}
}
- SG_LOG(SG_GENERAL, SG_ALERT, "Unknown logging class: " << name);
+ SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging class: " << name);
}
static void
setLoggingPriority (const char * p)
{
+ if (p == 0)
+ return;
string priority = p;
if (priority == "bulk") {
logbuf::set_log_priority(SG_BULK);
} else {
SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging priority " << priority);
}
- SG_LOG(SG_GENERAL, SG_INFO, "Logging priority is " << getLoggingPriority());
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Logging priority is " << getLoggingPriority());
}
// if the save file has been edited
// by hand.
if (ret != 6) {
- SG_LOG(SG_INPUT, SG_ALERT, "Date/time string " << date_string
+ SG_LOG(SG_INPUT, SG_WARN, "Date/time string " << date_string
<< " not in YYYY-MM-DDTHH:MM:SS format; skipped");
return;
}
double lat = current_aircraft.fdm_state->get_Latitude();
globals->set_warp(warp);
st->update(lon, lat, cur_time_override->getLongValue(), warp);
- fgUpdateSkyAndLightingParams();
}
/**
}
-/**
- * Get the texture rendering state.
- */
-static bool
-getTextures ()
-{
- return (material_lib.get_step() == 0);
-}
-
-
-/**
- * Set the texture rendering state.
- */
-static void
-setTextures (bool textures)
-{
- if (textures)
- material_lib.set_step(0);
- else
- material_lib.set_step(1);
-}
-
-
/**
* Return the magnetic variation
*/
static double
getHeadingMag ()
{
- return current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
+ double magheading;
+ magheading = current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
+ if (magheading < 0) magheading += 360;
+ return magheading;
}
fgTie("/sim/time/gmt", getDateString, setDateString);
fgSetArchivable("/sim/time/gmt");
fgTie("/sim/time/gmt-string", getGMTString);
- fgTie("/sim/rendering/textures", getTextures, setTextures);
// Orientation
fgTie("/orientation/heading-magnetic-deg", getHeadingMag);
{
SGPropertyNode * node = globals->get_props()->getNode(name);
if (node == 0)
- SG_LOG(SG_GENERAL, SG_ALERT,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Attempt to set archive flag for non-existant property "
<< name);
else
{
SGPropertyNode * node = globals->get_props()->getNode(name);
if (node == 0)
- SG_LOG(SG_GENERAL, SG_ALERT,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Attempt to set read flag for non-existant property "
<< name);
else
{
SGPropertyNode * node = globals->get_props()->getNode(name);
if (node == 0)
- SG_LOG(SG_GENERAL, SG_ALERT,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Attempt to set write flag for non-existant property "
<< name);
else