fly/flightgear
1
0
Fork 0
Code Activity

2D panels: improve error messages for missing textures

Browse source 
Check for a failed path resolve in FGTextrueManager, and report this
explicitly with the input path, to give the user some idea what is
going on.

Thanks to Huntely Palmer for the suggestion.

SF-ID: https://sourceforge.net/p/flightgear/codetickets/2820/
This commit is contained in:
James Turner 2023-08-12 12:58:36 +01:00
parent b97dcae5f0
commit 128143fd9b
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Cockpit/panel.cxx
View file

@ -27,9 +27,7 @@
// <layer> tag by adding <emissive>true</emissive> tag. When omitted the default
// value is for backward compatibility set to false.
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <config.h>
#include "panel.hxx"
@ -49,11 +47,12 @@
#include "fnt.h"
#include <osg/GLU>
#include <simgear/debug/ErrorReportingCallback.hxx>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/strutils.hxx>
#include <simgear/scene/model/model.hxx>
#include <osg/GLU>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
@ -104,14 +103,23 @@ osg::Texture2D*
FGTextureManager::createTexture (const std::string &relativePath, bool staticTexture)
{
osg::Texture2D* texture = _textureMap[relativePath].get();
if (texture == 0) {
SGPath tpath = globals->resolve_aircraft_path(relativePath);
texture = SGLoadTexture2D(staticTexture, tpath);
if (!texture) {
SGPath tpath = globals->resolve_aircraft_path(relativePath);
if (!tpath.exists()) {
simgear::reportFailure(simgear::LoadFailure::NotFound, simgear::ErrorCode::LoadingTexture,
std::string{"Panel texture:"} + relativePath, sg_location{tpath});
// fall through : SGLoadTexture2D will create an empty texture
}
_textureMap[relativePath] = texture;
if (!_textureMap[relativePath].valid())
SG_LOG( SG_COCKPIT, SG_ALERT, "Texture *still* doesn't exist" );
SG_LOG( SG_COCKPIT, SG_DEBUG, "Created texture " << relativePath );
texture = SGLoadTexture2D(staticTexture, tpath);
if (!texture) {
// path was valie but failed to load for some reason
simgear::reportFailure(simgear::LoadFailure::BadData, simgear::ErrorCode::LoadingTexture,
std::string{"Panel texture:"} + relativePath, sg_location{tpath});
return nullptr;
}
_textureMap[relativePath] = texture;
}
return texture;