Revision: 2709
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2709&view=rev
Author: ulteq
Date: 2012-05-26 19:21:41 +0000 (Sat, 26 May 2012)
Log Message:
-----------
replaced elfsingleton with GEnv->framelistener
Modified Paths:
--------------
trunk/source/main/gameplay/Savegame.cpp
trunk/source/main/gui/Console.cpp
trunk/source/main/gui/gui_inputmanager.cpp
trunk/source/main/gui/gui_mp.cpp
trunk/source/main/physics/Beam.cpp
trunk/source/main/physics/BeamFactory.cpp
trunk/source/main/scripting/GameScript.cpp
Modified: trunk/source/main/gameplay/Savegame.cpp
===================================================================
--- trunk/source/main/gameplay/Savegame.cpp 2012-05-26 19:21:09 UTC (rev
2708)
+++ trunk/source/main/gameplay/Savegame.cpp 2012-05-26 19:21:41 UTC (rev
2709)
@@ -87,22 +87,22 @@
}
// TODO: FIX savegame camera integration
- //h.camRotX =
RoRFrameListener::eflsingleton->camRotX.valueRadians();
- //h.camRotY =
RoRFrameListener::eflsingleton->camRotY.valueRadians();
- //h.camDist = RoRFrameListener::eflsingleton->camDist;
+ //h.camRotX =
gEnv->frameListener->camRotX.valueRadians();
+ //h.camRotY =
gEnv->frameListener->camRotY.valueRadians();
+ //h.camDist = gEnv->frameListener->camDist;
- //memcpy(&h.cam_ideal_pos,
RoRFrameListener::eflsingleton->camIdealPosition.ptr(), sizeof(float) * 3);
+ //memcpy(&h.cam_ideal_pos,
gEnv->frameListener->camIdealPosition.ptr(), sizeof(float) * 3);
- //h.pushcamRotX =
RoRFrameListener::eflsingleton->pushcamRotX.valueRadians();
- //h.pushcamRotY =
RoRFrameListener::eflsingleton->pushcamRotY.valueRadians();
- //h.mMoveScale =
RoRFrameListener::eflsingleton->mMoveScale;
- //h.mRotScale =
RoRFrameListener::eflsingleton->mRotScale.valueRadians();
+ //h.pushcamRotX =
gEnv->frameListener->pushcamRotX.valueRadians();
+ //h.pushcamRotY =
gEnv->frameListener->pushcamRotY.valueRadians();
+ //h.mMoveScale = gEnv->frameListener->mMoveScale;
+ //h.mRotScale =
gEnv->frameListener->mRotScale.valueRadians();
- //memcpy(&h.lastPosition,
RoRFrameListener::eflsingleton->lastPosition.ptr(), sizeof(float) * 3);
+ //memcpy(&h.lastPosition,
gEnv->frameListener->lastPosition.ptr(), sizeof(float) * 3);
- //h.cameramode =
RoRFrameListener::eflsingleton->cameramode;
- //h.lastcameramode =
RoRFrameListener::eflsingleton->lastcameramode;
+ //h.cameramode = gEnv->frameListener->cameramode;
+ //h.lastcameramode =
gEnv->frameListener->lastcameramode;
}
// write header to file
@@ -255,26 +255,26 @@
// TODO: FIX savegame camera integration
/*
- if(RoRFrameListener::eflsingleton->getCamera())
+ if(gEnv->frameListener->getCamera())
{
-
RoRFrameListener::eflsingleton->getCamera()->setPosition(Vector3(h.cam_pos));
+
gEnv->frameListener->getCamera()->setPosition(Vector3(h.cam_pos));
}
- RoRFrameListener::eflsingleton->camRotX = Radian(h.camRotX);
- RoRFrameListener::eflsingleton->camRotY = Radian(h.camRotY);
- RoRFrameListener::eflsingleton->camDist = h.camDist;
+ gEnv->frameListener->camRotX = Radian(h.camRotX);
+ gEnv->frameListener->camRotY = Radian(h.camRotY);
+ gEnv->frameListener->camDist = h.camDist;
- RoRFrameListener::eflsingleton->camIdealPosition =
Vector3(h.cam_ideal_pos);
+ gEnv->frameListener->camIdealPosition =
Vector3(h.cam_ideal_pos);
- RoRFrameListener::eflsingleton->pushcamRotX =
Radian(h.pushcamRotX);
- RoRFrameListener::eflsingleton->pushcamRotY =
Radian(h.pushcamRotY);
- RoRFrameListener::eflsingleton->mMoveScale = h.mMoveScale;
- RoRFrameListener::eflsingleton->mRotScale =
Radian(h.mRotScale);
+ gEnv->frameListener->pushcamRotX = Radian(h.pushcamRotX);
+ gEnv->frameListener->pushcamRotY = Radian(h.pushcamRotY);
+ gEnv->frameListener->mMoveScale = h.mMoveScale;
+ gEnv->frameListener->mRotScale = Radian(h.mRotScale);
- RoRFrameListener::eflsingleton->lastPosition =
Vector3(h.lastPosition);
+ gEnv->frameListener->lastPosition = Vector3(h.lastPosition);
- RoRFrameListener::eflsingleton->cameramode = h.cameramode;
- RoRFrameListener::eflsingleton->lastcameramode =
h.lastcameramode;
+ gEnv->frameListener->cameramode = h.cameramode;
+ gEnv->frameListener->lastcameramode = h.lastcameramode;
*/
}
Modified: trunk/source/main/gui/Console.cpp
===================================================================
--- trunk/source/main/gui/Console.cpp 2012-05-26 19:21:09 UTC (rev 2708)
+++ trunk/source/main/gui/Console.cpp 2012-05-26 19:21:41 UTC (rev 2709)
@@ -561,7 +561,7 @@
} else if(msg == "/quit")
{
- RoRFrameListener::eflsingleton->shutdown_final();
+ gEnv->frameListener->shutdown_final();
return;
} else if(msg == "/save")
Modified: trunk/source/main/gui/gui_inputmanager.cpp
===================================================================
--- trunk/source/main/gui/gui_inputmanager.cpp 2012-05-26 19:21:09 UTC (rev
2708)
+++ trunk/source/main/gui/gui_inputmanager.cpp 2012-05-26 19:21:41 UTC (rev
2709)
@@ -121,7 +121,7 @@
if(!handled)
{
// update the old airplane / autopilot gui
- handled =
RoRFrameListener::eflsingleton->getOverlayWrapper()->mouseMoved(_arg);
+ handled =
gEnv->frameListener->getOverlayWrapper()->mouseMoved(_arg);
}
if(!handled)
@@ -177,7 +177,7 @@
if(!handled)
{
// update the old airplane / autopilot gui
- handled =
RoRFrameListener::eflsingleton->getOverlayWrapper()->mousePressed(_arg, _id);
+ handled =
gEnv->frameListener->getOverlayWrapper()->mousePressed(_arg, _id);
}
if(!handled)
@@ -209,7 +209,7 @@
if(!handled)
{
// update the old airplane / autopilot gui
- handled =
RoRFrameListener::eflsingleton->getOverlayWrapper()->mouseReleased(_arg, _id);
+ handled =
gEnv->frameListener->getOverlayWrapper()->mouseReleased(_arg, _id);
}
if(!handled)
Modified: trunk/source/main/gui/gui_mp.cpp
===================================================================
--- trunk/source/main/gui/gui_mp.cpp 2012-05-26 19:21:09 UTC (rev 2708)
+++ trunk/source/main/gui/gui_mp.cpp 2012-05-26 19:21:41 UTC (rev 2709)
@@ -356,10 +356,10 @@
int height = lineheight * (slotid + 1);
mpPanel->setSize(sidebarWidth, height);
- if(RoRFrameListener::eflsingleton &&
RoRFrameListener::eflsingleton->getNetQuality(true) != 0)
+ if(gEnv->frameListener && gEnv->frameListener->getNetQuality(true) != 0)
{
netmsgwin->setVisible(true);
- } else if(RoRFrameListener::eflsingleton &&
RoRFrameListener::eflsingleton->getNetQuality(true) == 0)
+ } else if(gEnv->frameListener &&
gEnv->frameListener->getNetQuality(true) == 0)
{
netmsgwin->setVisible(false);
}
@@ -370,12 +370,12 @@
void GUI_Multiplayer::clickUserGoIcon(MyGUI::WidgetPtr sender)
{
int uid = StringConverter::parseInt(sender->getUserString("uid"));
- if (!RoRFrameListener::eflsingleton)
+ if (!gEnv->frameListener)
return;
- if(RoRFrameListener::eflsingleton->getNetPointToUID() == uid)
- RoRFrameListener::eflsingleton->setNetPointToUID(-1);
+ if(gEnv->frameListener->getNetPointToUID() == uid)
+ gEnv->frameListener->setNetPointToUID(-1);
else
- RoRFrameListener::eflsingleton->setNetPointToUID(uid);
+ gEnv->frameListener->setNetPointToUID(uid);
}
void GUI_Multiplayer::clickInfoIcon(MyGUI::WidgetPtr sender)
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-05-26 19:21:09 UTC (rev 2708)
+++ trunk/source/main/physics/Beam.cpp 2012-05-26 19:21:41 UTC (rev 2709)
@@ -5694,7 +5694,7 @@
/*
String txt = "AI:"+TOSTRING(mSteeringForce);
- RoRFrameListener::eflsingleton->getOverlayWrapper()->flashMessage(txt,
1, -1);
+ gEnv->frameListener->getOverlayWrapper()->flashMessage(txt, 1, -1);
*/
// actually steer
@@ -6190,9 +6190,9 @@
float gravity = DEFAULT_GRAVITY;
- if (RoRFrameListener::eflsingleton)
+ if (gEnv->frameListener)
{
- gravity = RoRFrameListener::eflsingleton->getGravity();
+ gravity = gEnv->frameListener->getGravity();
}
float vertacc = std::abs(gravity) - acc.dotProduct(-upv);
Modified: trunk/source/main/physics/BeamFactory.cpp
===================================================================
--- trunk/source/main/physics/BeamFactory.cpp 2012-05-26 19:21:09 UTC (rev
2708)
+++ trunk/source/main/physics/BeamFactory.cpp 2012-05-26 19:21:41 UTC (rev
2709)
@@ -530,16 +530,16 @@
int previous_truck = current_truck;
current_truck = new_truck;
- if (RoRFrameListener::eflsingleton)
+ if (gEnv->frameListener)
{
if (previous_truck >= 0 && current_truck >= 0)
-
RoRFrameListener::eflsingleton->changedCurrentTruck(trucks[previous_truck],
trucks[current_truck]);
+
gEnv->frameListener->changedCurrentTruck(trucks[previous_truck],
trucks[current_truck]);
else if (previous_truck >= 0)
-
RoRFrameListener::eflsingleton->changedCurrentTruck(trucks[previous_truck], 0);
+
gEnv->frameListener->changedCurrentTruck(trucks[previous_truck], 0);
else if (current_truck >= 0)
- RoRFrameListener::eflsingleton->changedCurrentTruck(0,
trucks[current_truck]);
+ gEnv->frameListener->changedCurrentTruck(0,
trucks[current_truck]);
else
- RoRFrameListener::eflsingleton->changedCurrentTruck(0,
0);
+ gEnv->frameListener->changedCurrentTruck(0, 0);
}
}
Modified: trunk/source/main/scripting/GameScript.cpp
===================================================================
--- trunk/source/main/scripting/GameScript.cpp 2012-05-26 19:21:09 UTC (rev
2708)
+++ trunk/source/main/scripting/GameScript.cpp 2012-05-26 19:21:41 UTC (rev
2709)
@@ -589,10 +589,10 @@
}
// add some hard coded values
- curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "terrain_Name",
CURLFORM_COPYCONTENTS, RoRFrameListener::eflsingleton->terrainName.c_str(),
CURLFORM_END);
- curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,
"terrain_FileName", CURLFORM_COPYCONTENTS,
RoRFrameListener::eflsingleton->terrainFileName.c_str(), CURLFORM_END);
- curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,
"terrain_FileHash", CURLFORM_COPYCONTENTS,
RoRFrameListener::eflsingleton->terrainFileHash.c_str(), CURLFORM_END);
- curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "terrain_ModHash",
CURLFORM_COPYCONTENTS, RoRFrameListener::eflsingleton->terrainModHash.c_str(),
CURLFORM_END);
+ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "terrain_Name",
CURLFORM_COPYCONTENTS, gEnv->frameListener->terrainName.c_str(), CURLFORM_END);
+ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,
"terrain_FileName", CURLFORM_COPYCONTENTS,
gEnv->frameListener->terrainFileName.c_str(), CURLFORM_END);
+ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,
"terrain_FileHash", CURLFORM_COPYCONTENTS,
gEnv->frameListener->terrainFileHash.c_str(), CURLFORM_END);
+ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "terrain_ModHash",
CURLFORM_COPYCONTENTS, gEnv->frameListener->terrainModHash.c_str(),
CURLFORM_END);
curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,
"terrain_ScriptName", CURLFORM_COPYCONTENTS, mse->getScriptName().c_str(),
CURLFORM_END);
curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,
"terrain_ScriptHash", CURLFORM_COPYCONTENTS, mse->getScriptHash().c_str(),
CURLFORM_END);
curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "User_NickName",
CURLFORM_COPYCONTENTS, SSETTING("Nickname", "Anonymous").c_str(), CURLFORM_END);
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
