Revision: 1686
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1686&view=rev
Author: rorthomas
Date: 2011-02-18 14:35:35 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
fixed mouse display
Modified Paths:
--------------
trunk/source/main/gui/OverlayWrapper.cpp
trunk/source/main/gui/OverlayWrapper.h
Modified: trunk/source/main/gui/OverlayWrapper.cpp
===================================================================
--- trunk/source/main/gui/OverlayWrapper.cpp 2011-02-17 21:32:24 UTC (rev
1685)
+++ trunk/source/main/gui/OverlayWrapper.cpp 2011-02-18 14:35:35 UTC (rev
1686)
@@ -62,17 +62,20 @@
node->setScale(0.0025, 0.007*len, 0.007);
}
-Ogre::Overlay *OverlayWrapper::loadOverlay(Ogre::String name)
+Ogre::Overlay *OverlayWrapper::loadOverlay(Ogre::String name, bool
autoResizeRation)
{
Overlay *o = OverlayManager::getSingleton().getByName(name);
- struct loadedOverlay_t lo;
- lo.o = o;
- lo.orgScaleX = o->getScaleX();
- lo.orgScaleY = o->getScaleY();
+ if(autoResizeRation)
+ {
+ struct loadedOverlay_t lo;
+ lo.o = o;
+ lo.orgScaleX = o->getScaleX();
+ lo.orgScaleY = o->getScaleY();
- overlays.push_back(lo);
- resizeOverlay(lo);
+ overlays.push_back(lo);
+ resizeOverlay(lo);
+ }
return o;
}
@@ -116,7 +119,7 @@
directionOverlay = loadOverlay("tracks/DirectionArrow");
directionArrowText =
(TextAreaOverlayElement*)loadOverlayElement("tracks/DirectionArrow/Text");
directionArrowDistance =
(TextAreaOverlayElement*)loadOverlayElement("tracks/DirectionArrow/Distance");
- mouseOverlay = loadOverlay("tracks/MouseOverlay");
+ mouseOverlay = loadOverlay("tracks/MouseOverlay", false);
#ifdef HAS_EDITOR
truckeditorOverlay = loadOverlay("tracks/TruckEditorOverlay");
#endif
Modified: trunk/source/main/gui/OverlayWrapper.h
===================================================================
--- trunk/source/main/gui/OverlayWrapper.h 2011-02-17 21:32:24 UTC (rev
1685)
+++ trunk/source/main/gui/OverlayWrapper.h 2011-02-18 14:35:35 UTC (rev
1686)
@@ -70,7 +70,7 @@
void placeNeedle(Ogre::SceneNode *node, float x, float y, float len);
void updateStats(bool detailed=false);
- Ogre::Overlay *loadOverlay(Ogre::String name);
+ Ogre::Overlay *loadOverlay(Ogre::String name, bool
autoResizeRation=true);
Ogre::OverlayElement *loadOverlayElement(Ogre::String name);
Ogre::RenderWindow* win;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
