From 3f67300c821d2a36c460ee2c8b6d5c7446bf7aad Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 13 Apr 2002 10:18:58 +0000 Subject: [PATCH] Saved workspace from VisualStudio to follow up on missing demo dependancies --- VisualStudio/VisualStudio.dsw | 718 ++++++++++----------------------- include/osg/Camera | 1 + src/osgPlugins/dx/DXWriter.cpp | 4 + 3 files changed, 229 insertions(+), 494 deletions(-) diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 5c9da331d..af58d26b3 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -15,23 +15,7 @@ Package=<4> ############################################################################### -Project: "Core osgDB"=".\osgDB\osgDB.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency -}}} - - -############################################################################### - -Project: "Core osgUtil"=".\osgUtil\osgUtil.dsp" - Package Owner=<4> +Project: "Core osgDB"=.\osgDB\osgDB.dsp - Package Owner=<4> Package=<5> {{{ @@ -46,25 +30,7 @@ Package=<4> ############################################################################### -Project: "Core osgText"=".\osgText\osgText.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency -}}} - -############################################################################### - -Project: "Core osgGLUT"=".\osgGLUT\osgGLUT.dsp" - Package Owner=<4> +Project: "Core osgGLUT"=.\osgGLUT\osgGLUT.dsp - Package Owner=<4> Package=<5> {{{ @@ -85,7 +51,7 @@ Package=<4> ############################################################################### -Project: "Demos sgv"=".\Demos\sgv\sgv.dsp" - Package Owner=<4> +Project: "Core osgText"=.\osgText\osgText.dsp - Package Owner=<4> Package=<5> {{{ @@ -97,19 +63,13 @@ Package=<4> Project_Dep_Name Core osg End Project Dependency Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency Project_Dep_Name Core osgDB End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency }}} ############################################################################### -Project: "Demos osgcopy"=".\Demos\osgcopy\osgcopy.dsp" - Package Owner=<4> +Project: "Core osgUtil"=.\osgUtil\osgUtil.dsp - Package Owner=<4> Package=<5> {{{ @@ -120,116 +80,11 @@ Package=<4> Begin Project Dependency Project_Dep_Name Core osg End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency }}} ############################################################################### -Project: "Demos osgbillboard"=".\Demos\osgbillboard\osgbillboard.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgtexture"=".\Demos\osgtexture\osgtexture.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgstereoimage"=".\Demos\osgstereoimage\osgstereoimage.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgversion"=".\Demos\osgversion\osgversion.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgtext"=".\Demos\osgtext\osgtext.dsp" - Package Owner=<4> +Project: "Demo hangglide"=.\Demos\hangglide\hangglide.dsp - Package Owner=<4> Package=<5> {{{ @@ -247,255 +102,169 @@ Package=<4> Project_Dep_Name Core osgGLUT End Project Dependency Begin Project Dependency - Project_Dep_Name Core osgText - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency -}}} -############################################################################### - -Project: "Demos hangglide"=".\Demos\hangglide\hangglide.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgconv"=".\Demos\osgconv\osgconv.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgcube"=".\Demos\osgcube\osgcube.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgimpostor"=".\Demos\osgimpostor\osgimpostor.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgreflect"=".\Demos\osgreflect\osgreflect.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgscribe"=".\Demos\osgscribe\osgscribe.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "Demos osgviews"=".\Demos\osgviews\osgviews.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency -}}} - -############################################################################### - -Project: "osgPlugin 3ds"=".\osgPlugins\lib3ds\osgPlugin lib3ds.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency -}}} - -############################################################################### - -Project: "osgPlugins bmp"=".\osgPlugins\bmp\bmp.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency -}}} - -############################################################################### - -Project: "osgPlugins dot_osg"=".\osgPlugins\osg\dot_osg.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency -}}} - -############################################################################### - -Project: "osgPlugins dw"=".\osgPlugins\dw\dw.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency Project_Dep_Name Core osgUtil End Project Dependency }}} ############################################################################### -Project: "osgPlugins flt"=".\osgPlugins\flt\flt.dsp" - Package Owner=<4> +Project: "Demo osgbillboard"=.\Demos\osgbillboard\osgbillboard.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgconv"=.\Demos\osgconv\osgconv.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgcopy"=.\Demos\osgcopy\osgcopy.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgcube"=.\Demos\osgcube\osgcube.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgimpostor"=.\Demos\osgimpostor\osgimpostor.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgreflect"=.\Demos\osgreflect\osgreflect.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgscribe"=.\Demos\osgscribe\osgscribe.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgstereoimage"=.\Demos\osgstereoimage\osgstereoimage.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgtext"=.\Demos\osgtext\osgtext.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgtexture"=.\Demos\osgtexture\osgtexture.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgversion"=.\Demos\osgversion\osgversion.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo osgviews"=.\Demos\osgviews\osgviews.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Demo sgv"=.\Demos\sgv\sgv.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "osgPlugin 3ds"=.\osgPlugins\lib3ds\lib3ds.dsp - Package Owner=<4> Package=<5> {{{ @@ -513,7 +282,7 @@ Package=<4> ############################################################################### -Project: "osgPlugins txp"=".\osgPlugins\txp\txp.dsp" - Package Owner=<4> +Project: "osgPlugin bmp"=.\osgPlugins\bmp\bmp.dsp - Package Owner=<4> Package=<5> {{{ @@ -521,17 +290,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins gif"=".\osgPlugins\gif\gif.dsp" - Package Owner=<4> +Project: "osgPlugin dw"=.\osgPlugins\dw\dw.dsp - Package Owner=<4> Package=<5> {{{ @@ -539,17 +302,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins jpeg"=".\osgPlugins\jpeg\jpeg.dsp" - Package Owner=<4> +Project: "osgPlugin dx"=.\osgPlugins\dx\dx.dsp - Package Owner=<4> Package=<5> {{{ @@ -557,17 +314,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins lwo"=".\osgPlugins\lwo\lwo.dsp" - Package Owner=<4> +Project: "osgPlugin flt"=.\osgPlugins\flt\flt.dsp - Package Owner=<4> Package=<5> {{{ @@ -575,20 +326,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency }}} ############################################################################### -Project: "osgPlugins obj"=".\osgPlugins\obj\obj.dsp" - Package Owner=<4> +Project: "osgPlugin gif"=.\osgPlugins\gif\gif.dsp - Package Owner=<4> Package=<5> {{{ @@ -596,17 +338,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins dx"=".\osgPlugins\dx\dx.dsp" - Package Owner=<4> +Project: "osgPlugin jpeg"=.\osgPlugins\jpeg\jpeg.dsp - Package Owner=<4> Package=<5> {{{ @@ -614,17 +350,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins osgtgz"=".\osgPlugins\osgtgz\osgtgz.dsp" - Package Owner=<4> +Project: "osgPlugin lwo"=.\osgPlugins\lwo\lwo.dsp - Package Owner=<4> Package=<5> {{{ @@ -632,17 +362,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins pic"=".\osgPlugins\pic\pic.dsp" - Package Owner=<4> +Project: "osgPlugin obj"=.\osgPlugins\obj\obj.dsp - Package Owner=<4> Package=<5> {{{ @@ -650,17 +374,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins png"=".\osgPlugins\png\png.dsp" - Package Owner=<4> +Project: "osgPlugin osg"=.\osgPlugins\osg\dot_osg.dsp - Package Owner=<4> Package=<5> {{{ @@ -668,17 +386,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins rgb"=".\osgPlugins\rgb\rgb.dsp" - Package Owner=<4> +Project: "osgPlugin osgtgz"=.\osgPlugins\osgtgz\osgtgz.dsp - Package Owner=<4> Package=<5> {{{ @@ -686,17 +398,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins tga"=".\osgPlugins\tga\tga.dsp" - Package Owner=<4> +Project: "osgPlugin pic"=.\osgPlugins\pic\pic.dsp - Package Owner=<4> Package=<5> {{{ @@ -704,17 +410,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins tgz"=".\osgPlugins\tgz\tgz.dsp" - Package Owner=<4> +Project: "osgPlugin png"=.\osgPlugins\png\png.dsp - Package Owner=<4> Package=<5> {{{ @@ -722,17 +422,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins tiff"=".\osgPlugins\tiff\tiff.dsp" - Package Owner=<4> +Project: "osgPlugin rgb"=.\osgPlugins\rgb\rgb.dsp - Package Owner=<4> Package=<5> {{{ @@ -740,17 +434,59 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### -Project: "osgPlugins zip"=".\osgPlugins\zip\zip.dsp" - Package Owner=<4> +Project: "osgPlugin tga- Win32 Debug"=.\osgPlugins\tga\tga.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "osgPlugin tgz"=.\osgPlugins\tgz\tgz.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "osgPlugin tiff"=.\osgPlugins\tiff\tiff.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "osgPlugin txp"=.\osgPlugins\txp\txp.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "osgPlugin zip"=.\osgPlugins\zip\zip.dsp - Package Owner=<4> Package=<5> {{{ @@ -758,12 +494,6 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency }}} ############################################################################### diff --git a/include/osg/Camera b/include/osg/Camera index 424908f4b..26209ac10 100644 --- a/include/osg/Camera +++ b/include/osg/Camera @@ -5,6 +5,7 @@ #ifndef OSG_CAMERA #define OSG_CAMERA 1 +#include #include #include #include diff --git a/src/osgPlugins/dx/DXWriter.cpp b/src/osgPlugins/dx/DXWriter.cpp index 8c7a7d18d..6fdadc68d 100644 --- a/src/osgPlugins/dx/DXWriter.cpp +++ b/src/osgPlugins/dx/DXWriter.cpp @@ -136,6 +136,10 @@ #endif #endif +#if defined(WIN32) && !defined(__CYGWIN__) +#define vsnprintf _vsnprintf +#endif + namespace dx { //----------------------------------------------------------------------------