Revision: 2768
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2768&view=rev
Author: ulteq
Date: 2012-06-01 11:25:53 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
-Codechange: added keyboard defaults for survey map
+small fix in MapTextureCreator
Modified Paths:
--------------
trunk/bin/resources/skeleton.zip
trunk/source/main/terrain/map/MapTextureCreator.cpp
trunk/source/main/utils/InputEngine.cpp
Modified: trunk/bin/resources/skeleton.zip
===================================================================
(Binary files differ)
Modified: trunk/source/main/terrain/map/MapTextureCreator.cpp
===================================================================
--- trunk/source/main/terrain/map/MapTextureCreator.cpp 2012-06-01 11:19:16 UTC
(rev 2767)
+++ trunk/source/main/terrain/map/MapTextureCreator.cpp 2012-06-01 11:25:53 UTC
(rev 2768)
@@ -58,6 +58,8 @@
mViewport = mRttTex->addViewport(mCamera);
mViewport->setBackgroundColour(ColourValue::Black);
mViewport->setOverlaysEnabled(false);
+ mViewport->setShadowsEnabled(false);
+ mViewport->setSkiesEnabled(false);
mMaterial = MaterialManager::getSingleton().create("MapRttMat" +
TOSTRING(mCounter), ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
@@ -76,13 +78,14 @@
void MapTextureCreator::setMapZoom(Real zoomValue)
{
- mMapZoom = std::max(0.0f, zoomValue);
- mMapZoom = std::min(zoomValue, 1.0f);
+ mMapZoom = zoomValue;
+ mMapZoom = std::max(0.0f, mMapZoom);
+ mMapZoom = std::min(mMapZoom, 1.0f);
}
void MapTextureCreator::setMapZoomRelative(Real zoomDelta)
{
- setMapZoom(mMapZoom + zoomDelta * mMapZoom / 100.0f);
+ setMapZoom(mMapZoom + zoomDelta * std::max(0.1f, 1.0f - mMapZoom) /
100.0f);
}
void MapTextureCreator::setMapCenter(Vector3 position)
Modified: trunk/source/main/utils/InputEngine.cpp
===================================================================
--- trunk/source/main/utils/InputEngine.cpp 2012-06-01 11:19:16 UTC (rev
2767)
+++ trunk/source/main/utils/InputEngine.cpp 2012-06-01 11:25:53 UTC (rev
2768)
@@ -899,27 +899,27 @@
_L("select previous element in current category")
},
{
+ "SURVEY_MAP_TOGGLE_VIEW",
+ EV_SURVEY_MAP_TOGGLE_VIEW,
+ "Keyboard EXPL+TAB",
+ _L("toggle map modes")
+ },
+ {
"SURVEY_MAP_TOGGLE_ALPHA",
EV_SURVEY_MAP_ALPHA,
"Keyboard EXPL+CTRL+TAB",
_L("toggle translucency of overview-map")
},
{
- "SURVEY_MAP_TOGGLE_VIEW",
- EV_SURVEY_MAP_TOGGLE_VIEW,
- "Keyboard EXPL+TAB",
- _L("toggle map modes")
- },
- {
"SURVEY_MAP_ZOOM_IN",
EV_SURVEY_MAP_ZOOM_IN,
- "Keyboard EXPL+TAB",
+ "Keyboard EXPL+SHIFT+CTRL+TAB",
_L("zoom in")
},
{
"SURVEY_MAP_ZOOM_OUT",
EV_SURVEY_MAP_ZOOM_OUT,
- "Keyboard EXPL+TAB",
+ "Keyboard EXPL+SHIFT+TAB",
_L("zoom out")
},
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
