Revision: 2767
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2767&view=rev
Author: ulteq
Date: 2012-06-01 11:19:16 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
merged trunk into branch
+camera/CameraBehaviorIsometric.cpp
+camera/CameraBehaviorIsometric.h
+added keyboard defaults for the survey map
Modified Paths:
--------------
branches/20120601_Testing_v0.39.7/bin/resources/skeleton.zip
branches/20120601_Testing_v0.39.7/source/main/gui/MapTextureCreator.cpp
branches/20120601_Testing_v0.39.7/source/main/gui/gui_inputmanager.cpp
branches/20120601_Testing_v0.39.7/source/main/utils/InputEngine.cpp
Added Paths:
-----------
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.cpp
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.h
Modified: branches/20120601_Testing_v0.39.7/bin/resources/skeleton.zip
===================================================================
(Binary files differ)
Added:
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.cpp
===================================================================
---
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.cpp
(rev 0)
+++
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.cpp
2012-06-01 11:19:16 UTC (rev 2767)
@@ -0,0 +1,30 @@
+/*
+This source file is part of Rigs of Rods
+Copyright 2005-2012 Pierre-Michel Ricordel
+Copyright 2007-2012 Thomas Fischer
+
+For more information, see http://www.rigsofrods.com/
+
+Rigs of Rods is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+Rigs of Rods is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "CameraBehaviorIsometric.h"
+
+#include "Beam.h"
+#include "Character.h"
+#include "CameraManager.h"
+
+using namespace Ogre;
+
+void CameraBehaviorIsometric::update(const CameraManager::cameraContext_t &ctx)
+{
+}
Added:
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.h
===================================================================
---
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.h
(rev 0)
+++
branches/20120601_Testing_v0.39.7/source/main/gfx/camera/CameraBehaviorIsometric.h
2012-06-01 11:19:16 UTC (rev 2767)
@@ -0,0 +1,44 @@
+/*
+This source file is part of Rigs of Rods
+Copyright 2005-2012 Pierre-Michel Ricordel
+Copyright 2007-2012 Thomas Fischer
+
+For more information, see http://www.rigsofrods.com/
+
+Rigs of Rods is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+Rigs of Rods is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef __CAMERA_BEHAVIOR_ISOMETRIC_H_
+#define __CAMERA_BEHAVIOR_ISOMETRIC_H_
+
+#include "RoRPrerequisites.h"
+
+#include "ICameraBehavior.h"
+
+class CameraBehaviorIsometric : public ICameraBehavior
+{
+public:
+
+ void update(const CameraManager::cameraContext_t &ctx);
+
+ bool mouseMoved(const CameraManager::cameraContext_t &ctx, const
OIS::MouseEvent& _arg) { return false; };
+ bool mousePressed(const CameraManager::cameraContext_t &ctx, const
OIS::MouseEvent& _arg, OIS::MouseButtonID _id) { return false; };
+ bool mouseReleased(const CameraManager::cameraContext_t &ctx, const
OIS::MouseEvent& _arg, OIS::MouseButtonID _id) { return false; };
+
+ void activate(const CameraManager::cameraContext_t &ctx, bool reset =
true) {};
+ void deactivate(const CameraManager::cameraContext_t &ctx) {};
+ void reset(const CameraManager::cameraContext_t &ctx) {};
+
+ bool switchBehavior(const CameraManager::cameraContext_t &ctx) { return
true; };
+};
+
+#endif // __CAMERA_BEHAVIOR_ISOMETRIC_H_
Modified:
branches/20120601_Testing_v0.39.7/source/main/gui/MapTextureCreator.cpp
===================================================================
--- branches/20120601_Testing_v0.39.7/source/main/gui/MapTextureCreator.cpp
2012-06-01 05:54:01 UTC (rev 2766)
+++ branches/20120601_Testing_v0.39.7/source/main/gui/MapTextureCreator.cpp
2012-06-01 11:19:16 UTC (rev 2767)
@@ -62,6 +62,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);
@@ -80,13 +82,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: branches/20120601_Testing_v0.39.7/source/main/gui/gui_inputmanager.cpp
===================================================================
--- branches/20120601_Testing_v0.39.7/source/main/gui/gui_inputmanager.cpp
2012-06-01 05:54:01 UTC (rev 2766)
+++ branches/20120601_Testing_v0.39.7/source/main/gui/gui_inputmanager.cpp
2012-06-01 11:19:16 UTC (rev 2767)
@@ -206,7 +206,7 @@
handled = false;
}
- if(!handled)
+ if(!handled && RoRFrameListener::eflsingleton->getOverlayWrapper())
{
// update the old airplane / autopilot gui
handled =
RoRFrameListener::eflsingleton->getOverlayWrapper()->mouseReleased(_arg, _id);
Modified: branches/20120601_Testing_v0.39.7/source/main/utils/InputEngine.cpp
===================================================================
--- branches/20120601_Testing_v0.39.7/source/main/utils/InputEngine.cpp
2012-06-01 05:54:01 UTC (rev 2766)
+++ branches/20120601_Testing_v0.39.7/source/main/utils/InputEngine.cpp
2012-06-01 11:19:16 UTC (rev 2767)
@@ -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
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
