Menu
▾
▴
SF.net SVN: openvrml:[3645] trunk
|
From: <br...@us...> - 2008-09-18 06:30:40
|
Revision: 3645
http://openvrml.svn.sourceforge.net/openvrml/?rev=3645&view=rev
Author: braden
Date: 2008-09-18 06:30:48 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Moved X3D Shape node implementations into a convenience library.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/x3d_shape.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
trunk/src/node/x3d-shape/
trunk/src/node/x3d-shape/fill_properties.cpp
trunk/src/node/x3d-shape/fill_properties.h
trunk/src/node/x3d-shape/line_properties.cpp
trunk/src/node/x3d-shape/line_properties.h
Removed Paths:
-------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
trunk/src/node/x3d-shape/fill_properties.cpp
trunk/src/node/x3d-shape/fill_properties.h
trunk/src/node/x3d-shape/line_properties.cpp
trunk/src/node/x3d-shape/line_properties.h
Property Changed:
----------------
trunk/
trunk/src/node/x3d-core/metadata_double.cpp
trunk/src/node/x3d-core/metadata_double.h
trunk/src/node/x3d-core/metadata_float.cpp
trunk/src/node/x3d-core/metadata_float.h
trunk/src/node/x3d-core/metadata_integer.cpp
trunk/src/node/x3d-core/metadata_integer.h
trunk/src/node/x3d-core/metadata_set.cpp
trunk/src/node/x3d-core/metadata_set.h
trunk/src/node/x3d-core/metadata_string.cpp
trunk/src/node/x3d-core/metadata_string.h
trunk/src/node/x3d-grouping/static_group.cpp
trunk/src/node/x3d-grouping/static_group.h
trunk/src/node/x3d-networking/load_sensor.cpp
trunk/src/node/x3d-networking/load_sensor.h
trunk/src/node/x3d-rendering/color_rgba.cpp
trunk/src/node/x3d-rendering/color_rgba.h
trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_set.h
trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
trunk/src/node/x3d-rendering/triangle_fan_set.cpp
trunk/src/node/x3d-rendering/triangle_fan_set.h
trunk/src/node/x3d-rendering/triangle_set.cpp
trunk/src/node/x3d-rendering/triangle_set.h
trunk/src/node/x3d-rendering/triangle_strip_set.cpp
trunk/src/node/x3d-rendering/triangle_strip_set.h
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641
+ /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/ChangeLog 2008-09-18 06:30:48 UTC (rev 3645)
@@ -1,3 +1,20 @@
+2008-09-18 Braden McDaniel <br...@en...>
+
+ Moved X3D Shape node implementations into a convenience
+ library.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added
+ x3d-shape static library project.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
+ * src/Makefile.am: Added convenience library
+ node/x3d-shape/libx3d-shape.la.
+ * src/libopenvrml/openvrml/x3d_shape.cpp: Moved node
+ implementations to separate files.
+ * src/node/x3d-shape/fill_properties.cpp
+ * src/node/x3d-shape/fill_properties.h
+ * src/node/x3d-shape/line_properties.cpp
+ * src/node/x3d-shape/line_properties.h
+
2008-09-17 Braden McDaniel <br...@en...>
Moved X3D Rendering node implementations into a convenience
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-18 06:30:48 UTC (rev 3645)
@@ -51,6 +51,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-rendering", "x3d-rendering\x3d-rendering.vcproj", "{7DAC4CA0-9382-4ED0-A26E-A5F84776054C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-shape", "x3d-shape\x3d-shape.vcproj", "{95D646C4-B759-469D-BDBB-A370A5778CA5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -105,6 +107,10 @@
{7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Debug|Win32.Build.0 = Debug|Win32
{7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Release|Win32.ActiveCfg = Release|Win32
{7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Release|Win32.Build.0 = Release|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Debug|Win32.Build.0 = Debug|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Release|Win32.ActiveCfg = Release|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
x3d-shape.vcproj.*.user
Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj 2008-09-18 06:30:48 UTC (rev 3645)
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x3d-shape"
- ProjectGUID="{95D646C4-B759-469D-BDBB-A370A5778CA5}"
- RootNamespace="x3dshape"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OPENVRML_BUILD_DLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4226;4250;4251;4275;4290;4355;4661;4800"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4226;4250;4251;4275;4290;4355;4661;4800"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-shape\fill_properties.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-shape\line_properties.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-shape\fill_properties.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-shape\line_properties.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj (from rev 3644, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj)
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj 2008-09-18 06:30:48 UTC (rev 3645)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="x3d-shape"
+ ProjectGUID="{95D646C4-B759-469D-BDBB-A370A5778CA5}"
+ RootNamespace="x3dshape"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OPENVRML_BUILD_DLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4226;4250;4251;4275;4290;4355;4661;4800"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4226;4250;4251;4275;4290;4355;4661;4800"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-shape\fill_properties.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-shape\line_properties.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-shape\fill_properties.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-shape\line_properties.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/src/Makefile.am 2008-09-18 06:30:48 UTC (rev 3645)
@@ -8,7 +8,8 @@
node/x3d-core/libx3d-core.la \
node/x3d-networking/libx3d-networking.la \
node/x3d-grouping/libx3d-grouping.la \
- node/x3d-rendering/libx3d-rendering.la
+ node/x3d-rendering/libx3d-rendering.la \
+ node/x3d-shape/libx3d-shape.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
@@ -145,6 +146,7 @@
node/x3d-networking/libx3d-networking.la \
node/x3d-grouping/libx3d-grouping.la \
node/x3d-rendering/libx3d-rendering.la \
+ node/x3d-shape/libx3d-shape.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
-lboost_filesystem$(BOOST_LIB_SUFFIX) \
-lltdl
@@ -379,6 +381,17 @@
node/x3d-rendering/triangle_strip_set.cpp \
node/x3d-rendering/triangle_strip_set.h
+node_x3d_shape_libx3d_shape_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+node_x3d_shape_libx3d_shape_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS)
+node_x3d_shape_libx3d_shape_la_SOURCES = \
+ node/x3d-shape/fill_properties.cpp \
+ node/x3d-shape/fill_properties.h \
+ node/x3d-shape/line_properties.cpp \
+ node/x3d-shape/line_properties.h
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
Modified: trunk/src/libopenvrml/openvrml/x3d_shape.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_shape.cpp 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/src/libopenvrml/openvrml/x3d_shape.cpp 2008-09-18 06:30:48 UTC (rev 3645)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2006, 2007 Braden McDaniel
+// Copyright 2006, 2007, 2008 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -18,62 +18,20 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "browser.h"
+# include "x3d_shape.h"
+# include <x3d-shape/fill_properties.h>
+# include <x3d-shape/line_properties.h>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <private.h>
-# include "browser.h"
-# include "node_impl_util.h"
-# include "x3d_shape.h"
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Class object for FillProperties nodes.
- */
- class OPENVRML_LOCAL fill_properties_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit fill_properties_metatype(openvrml::browser & browser);
- virtual ~fill_properties_metatype() OPENVRML_NOTHROW;
-
- private:
- virtual const boost::shared_ptr<node_type>
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- OPENVRML_THROW2(unsupported_interface, std::bad_alloc);
- };
-
-
- /**
- * @brief Class object for LineProperties nodes.
- */
- class OPENVRML_LOCAL line_properties_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit line_properties_metatype(openvrml::browser & browser);
- virtual ~line_properties_metatype() OPENVRML_NOTHROW;
-
- private:
- virtual const boost::shared_ptr<node_type>
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- OPENVRML_THROW2(unsupported_interface, std::bad_alloc);
- };
-}
-
void register_shape_node_metatypes(openvrml::browser & b)
{
using boost::shared_ptr;
using openvrml::node_metatype;
+ using namespace openvrml_node_x3d_shape;
b.add_node_metatype(fill_properties_metatype::id,
shared_ptr<node_metatype>(
new fill_properties_metatype(b)));
@@ -81,348 +39,3 @@
shared_ptr<node_metatype>(
new line_properties_metatype(b)));
}
-
-namespace {
-
- using namespace openvrml_;
-
- class OPENVRML_LOCAL fill_properties_node :
- public abstract_node<fill_properties_node> {
-
- friend class fill_properties_metatype;
-
- exposedfield<sfbool> filled_;
- exposedfield<sfcolor> hatch_color_;
- exposedfield<sfbool> hatched_;
- exposedfield<sfint32> hatch_style_;
-
- public:
- fill_properties_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~fill_properties_node() OPENVRML_NOTHROW;
- };
-
-
- class OPENVRML_LOCAL line_properties_node :
- public abstract_node<line_properties_node> {
-
- friend class line_properties_metatype;
-
- exposedfield<sfbool> applied_;
- exposedfield<sfint32> line_type_;
- exposedfield<sffloat> linewidth_scale_factor_;
-
- public:
- line_properties_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~line_properties_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const fill_properties_metatype::id =
- "urn:X-openvrml:node:FillProperties";
-
- /**
- * @brief Construct.
- *
- * @param browser the browser associated with this fill_properties_metatype.
- */
- fill_properties_metatype::fill_properties_metatype(openvrml::browser & browser):
- node_metatype(fill_properties_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- fill_properties_metatype::~fill_properties_metatype() OPENVRML_NOTHROW
- {}
-
- /**
- * @brief Create a node_type.
- *
- * @param id the name for the new node_type.
- * @param interfaces the interfaces for the new node_type.
- *
- * @return a node_type_ptr to a node_type capable of creating FillProperties nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by fill_properties_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- fill_properties_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- OPENVRML_THROW2(unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 5> supported_interfaces_t;
- static const supported_interfaces_t supported_interfaces = {
- node_interface(node_interface::exposedfield_id,
- field_value::sfnode_id,
- "metadata"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfbool_id,
- "filled"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfcolor_id,
- "hatchColor"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfbool_id,
- "hatched"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfint32_id,
- "hatchStyle")
- };
- typedef node_type_impl<fill_properties_node> node_type_t;
-
- const boost::shared_ptr<node_type> type(new node_type_t(*this, id));
- node_type_t & the_node_type = static_cast<node_type_t &>(*type);
-
- for (node_interface_set::const_iterator interface_(interfaces.begin());
- interface_ != interfaces.end();
- ++interface_) {
- supported_interfaces_t::const_iterator supported_interface =
- supported_interfaces.begin() - 1;
- if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::filled_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::hatch_color_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::hatched_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::hatch_style_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @class fill_properties_node
- *
- * @brief Represents FillProperties node instances.
- */
-
- /**
- * @var fill_properties_node::fill_properties_metatype
- *
- * @brief Class object for FillProperties nodes.
- */
-
- /**
- * @var fill_properties_node::filled_
- *
- * @brief filled exposedField
- */
-
- /**
- * @var fill_properties_node::hatch_color_
- *
- * @brief hatch_color exposedField
- */
-
- /**
- * @var fill_properties_node::hatched_
- *
- * @brief hatched exposedField
- */
-
- /**
- * @var fill_properties_node::hatch_style_
- *
- * @brief hatch_style exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- fill_properties_node::
- fill_properties_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- filled_(*this, true),
- hatch_color_(*this, make_color(1.0, 1.0, 1.0)),
- hatched_(*this, true),
- hatch_style_(*this, 1)
- {}
-
- /**
- * @brief Destroy.
- */
- fill_properties_node::~fill_properties_node() OPENVRML_NOTHROW
- {}
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const line_properties_metatype::id =
- "urn:X-openvrml:node:LineProperties";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c line_properties_metatype.
- */
- line_properties_metatype::line_properties_metatype(openvrml::browser & browser):
- node_metatype(line_properties_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- line_properties_metatype::~line_properties_metatype() OPENVRML_NOTHROW
- {}
-
- /**
- * @brief Create a node_type.
- *
- * @param id the name for the new node_type.
- * @param interfaces the interfaces for the new node_type.
- *
- * @return a node_type_ptr to a node_type capable of creating LineProperties nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by line_properties_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- line_properties_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- OPENVRML_THROW2(unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 4> supported_interfaces_t;
- static const supported_interfaces_t supported_interfaces = {
- node_interface(node_interface::exposedfield_id,
- field_value::sfnode_id,
- "metadata"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfbool_id,
- "applied"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfint32_id,
- "lineType"),
- node_interface(node_interface::exposedfield_id,
- field_value::sffloat_id,
- "linewidthScaleFactor")
- };
- typedef node_type_impl<line_properties_node> node_type_t;
-
- const boost::shared_ptr<node_type> type(new node_type_t(*this, id));
- node_type_t & the_node_type = static_cast<node_type_t &>(*type);
-
- for (node_interface_set::const_iterator interface_(interfaces.begin());
- interface_ != interfaces.end();
- ++interface_) {
- supported_interfaces_t::const_iterator supported_interface =
- supported_interfaces.begin() - 1;
- if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &line_properties_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &line_properties_node::applied_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &line_properties_node::line_type_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &line_properties_node::linewidth_scale_factor_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @class line_properties_node
- *
- * @brief Represents LineProperties node instances.
- */
-
- /**
- * @var line_properties_node::line_properties_metatype
- *
- * @brief Class object for LineProperties nodes.
- */
-
- /**
- * @var line_properties_node::applied_
- *
- * @brief applied exposedField
- */
-
- /**
- * @var line_properties_node::line_type_
- *
- * @brief line_type exposedField
- */
-
- /**
- * @var line_properties_node::linewidth_scale_factor_
- *
- * @brief linewidth_scale_factor exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- line_properties_node::
- line_properties_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- applied_(*this, true),
- line_type_(*this, 1),
- linewidth_scale_factor_(*this)
- {}
-
- /**
- * @brief Destroy.
- */
- line_properties_node::~line_properties_node() OPENVRML_NOTHROW
- {}
-}
Property changes on: trunk/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-grouping/static_group.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-grouping/static_group.cpp:3640-3641
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-grouping/static_group.cpp:3640-3641,3643-3644
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
Property changes on: trunk/src/node/x3d-grouping/static_group.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-grouping/static_group.h:3640-3641
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-grouping/static_group.h:3640-3641,3643-3644
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
Property changes on: trunk/src/node/x3d-networking/load_sensor.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-networking/load_sensor.cpp:3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-networking/load_sensor.cpp:3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-networking/load_sensor.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-networking/load_sensor.h:3637-3638,3640-3641
+ /branches/node-modules/src/node/x3d-networking/load_sensor.h:3637-3638,3640-3641,3643-3644
Property changes on: trunk/src/node/x3d-rendering/color_rgba.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/color_rgba.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/color_rgba.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/color_rgba.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_set.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_set.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_strip_set.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_strip_set.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/triangle_fan_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/triangle_fan_set.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/triangle_fan_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/triangle_fan_set.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/triangle_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/triangle_set.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/triangle_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/triangle_set.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/triangle_strip_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/triangle_strip_set.cpp:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/triangle_strip_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/triangle_strip_set.h:3643-3644
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Deleted: trunk/src/node/x3d-shape/fill_properties.cpp
===================================================================
--- branches/node-modules/src/node/x3d-shape/fill_properties.cpp 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/src/node/x3d-shape/fill_properties.cpp 2008-09-18 06:30:48 UTC (rev 3645)
@@ -1,212 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
-//
-// OpenVRML
-//
-// Copyright 2006, 2007, 2008 Braden McDaniel
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or (at your
-// option) any later version.
-//
-// This library is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-// License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library; if not, see <http://www.gnu.org/licenses/>.
-//
-
-# include "fill_properties.h"
-# include <openvrml/node_impl_util.h>
-# include <boost/array.hpp>
-
-# ifdef HAVE_CONFIG_H
-# include <config.h>
-# endif
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Represents FillProperties node instances.
- */
- class OPENVRML_LOCAL fill_properties_node :
- public abstract_node<fill_properties_node> {
-
- friend class openvrml_node_x3d_shape::fill_properties_metatype;
-
- exposedfield<sfbool> filled_;
- exposedfield<sfcolor> hatch_color_;
- exposedfield<sfbool> hatched_;
- exposedfield<sfint32> hatch_style_;
-
- public:
- fill_properties_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~fill_properties_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @var fill_properties_node::fill_properties_metatype
- *
- * @brief Class object for FillProperties nodes.
- */
-
- /**
- * @var fill_properties_node::filled_
- *
- * @brief filled exposedField
- */
-
- /**
- * @var fill_properties_node::hatch_color_
- *
- * @brief hatch_color exposedField
- */
-
- /**
- * @var fill_properties_node::hatched_
- *
- * @brief hatched exposedField
- */
-
- /**
- * @var fill_properties_node::hatch_style_
- *
- * @brief hatch_style exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- fill_properties_node::
- fill_properties_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- filled_(*this, true),
- hatch_color_(*this, make_color(1.0, 1.0, 1.0)),
- hatched_(*this, true),
- hatch_style_(*this, 1)
- {}
-
- /**
- * @brief Destroy.
- */
- fill_properties_node::~fill_properties_node() OPENVRML_NOTHROW
- {}
-}
-
-
-/**
- * @brief @c node_metatype identifier.
- */
-const char * const openvrml_node_x3d_shape::fill_properties_metatype::id =
- "urn:X-openvrml:node:FillProperties";
-
-/**
- * @brief Construct.
- *
- * @param browser the browser associated with this fill_properties_metatype.
- */
-openvrml_node_x3d_shape::fill_properties_metatype::
-fill_properties_metatype(openvrml::browser & browser):
- node_metatype(fill_properties_metatype::id, browser)
-{}
-
-/**
- * @brief Destroy.
- */
-openvrml_node_x3d_shape::fill_properties_metatype::~fill_properties_metatype()
- OPENVRML_NOTHROW
-{}
-
-/**
- * @brief Create a node_type.
- *
- * @param id the name for the new @c node_type.
- * @param interfaces the interfaces for the new @c node_type.
- *
- * @return a @c boost::shared_ptr to a @c node_type capable of creating
- * FillProperties nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by
- * @c fill_properties_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
-const boost::shared_ptr<openvrml::node_type>
-openvrml_node_x3d_shape::fill_properties_metatype::
-do_create_type(const std::string & id,
- const openvrml::node_interface_set & interfaces) const
- OPENVRML_THROW2(openvrml::unsupported_interface, std::bad_alloc)
-{
- typedef boost::array<node_interface, 5> supported_interfaces_t;
- static const supported_interfaces_t supported_interfaces = {
- node_interface(node_interface::exposedfield_id,
- field_value::sfnode_id,
- "metadata"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfbool_id,
- "filled"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfcolor_id,
- "hatchColor"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfbool_id,
- "hatched"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfint32_id,
- "hatchStyle")
- };
- typedef node_type_impl<fill_properties_node> node_type_t;
-
- const boost::shared_ptr<node_type> type(new node_type_t(*this, id));
- node_type_t & the_node_type = static_cast<node_type_t &>(*type);
-
- for (node_interface_set::const_iterator interface_(interfaces.begin());
- interface_ != interfaces.end();
- ++interface_) {
- supported_interfaces_t::const_iterator supported_interface =
- supported_interfaces.begin() - 1;
- if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::filled_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::hatch_color_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::hatched_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &fill_properties_node::hatch_style_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
-}
Copied: trunk/src/node/x3d-shape/fill_properties.cpp (from rev 3644, branches/node-modules/src/node/x3d-shape/fill_properties.cpp)
===================================================================
--- trunk/src/node/x3d-shape/fill_properties.cpp (rev 0)
+++ trunk/src/node/x3d-shape/fill_properties.cpp 2008-09-18 06:30:48 UTC (rev 3645)
@@ -0,0 +1,212 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2006, 2007, 2008 Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# include "fill_properties.h"
+# include <openvrml/node_impl_util.h>
+# include <boost/array.hpp>
+
+# ifdef HAVE_CONFIG_H
+# include <config.h>
+# endif
+
+using namespace openvrml;
+using namespace openvrml::node_impl_util;
+using namespace std;
+
+namespace {
+
+ /**
+ * @brief Represents FillProperties node instances.
+ */
+ class OPENVRML_LOCAL fill_properties_node :
+ public abstract_node<fill_properties_node> {
+
+ friend class openvrml_node_x3d_shape::fill_properties_metatype;
+
+ exposedfield<sfbool> filled_;
+ exposedfield<sfcolor> hatch_color_;
+ exposedfield<sfbool> hatched_;
+ exposedfield<sfint32> hatch_style_;
+
+ public:
+ fill_properties_node(const node_type & type,
+ const boost::shared_ptr<openvrml::scope> & scope);
+ virtual ~fill_properties_node() OPENVRML_NOTHROW;
+ };
+
+
+ /**
+ * @var fill_properties_node::fill_properties_metatype
+ *
+ * @brief Class object for FillProperties nodes.
+ */
+
+ /**
+ * @var fill_properties_node::filled_
+ *
+ * @brief filled exposedField
+ */
+
+ /**
+ * @var fill_properties_node::hatch_color_
+ *
+ * @brief hatch_color exposedField
+ */
+
+ /**
+ * @var fill_properties_node::hatched_
+ *
+ * @brief hatched exposedField
+ */
+
+ /**
+ * @var fill_properties_node::hatch_style_
+ *
+ * @brief hatch_style exposedField
+ */
+
+
+ /**
+ * @brief Construct.
+ *
+ * @param type the node_type associated with this node.
+ * @param scope the scope to which the node belongs.
+ */
+ fill_properties_node::
+ fill_properties_node(const node_type & type,
+ const boost::shared_ptr<openvrml::scope> & scope):
+ node(type, scope),
+ abstract_node<self_t>(type, scope),
+ filled_(*this, true),
+ hatch_color_(*this, make_color(1.0, 1.0, 1.0)),
+ hatched_(*this, true),
+ hatch_style_(*this, 1)
+ {}
+
+ /**
+ * @brief Destroy.
+ */
+ fill_properties_node::~fill_properties_node() OPENVRML_NOTHROW
+ {}
+}
+
+
+/**
+ * @brief @c node_metatype identifier.
+ */
+const char * const openvrml_node_x3d_shape::fill_properties_metatype::id =
+ "urn:X-openvrml:node:FillProperties";
+
+/**
+ * @brief Construct.
+ *
+ * @param browser the browser associated with this fill_properties_metatype.
+ */
+openvrml_node_x3d_shape::fill_properties_metatype::
+fill_properties_metatype(openvrml::browser & browser):
+ node_metatype(fill_properties_metatype::id, browser)
+{}
+
+/**
+ * @brief Destroy.
+ */
+openvrml_node_x3d_shape::fill_properties_metatype::~fill_properties_metatype()
+ OPENVRML_NOTHROW
+{}
+
+/**
+ * @brief Create a node_type.
+ *
+ * @param id the name for the new @c node_type.
+ * @param interfaces the interfaces for the new @c node_type.
+ *
+ * @return a @c boost::shared_ptr to a @c node_type capable of creating
+ * FillProperties nodes.
+ *
+ * @exception unsupported_interface if @p interfaces includes an interface
+ * not supported by
+ * @c fill_properties_metatype.
+ * @exception std::bad_alloc if memory allocation fails.
+ */
+const boost::shared_ptr<openvrml::node_type>
+openvrml_node_x3d_shape::fill_properties_metatype::
+do_create_type(const std::string & id,
+ const openvrml::node_interface_set & interfaces) const
+ OPENVRML_THROW2(openvrml::unsupported_interface, std::bad_alloc)
+{
+ typedef boost::array<node_interface, 5> supported_interfaces_t;
+ static const supported_interfaces_t supported_interfaces = {
+ node_interface(node_interface::exposedfield_id,
+ field_value::sfnode_id,
+ "metadata"),
+ node_interface(node_interface::exposedfield_id,
+ field_value::sfbool_id,
+ "filled"),
+ node_interface(node_interface::exposedfield_id,
+ field_value::sfcolor_id,
+ "hatchColor"),
+ node_interface(node_interface::exposedfield_id,
+ field_value::sfbool_id,
+ "hatched"),
+ node_interface(node_interface::exposedfield_id,
+ field_value::sfint32_id,
+ "hatchStyle")
+ };
+ typedef node_type_impl<fill_properties_node> node_type_t;
+
+ const boost::shared_ptr<node_type> type(new node_type_t(*this, id));
+ node_type_t & the_node_type = static_cast<node_type_t &>(*type);
+
+ for (node_interface_set::const_iterator interface_(interfaces.begin());
+ interface_ != interfaces.end();
+ ++interface_) {
+ supported_interfaces_t::const_iterator supported_interface =
+ supported_interfaces.begin() - 1;
+ if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &fill_properties_node::metadata);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &fill_properties_node::filled_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &fill_properties_node::hatch_color_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &fill_properties_node::hatched_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &fill_properties_node::hatch_style_);
+ } else {
+ throw unsupported_interface(*interface_);
+ }
+ }
+ return type;
+}
Deleted: trunk/src/node/x3d-shape/fill_properties.h
===================================================================
--- branches/node-modules/src/node/x3d-shape/fill_properties.h 2008-09-18 06:24:52 UTC (rev 3644)
+++ trunk/src/node/x3d-shape/fill_properties.h 2008-09-18 06:30:48 UTC (rev 3645)
@@ -1,47 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
-//
-// OpenVRML
-//
-// Copyright 2006, 2007, 2008 Braden McDaniel
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or (at your
-// option) any later version.
-//
-// This library is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-// License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library; if not, see <http://www.gnu.org/licenses/>.
-//
-
-# ifndef OPENVRML_NODE_X3D_SHAPE_FILL_PROPERTIES_H
-# define OPENVRML_NODE_X3D_SHAPE_FILL_PROPERTIES_H
-
-# include <openvrml/node.h>
-
-namespace openvrml_node_x3d_shape {
-
- /**
- * @brief Class object for FillProperties nodes.
- */
- class OPENVRML_LOCAL fill_properties_metatype :
- public openvrml::node_metatype {
- public:
- static const char * const id;
-
- explicit fill_properties_metatype(openvrml::browser & browser);
- virtual ~fill_properties_metatype() OPENVRML_NOTHROW;
-
- private:
- virtual const boost::shared_ptr<openvrml::node_type>
- do_create_type(const std::string & id,
- const openvrml::node_interface_set & interfaces) const
- OPENVRML_THROW2(openvrml::unsupported_interface, std::bad_alloc);
- };
-}
-
-# endif // ifndef OPENVRML_NODE_X3D_SHAPE_FILL_PROPERTIES_H
Copied: trunk/src/node/x3d-shape/fill_properties.h (from rev 3644, branches/node-modules/src/node/x3d-shape/fill_properties.h)
===================================================================
--- trunk/src/node/x3d-shape/fill_properties.h (rev 0)
+++ trunk/src/node/x3d-shape/fill_properties.h 2008-09-18 06:30:48 UTC (rev 3645)
@@ -0,0 +1,47 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2006, 2007, 2008 Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# ifndef OPENVRML_NODE_X3D_SHAPE_FILL_PROPERTIES_H
+# define OPENVRML_NODE_X3D_SHAPE_FILL_PROPERTIES_H
+
+# include <openvrml/node.h>
+
+namespace openvrml_node_x3d_shape {
+
+ /**
+ * @brief Class object for FillProperties nodes.
+ */
+ class OPENVRML_LOCAL fill_properties_metatype :
+ public openvrml::node_metatype {
+ public:
+ static const char * const id;
+
+ explicit fill_properties_metatype(openvrml::browser & browser);
+ virtual ~fill_properties_metatype() OPENVRML_NOTHROW;
+
+ private:
+ virtual const boost::shared_ptr<openvrml::node_type>
+ do_create_type(const std::string & id,
+ const openvrml::node_interface_set & interfaces) const
+ OPENVRML_THROW2(openvrml::unsupported_interface, std::bad_alloc);
+ };
+}
+
+# endif // if...
[truncated message content] |
