Changeset 112

Timestamp:

Jun 21, 2005, 7:15:07 PM (20 years ago)

Author:

darran

Message:

• working towards serialization of swollen state

Location:

Swollen

Files:

• swollen/customviewer.h (modified) (1 diff)
• swollen/main.vcproj (modified) (2 diffs)
• swollen/state.cpp (added)
• swollen/state.h (added)
• swwreader/swwreader.cpp (modified) (1 diff)
• swwreader/swwreader.vcproj (modified) (2 diffs)
• visualstudio/sww.suo (modified) (previous)

Swollen/swollen/customviewer.h

@@ -14 +14 @@
     virtual CustomTrackballManipulator* getTrackball(){return _trackball;}
     virtual CustomTerrainManipulator* getTerrainManipulator(){return _terrainmanipulator;}
+    osg::Vec3d getPosition(){return osg::Vec3d(_position[0],_position[1],_position[2]);}
+    osg::Quat getOrientation(){return _orientation;}
 
 protected:

Swollen/swollen/main.vcproj

@@ -153 +153 @@
                         </File>
                         <File
+                                RelativePath=".\state.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\surface.cpp">
                         </File>
@@ -194 +197 @@
                         </File>
                         <File
+                                RelativePath=".\state.h">
+                        </File>
+                        <File
                                 RelativePath=".\surface.h">
                         </File>

Swollen/swwreader/swwreader.cpp

@@ -270 +270 @@
    _valid = true;
 
-   std::cout << _state.alphamin << std::endl;
-   std::cout << _state.alphamax << std::endl;
-   std::cout << _state.heightmin << std::endl;
-   std::cout << _state.heightmax << std::endl;
-   std::cout << _state.cullangle << std::endl;
-   std::cout << _state.culling << std::endl;
-
-   std::cout << *_state.swwfilename << std::endl;
-   std::cout << *_state.bedslopetexturefilename << std::endl;
-
 }
 

Swollen/swwreader/swwreader.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="./;"$(OSG_ROOT)/Producer/include";"$(OSG_ROOT)/OpenThreads/include";"$(OSG_ROOT)/OpenSceneGraph/include";"$(NETCDF_DIR)/include";../include"
+                                AdditionalIncludeDirectories="./;"$(OSG_ROOT)/Producer/include";"$(OSG_ROOT)/OpenThreads/include";"$(OSG_ROOT)/OpenSceneGraph/include";"$(NETCDF_DIR)/include";../include;"$(OSG_ROOT)/3rdParty/include""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 MinimalRebuild="TRUE"
@@ -36 +36 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="osgd.lib netcdf.lib"
+                                AdditionalDependencies="osgd.lib osgdbd.lib netcdf.lib gdal_i.lib"
                                 OutputFile="../bin/swwreaderd.dll"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-                                AdditionalLibraryDirectories="&quot;$(OSG_ROOT)/Producer/lib&quot;;&quot;$(OSG_ROOT)/OpenThreads/lib/win32&quot;;&quot;$(OSG_ROOT)/OpenSceneGraph/lib&quot;;&quot;$(NETCDF_DIR)/lib&quot;;../lib"
+                                AdditionalLibraryDirectories="&quot;$(OSG_ROOT)/Producer/lib&quot;;&quot;$(OSG_ROOT)/OpenThreads/lib/win32&quot;;&quot;$(OSG_ROOT)/OpenSceneGraph/lib&quot;;&quot;$(NETCDF_DIR)/lib&quot;;../lib;&quot;$(OSG_ROOT)/3rdParty/lib&quot;"
                                 GenerateDebugInformation="TRUE"
                                 ProgramDatabaseFile="$(OutDir)/SWWReader.pdb"