Changeset 279 for experimental/TerrainTest/ModificationManager

Timestamp:

Mar 20, 2011, 8:31:20 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest/ModificationManager

Files:

• Export.h (modified) (1 diff)
• ModificationManager.cpp (modified) (1 diff)
• ModificationManager.h (modified) (4 diffs)
• ModificationManager.vcproj (modified) (6 diffs)

experimental/TerrainTest/ModificationManager/Export.h

@@ +1 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library 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 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef TERRAINMODMANAGER_EXPORT_
+#define TERRAINMODMANAGER_EXPORT_ 1
+
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    #pragma warning( disable : 4244 )
+    #pragma warning( disable : 4251 )
+    #pragma warning( disable : 4267 )
+    #pragma warning( disable : 4275 )
+    #pragma warning( disable : 4290 )
+    #pragma warning( disable : 4786 )
+    #pragma warning( disable : 4305 )
+    #pragma warning( disable : 4996 )
+#endif
+
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
+    #  if defined( OSG_LIBRARY_STATIC )
+    #    define TERRAINMODMANAGER_EXPORT
+    #  elif defined( TERRAINMODMANAGER_LIBRARY )
+    #    define TERRAINMODMANAGER_EXPORT   __declspec(dllexport)
+    #  else
+    #    define TERRAINMODMANAGER_EXPORT   __declspec(dllimport)
+    #  endif
+#else
+    #  define TERRAINMODMANAGER_EXPORT
+#endif  
+
+/**
+
+\namespace osgTerrain
+
+The osgTerrain library is a NodeKit that provides geospecifc terrain rendering support. 
+*/
+
+#endif

experimental/TerrainTest/ModificationManager/ModificationManager.cpp

@@ -23 +23 @@
 //-
 
-#define USE_TERRAIN_PROTO_WORKAROUND USE_TERRAIN_PROTO_WORKAROUND
 
 

experimental/TerrainTest/ModificationManager/ModificationManager.h

@@ -16 +16 @@
 */
 
-#include "region.h"
+#include <region.h>
 #include "myTileLoadedCallback.h"
 #include "terrainModificationTechnique.h"
@@ -23 +23 @@
 #include <osg/observer_ptr>
 #include <vector>
+
+#include "Export.h"
 
 
@@ -42 +44 @@
  * @date  Mrz 2011
  */ 
-class ModificationManager
+class TERRAINMODMANAGER_EXPORT ModificationManager
 {
 public:
@@ -103 +105 @@
 
         //! Copy-Constructor: Private to avoid that someone can create an class instance by copying the singleton instance.
-        ModificationManager(const ModificationManager& cc) {};
+        ModificationManager(const ModificationManager& cc) {cc;};
 
         //! Vector of all managed terrain pointers.

experimental/TerrainTest/ModificationManager/ModificationManager.vcproj

@@ -42 +42 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS"
+                                AdditionalIncludeDirectories=""$(OSG_ROOT)\include";..\;.\"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS;TERRAINMODMANAGER_LIBRARY;USE_TERRAIN_PROTO_WORKAROUND"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -61 +62 @@
                         <Tool
                                 Name="VCLinkerTool"
+                                LinkLibraryDependencies="false"
+                                AdditionalDependencies="osgTerraind.lib osgDBd.lib osgd.lib OpenThreadsd.lib"
+                                OutputFile="$(OutDir)\$(ProjectName)d.dll"
                                 LinkIncremental="2"
+                                AdditionalLibraryDirectories="$(OSG_ROOT)/lib"
                                 GenerateDebugInformation="true"
                                 SubSystem="2"
+                                ImportLibrary="$(TargetDir)$(TargetName).lib"
                                 TargetMachine="1"
                         />
@@ -115 +121 @@
                                 Optimization="2"
                                 EnableIntrinsicFunctions="true"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS"
+                                AdditionalIncludeDirectories="&quot;$(OSG_ROOT)\include&quot;;..\;.\"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MODIFICATIONMANAGER_EXPORTS;TERRAINMODMANAGER_LIBRARY;USE_TERRAIN_PROTO_WORKAROUND"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="true"
@@ -133 +140 @@
                         <Tool
                                 Name="VCLinkerTool"
+                                LinkLibraryDependencies="false"
+                                AdditionalDependencies="osgTerrain.lib osgDB.lib osg.lib OpenThreads.lib"
                                 LinkIncremental="1"
+                                AdditionalLibraryDirectories="$(OSG_ROOT)/lib"
                                 GenerateDebugInformation="true"
                                 SubSystem="2"
@@ -171 +181 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                         >
+                        <File
+                                RelativePath=".\ModificationManager.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\myTerrainTechnique.cpp"
+                                >
+                        </File>
                 </Filter>
                 <Filter
@@ -177 +195 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                         >
+                        <File
+                                RelativePath=".\Export.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\ModificationManager.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\myTerrainTechnique.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\region.h"
+                                >
+                        </File>
                 </Filter>
                 <Filter