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

Moved the IO support for the osgText and osgParticle libraries into seperate

Browse Source 
plugin libraries.
This commit is contained in:
Robert Osfield
2002-08-20 11:27:08 +00:00
parent 05573d553d
commit df9a899d9e
34 changed files with 498 additions and 1637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Make/makedirdefs
View File

@@ -23,6 +23,8 @@ SRC_DIRS = \
PLUGIN_DIRS = \
osg\
osgParticle\
osgText\
rgb\
lib3ds\
flt\

1208
VisualStudio/VisualStudio.dsw
View File

File diff suppressed because it is too large Load Diff

420
VisualStudio/osgParticle/osgParticle.dsp
View File

@@ -1,680 +1,260 @@
# Microsoft Developer Studio Project File - Name="Core osgParticle" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=Core osgParticle - 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 "osgParticle.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 "osgParticle.mak" CFG="Core osgParticle - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Core osgParticle - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "Core osgParticle - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "Core osgParticle - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../../lib"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../../lib"
# PROP Intermediate_Dir "Release"
# 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 "OSGPARTICLE_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# 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 /dll /machine:I386
# ADD LINK32 glu32.lib opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgParticle.dll" /libpath:"../../lib"
!ELSEIF "$(CFG)" == "Core osgParticle - 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 "../../lib"
# PROP Intermediate_Dir "Debug"
# 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 "OSGPARTICLE_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 glu32.lib opengl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgParticled.dll" /pdbtype:sept /libpath:"../../lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
# Name "Core osgParticle - Win32 Release"
# Name "Core osgParticle - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\..\src\osgParticle\Emitter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\FluidFrictionOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_AccelOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_CenteredPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_Emitter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_FluidFrictionOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_ForceOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_LinearInterpolator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_ModularEmitter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_ModularProgram.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_MultiSegmentPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_Particle.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_ParticleProcessor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_ParticleSystem.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_ParticleSystemUpdater.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_PointPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_Program.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_RadialShooter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_RandomRateCounter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_SectorPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_SegmentPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\IO_VariableRateCounter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\ModularEmitter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\ModularProgram.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\MultiSegmentPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\Particle.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\ParticleProcessor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\ParticleSystem.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\ParticleSystemUpdater.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\Program.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgParticle\Version.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter ";h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\..\include\osgParticle\AccelOperator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\CenteredPlacer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Counter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Emitter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Export
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\FluidFrictionOperator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\ForceOperator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Interpolator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\LinearInterpolator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\ModularEmitter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\ModularProgram
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\MultiSegmentPlacer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Operator
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Particle
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\ParticleProcessor
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\ParticleSystem
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\ParticleSystemUpdater
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Placer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\PointPlacer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Program
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\RadialShooter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\RandomRateCounter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\SectorPlacer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\SegmentPlacer
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Shooter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\VariableRateCounter
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\Version
# End Source File
# Begin Source File
SOURCE=..\..\include\osgParticle\range
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

265
VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp Normal file
View File

@@ -0,0 +1,265 @@
# Microsoft Developer Studio Project File - Name="osgPlugin osg" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=osgPlugin osg - 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 "dot_osg.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 "dot_osg.mak" CFG="osgPlugin osg - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "osgPlugin osg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "osgPlugin osg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "osgPlugin osg - 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 "../../../lib"
# PROP Intermediate_Dir "Release"
# 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# 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 /dll /machine:I386
# ADD LINK32 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osg.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "osgPlugin osg - 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 "../../../lib"
# PROP Intermediate_Dir "Debug"
# 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 "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osgd.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ENDIF
# Begin Target
# Name "osgPlugin osg - Win32 Release"
# Name "osgPlugin osg - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_AccelOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_CenteredPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_Emitter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_FluidFrictionOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_ForceOperator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_LinearInterpolator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_ModularEmitter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_ModularProgram.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_MultiSegmentPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_Particle.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_ParticleProcessor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_ParticleSystem.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_ParticleSystemUpdater.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_PointPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_Program.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_RadialShooter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_RandomRateCounter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_SectorPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_SegmentPlacer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgParticle\IO_VariableRateCounter.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

117
VisualStudio/osgPlugins/osgText/dot_osgText.dsp Normal file
View File

@@ -0,0 +1,117 @@
# Microsoft Developer Studio Project File - Name="osgPlugin osg" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=osgPlugin osg - 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 "dot_osg.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 "dot_osg.mak" CFG="osgPlugin osg - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "osgPlugin osg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "osgPlugin osg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "osgPlugin osg - 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 "../../../lib"
# PROP Intermediate_Dir "Release"
# 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# 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 /dll /machine:I386
# ADD LINK32 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osg.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "osgPlugin osg - 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 "../../../lib"
# PROP Intermediate_Dir "Debug"
# 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 "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osgd.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ENDIF
# Begin Target
# Name "osgPlugin osg - Win32 Release"
# Name "osgPlugin osg - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgText\IO_Font.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgText\IO_Paragraph.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgPlugins\osgText\IO_Text.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

12
VisualStudio/osgText/osgText.dsp
View File

@@ -169,18 +169,6 @@ SOURCE=..\..\src\osgText\FTVectoriser.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgText\IO_Font.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgText\IO_Paragraph.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgText\IO_Text.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgText\Paragraph.cpp
# End Source File
# Begin Source File

16
src/osgDB/Registry.cpp
View File

@@ -810,7 +810,19 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw)
std::string classname = obj.className();
DotOsgWrapperMap::iterator itr = _classNameWrapperMap.find(classname);
if (itr!=_classNameWrapperMap.end())
if (itr==_classNameWrapperMap.end())
{
// first try the standard nodekit library.
std::string nodeKitLibraryName = createLibraryNameForNodeKit(obj.libraryName());
if (loadLibrary(nodeKitLibraryName)) return writeObject(obj,fw);
// otherwise try the osgdb_ plugin library.
std::string pluginLibraryName = createLibraryNameForExt(obj.libraryName());
if (loadLibrary(pluginLibraryName)) return writeObject(obj,fw);
}
else
{
@@ -862,7 +874,7 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw)
return true;
}
return false;
}

43
src/osgParticle/Makefile
View File

@@ -2,38 +2,17 @@ TOPDIR = ../..
include $(TOPDIR)/Make/makedefs
CXXFILES =\
Emitter.cpp\
FluidFrictionOperator.cpp\
IO_AccelOperator.cpp\
IO_CenteredPlacer.cpp\
IO_Emitter.cpp\
IO_FluidFrictionOperator.cpp\
IO_ForceOperator.cpp\
IO_LinearInterpolator.cpp\
IO_ModularEmitter.cpp\
IO_ModularProgram.cpp\
IO_MultiSegmentPlacer.cpp\
IO_Particle.cpp\
IO_ParticleProcessor.cpp\
IO_ParticleSystem.cpp\
IO_ParticleSystemUpdater.cpp\
IO_PointPlacer.cpp\
IO_Program.cpp\
IO_RadialShooter.cpp\
IO_RandomRateCounter.cpp\
IO_SectorPlacer.cpp\
IO_SegmentPlacer.cpp\
IO_VariableRateCounter.cpp\
ModularEmitter.cpp\
ModularProgram.cpp\
MultiSegmentPlacer.cpp\
Particle.cpp\
ParticleProcessor.cpp\
ParticleSystem.cpp\
ParticleSystemUpdater.cpp\
Program.cpp\
Version.cpp\
Emitter.cpp\
FluidFrictionOperator.cpp\
ModularEmitter.cpp\
ModularProgram.cpp\
MultiSegmentPlacer.cpp\
Particle.cpp\
ParticleProcessor.cpp\
ParticleSystem.cpp\
ParticleSystemUpdater.cpp\
Program.cpp\
Version.cpp\
LIBS += -losg -losgDB -losgUtil $(GL_LIBS) $(OTHER_LIBS) $(DYNAMICLIBRARYLIB)

0
src/osgParticle/IO_AccelOperator.cpp → src/osgPlugins/osgParticle/IO_AccelOperator.cpp
View File

0
src/osgParticle/IO_CenteredPlacer.cpp → src/osgPlugins/osgParticle/IO_CenteredPlacer.cpp
View File

0
src/osgParticle/IO_Emitter.cpp → src/osgPlugins/osgParticle/IO_Emitter.cpp
View File

0
src/osgParticle/IO_FluidFrictionOperator.cpp → src/osgPlugins/osgParticle/IO_FluidFrictionOperator.cpp
View File

0
src/osgParticle/IO_ForceOperator.cpp → src/osgPlugins/osgParticle/IO_ForceOperator.cpp
View File

0
src/osgParticle/IO_LinearInterpolator.cpp → src/osgPlugins/osgParticle/IO_LinearInterpolator.cpp
View File

0
src/osgParticle/IO_ModularEmitter.cpp → src/osgPlugins/osgParticle/IO_ModularEmitter.cpp
View File

0
src/osgParticle/IO_ModularProgram.cpp → src/osgPlugins/osgParticle/IO_ModularProgram.cpp
View File

0
src/osgParticle/IO_MultiSegmentPlacer.cpp → src/osgPlugins/osgParticle/IO_MultiSegmentPlacer.cpp
View File

0
src/osgParticle/IO_Particle.cpp → src/osgPlugins/osgParticle/IO_Particle.cpp
View File

0
src/osgParticle/IO_ParticleProcessor.cpp → src/osgPlugins/osgParticle/IO_ParticleProcessor.cpp
View File

0
src/osgParticle/IO_ParticleSystem.cpp → src/osgPlugins/osgParticle/IO_ParticleSystem.cpp
View File

0
src/osgParticle/IO_ParticleSystemUpdater.cpp → src/osgPlugins/osgParticle/IO_ParticleSystemUpdater.cpp
View File

0
src/osgParticle/IO_PointPlacer.cpp → src/osgPlugins/osgParticle/IO_PointPlacer.cpp
View File

0
src/osgParticle/IO_Program.cpp → src/osgPlugins/osgParticle/IO_Program.cpp
View File

0
src/osgParticle/IO_RadialShooter.cpp → src/osgPlugins/osgParticle/IO_RadialShooter.cpp
View File

0
src/osgParticle/IO_RandomRateCounter.cpp → src/osgPlugins/osgParticle/IO_RandomRateCounter.cpp
View File

0
src/osgParticle/IO_SectorPlacer.cpp → src/osgPlugins/osgParticle/IO_SectorPlacer.cpp
View File

0
src/osgParticle/IO_SegmentPlacer.cpp → src/osgPlugins/osgParticle/IO_SegmentPlacer.cpp
View File

0
src/osgParticle/IO_VariableRateCounter.cpp → src/osgPlugins/osgParticle/IO_VariableRateCounter.cpp
View File

33
src/osgPlugins/osgParticle/Makefile Normal file
View File

@@ -0,0 +1,33 @@
TOPDIR = ../../..
include $(TOPDIR)/Make/makedefs
CXXFILES =\
IO_AccelOperator.cpp\
IO_CenteredPlacer.cpp\
IO_Emitter.cpp\
IO_FluidFrictionOperator.cpp\
IO_ForceOperator.cpp\
IO_LinearInterpolator.cpp\
IO_ModularEmitter.cpp\
IO_ModularProgram.cpp\
IO_MultiSegmentPlacer.cpp\
IO_Particle.cpp\
IO_ParticleProcessor.cpp\
IO_ParticleSystem.cpp\
IO_ParticleSystemUpdater.cpp\
IO_PointPlacer.cpp\
IO_Program.cpp\
IO_RadialShooter.cpp\
IO_RandomRateCounter.cpp\
IO_SectorPlacer.cpp\
IO_SegmentPlacer.cpp\
IO_VariableRateCounter.cpp\
LIBS += -losgParticle $(OSG_LIBS) $(OTHER_LIBS)
TARGET_BASENAME = osgParticle
include $(TOPDIR)/Make/cygwin_plugin_def
PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)
include $(TOPDIR)/Make/makerules

0
src/osgText/IO_Font.cpp → src/osgPlugins/osgText/IO_Font.cpp
View File

0
src/osgText/IO_Paragraph.cpp → src/osgPlugins/osgText/IO_Paragraph.cpp
View File

0
src/osgText/IO_Text.cpp → src/osgPlugins/osgText/IO_Text.cpp
View File

16
src/osgPlugins/osgText/Makefile Normal file
View File

@@ -0,0 +1,16 @@
TOPDIR = ../../..
include $(TOPDIR)/Make/makedefs
CXXFILES =\
IO_Text.cpp \
IO_Font.cpp \
IO_Paragraph.cpp \
LIBS += -losgText $(OSG_LIBS) $(OTHER_LIBS)
TARGET_BASENAME = osgText
include $(TOPDIR)/Make/cygwin_plugin_def
PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)
include $(TOPDIR)/Make/makerules

3
src/osgText/Makefile
View File

@@ -23,9 +23,6 @@ CXXFILES =\
Font.cpp \
Paragraph.cpp \
Text.cpp \
IO_Text.cpp \
IO_Font.cpp \
IO_Paragraph.cpp \
Version.cpp