FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Bart Gallet, updates to VisualStudo .dsp's to keep things compiling under Windows.

Browse Source
This commit is contained in:
Robert Osfield
2003-07-15 09:39:45 +00:00
parent 953ac782ac
commit b2e5e09c28
6 changed files with 52 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

289
VisualStudio/examples/osgcallback/osgcallback.dsp
View File

@@ -1,380 +1,95 @@
# Microsoft Developer Studio Project File - Name="Example osgcallback" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=Example osgcallback - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "osgcallback.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "osgcallback.mak" CFG="Example osgcallback - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Example osgcallback - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Example osgcallback - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "Example osgcallback - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgcallback.exe" /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "Example osgcallback - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /FR /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /FR /YX /FD /Zm200 /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgcallbackd.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /incremental:no
!ENDIF
# Begin Target
# Name "Example osgcallback - Win32 Release"
# Name "Example osgcallback - Win32 Debug"
# Begin Source File
SOURCE=..\..\..\examples\osgcallback\osgcallback.cpp
# End Source File
# End Target
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Project

99
VisualStudio/examples/osgcopy/osgcopy.dsp
View File

@@ -1,190 +1,95 @@
# Microsoft Developer Studio Project File - Name="Example osgcopy" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=Example osgcopy - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "osgcopy.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "osgcopy.mak" CFG="Example osgcopy - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Example osgcopy - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Example osgcopy - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "Example osgcopy - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgcopy.exe" /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "Example osgcopy - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /FR /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /FR /YX /FD /Zm200 /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgcopyd.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /incremental:no
!ENDIF
# Begin Target
# Name "Example osgcopy - Win32 Release"
# Name "Example osgcopy - Win32 Debug"
# Begin Source File
SOURCE=..\..\..\examples\osgcopy\osgcopy.cpp
# End Source File
# End Target
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Project

74
VisualStudio/osgUtil/osgUtil.dsp
View File

@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /YX /FD /Zm200 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /YX /FD /GZ /Zm200 /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -97,18 +97,6 @@ SOURCE=..\..\src\osgUtil\CubeMapGenerator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\HalfWayMapGenerator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\HighlightMapGenerator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\UpdateVisitor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\CullVisitor.cpp
# End Source File
# Begin Source File
@@ -125,6 +113,14 @@ SOURCE=..\..\src\osgUtil\DisplayRequirementsVisitor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\HalfWayMapGenerator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\HighlightMapGenerator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\InsertImpostorsVisitor.cpp
# End Source File
# Begin Source File
@@ -173,11 +169,15 @@ SOURCE=..\..\src\osgUtil\Tesselator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\TransformAttributeFunctor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\TransformCallback.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\TransformAttributeFunctor.cpp
SOURCE=..\..\src\osgUtil\TriStrip_tri_stripper.cpp
# End Source File
# Begin Source File
@@ -185,7 +185,7 @@ SOURCE=..\..\src\osgUtil\TriStripVisitor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\TriStrip_tri_stripper.cpp
SOURCE=..\..\src\osgUtil\UpdateVisitor.cpp
# End Source File
# Begin Source File
@@ -201,22 +201,6 @@ SOURCE=..\..\include\osgUtil\CubeMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\HalfWayMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\HighlightMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\ReflectionMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\UpdateVisitor
# End Source File
# Begin Source File
SOURCE=..\..\Include\osgUtil\CullVisitor
# End Source File
# Begin Source File
@@ -237,6 +221,14 @@ SOURCE=..\..\Include\osgUtil\Export
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\HalfWayMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\HighlightMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\Include\osgUtil\InsertImpostorsVisitor
# End Source File
# Begin Source File
@@ -249,6 +241,10 @@ SOURCE=..\..\include\osgUtil\Optimizer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\ReflectionMapGenerator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\RenderBin
# End Source File
# Begin Source File
@@ -285,15 +281,11 @@ SOURCE=..\..\include\osgUtil\Tesselator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\TransformCallback
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\TransformAttributeFunctor
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\TriStripVisitor
SOURCE=..\..\include\osgUtil\TransformCallback
# End Source File
# Begin Source File
@@ -309,6 +301,14 @@ SOURCE=..\..\Src\osgUtil\TriStrip_tri_stripper.h
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\TriStripVisitor
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\UpdateVisitor
# End Source File
# Begin Source File
SOURCE=..\..\Include\osgUtil\Version
# End Source File
# End Group

13
include/osgProducer/DatabasePager
View File

@@ -91,13 +91,7 @@ class OSGPRODUCER_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseReques
void compileRenderingObjects(osg::State& state);
protected :
virtual ~DatabasePager() {}
// make friends with helper classes defined in DatabasePager.cpp.
class FindCompileableRenderingObjectsVisitor;
class FindPagedLODsVisitor;
public:
typedef std::vector< osg::ref_ptr<osg::PagedLOD> > PagedLODList;
@@ -107,6 +101,11 @@ class OSGPRODUCER_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseReques
typedef std::map< unsigned int, DataToCompile > DataToCompileMap;
typedef std::set<unsigned int> ActiveGraphicsContexts;
protected :
virtual ~DatabasePager() {}
struct DatabaseRequest : public osg::Referenced
{

6
src/osgPlugins/osg/PagedLOD.cpp
View File

@@ -112,11 +112,11 @@ bool PagedLOD_writeLocalData(const Object& obj, Output& fw)
fw.indent() << "}"<< std::endl;
fw.indent() << "num_children " << numChildrenToWriteOut << std::endl;
for(unsigned int i=0;i<lod.getNumChildren();++i)
for(unsigned int j=0;j<lod.getNumChildren();++j)
{
if (lod.getFileName(i).empty())
if (lod.getFileName(j).empty())
{
fw.writeObject(*lod.getChild(i));
fw.writeObject(*lod.getChild(j));
}
}

4
src/osgProducer/DatabasePager.cpp
View File

@@ -100,7 +100,7 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
}
}
class DatabasePager::FindCompileableRenderingObjectsVisitor : public osg::NodeVisitor
class FindCompileableRenderingObjectsVisitor : public osg::NodeVisitor
{
public:
FindCompileableRenderingObjectsVisitor(DatabasePager::DataToCompile& dataToCompile):
@@ -421,7 +421,7 @@ void DatabasePager::removeExpiredSubgraphs(double currentFrameTime)
}
class DatabasePager::FindPagedLODsVisitor : public osg::NodeVisitor
class FindPagedLODsVisitor : public osg::NodeVisitor
{
public:
FindPagedLODsVisitor(DatabasePager::PagedLODList& pagedLODList):