xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove cmake OPTIONS_HUDDEBUG and always build OSG debug HUD 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7996 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2022-02-04 22:13:02 +00:00
parent ef199d805b
commit 9bd072e614
7 changed files with 5 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/options.cmake
View File

@ -80,8 +80,6 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
SET(OPTION_OSGGRAPH true CACHE BOOL "Build OpenScenGraph-based WIP osggraph graphics module")
SET(OPTION_HUDDEBUG false CACHE BOOL "Build with HUD Debug in OsgGraph")
SET(OPTION_WEBSERVER true CACHE BOOL "Build with WebServer functionality")
SET(OPTION_CLIENT_SERVER false CACHE BOOL "Build with Client/Server network architecture")
@ -199,10 +197,6 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
ADD_DEFINITIONS(-DWEBSERVER)
ENDIF(OPTION_WEBSERVER)
IF(OPTION_HUDDEBUG)
ADD_DEFINITIONS(-DHUDDEBUG)
ENDIF(OPTION_HUDDEBUG)
IF(OPTION_CLIENT_SERVER)
ADD_DEFINITIONS(-DCLIENT_SERVER)
ENDIF(OPTION_CLIENT_SERVER)

10
src/modules/graphic/osggraph/CMakeLists.txt
View File

@ -32,6 +32,7 @@ SET(OSGGRAPH_HEADERS Utils/OsgVectorArrayAdapter.h
Viewer/OsgScreens.h
Viewer/OsgCamera.h
Viewer/OsgHUD.h
Viewer/OsgDebugHUD.h
Viewer/OsgGraphicsWindow.h
Car/OsgCar.h
@ -43,10 +44,6 @@ SET(OSGGRAPH_HEADERS Utils/OsgVectorArrayAdapter.h
OsgGraph.h
OsgMain.h)
IF(OPTION_HUDDEBUG)
SET(OSGGRAPH_HEADERS ${OSGGRAPH_HEADERS} Viewer/OsgDebugHUD.h)
ENDIF(OPTION_HUDDEBUG)
SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
Utils/OsgLightTransform.cpp
#Utils/OsgPrecipitation.cpp
@ -78,6 +75,7 @@ SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
Viewer/OsgScreens.cpp
Viewer/OsgCamera.cpp
Viewer/OsgHUD.cpp
Viewer/OsgDebugHUD.cpp
Viewer/OsgGraphicsWindow.cpp
Car/OsgCar.cpp
@ -89,10 +87,6 @@ SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
OsgGraph.cpp
OsgMain.cpp)
IF(OPTION_HUDDEBUG)
SET(OSGGRAPH_SOURCES ${OSGGRAPH_SOURCES} Viewer/OsgDebugHUD.cpp)
ENDIF(OPTION_HUDDEBUG)
INCLUDE_DIRECTORIES(Utils Sky Loader Scenery Render Viewer Car .)
ADD_INTERFACE_INCLUDEDIR()

6
src/modules/graphic/osggraph/OsgMain.cpp
View File

@ -168,7 +168,6 @@ void SDToggleHUDdashitems(void *vp)
{
screens->toggleHUDdashitems();
}
#ifdef HUDDEBUG
void SDToggleHUDgraphFPS(void *vp)
{
screens->toggleHUDgraphFPS();
@ -185,7 +184,7 @@ void SDToggleHUDgraphInputs(void *vp)
{
screens->toggleHUDgraphInputs();
}
#endif
/*Driver position change*/
void SDMoveSeatUpDown(void *move)
{
@ -276,12 +275,11 @@ int initView(int x, int y, int width, int height, int /* flag */, void *screen)
GfuiAddKey(screen, '6', "Toggle HUD dashitemsWidget", (void*)0, SDToggleHUDdashitems, NULL);
GfuiAddKey(screen, '7', "Toggle HUD raceinfoWidget", (void*)0, SDToggleHUDraceinfo, NULL);
GfuiAddKey(screen, '8', "Toggle HUD", (void*)0, SDToggleHUD, NULL);
#ifdef HUDDEBUG
GfuiAddKey(screen, '!', "Toggle HUD graphFPSWidget", (void*)0, SDToggleHUDgraphFPS, NULL);
GfuiAddKey(screen, '@', "Toggle HUD graphSpeedWidget", (void*)0, SDToggleHUDgraphSpeed, NULL);
GfuiAddKey(screen, '#', "Toggle HUD graphFFBWidget", (void*)0, SDToggleHUDgraphFFB, NULL);
GfuiAddKey(screen, '$', "Toggle HUD graphInputsWidget", (void*)0, SDToggleHUDgraphInputs, NULL);
#endif
/*GfuiAddKey(screen, '5', "Debug Info", (void*)3, grSelectBoard, NULL);
GfuiAddKey(screen, '4', "G/Cmd Graph", (void*)4, grSelectBoard, NULL);

26
src/modules/graphic/osggraph/Viewer/OsgHUD.cpp
View File

@ -184,7 +184,6 @@ osg::Vec4 colorStringToVec4(const std::string & colorString)
);
}
#ifdef HUDDEBUG
OSGPLOT::OSGPLOT(
float positionX,
float positionY,
@ -489,7 +488,6 @@ void OSGPLOT::drawBackground()
// add the geode to the graph group
osgGroup->addChild(geode);
}
#endif
std::string formatLaptime(tdble sec, int sgn)
{
@ -772,9 +770,7 @@ SDHUD::DispDebug(const tSituation *s, const SDFrameInfo* frame)
void SDHUD::Refresh(tSituation *s, const SDFrameInfo* frameInfo,
const tCarElt *currCar)
{
#ifdef HUDDEBUG
typedef std::map<std::string,OSGPLOT* >::iterator it_type;
#endif
CarData &data = carData[currCar];
@ -786,14 +782,12 @@ void SDHUD::Refresh(tSituation *s, const SDFrameInfo* frameInfo,
data.laptimeFreezeTime = 0.0;
data.timeDiffFreezeTime = 0.0;
#ifdef HUDDEBUG
for(it_type iterator = hudGraphElements.begin(); iterator != hudGraphElements.end(); ++iterator)
iterator->second->clearDataPoints();
#endif
lastCar = currCar;
}
#ifdef HUDDEBUG
//update all the graphs
for(it_type iterator = hudGraphElements.begin(); iterator != hudGraphElements.end(); ++iterator)
@ -803,8 +797,6 @@ void SDHUD::Refresh(tSituation *s, const SDFrameInfo* frameInfo,
iterator->second->update(s,frameInfo,currCar);
}
#endif
//board
tCarElt *firstAheadCar;
tCarElt *secondAheadCar;
@ -1406,12 +1398,10 @@ void SDHUD::ToggleHUD()
hudElementsVisibilityStatus["driverinput-wheel"] = (int)hudImgRotableElements["driverinput-wheel"]->getNodeMask();
hudElementsVisibilityStatus["debugWidget"] = (int)hudWidgets["debugWidget"]->getNodeMask();
hudElementsVisibilityStatus["dashitemsWidget"] = (int)hudWidgets["dashitemsWidget"]->getNodeMask();
#ifdef HUDDEBUG
hudElementsVisibilityStatus["graphFPSWidget"] = (int)hudWidgets["graphFPSWidget"]->getNodeMask();
hudElementsVisibilityStatus["graphSpeedWidget"] = (int)hudWidgets["graphSpeedWidget"]->getNodeMask();
hudElementsVisibilityStatus["graphFFBWidget"] = (int)hudWidgets["graphFFBWidget"]->getNodeMask();
hudElementsVisibilityStatus["graphInputsWidget"] = (int)hudWidgets["graphInputsWidget"]->getNodeMask();
#endif
hudWidgets["boardWidget"]->setNodeMask(0);
hudWidgets["racepositionWidget"]->setNodeMask(0);
@ -1423,12 +1413,10 @@ void SDHUD::ToggleHUD()
hudImgRotableElements["driverinput-wheel"]->setNodeMask(0);
hudWidgets["debugWidget"]->setNodeMask(0);
hudWidgets["dashitemsWidget"]->setNodeMask(0);
#ifdef HUDDEBUG
hudWidgets["graphFPSWidget"]->setNodeMask(0);
hudWidgets["graphSpeedWidget"]->setNodeMask(0);
hudWidgets["graphFFBWidget"]->setNodeMask(0);
hudWidgets["graphInputsWidget"]->setNodeMask(0);
#endif
hudElementsVisibilityStatusEnabled = 0;
}else{
hudWidgets["boardWidget"]->setNodeMask(hudElementsVisibilityStatus["boardWidget"]);
@ -1441,12 +1429,10 @@ void SDHUD::ToggleHUD()
hudImgRotableElements["driverinput-wheel"]->setNodeMask(hudElementsVisibilityStatus["driverinput-wheel"]);
hudWidgets["debugWidget"]->setNodeMask(hudElementsVisibilityStatus["debugWidget"]);
hudWidgets["dashitemsWidget"]->setNodeMask(hudElementsVisibilityStatus["dashitemsWidget"]);
#ifdef HUDDEBUG
hudWidgets["graphFPSWidget"]->setNodeMask(hudElementsVisibilityStatus["graphFPSWidget"]);
hudWidgets["graphSpeedWidget"]->setNodeMask(hudElementsVisibilityStatus["graphSpeedWidget"]);
hudWidgets["graphFFBWidget"]->setNodeMask(hudElementsVisibilityStatus["graphFFBWidget"]);
hudWidgets["graphInputsWidget"]->setNodeMask(hudElementsVisibilityStatus["graphInputsWidget"]);
#endif
hudElementsVisibilityStatusEnabled = 1;
}
}
@ -1587,7 +1573,6 @@ void SDHUD::ToggleHUDdashitems()
}
#ifdef HUDDEBUG
void SDHUD::ToggleHUDgraphFPS()
{
//toggle the visibility
@ -1659,7 +1644,6 @@ void SDHUD::ToggleHUDgraphInputs()
GfParmSetNum(paramHandle, path.c_str(), attribute.c_str(), NULL, (int)value);
GfParmWriteFile(NULL, paramHandle, "osghudconfig");
}
#endif
osg::ref_ptr <osg::Group> SDHUD::generateHudFromXmlFile(int scrH, int scrW)
{
@ -1798,12 +1782,10 @@ osg::ref_ptr <osg::Group> SDHUD::generateHudFromXmlFile(int scrH, int scrW)
{
refObjBb = hudImgElements[positionRefObj]->getBoundingBox();
}
#ifdef HUDDEBUG
else if ( hudGraphElements.find(positionRefObj) != hudGraphElements.end() )
{
//refObjBb = hudGraphElements[positionRefObj]->getBoundingBox();
}
#endif
else
{
GfLogDebug("OSGHUD: No (valid) reference object given for the current element alignement: Assuming Screen!\n");
@ -1884,12 +1866,10 @@ osg::ref_ptr <osg::Group> SDHUD::generateHudFromXmlFile(int scrH, int scrW)
{
refObjBb = hudImgElements[positionRefObj]->getBoundingBox();
}
#ifdef HUDDEBUG
else if ( hudGraphElements.find(positionRefObj) != hudGraphElements.end() )
{
//refObjBb = hudGraphElements[positionRefObj]->getBoundingBox();
}
#endif
else
{
GfLogDebug("OSGHUD: No (valid) reference object given for the current element alignement: Assuming Screen!\n");
@ -1996,7 +1976,6 @@ osg::ref_ptr <osg::Group> SDHUD::generateHudFromXmlFile(int scrH, int scrW)
}
else if( type == "graph")
{
#ifdef HUDDEBUG
/* ============================
CREATE OSG GRAPH
============================*/
@ -2080,7 +2059,6 @@ osg::ref_ptr <osg::Group> SDHUD::generateHudFromXmlFile(int scrH, int scrW)
//istantiate the graph
hudGraphElements[elementId] = new OSGPLOT(positionX, positionY, width, height, title, lines);
geode->addChild(hudGraphElements[elementId]->getGroup());
#endif
}
else
{
@ -2116,7 +2094,5 @@ SDHUD::~SDHUD()
//do some cleanup
hudTextElements.clear();
hudImgElements.clear();
#ifdef HUDDEBUG
hudGraphElements.clear();
#endif
}

7
src/modules/graphic/osggraph/Viewer/OsgHUD.h
View File

@ -29,7 +29,6 @@
class SDFrameInfo;
#ifdef HUDDEBUG
class OSGPLOT
{
public:
@ -90,7 +89,6 @@ public:
void update(tSituation *s, const SDFrameInfo* frameInfo,const tCarElt *currCar);
void clearDataPoints();
};
#endif
class SDHUD
{
@ -123,10 +121,7 @@ class SDHUD
std::map<std::string,osg::Geode* > hudWidgets;
std::map<std::string,osg::Geometry* > hudImgElements;
std::map<std::string,osg::MatrixTransform* > hudImgRotableElements;
#ifdef HUDDEBUG
std::map<std::string,OSGPLOT* > hudGraphElements;
#endif
public:
SDHUD();
@ -140,12 +135,10 @@ class SDHUD
void ToggleHUDdriverinput();
void ToggleHUDdebug();
void ToggleHUDdashitems();
#ifdef HUDDEBUG
void ToggleHUDgraphFPS();
void ToggleHUDgraphSpeed();
void ToggleHUDgraphFFB();
void ToggleHUDgraphInputs();
#endif
osg::ref_ptr<osg::Camera> camera;

8
src/modules/graphic/osggraph/Viewer/OsgScreens.cpp
View File

@ -47,9 +47,7 @@ SDScreens::SDScreens() :
m_SpanSplit(false),
m_CurrentScreenIndex(0)
{
#ifdef HUDDEBUG
debugHUD = new SDDebugHUD();
#endif
}
extern SDHUD hud;
@ -192,12 +190,10 @@ void SDScreens::update(tSituation * s, SDFrameInfo* fi)
Screens[i]->update(s, fi);
}
#ifdef HUDDEBUG
SDCars * cars = getCars();
tCarElt * c = this->getActiveView()->getCurrentCar();
this->debugHUD->setTexture(cars->getCar(c)->getReflectionMap()->getReflectionMap());
#endif
if (!viewer->done())
viewer->frame();
@ -253,7 +249,6 @@ void SDScreens::toggleHUDdashitems()
{
hud.ToggleHUDdashitems();
}
#ifdef HUDDEBUG
void SDScreens::toggleHUDgraphFPS()
{
hud.ToggleHUDgraphFPS();
@ -270,7 +265,6 @@ void SDScreens::toggleHUDgraphInputs()
{
hud.ToggleHUDgraphInputs();
}
#endif
void SDScreens::registerViewDependantPreRenderNode(osg::ref_ptr<osg::Node> node)
{
@ -289,7 +283,5 @@ SDScreens::~SDScreens()
delete Screens[i];
}
#ifdef HUDDEBUG
delete debugHUD;
#endif
}

6
src/modules/graphic/osggraph/Viewer/OsgScreens.h
View File

@ -26,9 +26,7 @@
#include "OsgView.h"
#ifdef HUDDEBUG
class SDDebugHUD;
#endif
class SDReflectionMapping;
class SDScreens
@ -38,9 +36,7 @@ protected:
std::vector<SDView *> Screens;
osg::ref_ptr<osg::Group> root;
osg::ref_ptr<osg::Group> prerenderRoot;
#ifdef HUDDEBUG
SDDebugHUD * debugHUD;
#endif
int m_NbActiveScreens;
int m_NbArrangeScreens;
@ -64,12 +60,10 @@ public:
void toggleHUDdriverinput();
void toggleHUDdebug();
void toggleHUDdashitems();
#ifdef HUDDEBUG
void toggleHUDgraphFPS();
void toggleHUDgraphSpeed();
void toggleHUDgraphFFB();
void toggleHUDgraphInputs();
#endif
inline SDView * getActiveView(){return Screens[m_CurrentScreenIndex];}
};