Revision: 276
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=276&view=rev
Author: rorthomas
Date: 2009-05-19 11:01:18 +0000 (Tue, 19 May 2009)
Log Message:
-----------
traling whitespace fixes
added ABS stub, commented out
replaced String with UTFString where required
added new font
Modified Paths:
--------------
trunk/build/main/source/Beam.cpp
trunk/build/main/source/Beam.h
trunk/build/main/source/ExampleFrameListener.cpp
trunk/build/main/source/IngameConsole.cpp
trunk/build/main/source/IngameConsole.h
trunk/build/main/source/InputEngine.cpp
trunk/build/main/source/InputEngine.h
trunk/build/main/source/MovableText.h
trunk/build/main/source/Settings.h
trunk/build/main/source/collisions.cpp
trunk/build/main/unused/spincontrol.cpp
Modified: trunk/build/main/source/Beam.cpp
===================================================================
--- trunk/build/main/source/Beam.cpp 2009-05-18 05:10:59 UTC (rev 275)
+++ trunk/build/main/source/Beam.cpp 2009-05-19 11:01:18 UTC (rev 276)
@@ -72,7 +72,7 @@
// hide all meshes, prevents deleting stuff while drawing
this->setMeshVisibility(false);
-
+
//block until all threads done
if (thread_mode==THREAD_HT)
{
@@ -361,6 +361,8 @@
smokeRef=0;
smoker=NULL;
brake=0.0;
+ abs_timer=0.0;
+ abs_state=false;
blinktreshpassed=false;
blinkingtype=BLINK_NONE;
netCustomLightArray[0] = -1;
@@ -963,7 +965,7 @@
netBrakeLight = ((flagmask&NETMASK_BRAKES)!=0);
netReverseLight = ((flagmask&NETMASK_REVERSE)!=0);
-
+
if(netReverseLight)
ssm->trigStart(trucknum, SS_TRIG_REVERSE_GEAR);
else
@@ -2630,7 +2632,7 @@
continue;
}
if(materialFunctionMapper)
materialFunctionMapper->replaceMeshMaterials(te);
- if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(te);
+ if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(te);
props[free_prop].wheel=manager->getRootSceneNode()->createChildSceneNode();
props[free_prop].wheel->attachObject(te);
props[free_prop].wheelpos=stdpos;
@@ -2647,7 +2649,7 @@
continue;
}
if(materialFunctionMapper)
materialFunctionMapper->replaceMeshMaterials(te);
- if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(te);
+ if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(te);
props[free_prop].snode=manager->getRootSceneNode()->createChildSceneNode();
props[free_prop].snode->attachObject(te);
//hack for the spinprops
@@ -2837,7 +2839,7 @@
continue;
}
if(materialFunctionMapper)
materialFunctionMapper->replaceMeshMaterials(ec);
- if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(ec);
+ if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(ec);
wings[free_wing].cnode =
manager->getRootSceneNode()->createChildSceneNode();
wings[free_wing].cnode->attachObject(ec);
//induced drag
@@ -4036,7 +4038,7 @@
LogManager::getSingleton().logMessage("error loading
mesh: "+String(wname));
}
if(materialFunctionMapper)
materialFunctionMapper->replaceMeshMaterials(ec);
- if(!usedSkin.isNull()) usedSkin->replaceMeshMaterials(ec);
+ if(!usedSkin.isNull()) usedSkin->replaceMeshMaterials(ec);
};
LogManager::getSingleton().logMessage("BEAM: cab ok");
// mWindow->setDebugText("Beam number:"+
StringConverter::toString(free_beam));
@@ -4482,7 +4484,7 @@
vwheels[free_wheel].cnode =
manager->getRootSceneNode()->createChildSceneNode();
vwheels[free_wheel].cnode->attachObject(ec);
if(materialFunctionMapper)
materialFunctionMapper->replaceMeshMaterials(ec);
- if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(ec);
+ if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(ec);
}catch(...)
{
LogManager::getSingleton().logMessage("error loading
mesh: "+String(wname));
@@ -4495,7 +4497,7 @@
{
Entity *ec = manager->createEntity(wnamei, wname);
if(materialFunctionMapper)
materialFunctionMapper->replaceMeshMaterials(ec);
- if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(ec);
+ if(!usedSkin.isNull())
usedSkin->replaceMeshMaterials(ec);
vwheels[free_wheel].cnode =
manager->getRootSceneNode()->createChildSceneNode();
vwheels[free_wheel].cnode->attachObject(ec);
} catch(...)
@@ -4963,11 +4965,19 @@
if (dt==0) return true;
if(mTimeUntilNextToggle>-1)
mTimeUntilNextToggle-= dt;
+
+ abs_timer += dt;
+ if(abs_timer > 2.0f)
+ {
+ abs_state = !abs_state;
+ abs_timer = 0.0f;
+ }
+
int i;
// Real dt=evt.timeSinceLastFrame;
int steps=100;
steps=(int)(2000.0*dt);
- truckSteps = steps; // copy for the stats
+ truckSteps = steps; // copy for the stats
if (steps>100) steps=100;
if (dt>1.0/20.0)
{
@@ -6263,7 +6273,7 @@
// if ((brake!=0.0 || engine_torque!=0.0 ||
doUpdate)&&free_wheel)
int propcounter=0;
-float torques[MAX_WHEELS];
+ float torques[MAX_WHEELS];
float newspeeds[MAX_WHEELS];
for (i=0; i<free_wheel; i++)
{
@@ -6276,17 +6286,25 @@
total_torque+=engine_torque/proped_wheels;
//braking
if (parkingbrake) brake=brakeforce*2.0;
+
//directional braking
float dbrake=0.0;
if (wheels[i].braked==2 && hydrodirstate>0.0 &&
WheelSpeed<20.0) dbrake=brakeforce*hydrodirstate;
if (wheels[i].braked==3 && hydrodirstate<0.0 &&
WheelSpeed<20.0) dbrake=brakeforce*-hydrodirstate;
+ // ABS system
+ /*
+ if(abs_state && fabs(wheels[i].speed) < 0.1f )
+ // remove all brake force when ABS is active and wheel
speed is low enough
+ brake = 0.0f;
+ */
+
if ((brake != 0.0 || dbrake != 0.0) && wheels[i].braked &&
braked_wheels != 0)
{
if( fabs(wheels[i].speed) > 0.00f )
total_torque -=
(wheels[i].speed/fabs(wheels[i].speed))*(brake + dbrake);
// wheels are stopped
- else if( fabs(wheels[i].speed) > 0.0f )
+ else if( fabs(wheels[i].speed) > 0.0f)
total_torque -=
(wheels[i].speed/fabs(wheels[i].speed))*(brake + dbrake)*1.2;
}
@@ -7285,7 +7303,7 @@
}
-void Beam::setBlinkType(blinktype blink)
+void Beam::setBlinkType(blinktype blink)
{
blinkingtype = blink;
if(blink == BLINK_NONE)
@@ -7302,10 +7320,10 @@
if(blink == BLINK_LEFT && hydrodirstate < -0.1)
// passed the treshold: the turn signal gets locked
blinktreshpassed = true;
-
+
if(blink == BLINK_LEFT && blinktreshpassed && hydrodirstate > -0.1)
{
- // steering wheel turned back: turn signal gets autmatically
unlocked
+ // steering wheel turned back: turn signal gets autmatically
unlocked
setBlinkType(BLINK_NONE);
blinktreshpassed = false;
}
@@ -7318,7 +7336,7 @@
{
setBlinkType(BLINK_NONE);
blinktreshpassed = false;
- }
+ }
}
void Beam::updateProps()
@@ -8339,7 +8357,7 @@
netMT->showOnTop(false);
netMT->setCharacterHeight(2);
netMT->setColor(ColourValue::White);
-
+
if(networkInfo.user_authlevel & AUTH_ADMIN)
{
netMT->setFontName("highcontrast_red");
Modified: trunk/build/main/source/Beam.h
===================================================================
--- trunk/build/main/source/Beam.h 2009-05-18 05:10:59 UTC (rev 275)
+++ trunk/build/main/source/Beam.h 2009-05-19 11:01:18 UTC (rev 276)
@@ -6,7 +6,7 @@
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
+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,
@@ -797,6 +797,8 @@
int airbrakeval;
Vector3 cameranodeacc;
int cameranodecount;
+ bool abs_state;
+ float abs_timer;
Vector3 origin;
int free_cab;
@@ -805,7 +807,7 @@
void setMeshVisibility(bool visible);
bool meshesVisible;
inline bool isFiniteNum(float x);
-
+
int getTruckTime() { return nettimer->getMilliseconds(); };
int getNetTruckTimeOffset() { return net_toffset; };
protected:
@@ -864,7 +866,7 @@
Vector3 texcoords[MAX_TEXCOORDS];
int collcabs[MAX_CABS];
int collcabstype[MAX_CABS];
-
+
int buoycabs[MAX_CABS];
int buoycabtypes[MAX_CABS];
FlexObj *cabMesh;
Modified: trunk/build/main/source/ExampleFrameListener.cpp
===================================================================
--- trunk/build/main/source/ExampleFrameListener.cpp 2009-05-18 05:10:59 UTC
(rev 275)
+++ trunk/build/main/source/ExampleFrameListener.cpp 2009-05-19 11:01:18 UTC
(rev 276)
@@ -6,7 +6,7 @@
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
+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,
@@ -268,7 +268,7 @@
t->setColourOperationEx(Ogre::LBX_SOURCE1,
Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, ColourValue::White);
t->setAlphaOperation(Ogre::LBX_SOURCE1,
Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, 0.3);
backMat->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
-
+
backMat =
MaterialManager::getSingleton().create("linestream_lines",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
t =
backMat->getTechnique(0)->getPass(0)->createTextureUnitState();
@@ -362,13 +362,13 @@
netLineStream->setTraceValue(0,
speedUp);
netLineStream->setTraceInfo(0, cr,
"Traffic Up: "+String(tmp));
-
+
float speedDown =
net->getSpeedDown()/1024.0f;
memset(tmp, 0, 10);
sprintf(tmp, "%0.1fkB/s", speedDown);
netLineStream->setTraceValue(1,
speedDown);
netLineStream->setTraceInfo(1, cg,
"Traffic Down: "+String(tmp));
-
+
netLineStream->moveForward();
std::map<int, float> &lag =
net->getLagData();
@@ -1368,7 +1368,7 @@
debugCollisions = (SETTINGS.getSetting("Debug Collisions") == "Yes");
-
+
xfire_enabled = (SETTINGS.getSetting("XFire") == "Yes");
externalCameraMode = (SETTINGS.getSetting("External Camera Mode") ==
"Static")? 1 : 0;
@@ -1446,7 +1446,7 @@
//network
netmode=(SETTINGS.getSetting("Network enable")=="Yes");
-
+
// check command line args
String cmd = SETTINGS.getSetting("cmdline CMD");
String cmdAction = "";
@@ -1965,7 +1965,7 @@
odefFound=false;
}
}
-
+
//if(!CACHE.checkResourceLoaded(odefname, odefgroup))
if(!odefFound)
{
@@ -2452,7 +2452,7 @@
sprintf(tmp1, "%s %d", ssmsg.c_str(), mNumScreenShots);
flashMessage(tmp1);
}
-
+
if (INPUTENGINE.getEventBoolValueBounce(EV_COMMON_FOV_LESS))
{
int fov = mCamera->getFOVy().valueDegrees();
@@ -2728,7 +2728,7 @@
{
if (road)
{
- if (!editorfd)
+ if (!editorfd)
{
String editorfn
= SETTINGS.getSetting("Log Path") + "editor_out.txt";
editorfd =
fopen(editorfn.c_str(), "a");
@@ -2747,7 +2747,7 @@
}
if (editor)
{
- if (!editorfd)
+ if (!editorfd)
{
String editorfn
= SETTINGS.getSetting("Log Path") + "editor_out.txt";
editorfd =
fopen(editorfn.c_str(), "a");
@@ -3765,11 +3765,11 @@
//if (current_truck!=-1) setCurrentTruck(-1);
int rtruck=-1;
// search a rescue truck
- for (int i=0; i<free_truck; i++)
- if (trucks[i]->rescuer)
+ for (int i=0; i<free_truck; i++)
+ if (trucks[i]->rescuer)
rtruck=i;
if(rtruck == -1)
- {
+ {
flashMessage("No rescue truck found!", 3);
} else
{
@@ -3940,7 +3940,7 @@
if (trucks[free_truck]->engine)
trucks[free_truck]->engine->start();
setCurrentTruck(free_truck);
- } else
+ } else
{
// if it is a load or trailer, than
stay in person mode
// but relocate to the new position, so
we dont spawn the dialog again
@@ -4262,13 +4262,13 @@
void ExampleFrameListener::processConsoleInput()
{
- String chatline = INPUTENGINE.getKeyLine();
+ UTFString chatline = INPUTENGINE.getKeyLine();
if (chatline.size()==0) return;
if(netmode)
{
NETCHAT.addText(net->getNickname(true) + ": ^7" +
ColoredTextAreaOverlayElement::StripColors(chatline), false);
- net->sendChat(const_cast<char *>(chatline.c_str()));
+ net->sendChat( const_cast<char *>(chatline.asUTF8_c_str()));
} else
NETCHAT.addText(_L("^8 Player: ^7") + chatline);
@@ -5049,7 +5049,7 @@
}
densityMap->setFilter(Forests::MAPFILTER_BILINEAR);
//densityMap->setMapBounds(TRect(0, 0, mapsizex,
mapsizez));
-
+
paged_geometry_t paged;
paged.geom = new PagedGeometry();
//paged.geom->setTempDir(SETTINGS.getSetting("User
Path") + "cache" + SETTINGS.getSetting("dirsep"));
@@ -5071,7 +5071,7 @@
paged.geom->setPageLoader(treeLoader);
treeLoader->setHeightFunction(&getTerrainHeight);
if(String(ColorMap) != "none")
- treeLoader->setColorMap(ColorMap);
+ treeLoader->setColorMap(ColorMap);
curTree =
mSceneMgr->createEntity(String("paged_")+treemesh+StringConverter::toString(pagedGeometry.size()),
treemesh);
@@ -5834,7 +5834,7 @@
}
// show minimap and put it into lower left corner
- if(bigMap)
+ if(bigMap)
{
bigMap->setVisibility(true);
bigMap->setPosition(0, 0.81, 0.14, 0.19, mWindow);
@@ -6656,7 +6656,7 @@
for (int i=0; i<free_truck; i++)
{
if(!trucks[i]) continue;
- if (sleepyList[i])
+ if (sleepyList[i])
trucks[i]->state=GOSLEEP;
}
}
@@ -6672,13 +6672,13 @@
if(!trucks[t]) continue;
trucks[t]->updateFlares(dt, (t==current_truck) );
}
- for (t=0; t<free_truck; t++)
+ for (t=0; t<free_truck; t++)
{
if(!trucks[t]) continue;
- if (trucks[t]->state!=SLEEPING)
+ if (trucks[t]->state!=SLEEPING)
rollmode=rollmode ||
trucks[t]->wheel_contact_requested;
}
- for (t=0; t<free_truck; t++)
+ for (t=0; t<free_truck; t++)
{
if(!trucks[t]) continue;
trucks[t]->requires_wheel_contact=rollmode;// &&
!trucks[t]->wheel_contact_requested;
@@ -6788,7 +6788,7 @@
TextAreaOverlayElement *taoe=new
TextAreaOverlayElement(poename);
taoe->setColourTop(ColourValue(0.1, 0.1, 0.1,
1.0));
taoe->setColourBottom(ColourValue(0.0, 0.0,
0.0, 1.0));
- taoe->setFontName("BlueHighway");
+ taoe->setFontName("Cyberbit");
taoe->setCharHeight(0.02);
taoe->setCaption(nickname);
taoe->setLeft(bigMapo->getWidth()*(truckx/mapsizex)+0.01);
@@ -6877,7 +6877,7 @@
else
// set original height
flashMessageTE->setCharHeight(0.05f);
-
+
flashOverlay->show();
timeUntilUnflash=time;
}
Modified: trunk/build/main/source/IngameConsole.cpp
===================================================================
--- trunk/build/main/source/IngameConsole.cpp 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/source/IngameConsole.cpp 2009-05-19 11:01:18 UTC (rev
276)
@@ -6,7 +6,7 @@
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
+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,
@@ -31,7 +31,7 @@
consoleOverlay = 0;
displaymode=-1;
top=width=left=height=0;
- lineheight = 12; //lineheight = fontheight
+ lineheight = 16; //lineheight = fontheight
bordersize = 10;
isvisible=false;
cursorBlink=false;
@@ -186,11 +186,11 @@
textArea->setPosition(bordersize, bordersize + (lineheight +
linespace) * i);
textArea->setDimensions(width, lineheight);
textArea->setCharHeight(lineheight + 2);
- textArea->setFontName("VeraMono");
+ textArea->setFontName("Cyberbit");
textArea->setValueBottom(0.7);
textArea->setValueTop(0.9);
textArea->setCaption("");
- //textArea->setCaption(String("^1Line^7
")+StringConverter::toString(i));
+ //textArea->setCaption(UTFString("^1Line^7
")+StringConverter::toString(i));
textArea->show();
chatLines.push_back(textArea);
// Add the text area to the panel
@@ -220,7 +220,7 @@
return true;
}
-bool IngameConsole::addText(String msg, bool addtime)
+bool IngameConsole::addText(UTFString msg, bool addtime)
{
try {
chatBuffer.push_back(msg);
@@ -233,7 +233,7 @@
void IngameConsole::updateEnterText()
{
- static const String cursor = "_";
+ static const UTFString cursor = "_";
vector<ColoredTextAreaOverlayElement *>::reverse_iterator enterline =
chatLines.rbegin();
try
{
@@ -245,14 +245,13 @@
{
(*enterline)->setCaption("^7> " + enterText);
}
- }
- catch(...)
+ } catch(Ogre::Exception& e)
{
- (*enterline)->setCaption("^7> ^1CODEC ERROR");
+ (*enterline)->setCaption("^7> ^1CODEC ERROR:
"+e.getFullDescription());
}
}
-bool IngameConsole::setEnterText(String msg, bool visible, bool cursor)
+bool IngameConsole::setEnterText(UTFString msg, bool visible, bool cursor)
{
enterText = msg;
cursorBlink = cursor;
@@ -272,7 +271,7 @@
if(chatLines.size() == 0 || chatBuffer.size() == 0)
return;
vector<ColoredTextAreaOverlayElement *>::reverse_iterator i;
- vector<String>::reverse_iterator ib;
+ vector<UTFString>::reverse_iterator ib;
// chatLines + 1 because last line is for entering something!
for(i = chatLines.rbegin() + 1, ib = chatBuffer.rbegin() +
(scrollOffset); i!=chatLines.rend() && ib != chatBuffer.rend(); i++, ib++)
{
Modified: trunk/build/main/source/IngameConsole.h
===================================================================
--- trunk/build/main/source/IngameConsole.h 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/source/IngameConsole.h 2009-05-19 11:01:18 UTC (rev
276)
@@ -6,7 +6,7 @@
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
+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,
@@ -44,8 +44,8 @@
void toggleVisible(ExampleFrameListener *mefl);
static IngameConsole & getInstance();
~IngameConsole();
- bool addText(Ogre::String msg, bool addtime=false);
- bool setEnterText(Ogre::String msg, bool visible=true, bool
cursor=false);
+ bool addText(Ogre::UTFString msg, bool addtime=false);
+ bool setEnterText(Ogre::UTFString msg, bool visible=true, bool
cursor=false);
void resize(int left, int top, int width, int height);
bool getVisible() { return isvisible; };
void setVisible(bool visible);
@@ -53,7 +53,7 @@
int getFontSize() { return lineheight; };
void setFontSize(int size);
- int parseCommand(Ogre::String &msg, std::vector<Ogre::String>
&arguments);
+ int parseCommand(Ogre::UTFString &msg, std::vector<Ogre::UTFString>
&arguments);
void scrollPageUp();
void scrollPageDown();
@@ -71,9 +71,9 @@
int lineheight, bordersize;
int displaymode;
ExampleFrameListener *mefl;
-
+
// cursor stuff
- Ogre::String enterText;
+ Ogre::UTFString enterText;
bool cursorBlink;
bool cursorBlinkState;
float lastCursorBlink;
@@ -89,7 +89,7 @@
Ogre::OverlayContainer *consoleOverlay;
std::vector < ColoredTextAreaOverlayElement * > chatLines;
- std::vector < Ogre::String > chatBuffer;
+ std::vector < Ogre::UTFString > chatBuffer;
void updateDisplay();
};
Modified: trunk/build/main/source/InputEngine.cpp
===================================================================
--- trunk/build/main/source/InputEngine.cpp 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/source/InputEngine.cpp 2009-05-19 11:01:18 UTC (rev
276)
@@ -1382,7 +1382,7 @@
//Create all devices (We only catch joystick exceptions here,
as, most people have Key/Mouse)
mKeyboard =
static_cast<Keyboard*>(mInputManager->createInputObject( OISKeyboard, true ));
- mKeyboard->setTextTranslation(OIS::Keyboard::Ascii);
+ mKeyboard->setTextTranslation(OIS::Keyboard::Unicode);
if(capturemouse)
mMouse =
static_cast<Mouse*>(mInputManager->createInputObject( OISMouse, true ));
Modified: trunk/build/main/source/InputEngine.h
===================================================================
--- trunk/build/main/source/InputEngine.h 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/source/InputEngine.h 2009-05-19 11:01:18 UTC (rev
276)
@@ -32,6 +32,8 @@
#include "OISJoyStick.h"
//#include <OgreFrameListener.h>
#include <OgreWindowEventUtilities.h>
+#include <OgrePrerequisites.h>
+#include <OgreUTFString.h>
#include <map>
//class ExampleFrameListener;
@@ -358,7 +360,7 @@
bool isEventDefined(int eventID);
void addEvent(int eventID, event_trigger_t t);
bool deleteEventBySUID(int suid);
- Ogre::String getKeyLine() { return keyInput; };
+ Ogre::UTFString getKeyLine() { return keyInput; };
void resetKeyLine() { keyInput=""; };
void setRecordInput(bool value) { recordChat=value; };
bool getInputsChanged() { return inputsChanged; };
@@ -432,7 +434,7 @@
std::string getEventGroup(Ogre::String eventName);
bool mappingLoaded;
- Ogre::String keyInput;
+ Ogre::UTFString keyInput;
bool recordChat;
bool inputsChanged;
bool fileExists(char* filename);
Modified: trunk/build/main/source/MovableText.h
===================================================================
--- trunk/build/main/source/MovableText.h 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/source/MovableText.h 2009-05-19 11:01:18 UTC (rev
276)
@@ -51,7 +51,7 @@
/******************************** public methods
******************************/
public:
- MovableText(const String &name, const String &caption, const String
&fontName = "BlueHighway", Real charHeight = 1.0, const ColourValue &color =
ColourValue::White);
+ MovableText(const String &name, const String &caption, const String
&fontName = "Cyberbit", Real charHeight = 1.0, const ColourValue &color =
ColourValue::White);
virtual ~MovableText();
// Add to build on Shoggoth:
Modified: trunk/build/main/source/Settings.h
===================================================================
--- trunk/build/main/source/Settings.h 2009-05-18 05:10:59 UTC (rev 275)
+++ trunk/build/main/source/Settings.h 2009-05-19 11:01:18 UTC (rev 276)
@@ -6,7 +6,7 @@
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
+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,
@@ -58,4 +58,4 @@
void path_add(char* path, char* dirname);
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/build/main/source/collisions.cpp
===================================================================
--- trunk/build/main/source/collisions.cpp 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/source/collisions.cpp 2009-05-19 11:01:18 UTC (rev
276)
@@ -6,7 +6,7 @@
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
+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,
Modified: trunk/build/main/unused/spincontrol.cpp
===================================================================
--- trunk/build/main/unused/spincontrol.cpp 2009-05-18 05:10:59 UTC (rev
275)
+++ trunk/build/main/unused/spincontrol.cpp 2009-05-19 11:01:18 UTC (rev
276)
@@ -119,7 +119,7 @@
sign=static_cast<TextAreaOverlayElement*>(OverlayManager::getSingleton().createOverlayElement
("TextArea", mName+"-signtext"));
sign->setCaption("+");
sign->setColour(ColourValue::Black);
- sign->setFontName("BlueHighway");
+ sign->setFontName("Cyberbit");
sign->setCharHeight(0.018);
sign->setPosition(0.002,0.012);
sign->setWidth(0.01);
@@ -143,7 +143,7 @@
taoe[i]=static_cast<TextAreaOverlayElement*>(OverlayManager::getSingleton().createOverlayElement
("TextArea", mName+"-digittext"+StringConverter::toString(i)));
taoe[i]->setCaption("-");
taoe[i]->setColour(ColourValue::Black);
- taoe[i]->setFontName("BlueHighway");
+ taoe[i]->setFontName("Cyberbit");
taoe[i]->setCharHeight(0.018);
taoe[i]->setPosition(0.012+(float)i*0.01+dotoffset,0.012);
taoe[i]->setWidth(0.01);
@@ -176,7 +176,7 @@
unit=static_cast<TextAreaOverlayElement*>(OverlayManager::getSingleton().createOverlayElement
("TextArea", mName+"-unittext"));
unit->setCaption(preunit);
unit->setColour(ColourValue::Black);
- unit->setFontName("BlueHighway");
+ unit->setFontName("Cyberbit");
unit->setCharHeight(0.018);
unit->setPosition(0.012+(float)numdigits*0.01+dotoffset,0.012);
unit->setWidth(0.01);
@@ -202,7 +202,7 @@
taoe[i]->setCaption(dtext);
bpoe[i]->setMaterialName("gui/active");
}
- else
+ else
{
taoe[i]->setCaption("-");
bpoe[i]->setMaterialName("gui/background");
@@ -577,7 +577,7 @@
//-----------------------------------------------------------------------
String SpinControl::CmdUnit::doGet(const void* target) const
{
- return
+ return
static_cast<const SpinControl*>(target)->preunit;
}
void SpinControl::CmdUnit::doSet(void* target, const String& val)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
