Revision: 1708
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1708&view=rev
Author: rorthomas
Date: 2011-02-28 01:18:28 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
fixed some vidcam bugs
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gfx/vidcam.cpp
trunk/source/main/gui/OverlayWrapper.cpp
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-28 00:28:20 UTC
(rev 1707)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-28 01:18:28 UTC
(rev 1708)
@@ -4532,59 +4532,6 @@
}
- if(terrainfile == "simple.terrn")
- {
- Ogre::ColourValue BackgroundColour =
Ogre::ColourValue::White;//Ogre::ColourValue(0.1337f, 0.1337f, 0.1337f, 1.0f);
- Ogre::ColourValue GridColour = Ogre::ColourValue(0.2000f,
0.2000f, 0.2000f, 1.0f);
-
- Ogre::ManualObject *mReferenceObject = new
Ogre::ManualObject("ReferenceGrid");
-
- mReferenceObject->begin("BaseWhiteNoLighting",
Ogre::RenderOperation::OT_LINE_LIST);
-
- Ogre::Real step = 1.0f;
- unsigned int count = 200;
- unsigned int halfCount = count / 2;
- Ogre::Real full = (step * count);
- Ogre::Real half = full / 2;
- Ogre::Real y = 0;
- Ogre::ColourValue c;
- for (unsigned i=0;i < count+1;i++)
- {
-
- if (i == halfCount)
- c = Ogre::ColourValue(0.5f,0.3f,0.3f,1.0f);
- else
- c = GridColour;
-
- mReferenceObject->position(-half,y,-half+(step*i));
- mReferenceObject->colour(BackgroundColour);
- mReferenceObject->position(0,y,-half+(step*i));
- mReferenceObject->colour(c);
- mReferenceObject->position(0,y,-half+(step*i));
- mReferenceObject->colour(c);
- mReferenceObject->position(half,y,-half+(step*i));
- mReferenceObject->colour(BackgroundColour);
-
- if (i == halfCount)
- c = Ogre::ColourValue(0.3f,0.3f,0.5f,1.0f);
- else
- c = GridColour;
-
- mReferenceObject->position(-half+(step*i),y,-half);
- mReferenceObject->colour(BackgroundColour);
- mReferenceObject->position(-half+(step*i),y,0);
- mReferenceObject->colour(c);
- mReferenceObject->position(-half+(step*i),y,0);
- mReferenceObject->colour(c);
- mReferenceObject->position(-half+(step*i),y, half);
- mReferenceObject->colour(BackgroundColour);
- }
-
- mReferenceObject->end();
- mReferenceObject->setCastShadows(false);
- mSceneMgr->getRootSceneNode()->attachObject(mReferenceObject);
- }
-
// set the terrain hash
{
Cache_Entry ce = CACHE.getResourceInfo(terrainfile);
@@ -5517,7 +5464,67 @@
if (line[0]=='/' || line[0]==';' || ll==0) continue; //comments
if (!strcmp("end",line)) break;
+ if (!strncmp(line,"grid", 4))
+ {
+ float px=0,py=0,pz=0;
+ int res = sscanf(line, "grid %f, %f, %f", &px, &py,
&pz);
+ Vector3 pos = Vector3(px,py,pz);
+ Ogre::ColourValue BackgroundColour =
Ogre::ColourValue::White;//Ogre::ColourValue(0.1337f, 0.1337f, 0.1337f, 1.0f);
+ Ogre::ColourValue GridColour =
Ogre::ColourValue(0.2000f, 0.2000f, 0.2000f, 1.0f);
+
+ Ogre::ManualObject *mReferenceObject = new
Ogre::ManualObject("ReferenceGrid");
+
+ mReferenceObject->begin("BaseWhiteNoLighting",
Ogre::RenderOperation::OT_LINE_LIST);
+
+ Ogre::Real step = 1.0f;
+ unsigned int count = 200;
+ unsigned int halfCount = count / 2;
+ Ogre::Real full = (step * count);
+ Ogre::Real half = full / 2;
+ Ogre::Real y = 0;
+ Ogre::ColourValue c;
+ for (unsigned i=0;i < count+1;i++)
+ {
+
+ if (i == halfCount)
+ c =
Ogre::ColourValue(0.5f,0.3f,0.3f,1.0f);
+ else
+ c = GridColour;
+
+
mReferenceObject->position(-half,y,-half+(step*i));
+ mReferenceObject->colour(BackgroundColour);
+ mReferenceObject->position(0,y,-half+(step*i));
+ mReferenceObject->colour(c);
+ mReferenceObject->position(0,y,-half+(step*i));
+ mReferenceObject->colour(c);
+
mReferenceObject->position(half,y,-half+(step*i));
+ mReferenceObject->colour(BackgroundColour);
+
+ if (i == halfCount)
+ c =
Ogre::ColourValue(0.3f,0.3f,0.5f,1.0f);
+ else
+ c = GridColour;
+
+
mReferenceObject->position(-half+(step*i),y,-half);
+ mReferenceObject->colour(BackgroundColour);
+ mReferenceObject->position(-half+(step*i),y,0);
+ mReferenceObject->colour(c);
+ mReferenceObject->position(-half+(step*i),y,0);
+ mReferenceObject->colour(c);
+ mReferenceObject->position(-half+(step*i),y,
half);
+ mReferenceObject->colour(BackgroundColour);
+ }
+
+ mReferenceObject->end();
+ mReferenceObject->setCastShadows(false);
+ SceneNode *n =
mSceneMgr->getRootSceneNode()->createChildSceneNode();
+ n->setPosition(pos - Vector3(count / 2, 0, count / 2));
+ n->attachObject(mReferenceObject);
+ n->setVisible(true);
+ }
+
+
//Caelum config
if (!strncmp(line,"caelumconfig", 12))
{
Modified: trunk/source/main/gfx/vidcam.cpp
===================================================================
--- trunk/source/main/gfx/vidcam.cpp 2011-02-28 00:28:20 UTC (rev 1707)
+++ trunk/source/main/gfx/vidcam.cpp 2011-02-28 01:18:28 UTC (rev 1708)
@@ -88,8 +88,8 @@
Vector3 refy=refx.crossProduct(normal);
- //Quaternion rot = Quaternion(refx, normal, refy) * driverSeat->rot *
Quaternion(Degree(180), Vector3::UNIT_Y); // rotate towards the driving
direction
- Quaternion rot = Quaternion(refx, normal, refy);
+ Quaternion rot = Quaternion(refx, normal, refy); // rotate towards the
driving direction
+ //Quaternion rot = Quaternion(refx, normal, refy);
// set the new position / orientation to the camera
mVidCam->setPosition(pos);
Modified: trunk/source/main/gui/OverlayWrapper.cpp
===================================================================
--- trunk/source/main/gui/OverlayWrapper.cpp 2011-02-28 00:28:20 UTC (rev
1707)
+++ trunk/source/main/gui/OverlayWrapper.cpp 2011-02-28 01:18:28 UTC (rev
1708)
@@ -117,15 +117,15 @@
{
fpsLineStream = netLineStream = netlagLineStream = 0;
- directionOverlay = loadOverlay("tracks/DirectionArrow");
+ directionOverlay = loadOverlay("tracks/DirectionArrow", false);
directionArrowText =
(TextAreaOverlayElement*)loadOverlayElement("tracks/DirectionArrow/Text");
directionArrowDistance =
(TextAreaOverlayElement*)loadOverlayElement("tracks/DirectionArrow/Distance");
mouseOverlay = loadOverlay("tracks/MouseOverlay", false);
#ifdef HAS_EDITOR
truckeditorOverlay = loadOverlay("tracks/TruckEditorOverlay");
#endif
- mDebugOverlay = loadOverlay("Core/DebugOverlay");
- mTimingDebugOverlay = loadOverlay("tracks/DebugBeamTiming");
+ mDebugOverlay = loadOverlay("Core/DebugOverlay", false);
+ mTimingDebugOverlay = loadOverlay("tracks/DebugBeamTiming", false);
mTimingDebugOverlay->hide();
@@ -407,7 +407,7 @@
pressureNeedleOverlay = loadOverlay("tracks/PressureNeedleOverlay");
editorOverlay = loadOverlay("tracks/EditorOverlay");
- racing = loadOverlay("tracks/Racing");
+ racing = loadOverlay("tracks/Racing", false);
laptimemin =
(TextAreaOverlayElement*)loadOverlayElement("tracks/LapTimemin");
laptimes =
(TextAreaOverlayElement*)loadOverlayElement("tracks/LapTimes");
laptimems =
(TextAreaOverlayElement*)loadOverlayElement("tracks/LapTimems");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
