- adjusted for no-value constructor for FGPanel
- removed unused DefaultPanel, DefaultInstrument, classes - removed unused defaultTexture
This commit is contained in:
parent
982f145bb7
commit
b498efa47e
1 changed files with 1 additions and 48 deletions
|
@ -50,53 +50,6 @@ SG_USING_STD(ifstream);
|
||||||
SG_USING_STD(string);
|
SG_USING_STD(string);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
|
||||||
// Default panel, instrument, and layer for when things go wrong...
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
static FGCroppedTexture defaultTexture("Textures/default.rgb");
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default layer: the default texture.
|
|
||||||
*/
|
|
||||||
class DefaultLayer : public FGTexturedLayer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DefaultLayer () : FGTexturedLayer(defaultTexture)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default instrument: a single default layer.
|
|
||||||
*/
|
|
||||||
class DefaultInstrument : public FGLayeredInstrument
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DefaultInstrument (int x, int y, int w, int h)
|
|
||||||
: FGLayeredInstrument(x, y, w, h)
|
|
||||||
{
|
|
||||||
addLayer(new DefaultLayer());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default panel: the default texture.
|
|
||||||
*/
|
|
||||||
class DefaultPanel : public FGPanel
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DefaultPanel (int x, int y, int w, int h) : FGPanel(x, y, w, h)
|
|
||||||
{
|
|
||||||
setBackground(defaultTexture.getTexture());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
// Built-in layer for the magnetic compass ribbon layer.
|
// Built-in layer for the magnetic compass ribbon layer.
|
||||||
|
@ -734,7 +687,7 @@ readPanel (const SGPropertyNode * root)
|
||||||
SG_LOG( SG_COCKPIT, SG_INFO, "Reading properties for panel " <<
|
SG_LOG( SG_COCKPIT, SG_INFO, "Reading properties for panel " <<
|
||||||
root->getStringValue("name", "[Unnamed Panel]") );
|
root->getStringValue("name", "[Unnamed Panel]") );
|
||||||
|
|
||||||
FGPanel * panel = new FGPanel(0, 0, 1024, 768);
|
FGPanel * panel = new FGPanel();
|
||||||
panel->setWidth(root->getIntValue("w", 1024));
|
panel->setWidth(root->getIntValue("w", 1024));
|
||||||
panel->setHeight(root->getIntValue("h", 443));
|
panel->setHeight(root->getIntValue("h", 443));
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue