From: <sv...@ww...> - 2005-06-07 03:45:34
|
Author: mkrose Date: 2005-06-06 20:45:27 -0700 (Mon, 06 Jun 2005) New Revision: 1556 Modified: trunk/CSP/CSPSim/Include/InputInterface.h trunk/CSP/CSPSim/Source/LogoScreen.cpp Log: Trivial cleanup. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1556 Modified: trunk/CSP/CSPSim/Include/InputInterface.h =================================================================== --- trunk/CSP/CSPSim/Include/InputInterface.h 2005-06-07 02:40:26 UTC (rev 1555) +++ trunk/CSP/CSPSim/Include/InputInterface.h 2005-06-07 03:45:27 UTC (rev 1556) @@ -396,6 +396,7 @@ void bindMotionEvent(std::string const &id, MotionEventSlot const &slot) { runtimeDispatch()->bindMotion(id, slot); } + protected: /** Internal */ Modified: trunk/CSP/CSPSim/Source/LogoScreen.cpp =================================================================== --- trunk/CSP/CSPSim/Source/LogoScreen.cpp 2005-06-07 02:40:26 UTC (rev 1555) +++ trunk/CSP/CSPSim/Source/LogoScreen.cpp 2005-06-07 03:45:27 UTC (rev 1556) @@ -73,20 +73,6 @@ // serialized? typedef std::vector<std::string> StrVec; StrVec file_name; - /* - file_name.push_back("CSPLogo.bmp"); - file_name.push_back("moonrise1.png"); - file_name.push_back("crescent.png"); - file_name.push_back("sunlight2.png"); - file_name.push_back("sunset4.png"); - file_name.push_back("console2.png"); - file_name.push_back("TLabMultitex.jpeg"); - file_name.push_back("landing-2.png"); - file_name.push_back("vista.png"); - file_name.push_back("ground-fog.png"); - file_name.push_back("fx2.jpeg"); - */ - file_name.push_back("Logo/CSPLogo.jpg"); file_name.push_back("Logo/moonrise1.jpg"); file_name.push_back("Logo/crescent.jpg"); @@ -142,7 +128,7 @@ float w = scale * m_width, h = scale * m_height; m_LogoView->setProjectionMatrixAsOrtho2D(-w,w,-h,h); osg::FrameStamp *fs = new osg::FrameStamp(); - m_LogoView-> setFrameStamp(fs); + m_LogoView->setFrameStamp(fs); // create geometry osg::Geometry* geom = new osg::Geometry; |