Revision: 2679
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2679&view=rev
Author: rorthomas
Date: 2012-05-26 02:34:46 +0000 (Sat, 26 May 2012)
Log Message:
-----------
readded /MP, removed /LTCG
moved heightfinder interface to TerrainGeometryManager
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/source/main/terrain/TerrainGeometryManager.h
Removed Paths:
-------------
trunk/source/main/terrain/TerrainHeightFinder.h
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-05-26 02:11:46 UTC (rev 2678)
+++ trunk/CMakeLists.txt 2012-05-26 02:34:46 UTC (rev 2679)
@@ -71,11 +71,11 @@
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP
/GL /Ox /Ob2 /Oi /Ot /Oy /fp:fast /GS- /MP /Zi")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP
/Zi")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Gm
/Od /Zi /Gy /fp:except /GF- /GS /Ob0")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP
/Od /Zi /Gy /fp:except /GF- /GS /Ob0")
#if(ROR_USING_VISUAL_STUDIO_PROFESSIONAL)
# set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
/analyze") # /analyze only available when using VS professional
#endif(ROR_USING_VISUAL_STUDIO_PROFESSIONAL)
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm
/Od /Zi /RTC1 /Gy /fp:except /GF- /RTCc /GS /Ob0")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP
/Od /Zi /RTC1 /Gy /fp:except /GF- /RTCc /GS /Ob0")
# some general flags
add_definitions("-D_CRT_SECURE_NO_WARNINGS")
include_directories(${DirectX_INCLUDE_DIR})
@@ -83,7 +83,7 @@
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
/DEBUG /LARGEADDRESSAWARE ")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
/DEBUG /LARGEADDRESSAWARE /OPT:REF /LTCG /RELEASE")
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
"${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /DEBUG /LARGEADDRESSAWARE /OPT:REF
/LTCG ")
- set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /LARGEADDRESSAWARE /OPT:NOREF
/LTCG /MAP /DYNAMICBASE:NO /FIXED /NXCOMPAT:NO")
+ set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /LARGEADDRESSAWARE /OPT:NOREF
/MAP /DYNAMICBASE:NO /FIXED /NXCOMPAT:NO")
# fix executable paths for windows
#SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY})
Modified: trunk/source/main/terrain/TerrainGeometryManager.h
===================================================================
--- trunk/source/main/terrain/TerrainGeometryManager.h 2012-05-26 02:11:46 UTC
(rev 2678)
+++ trunk/source/main/terrain/TerrainGeometryManager.h 2012-05-26 02:34:46 UTC
(rev 2679)
@@ -31,7 +31,7 @@
#include <OgreConfigFile.h>
// this class handles all interactions with the Ogre Terrain system
-class TerrainGeometryManager
+class TerrainGeometryManager : public HeightFinder
{
public:
TerrainGeometryManager(Ogre::SceneManager *smgr, TerrainManager
*terrainManager);
@@ -41,6 +41,11 @@
inline Ogre::TerrainGroup *getTerrainGroup() { return mTerrainGroup; };
+ inline float getHeightAt(float x, float z)
+ {
+ return mTerrainGroup->getHeightAtWorldPosition(x, 1000, z);
+ }
+
protected:
bool disableCaching;
bool mTerrainsImported;
Deleted: trunk/source/main/terrain/TerrainHeightFinder.h
===================================================================
--- trunk/source/main/terrain/TerrainHeightFinder.h 2012-05-26 02:11:46 UTC
(rev 2678)
+++ trunk/source/main/terrain/TerrainHeightFinder.h 2012-05-26 02:34:46 UTC
(rev 2679)
@@ -1,47 +0,0 @@
-/*
-This source file is part of Rigs of Rods
-Copyright 2005-2012 Pierre-Michel Ricordel
-Copyright 2007-2012 Thomas Fischer
-
-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
-published by the Free Software Foundation.
-
-Rigs of Rods is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef TERRAINHEIGHTFINDER_H__
-#define TERRAINHEIGHTFINDER_H__
-
-#include "RoRPrerequisites.h"
-
-/**
- * New terrain Height-Finder. For the new terrain from Ogre 1.7
- */
-class TerrainHeightFinder : public HeightFinder
-{
-public:
- TerrainHeightFinder(TerrainGeometryManager *tgm) :
mTerrainGroup(tgm->getTerrainGroup())
- {
- }
-
- inline float getHeightAt(float x, float z)
- {
- return mTerrainGroup->getHeightAtWorldPosition(x, 1000, z);
- }
-
-protected:
- Ogre::TerrainGroup *mTerrainGroup;
-};
-
-#endif // TERRAINHEIGHTFINDER_H__
-
-
-
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
