Revision: 2639
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2639&view=rev
Author: ulteq
Date: 2012-05-23 21:11:47 +0000 (Wed, 23 May 2012)
Log Message:
-----------
-Codechange: added mapsizey
survey map render cam now always on the correct height
prepared skeleton.zip for the new survey map shortcuts
dashboard cleanup
heightfinder revert
Modified Paths:
--------------
trunk/bin/resources/skeleton.zip
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gameplay/RoRFrameListener.h
trunk/source/main/gui/MapControl.cpp
trunk/source/main/gui/MapControl.h
trunk/source/main/gui/MapEntity.cpp
trunk/source/main/gui/MapTextureCreator.cpp
trunk/source/main/gui/MapTextureCreator.h
trunk/source/main/gui/dashboard.cpp
trunk/source/main/gui/dashboard.h
trunk/source/main/physics/collision/heightfinder.h
trunk/source/main/utils/InputEngine.cpp
trunk/source/main/utils/InputEngine.h
Modified: trunk/bin/resources/skeleton.zip
===================================================================
(Binary files differ)
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-23 19:01:32 UTC
(rev 2638)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-23 21:11:47 UTC
(rev 2639)
@@ -765,6 +765,7 @@
mTruckInfoOn(false),
mWindow(win),
mapsizex(3000),
+ mapsizey(1000),
mapsizez(3000),
mtc(0),
net(0),
@@ -3157,7 +3158,7 @@
{
velocity =
curr_truck->nodes[0].Velocity.length();
}
- if
(INPUTENGINE.getEventBoolValueBounce(EV_COMMON_VIEW_MAP))
+ if
(INPUTENGINE.getEventBoolValueBounce(EV_SURVEY_MAP_TOGGLE_VIEW))
{
surveyMapMode = (surveyMapMode + 1) %
SURVEY_MAP_END;
@@ -3185,7 +3186,7 @@
surveyMap->setVisibility(true);
}
}
- if
(INPUTENGINE.getEventBoolValueBounce(EV_COMMON_MAP_ALPHA))
+ if
(INPUTENGINE.getEventBoolValueBounce(EV_SURVEY_MAP_ALPHA))
{
if (surveyMap->getAlpha() > 0.51f)
{
@@ -3510,7 +3511,7 @@
// init the map
if (!disableMap)
{
- surveyMap = new MapControl((int)mapsizex, (int)mapsizez);
+ surveyMap = new MapControl(mapsizex, mapsizey, mapsizez);
}
#endif //USE_MYGUI
@@ -3835,17 +3836,16 @@
DataStreamPtr ds_config =
ResourceGroupManager::getSingleton().openResource(String(geom), group);
cfg.load(ds_config, "\t:=", false);
- // X and Z scale
- String tmpSize = cfg.getSetting("PageWorldX");
- if (tmpSize != String(""))
- mapsizex = atof(tmpSize.c_str());
+ // X, Y and Z scale
+ mapsizex =
StringConverter::parseInt(cfg.getSetting("PageWorldX"));
+ mapsizey =
StringConverter::parseInt(cfg.getSetting("MaxHeight"));
+ mapsizez =
StringConverter::parseInt(cfg.getSetting("PageWorldZ"));
- tmpSize = cfg.getSetting("PageWorldZ");
- if (tmpSize != String(""))
- mapsizez = atof(tmpSize.c_str());
#ifdef USE_MYGUI
if (surveyMap)
- surveyMap->setWorldSize(mapsizex, mapsizez);
+ {
+ surveyMap->setWorldSize(mapsizex, mapsizey, mapsizez);
+ }
#endif //MYGUI
if (!newTerrainMode && !disableTetrrain)
@@ -4417,7 +4417,7 @@
#ifdef USE_MYGUI
if (surveyMap)
{
- mtc = new MapTextureCreator(mSceneMgr, mCamera, this);
+ mtc = new MapTextureCreator(mSceneMgr, mCamera, surveyMap);
surveyMap->setMapTexture(mtc->getRTName());
}
#endif //USE_MYGUI
Modified: trunk/source/main/gameplay/RoRFrameListener.h
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.h 2012-05-23 19:01:32 UTC
(rev 2638)
+++ trunk/source/main/gameplay/RoRFrameListener.h 2012-05-23 21:11:47 UTC
(rev 2639)
@@ -75,7 +75,7 @@
bool freeTruckPosition;
bool terrainHasTruckShop;
- float mapsizex, mapsizez;
+ float mapsizex, mapsizey, mapsizez;
float netcheckGUITimer;
int loading_state;
Modified: trunk/source/main/gui/MapControl.cpp
===================================================================
--- trunk/source/main/gui/MapControl.cpp 2012-05-23 19:01:32 UTC (rev
2638)
+++ trunk/source/main/gui/MapControl.cpp 2012-05-23 21:11:47 UTC (rev
2639)
@@ -27,9 +27,8 @@
using namespace Ogre;
-MapControl::MapControl(int mapsizex, int mapsizez) :
- mMapWidth(mapsizex)
- , mMapLength(mapsizez)
+MapControl::MapControl(float mapsizex, float mapsizey, float mapsizez) :
+ mMapSize(Vector3(mapsizex, mapsizey, mapsizez))
, mAlpha(1.0f)
, mScale(1.0f)
, mX(0)
@@ -67,11 +66,6 @@
return NULL;
}
-Vector2 MapControl::getMapSize()
-{
- return Vector2(mMapWidth, mMapLength);
-}
-
bool MapControl::getVisibility()
{
return mMainWidget->getVisible();
@@ -140,10 +134,9 @@
mMainWidget->setVisible(value);
}
-void MapControl::setWorldSize(int width, int length)
+void MapControl::setWorldSize(float width, float length, float height)
{
- mMapWidth = width;
- mMapLength = length;
+ mMapSize = Vector3(width, length, height);
}
void MapControl::windowResized(Ogre::RenderWindow *rw)
Modified: trunk/source/main/gui/MapControl.h
===================================================================
--- trunk/source/main/gui/MapControl.h 2012-05-23 19:01:32 UTC (rev 2638)
+++ trunk/source/main/gui/MapControl.h 2012-05-23 21:11:47 UTC (rev 2639)
@@ -32,7 +32,7 @@
{
public:
- MapControl(int mapsizex, int mapsizez);
+ MapControl(float mapsizex, float mapsizey, float mapsizez);
MapEntity *createMapEntity(Ogre::String type);
MapEntity *createNamedMapEntity(Ogre::String name, Ogre::String type);
@@ -40,7 +40,7 @@
void deleteMapEntity(MapEntity *ent);
MapEntity *getEntityByName(Ogre::String name);
- Ogre::Vector2 getMapSize();
+ Ogre::Vector3 getMapSize() { return mMapSize; };
bool getVisibility();
float getAlpha() { return mAlpha; }
float getWindowScale() { return mScale; }
@@ -50,7 +50,7 @@
void setMapTexture(Ogre::String name);
void setPosition(int x, int y, float size, Ogre::RenderWindow *rw);
void setVisibility(bool value);
- void setWorldSize(int width, int length);
+ void setWorldSize(float width, float length, float height);
void windowResized(Ogre::RenderWindow *rw);
@@ -61,7 +61,7 @@
float mAlpha, mScale;
int mX, mY;
- int mMapWidth, mMapLength;
+ Ogre::Vector3 mMapSize;
ATTRIBUTE_FIELD_WIDGET_NAME(MapControl, mMapTexture, "mMapTexture");
MyGUI::StaticImage* mMapTexture;
Modified: trunk/source/main/gui/MapEntity.cpp
===================================================================
--- trunk/source/main/gui/MapEntity.cpp 2012-05-23 19:01:32 UTC (rev 2638)
+++ trunk/source/main/gui/MapEntity.cpp 2012-05-23 21:11:47 UTC (rev 2639)
@@ -158,10 +158,10 @@
mCaption->setVisible(wscale > 0.5f);
- Vector2 s = mMapControl->getMapSize();
+ Vector3 mapSize = mMapControl->getMapSize();
mMainWidget->setPosition(
- mX / s.x * mParent->getWidth() - mMainWidget->getWidth() / 2,
- mZ / s.y * mParent->getHeight() - mMainWidget->getHeight() / 2
+ mX / mapSize.x * mParent->getWidth() - mMainWidget->getWidth()
/ 2,
+ mZ / mapSize.z * mParent->getHeight() -
mMainWidget->getHeight() / 2
);
mIcon->setCoord(
mMainWidget->getWidth() / 2 - mIconSize.width * wscale / 2,
Modified: trunk/source/main/gui/MapTextureCreator.cpp
===================================================================
--- trunk/source/main/gui/MapTextureCreator.cpp 2012-05-23 19:01:32 UTC (rev
2638)
+++ trunk/source/main/gui/MapTextureCreator.cpp 2012-05-23 21:11:47 UTC (rev
2639)
@@ -21,17 +21,17 @@
#include "BeamFactory.h"
#include "IWater.h"
+#include "MapControl.h"
#include "ResourceBuffer.h"
-#include "RoRFrameListener.h"
using namespace Ogre;
int MapTextureCreator::mCounter = 0;
-MapTextureCreator::MapTextureCreator(SceneManager *scm, Camera *cam,
RoRFrameListener *efl) :
+MapTextureCreator::MapTextureCreator(SceneManager *scm, Camera *cam,
MapControl *ctrl) :
mSceneManager(scm)
, mMainCam(cam)
- , mEfl(efl)
+ , mMapControl(ctrl)
, mCamera(NULL)
, mMapCenter(Vector3::ZERO)
, mMapZoom(0.0f)
@@ -73,6 +73,7 @@
mCamera->setFixedYawAxis(false);
mCamera->setProjectionType(PT_ORTHOGRAPHIC);
+ mCamera->setNearClipDistance(1.0f);
return true;
}
@@ -103,11 +104,13 @@
{
if ( !mRttTex ) return;
- float orthoWindowWidth = mEfl->mapsizex - mEfl->mapsizex * mMapZoom;
- float orthoWindowHeight = mEfl->mapsizez - mEfl->mapsizez * mMapZoom;
+ Vector3 mapSize = mMapControl->getMapSize();
+ float orthoWindowWidth = mapSize.x - (mapSize.x - 20.0f) * mMapZoom;
+ float orthoWindowHeight = mapSize.z - (mapSize.z - 20.0f) * mMapZoom;
+ mCamera->setFarClipDistance(mapSize.y + 3.0f);
mCamera->setOrthoWindow(orthoWindowWidth, orthoWindowHeight);
- mCamera->setPosition(mMapCenter + Vector3(0.0f, 500.0f, 0.0f));
+ mCamera->setPosition(mMapCenter + Vector3(0.0f, mapSize.y + 2.0f,
0.0f));
mCamera->lookAt(mMapCenter);
preRenderTargetUpdate();
Modified: trunk/source/main/gui/MapTextureCreator.h
===================================================================
--- trunk/source/main/gui/MapTextureCreator.h 2012-05-23 19:01:32 UTC (rev
2638)
+++ trunk/source/main/gui/MapTextureCreator.h 2012-05-23 21:11:47 UTC (rev
2639)
@@ -28,7 +28,7 @@
{
public:
- MapTextureCreator(Ogre::SceneManager *scm, Ogre::Camera *cam,
RoRFrameListener *efl);
+ MapTextureCreator(Ogre::SceneManager *scm, Ogre::Camera *cam,
MapControl *ctrl);
Ogre::String getMaterialName();
Ogre::String getRTName();
@@ -47,6 +47,7 @@
void preRenderTargetUpdate();
void postRenderTargetUpdate();
+ MapControl *mMapControl;
Ogre::Camera *mCamera;
Ogre::Camera *mMainCam;
Ogre::MaterialPtr mMaterial;
@@ -57,7 +58,6 @@
Ogre::TextureUnitState *mTextureUnitState;
Ogre::Vector3 mMapCenter;
Ogre::Viewport *mViewport;
- RoRFrameListener *mEfl;
static int mCounter;
};
Modified: trunk/source/main/gui/dashboard.cpp
===================================================================
--- trunk/source/main/gui/dashboard.cpp 2012-05-23 19:01:32 UTC (rev 2638)
+++ trunk/source/main/gui/dashboard.cpp 2012-05-23 21:11:47 UTC (rev 2639)
@@ -29,6 +29,8 @@
Dashboard::Dashboard(SceneManager *mSceneMgr) :
mScene(mSceneMgr)
+ , mDashCam(0)
+ , mDashboardListener(0)
, rttTex(0)
{
TexturePtr rttTexPtr =
TextureManager::getSingleton().createManual("dashtexture",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 512, 0,
PF_R8G8B8, TU_RENDERTARGET, new ResourceBuffer());
@@ -68,7 +70,10 @@
void Dashboard::prepareShutdown()
{
- if (rttTex) rttTex->removeListener(mDashboardListener);
+ if (rttTex)
+ {
+ rttTex->removeListener(mDashboardListener);
+ }
}
DashboardListener::DashboardListener(Ogre::SceneManager *mSceneMgr) :
@@ -83,7 +88,7 @@
void DashboardListener::preRenderTargetUpdate(const RenderTargetEvent& evt)
{
- // Hide everything
+ // hide everything
mScene->setFindVisibleObjects(false);
// hide fps stats
@@ -115,10 +120,10 @@
void DashboardListener::postRenderTargetUpdate(const RenderTargetEvent& evt)
{
- // Show everything
+ // show everything
mScene->setFindVisibleObjects(true);
- //show everything again, if it was displayed before hiding it...
+ // show everything again, if it was displayed before hiding it...
if (fpsOverlay && fpsDisplayed)
{
fpsOverlay->show();
@@ -129,8 +134,8 @@
truckHUDOverlay->show();
}
- //hide overlay
+ // hide overlay
dashOverlay->hide();
needlesOverlay->hide();
blendOverlay->hide();
-}
\ No newline at end of file
+}
Modified: trunk/source/main/gui/dashboard.h
===================================================================
--- trunk/source/main/gui/dashboard.h 2012-05-23 19:01:32 UTC (rev 2638)
+++ trunk/source/main/gui/dashboard.h 2012-05-23 21:11:47 UTC (rev 2639)
@@ -40,10 +40,10 @@
private:
- DashboardListener* mDashboardListener;
+ DashboardListener *mDashboardListener;
Ogre::Camera *mDashCam;
- Ogre::RenderTexture* rttTex;
- Ogre::SceneManager* mScene;
+ Ogre::RenderTexture *rttTex;
+ Ogre::SceneManager *mScene;
};
class DashboardListener : public Ogre::RenderTargetListener
@@ -58,12 +58,12 @@
private:
+ Ogre::Overlay *blendOverlay;
+ Ogre::Overlay *dashOverlay;
Ogre::Overlay *fpsOverlay;
- Ogre::Overlay* blendOverlay;
- Ogre::Overlay* dashOverlay;
- Ogre::Overlay* needlesOverlay;
- Ogre::Overlay* truckHUDOverlay;
- Ogre::SceneManager* mScene;
+ Ogre::Overlay *needlesOverlay;
+ Ogre::Overlay *truckHUDOverlay;
+ Ogre::SceneManager *mScene;
bool consolevisible;
bool fpsDisplayed;
bool truckHUD;
Modified: trunk/source/main/physics/collision/heightfinder.h
===================================================================
--- trunk/source/main/physics/collision/heightfinder.h 2012-05-23 19:01:32 UTC
(rev 2638)
+++ trunk/source/main/physics/collision/heightfinder.h 2012-05-23 21:11:47 UTC
(rev 2639)
@@ -65,30 +65,6 @@
return mTerrainGroup->getHeightAtWorldPosition(x, 1000, z);
}
- float getMaxHeight()
- {
- float maxHeight = 0.0f;
- Ogre::TerrainGroup::TerrainIterator ti =
mTerrainGroup->getTerrainIterator();
- while(ti.hasMoreElements())
- {
- Ogre::Terrain* t = ti.getNext()->instance;
- maxHeight = std::max(maxHeight, t->getMaxHeight());
- }
- return maxHeight;
- }
-
- float getMinHeight()
- {
- float minHeight = 0.0f;
- Ogre::TerrainGroup::TerrainIterator ti =
mTerrainGroup->getTerrainIterator();
- while(ti.hasMoreElements())
- {
- Ogre::Terrain* t = ti.getNext()->instance;
- minHeight = std::min(t->getMaxHeight(), minHeight);
- }
- return minHeight;
- }
-
protected:
Ogre::TerrainGroup *mTerrainGroup;
Modified: trunk/source/main/utils/InputEngine.cpp
===================================================================
--- trunk/source/main/utils/InputEngine.cpp 2012-05-23 19:01:32 UTC (rev
2638)
+++ trunk/source/main/utils/InputEngine.cpp 2012-05-23 21:11:47 UTC (rev
2639)
@@ -701,12 +701,6 @@
_L("connect a rope to a node in close proximity")
},
{
- "COMMON_MAP_ALPHA",
- EV_COMMON_MAP_ALPHA,
- "Keyboard EXPL+CTRL+TAB",
- _L("toggle translucency of overview-map")
- },
- {
"COMMON_OUTPUT_POSITION",
EV_COMMON_OUTPUT_POSITION,
"Keyboard H",
@@ -833,12 +827,6 @@
_L("toggle truck HUD")
},
{
- "COMMON_VIEW_MAP",
- EV_COMMON_VIEW_MAP,
- "Keyboard EXPL+TAB",
- _L("toggle map modes")
- },
- {
"COMMON_FOV_LESS",
EV_COMMON_FOV_LESS,
"Keyboard EXPL+NUMPAD7",
@@ -911,6 +899,30 @@
_L("select previous element in current category")
},
{
+ "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",
+ _L("zoom in")
+ },
+ {
+ "SURVEY_MAP_ZOOM_OUT",
+ EV_SURVEY_MAP_ZOOM_OUT,
+ "Keyboard EXPL+TAB",
+ _L("zoom out")
+ },
+ {
"TERRAINEDITOR_BUILT",
EV_TERRAINEDITOR_BUILT,
"Keyboard SPACE",
Modified: trunk/source/main/utils/InputEngine.h
===================================================================
--- trunk/source/main/utils/InputEngine.h 2012-05-23 19:01:32 UTC (rev
2638)
+++ trunk/source/main/utils/InputEngine.h 2012-05-23 21:11:47 UTC (rev
2639)
@@ -81,7 +81,11 @@
enum events
{
// has to start at zero, since we iterate over it at times
- EV_AIRPLANE_BRAKE=0, //!< normal brake for an aircraft.
+ EV_AIRPLANE_AIRBRAKES_FULL=0,
+ EV_AIRPLANE_AIRBRAKES_LESS,
+ EV_AIRPLANE_AIRBRAKES_MORE,
+ EV_AIRPLANE_AIRBRAKES_NONE,
+ EV_AIRPLANE_BRAKE, //!< normal brake for an aircraft.
EV_AIRPLANE_ELEVATOR_DOWN, //!< pull the elevator down in an aircraft.
EV_AIRPLANE_ELEVATOR_UP, //!< pull the elevator up in an aircraft.
EV_AIRPLANE_FLAPS_FULL, //!< full flaps in an aircraft.
@@ -94,6 +98,7 @@
EV_AIRPLANE_RUDDER_RIGHT, //!< rudder right
EV_AIRPLANE_STEER_LEFT, //!< steer left
EV_AIRPLANE_STEER_RIGHT, //!< steer right
+ EV_AIRPLANE_THROTTLE,
EV_AIRPLANE_THROTTLE_AXIS, //!< throttle axis. Only use this if you
have fitting hardware :) (i.e. a Slider)
EV_AIRPLANE_THROTTLE_DOWN, //!< decreases the airplane thrust
EV_AIRPLANE_THROTTLE_FULL, //!< full thrust
@@ -114,6 +119,8 @@
EV_CAELUM_INCREASE_TIME, //!< increase day-time
EV_CAELUM_INCREASE_TIME_FAST, //!< increase day-time a lot faster
EV_CAMERA_CHANGE, //!< change camera mode
+ EV_CAMERA_FREE_MODE,
+ EV_CAMERA_FREE_MODE_FIX,
EV_CAMERA_LOOKBACK, //!< look back (toggles between normal and lookback)
EV_CAMERA_RESET, //!< reset the camera position
EV_CAMERA_ROTATE_DOWN, //!< rotate camera down
@@ -125,13 +132,17 @@
EV_CAMERA_ZOOM_OUT, //!< zoom camera out
EV_CAMERA_ZOOM_OUT_FAST, //!< zoom camera out faster
EV_CHARACTER_BACKWARDS, //!< step backwards with the character
+ EV_CHARACTER_DOWN,
EV_CHARACTER_FORWARD, //!< step forward with the character
EV_CHARACTER_JUMP, //!< let the character jump
EV_CHARACTER_LEFT, //!< rotate character left
EV_CHARACTER_RIGHT, //!< rotate character right
+ EV_CHARACTER_ROT_DOWN,
+ EV_CHARACTER_ROT_UP,
EV_CHARACTER_RUN, //!< let the character run
EV_CHARACTER_SIDESTEP_LEFT, //!< sidestep to the left
EV_CHARACTER_SIDESTEP_RIGHT, //!< sidestep to the right
+ EV_CHARACTER_UP,
EV_COMMANDS_01, //!< Command 1
EV_COMMANDS_02, //!< Command 2
EV_COMMANDS_03, //!< Command 3
@@ -180,27 +191,37 @@
EV_COMMANDS_46, //!< Command 46
EV_COMMANDS_47, //!< Command 47
EV_COMMANDS_48, //!< Command 48
+ EV_COMMON_AUTOLOCK, //!< unlock autolock hook node
EV_COMMON_CONSOLEDISPLAY, //!< show / hide the console
EV_COMMON_CONSOLEMODE, //!< toggle appearance of console
EV_COMMON_ENTER_CHATMODE, //!< enter the chat mode
- EV_COMMON_SEND_CHAT, //!< send the chat text
EV_COMMON_ENTER_OR_EXIT_TRUCK, //!< enter or exit a truck
+ EV_COMMON_FOV_LESS, //!<decreases the current FOV value
+ EV_COMMON_FOV_MORE, //!<increases the current FOV value
+ EV_COMMON_FULLSCREEN_TOGGLE,
EV_COMMON_HIDE_GUI, //!< hide all GUI elements
EV_COMMON_LOCK, //!< connect hook node to a node in close proximity
- EV_COMMON_AUTOLOCK, //!< unlock autolock hook node
- EV_COMMON_ROPELOCK, //!< connect hook node to a node in close proximity
- EV_COMMON_MAP_ALPHA, //!< toggle translucency of overview-map
+ EV_COMMON_NETCHATDISPLAY,
+ EV_COMMON_NETCHATMODE,
EV_COMMON_OUTPUT_POSITION, //!< write current position to log (you can
open the logfile and reuse the position)
EV_COMMON_PRESSURE_LESS, //!< decrease tire pressure (note: only very
few trucks support this)
EV_COMMON_PRESSURE_MORE, //!< increase tire pressure (note: only very
few trucks support this)
EV_COMMON_QUIT_GAME, //!< exit the game
+ EV_COMMON_RELOAD_ROADS,
EV_COMMON_REPAIR_TRUCK, //!< repair truck to original condition
+ EV_COMMON_REPLAY_BACKWARD,
+ EV_COMMON_REPLAY_FAST_BACKWARD,
+ EV_COMMON_REPLAY_FAST_FORWARD,
+ EV_COMMON_REPLAY_FORWARD,
EV_COMMON_RESCUE_TRUCK, //!< teleport to rescue truck
EV_COMMON_RESET_TRUCK, //!< reset truck to original starting position
+ EV_COMMON_ROPELOCK, //!< connect hook node to a node in close proximity
+ EV_COMMON_SAVE_TERRAIN, //!< save terrain mesh to file
EV_COMMON_SCREENSHOT, //!< take a screenshot
EV_COMMON_SCREENSHOT_BIG, //!< take a BIG screenshot
- EV_COMMON_SAVE_TERRAIN, //!< save terrain mesh to file
EV_COMMON_SECURE_LOAD, //!< tie a load to the truck
+ EV_COMMON_SEND_CHAT, //!< send the chat text
+ EV_COMMON_SHOWTRUCKTOOL,
EV_COMMON_SHOW_SKELETON, //!< toggle skeleton display mode
EV_COMMON_START_TRUCK_EDITOR, //!< start the old truck editor
EV_COMMON_TOGGLE_CUSTOM_PARTICLES, //!< toggle particle cannon
@@ -211,9 +232,7 @@
EV_COMMON_TOGGLE_TRUCK_BEACONS, //!< toggle truck beacons
EV_COMMON_TOGGLE_TRUCK_LIGHTS, //!< toggle truck front lights
EV_COMMON_TRUCK_INFO, //!< toggle truck HUD
- EV_COMMON_VIEW_MAP, //!< toggle map modes
- EV_COMMON_FOV_LESS, //!<decreases the current FOV value
- EV_COMMON_FOV_MORE, //!<increases the current FOV value
+ EV_COMMON_TRUCK_REMOVE,
EV_GRASS_LESS, //!< EXPERIMENTAL: remove some grass
EV_GRASS_MORE, //!< EXPERIMENTAL: add some grass
EV_GRASS_MOST, //!< EXPERIMENTAL: set maximum amount of grass
@@ -224,6 +243,10 @@
EV_MENU_RIGHT, //!< select next category
EV_MENU_SELECT, //!< select focussed item and close menu
EV_MENU_UP, //!< select previous element in current category
+ EV_SURVEY_MAP_ALPHA, //!< toggle translucency of overview-map
+ EV_SURVEY_MAP_TOGGLE_VIEW, //!< toggle map modes
+ EV_SURVEY_MAP_ZOOM_IN, //!< increase survey map scale
+ EV_SURVEY_MAP_ZOOM_OUT, //!< decrease survey map scale
EV_TERRAINEDITOR_BUILT, //!< place currently selected object at current
position
EV_TERRAINEDITOR_PITCHBACKWARD, //!< pitch object backward
EV_TERRAINEDITOR_PITCHFOREWARD, //!< pitch object foreward
@@ -232,15 +255,25 @@
EV_TERRAINEDITOR_SELECTROAD, //!< switch to road laying mode
EV_TERRAINEDITOR_TOGGLEOBJECT, //!< toggle between available objects
EV_TERRAINEDITOR_TOGGLEROADTYPE, //!< toggle between available road
types
+ EV_TOGGLESHADERS,
+ EV_TRUCKEDIT_RELOAD,
EV_TRUCK_ACCELERATE, //!< accelerate the truck
+ EV_TRUCK_ANTILOCK_BRAKE, //!< toggle antilockbrake system
EV_TRUCK_AUTOSHIFT_DOWN, //!< shift automatic transmission one gear down
EV_TRUCK_AUTOSHIFT_UP, //!< shift automatic transmission one gear up
EV_TRUCK_BLINK_LEFT, //!< toggle left direction indicator (blinker)
EV_TRUCK_BLINK_RIGHT, //!< toggle right direction indicator (blinker)
EV_TRUCK_BLINK_WARN, //!< toggle all direction indicators
EV_TRUCK_BRAKE, //!< brake
+ EV_TRUCK_CRUISE_CONTROL, //!< toggle cruise control
+ EV_TRUCK_CRUISE_CONTROL_ACCL,//!< increase target speed / rpm
+ EV_TRUCK_CRUISE_CONTROL_DECL,//!< decrease target speed / rpm
+ EV_TRUCK_CRUISE_CONTROL_READJUST, //!< match target speed / rpm with
current truck speed / rpm
EV_TRUCK_HORN, //!< truck horn
+ EV_TRUCK_LEFT_MIRROR_LEFT,
+ EV_TRUCK_LEFT_MIRROR_RIGHT,
EV_TRUCK_LIGHTTOGGLE1, //!< toggle custom light 1
+ EV_TRUCK_LIGHTTOGGLE10, //!< toggle custom light 10
EV_TRUCK_LIGHTTOGGLE2, //!< toggle custom light 2
EV_TRUCK_LIGHTTOGGLE3, //!< toggle custom light 3
EV_TRUCK_LIGHTTOGGLE4, //!< toggle custom light 4
@@ -249,28 +282,12 @@
EV_TRUCK_LIGHTTOGGLE7, //!< toggle custom light 7
EV_TRUCK_LIGHTTOGGLE8, //!< toggle custom light 8
EV_TRUCK_LIGHTTOGGLE9, //!< toggle custom light 9
- EV_TRUCK_LIGHTTOGGLE10, //!< toggle custom light 10
EV_TRUCK_MANUAL_CLUTCH, //!< manual clutch (for manual transmission)
EV_TRUCK_PARKING_BRAKE, //!< toggle parking brake
- EV_TRUCK_ANTILOCK_BRAKE, //!< toggle antilockbrake system
- EV_TRUCK_TRACTION_CONTROL, //!< toggle antilockbrake system
- EV_TRUCK_CRUISE_CONTROL, //!< toggle cruise control
- EV_TRUCK_CRUISE_CONTROL_READJUST, //!< match target speed / rpm with
current truck speed / rpm
- EV_TRUCK_CRUISE_CONTROL_ACCL,//!< increase target speed / rpm
- EV_TRUCK_CRUISE_CONTROL_DECL,//!< decrease target speed / rpm
+ EV_TRUCK_RIGHT_MIRROR_LEFT,
+ EV_TRUCK_RIGHT_MIRROR_RIGHT,
EV_TRUCK_SHIFT_DOWN, //!< shift one gear down in manual transmission
mode
- EV_TRUCK_SHIFT_NEUTRAL, //!< shift to neutral gear in manual
transmission mode
- EV_TRUCK_SHIFT_UP, //!< shift one gear up in manual transmission mode
- EV_TRUCK_SHIFT_GEAR_REVERSE, //!< shift directly into this gear
EV_TRUCK_SHIFT_GEAR1,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR2,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR3,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR4,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR5,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR6,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR7,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR8,//!< shift directly into this gear
- EV_TRUCK_SHIFT_GEAR9,//!< shift directly into this gear
EV_TRUCK_SHIFT_GEAR10,//!< shift directly into this gear
EV_TRUCK_SHIFT_GEAR11,//!< shift directly into this gear
EV_TRUCK_SHIFT_GEAR12,//!< shift directly into this gear
@@ -280,45 +297,28 @@
EV_TRUCK_SHIFT_GEAR16,//!< shift directly into this gear
EV_TRUCK_SHIFT_GEAR17,//!< shift directly into this gear
EV_TRUCK_SHIFT_GEAR18,//!< shift directly into this gear
-
+ EV_TRUCK_SHIFT_GEAR2,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR3,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR4,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR5,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR6,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR7,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR8,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR9,//!< shift directly into this gear
+ EV_TRUCK_SHIFT_GEAR_REVERSE, //!< shift directly into this gear
+ EV_TRUCK_SHIFT_HIGHRANGE, //!< select high range (13-18) for H-shaft
EV_TRUCK_SHIFT_LOWRANGE, //!< select low range (1-6) for H-shaft
EV_TRUCK_SHIFT_MIDRANGE, //!< select middle range (7-12) for H-shaft
- EV_TRUCK_SHIFT_HIGHRANGE, //!< select high range (13-18) for H-shaft
-
+ EV_TRUCK_SHIFT_NEUTRAL, //!< shift to neutral gear in manual
transmission mode
+ EV_TRUCK_SHIFT_UP, //!< shift one gear up in manual transmission mode
EV_TRUCK_STARTER, //!< hold to start the engine
EV_TRUCK_STEER_LEFT, //!< steer left
EV_TRUCK_STEER_RIGHT, //!< steer right
EV_TRUCK_SWITCH_SHIFT_MODES, //!< toggle between transmission modes
- EV_TRUCK_TOGGLE_CONTACT, //!< toggle ignition
EV_TRUCK_TOGGLE_AXLE_LOCK,
+ EV_TRUCK_TOGGLE_CONTACT, //!< toggle ignition
+ EV_TRUCK_TRACTION_CONTROL, //!< toggle antilockbrake system
- EV_COMMON_SHOWTRUCKTOOL,
- EV_COMMON_RELOAD_ROADS,
- EV_COMMON_FULLSCREEN_TOGGLE,
- EV_CAMERA_FREE_MODE_FIX,
- EV_CAMERA_FREE_MODE,
- EV_TRUCK_LEFT_MIRROR_LEFT,
- EV_TRUCK_LEFT_MIRROR_RIGHT,
- EV_TRUCK_RIGHT_MIRROR_LEFT,
- EV_TRUCK_RIGHT_MIRROR_RIGHT,
- EV_COMMON_REPLAY_FORWARD,
- EV_COMMON_REPLAY_BACKWARD,
- EV_COMMON_REPLAY_FAST_FORWARD,
- EV_COMMON_REPLAY_FAST_BACKWARD,
- EV_AIRPLANE_AIRBRAKES_NONE,
- EV_AIRPLANE_AIRBRAKES_FULL,
- EV_AIRPLANE_AIRBRAKES_LESS,
- EV_AIRPLANE_AIRBRAKES_MORE,
-
- EV_AIRPLANE_THROTTLE,
- EV_COMMON_TRUCK_REMOVE,
- EV_COMMON_NETCHATDISPLAY,
- EV_COMMON_NETCHATMODE,
- EV_CHARACTER_ROT_UP,
- EV_CHARACTER_ROT_DOWN,
- EV_CHARACTER_UP,
- EV_CHARACTER_DOWN,
-
// position storage now
EV_TRUCK_SAVE_POS1,
EV_TRUCK_SAVE_POS2,
@@ -353,10 +353,6 @@
EV_DOF_DEBUG_FOCUS_IN,
EV_DOF_DEBUG_FOCUS_OUT,
- EV_TRUCKEDIT_RELOAD,
-
- EV_TOGGLESHADERS,
-
// the end, DO NOT MODIFY
EV_MODE_BEFORELAST,
EV_MODE_LAST
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
