From e0074d7c448f010e743b017df076854e6915e845 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 15 Jan 2003 20:50:12 +0000 Subject: [PATCH] Made the osgDB::ParamterOutput class so that it is purely defined in terms of the header, and therefore not requiring to be exported. Updated the MUSE_READ_ME.txt to include mention of syntax highlighting. --- VisualStudio/MUST_READ_ME.txt | 12 ++++++++++++ VisualStudio/osgDB/osgDB.dsp | 4 ---- include/osgDB/ParameterOutput | 36 ++++++++++++++++++++++++++++------- src/osgDB/Makefile | 1 - src/osgDB/ParameterOutput.cpp | 33 -------------------------------- 5 files changed, 41 insertions(+), 45 deletions(-) delete mode 100644 src/osgDB/ParameterOutput.cpp diff --git a/VisualStudio/MUST_READ_ME.txt b/VisualStudio/MUST_READ_ME.txt index 708338bf6..85be4853b 100644 --- a/VisualStudio/MUST_READ_ME.txt +++ b/VisualStudio/MUST_READ_ME.txt @@ -16,3 +16,15 @@ documentation. Several of the plugins and demoes, and two of the core libraries - osgText and osgGLUT require external dependancies. Full details on where to obtain these can be found in doc/dependancies.html. + + +-- + +For syntax highlighting in VisualStudio which the stanard C++ style found in the +OSG you can substiture the LANDEXT.DAT file found in this directory with the one found +in : + +VisualStudio6.0 *\Common\MSDev98\Bin + +VisualStudio7.0/.NET *\Common7\IDE\langext.dat + diff --git a/VisualStudio/osgDB/osgDB.dsp b/VisualStudio/osgDB/osgDB.dsp index 693cf35aa..ec0bd47e6 100755 --- a/VisualStudio/osgDB/osgDB.dsp +++ b/VisualStudio/osgDB/osgDB.dsp @@ -129,10 +129,6 @@ SOURCE=..\..\Src\osgDB\Output.cpp # End Source File # Begin Source File -SOURCE=..\..\Src\osgDB\ParameterOutput.cpp -# End Source File -# Begin Source File - SOURCE=..\..\Src\osgDB\ReadFile.cpp # End Source File # Begin Source File diff --git a/include/osgDB/ParameterOutput b/include/osgDB/ParameterOutput index 692a1ae89..8c71aa61f 100644 --- a/include/osgDB/ParameterOutput +++ b/include/osgDB/ParameterOutput @@ -9,17 +9,39 @@ namespace osgDB { -class OSGDB_EXPORT ParameterOutput +class ParameterOutput { public: - ParameterOutput(Output& fw); + ParameterOutput(Output& fw): + _fw(fw), + _numItemsPerLine(fw.getNumIndicesPerLine()), + _column(0) {} - ParameterOutput(Output& fw,int numItemsPerLine); - - void begin(); - void newLine(); - void end(); + ParameterOutput(Output& fw,int numItemsPerLine): + _fw(fw), + _numItemsPerLine(numItemsPerLine), + _column(0) {} + + void begin() + { + _fw.indent() << "{"< void write(const T& t) diff --git a/src/osgDB/Makefile b/src/osgDB/Makefile index 0f41b233f..fe530b6d7 100644 --- a/src/osgDB/Makefile +++ b/src/osgDB/Makefile @@ -11,7 +11,6 @@ CXXFILES =\ WriteFile.cpp\ Input.cpp\ Output.cpp\ - ParameterOutput.cpp\ Field.cpp\ FieldReader.cpp\ FieldReaderIterator.cpp\ diff --git a/src/osgDB/ParameterOutput.cpp b/src/osgDB/ParameterOutput.cpp deleted file mode 100644 index 49463c193..000000000 --- a/src/osgDB/ParameterOutput.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include - -using namespace osgDB; - -ParameterOutput::ParameterOutput(Output& fw): - _fw(fw), - _numItemsPerLine(fw.getNumIndicesPerLine()), - _column(0) {} - -ParameterOutput::ParameterOutput(Output& fw,int numItemsPerLine): - _fw(fw), - _numItemsPerLine(numItemsPerLine), - _column(0) {} - -void ParameterOutput::begin() -{ - _fw.indent() << "{"<