speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
6
2
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

OSG: warn about missing car files

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8010 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 4b872af423bfcfc3fc56ad4b53620e99cd65d723
Former-commit-id: 9ffbd2027db11dd56747284d9965284e9021f279
This commit is contained in:
iobyte 2022-02-07 02:07:36 +00:00
parent 90634f216e
commit 304320ceb5
1 changed files with 54 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/modules/graphic/osggraph/Car/OsgCar.cpp
View file

@ -276,7 +276,6 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
gCar->setName("CAR");
osg::ref_ptr<osg::Switch> pBody =new osg::Switch;
pBody->setName("COCK");
osg::ref_ptr<osg::Node> pCar = new osg::Node;
osg::ref_ptr<osg::Node> pCockpit = new osg::Node;
osg::ref_ptr<osg::Switch> pWing = new osg::Switch;
pWing->setName("WING");
@ -297,8 +296,14 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
GfLogDebug("Car Texture = %s - Car Name = %s\n", bSkinName.c_str(), bCarName.c_str());
}
pCar = loader.Load3dFile(strPath, true, bCarName, bSkinName);
GfLogDebug("Load Car ACC !\n");
osg::ref_ptr<osg::Node> pCar = loader.Load3dFile(strPath, true, bCarName, bSkinName);
if (pCar)
GfLogDebug("Load Car ACC !\n");
else
{
GfLogError("Failed to load %s\n", strPath.c_str());
pCar = new osg::Node;
}
/* Set a selector on the wing type MPA*/
snprintf(path, nMaxTexPathSize, "%s/%s", SECT_GROBJECTS, SECT_WING_MODEL);
@ -306,10 +311,6 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
if (param)
{
osg::ref_ptr<osg::Node> pWin1 = new osg::Node;
osg::ref_ptr<osg::Node> pWin2 = new osg::Node;
osg::ref_ptr<osg::Node> pWin3 = new osg::Node;
_wing1 = true;
std::string tmp = GetDataDir();
@ -318,19 +319,39 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
param = GfParmGetStr(handle, path, PRM_WING_1, NULL);
strPath=tmp+param;
pWin1 = loader.Load3dFile(strPath, true, bCarName, bSkinName);
osg::ref_ptr<osg::Node> pWin1 = loader.Load3dFile(strPath, true, bCarName, bSkinName);
if (pWin1)
GfLogDebug("Load Wing1 ACC ! %s\n", strPath.c_str() );
else
{
GfLogError("Failed to load %s\n", strPath.c_str());
pWin1 = new osg::Node;
}
pWin1->setName("WING1");
GfLogDebug("Load Wing1 ACC ! %s\n", strPath.c_str() );
param = GfParmGetStr(handle, path, PRM_WING_2, NULL);
strPath=tmp+param;
pWin2 = loader.Load3dFile(strPath, true, bCarName, bSkinName);
osg::ref_ptr<osg::Node> pWin2 = loader.Load3dFile(strPath, true, bCarName, bSkinName);
if (pWin2)
GfLogDebug("Load Wing2 ACC ! %s\n", strPath.c_str());
else
{
GfLogError("Failed to load %s\n", strPath.c_str());
pWin2 = new osg::Node;
}
pWin2->setName("WING2");
GfLogDebug("Load Wing2 ACC ! %s\n", strPath.c_str());
param = GfParmGetStr(handle, path, PRM_WING_3, NULL);
strPath=tmp+param;
pWin3 = loader.Load3dFile(strPath, true, bCarName, bSkinName);
osg::ref_ptr<osg::Node> pWin3 = loader.Load3dFile(strPath, true, bCarName, bSkinName);
if (pWin3)
GfLogDebug("Load Wing3 ACC ! %s\n", strPath.c_str());
else
{
GfLogError("Failed to load %s\n", strPath.c_str());
pWin3 = new osg::Node;
}
pWin3->setName("WING3");
GfLogDebug("Load Wing3 ACC ! %s\n", strPath.c_str());
@ -377,13 +398,18 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
// Add the rearwings
for (int i = 1; i < nranges; i++)
{
osg::ref_ptr<osg::Node> pWing1_branch = new osg::Node;
snprintf(path, nMaxTexPathSize, "%s/%s/%d", SECT_GROBJECTS, LST_REARWING, i);
param = GfParmGetStr(handle, path, PRM_REARWINGMODEL, "");
strPath = tmp+param;
pWing1_branch = loader.Load3dFile(strPath, true, bCarName, bSkinName);
GfLogDebug("Loading Wing animate %i - %s !\n", i, strPath.c_str());
osg::ref_ptr<osg::Node> pWing1_branch = loader.Load3dFile(strPath, true, bCarName, bSkinName);
if (pWing1_branch)
GfLogDebug("Loading Wing animate %i - %s !\n", i, strPath.c_str());
else
{
GfLogError("failed to load Wing animate %i - %s !\n", i, strPath.c_str());
pWing1_branch = new osg::Node;
}
this->DRMSelector2->addChild(pWing1_branch.get());
strPath ="";
@ -397,7 +423,6 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
GfLogDebug("Rear Wing angle Loaded\n");
}
// Cockpit separate object loaded ...
snprintf(path, nMaxTexPathSize, "%s/%s", SECT_GROBJECTS, SECT_COCKPIT);
param = GfParmGetStr(handle, path, PRM_MODELCOCKPIT, NULL);
@ -412,7 +437,13 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
strPath= tmp+param;
pCockpit = loader.Load3dFile(strPath, true, bCarName, bSkinName);
GfLogDebug("Cockpit loaded = %s !\n", strPath.c_str());
if (pCockpit)
GfLogDebug("Cockpit loaded = %s !\n", strPath.c_str());
else
{
GfLogError("Failed to load %s\n", strPath.c_str());
pCockpit = new osg::Node;
}
}
pBody->addChild(pCockpit.get(), false);
@ -432,10 +463,8 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
osg::ref_ptr<osg::Node> steerEntityLo = loader.Load3dFile(strPath, true, "", "");
if (steerEntityLo == nullptr)
GfLogError("Failed to load: %s\n", strPath.c_str());
osg::ref_ptr<osg::MatrixTransform> steer_transform = new osg::MatrixTransform;
if(steerEntityLo)
GfLogError("Failed to load %s\n", strPath.c_str());
else
{
this->nSteer = 1;
this->steerMovt = GfParmGetNum(handle, path, PRM_SW_MOVT, NULL, 1.0);
@ -476,6 +505,11 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
strPath = tmpPath + param;
osg::ref_ptr<osg::Node> steerEntityHi = loader.Load3dFile(strPath, true, "", "");
if (steerEntityHi == nullptr)
{
GfLogError("Failed to load: %s\n", strPath.c_str());
steerEntityHi = new osg::Node;
}
this->nSteer = 2;
steerbranch = new osg::Group;
@ -518,7 +552,6 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
this->DRMSelector = new osg::Switch;
this->carTransform->addChild(DriverSelector.get());
std::string tmp = GetLocalDir();
std::string driver_path;
@ -591,7 +624,6 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
if(_steer && SteerSelector)
gCar->addChild(SteerSelector.get());
pBody->addChild(gCar.get(), true);
pBody->setSingleChildOn(1);