![(please configure the [header_logo] section in trac.ini)](/chrome/site/osgVisual_long.png)
Changeset 279 for experimental
- Timestamp:
- Mar 20, 2011, 8:31:20 PM (14 years ago)
- Location:
- experimental/TerrainTest
- Files:
-
- 7 edited
-
ModificationManager/Export.h (modified) (1 diff)
-
ModificationManager/ModificationManager.cpp (modified) (1 diff)
-
ModificationManager/ModificationManager.h (modified) (4 diffs)
-
ModificationManager/ModificationManager.vcproj (modified) (6 diffs)
-
ModificationVisitor.cpp (modified) (1 diff)
-
ModificationVisitor.h (modified) (1 diff)
-
Plugins terrainmod/Plugins terrainmod.vcproj (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
experimental/TerrainTest/ModificationManager/Export.h
r277 r279 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 * (at your option) any later version. The full license is in LICENSE file 6 * included with this distribution, and on the openscenegraph.org website. 7 * 8 * This library is distributed in the hope that it will be useful, 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * OpenSceneGraph Public License for more details. 12 */ 13 14 #ifndef TERRAINMODMANAGER_EXPORT_ 15 #define TERRAINMODMANAGER_EXPORT_ 1 16 17 #include<osg/Config> 18 19 #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) 20 #pragma warning( disable : 4244 ) 21 #pragma warning( disable : 4251 ) 22 #pragma warning( disable : 4267 ) 23 #pragma warning( disable : 4275 ) 24 #pragma warning( disable : 4290 ) 25 #pragma warning( disable : 4786 ) 26 #pragma warning( disable : 4305 ) 27 #pragma warning( disable : 4996 ) 28 #endif 29 30 #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) 31 # if defined( OSG_LIBRARY_STATIC ) 32 # define TERRAINMODMANAGER_EXPORT 33 # elif defined( TERRAINMODMANAGER_LIBRARY ) 34 # define TERRAINMODMANAGER_EXPORT __declspec(dllexport) 35 # else 36 # define TERRAINMODMANAGER_EXPORT __declspec(dllimport) 37 # endif 38 #else 39 # define TERRAINMODMANAGER_EXPORT 40 #endif 41 42 /** 43 44 \namespace osgTerrain 45 46 The osgTerrain library is a NodeKit that provides geospecifc terrain rendering support. 47 */ 48 49 #endif -
experimental/TerrainTest/ModificationManager/ModificationManager.cpp
r277 r279 23 23 //- 24 24 25 #define USE_TERRAIN_PROTO_WORKAROUND USE_TERRAIN_PROTO_WORKAROUND26 25 27 26 -
experimental/TerrainTest/ModificationManager/ModificationManager.h
r277 r279 16 16 */ 17 17 18 #include "region.h"18 #include <region.h> 19 19 #include "myTileLoadedCallback.h" 20 20 #include "terrainModificationTechnique.h" … … 23 23 #include <osg/observer_ptr> 24 24 #include <vector> 25 26 #include "Export.h" 25 27 26 28 … … 42 44 * @date Mrz 2011 43 45 */ 44 class ModificationManager46 class TERRAINMODMANAGER_EXPORT ModificationManager 45 47 { 46 48 public: … … 103 105 104 106 //! Copy-Constructor: Private to avoid that someone can create an class instance by copying the singleton instance. 105 ModificationManager(const ModificationManager& cc) { };107 ModificationManager(const ModificationManager& cc) {cc;}; 106 108 107 109 //! Vector of all managed terrain pointers. -
experimental/TerrainTest/ModificationManager/ModificationManager.vcproj
r277 r279 42 42 Name="VCCLCompilerTool" 43 43 Optimization="0" 44 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS" 44 AdditionalIncludeDirectories=""$(OSG_ROOT)\include";..\;.\" 45 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS;TERRAINMODMANAGER_LIBRARY;USE_TERRAIN_PROTO_WORKAROUND" 45 46 MinimalRebuild="true" 46 47 BasicRuntimeChecks="3" … … 61 62 <Tool 62 63 Name="VCLinkerTool" 64 LinkLibraryDependencies="false" 65 AdditionalDependencies="osgTerraind.lib osgDBd.lib osgd.lib OpenThreadsd.lib" 66 OutputFile="$(OutDir)\$(ProjectName)d.dll" 63 67 LinkIncremental="2" 68 AdditionalLibraryDirectories="$(OSG_ROOT)/lib" 64 69 GenerateDebugInformation="true" 65 70 SubSystem="2" 71 ImportLibrary="$(TargetDir)$(TargetName).lib" 66 72 TargetMachine="1" 67 73 /> … … 115 121 Optimization="2" 116 122 EnableIntrinsicFunctions="true" 117 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS" 123 AdditionalIncludeDirectories=""$(OSG_ROOT)\include";..\;.\" 124 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS;TERRAINMODMANAGER_LIBRARY;USE_TERRAIN_PROTO_WORKAROUND" 118 125 RuntimeLibrary="2" 119 126 EnableFunctionLevelLinking="true" … … 133 140 <Tool 134 141 Name="VCLinkerTool" 142 LinkLibraryDependencies="false" 143 AdditionalDependencies="osgTerrain.lib osgDB.lib osg.lib OpenThreads.lib" 135 144 LinkIncremental="1" 145 AdditionalLibraryDirectories="$(OSG_ROOT)/lib" 136 146 GenerateDebugInformation="true" 137 147 SubSystem="2" … … 171 181 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 172 182 > 183 <File 184 RelativePath=".\ModificationManager.cpp" 185 > 186 </File> 187 <File 188 RelativePath="..\myTerrainTechnique.cpp" 189 > 190 </File> 173 191 </Filter> 174 192 <Filter … … 177 195 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 178 196 > 197 <File 198 RelativePath=".\Export.h" 199 > 200 </File> 201 <File 202 RelativePath=".\ModificationManager.h" 203 > 204 </File> 205 <File 206 RelativePath="..\myTerrainTechnique.h" 207 > 208 </File> 209 <File 210 RelativePath="..\region.h" 211 > 212 </File> 179 213 </Filter> 180 214 <Filter -
experimental/TerrainTest/ModificationVisitor.cpp
r275 r279 26 26 // Set ROI to flatten and estimated height after correction 27 27 _technique->setModifiedHeight(600); // 450 28 29 ModificationManager::getInstance()->addTerrainToManage( new osgTerrain::Terrain() ); 28 30 } 29 31 -
experimental/TerrainTest/ModificationVisitor.h
r275 r279 24 24 #include "ellipsoidTechnique.h" 25 25 #include "rampedEllipsoidTechnique.h" 26 #include "ModificationManager/ModificationManager.h" 26 27 27 28 -
experimental/TerrainTest/Plugins terrainmod/Plugins terrainmod.vcproj
r275 r279 41 41 Name="VCCLCompilerTool" 42 42 Optimization="0" 43 AdditionalIncludeDirectories=" $(OSG_ROOT)/include"43 AdditionalIncludeDirectories=""$(OSG_ROOT)/include";.\;..\" 44 44 PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;osgdb_terrainmod_EXPORTS" 45 45 MinimalRebuild="true" … … 62 62 Name="VCLinkerTool" 63 63 LinkLibraryDependencies="false" 64 AdditionalDependencies="osgTerraind.lib osgDBd.lib osgd.lib OpenThreadsd.lib "64 AdditionalDependencies="osgTerraind.lib osgDBd.lib osgd.lib OpenThreadsd.lib ModificationManagerd.lib" 65 65 OutputFile="$(OSG_ROOT)\bin\osgPlugins-2.9.12\osgdb_terrainmodd.dll" 66 66 Version="0.0" 67 67 LinkIncremental="1" 68 AdditionalLibraryDirectories=" $(OSG_ROOT)/lib"68 AdditionalLibraryDirectories=""$(OSG_ROOT)/lib";.\Debug" 69 69 GenerateDebugInformation="true" 70 70 TargetMachine="1" … … 119 119 Optimization="2" 120 120 EnableIntrinsicFunctions="true" 121 AdditionalIncludeDirectories=" $(OSG_ROOT)/include"121 AdditionalIncludeDirectories=""$(OSG_ROOT)/include";.\;..\" 122 122 PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;osgdb_terrainmods_EXPORTS" 123 123 RuntimeLibrary="2" … … 138 138 Name="VCLinkerTool" 139 139 LinkLibraryDependencies="false" 140 AdditionalDependencies="osgTerrain.lib osgDB.lib osg.lib OpenThreads.lib "140 AdditionalDependencies="osgTerrain.lib osgDB.lib osg.lib OpenThreads.lib ModificationManager.lib" 141 141 OutputFile="$(OSG_ROOT)\bin\osgPlugins-2.9.12\osgdb_terrainmod.dll" 142 142 Version="0.0" 143 143 LinkIncremental="1" 144 AdditionalLibraryDirectories=" $(OSG_ROOT)/lib"144 AdditionalLibraryDirectories=""$(OSG_ROOT)/lib";.\Release" 145 145 GenerateDebugInformation="false" 146 146 OptimizeReferences="2" … … 175 175 <Files> 176 176 <Filter 177 Name="Quelldateien"178 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"179 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"180 >181 <File182 RelativePath="..\ellipsoidTechnique.cpp"183 >184 </File>185 <File186 RelativePath="..\ModificationManager.cpp"187 >188 </File>189 <File190 RelativePath="..\ModificationVisitor.cpp"191 >192 </File>193 <File194 RelativePath="..\myTerrainTechnique.cpp"195 >196 </File>197 <File198 RelativePath="..\rampedEllipsoidTechnique.cpp"199 >200 </File>201 <File202 RelativePath="..\ReaderWriterTerrainMod.cpp"203 >204 </File>205 <File206 RelativePath="..\region.cpp"207 >208 </File>209 <File210 RelativePath="..\terrainModificationTechnique.cpp"211 >212 </File>213 </Filter>214 <Filter215 177 Name="Headerdateien" 216 178 Filter="h;hpp;hxx;hm;inl;inc;xsd" … … 222 184 </File> 223 185 <File 224 RelativePath="..\ModificationManager .h"186 RelativePath="..\ModificationManager\ModificationManager.h" 225 187 > 226 188 </File> … … 260 222 > 261 223 </Filter> 224 <Filter 225 Name="Quelldateien" 226 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" 227 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 228 > 229 <File 230 RelativePath="..\ellipsoidTechnique.cpp" 231 > 232 </File> 233 <File 234 RelativePath="..\ModificationVisitor.cpp" 235 > 236 </File> 237 <File 238 RelativePath="..\myTerrainTechnique.cpp" 239 > 240 </File> 241 <File 242 RelativePath="..\rampedEllipsoidTechnique.cpp" 243 > 244 </File> 245 <File 246 RelativePath="..\ReaderWriterTerrainMod.cpp" 247 > 248 </File> 249 <File 250 RelativePath="..\region.cpp" 251 > 252 </File> 253 <File 254 RelativePath="..\terrainModificationTechnique.cpp" 255 > 256 </File> 257 </Filter> 262 258 </Files> 263 259 <Globals>
Note: See TracChangeset
for help on using the changeset viewer.
