Revision: 1717
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1717&view=rev
Author: rorthomas
Date: 2011-03-01 15:35:25 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
fixed lifters patch merging issues ...
Modified Paths:
--------------
trunk/source/main/gfx/vidcam.cpp
Modified: trunk/source/main/gfx/vidcam.cpp
===================================================================
--- trunk/source/main/gfx/vidcam.cpp 2011-03-01 15:22:09 UTC (rev 1716)
+++ trunk/source/main/gfx/vidcam.cpp 2011-03-01 15:35:25 UTC (rev 1717)
@@ -114,24 +114,6 @@
return 0;
}
-<<<<<<< .mine
- // check for correct and resonable values
- if(nref < 0 || nref > truck->free_node || (nx < 0 || nx >
truck->free_node) || ny < 0 || ny > truck->free_node || ncam < -1 || ncam >
truck->free_node)
- {
- LogManager::getSingleton().logMessage("Error parsing File
(videocamera) " + String(fname) +" line " +
StringConverter::toString(linecounter) + ". Unknown node number, trying to
continue ...");
- return 0;
- }
- if(fov < 0 || fov > 360)
- {
- LogManager::getSingleton().logMessage("Error parsing File
(videocamera) " + String(fname) +" line " +
StringConverter::toString(linecounter) + ". Field of view setting incorrect,
trying to continue ...");
- return 0;
- }
- if(minclip < 0 || maxclip < 0 || maxclip <= minclip)
- {
- LogManager::getSingleton().logMessage("Error parsing File
(videocamera) " + String(fname) +" line " +
StringConverter::toString(linecounter) + ". Min/Max clip setting incorrect,
trying to continue ...");
- return 0;
- }
-=======
if (nx < 0 || nx >= truck->free_node || ny < 0 || ny >=
truck->free_node || nref < 0 || nref >= truck->free_node)
{
LogManager::getSingleton().logMessage("Error parsing File
(videocamera) " + String(fname) +" line " +
StringConverter::toString(linecounter) + ". Wrong node definition. trying to
continue ...");
@@ -150,16 +132,12 @@
return 0;
}
- // TODO check for correct and resonable values
->>>>>>> .r1715
-
if(cammode < -2 )
{
LogManager::getSingleton().logMessage("Error parsing File
(videocamera) " + String(fname) +" line " +
StringConverter::toString(linecounter) + ". CamMode setting incorrect, trying
to continue ...");
return 0;
}
-
VideoCamera *v = new VideoCamera(mSceneMgr, camera, truck);
v->fov = fov;
v->minclip = minclip;
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
