Menu
▾
▴
SF.net SVN: openvrml:[3636] trunk
|
From: <br...@us...> - 2008-09-17 00:00:02
|
Revision: 3636
http://openvrml.svn.sourceforge.net/openvrml/?rev=3636&view=rev
Author: braden
Date: 2008-09-17 00:00:10 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Moved X3D Networking 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_networking.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
trunk/src/node/x3d-networking/
trunk/src/node/x3d-networking/load_sensor.cpp
trunk/src/node/x3d-networking/load_sensor.h
Removed Paths:
-------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
trunk/src/node/x3d-networking/load_sensor.cpp
trunk/src/node/x3d-networking/load_sensor.h
Property Changed:
----------------
trunk/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
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
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules:3622-3623
+ /branches/node-modules:3622-3623,3632-3635
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-16 08:45:06 UTC (rev 3635)
+++ trunk/ChangeLog 2008-09-17 00:00:10 UTC (rev 3636)
@@ -1,5 +1,20 @@
2008-09-16 Braden McDaniel <br...@en...>
+ Moved X3D Networking node implementations into a convenience
+ library.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added
+ x3d-networking static library project.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
+ * src/Makefile.am: Added convenience library
+ node/x3d-networking/libx3d-networking.la.
+ * src/libopenvrml/openvrml/x3d_networking.cpp: Moved node
+ implementations to separate files.
+ * src/node/x3d-networking/load_sensor.cpp
+ * src/node/x3d-networking/load_sensor.h
+
+2008-09-16 Braden McDaniel <br...@en...>
+
* ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj:
Removed flags defining BOOST_SPIRIT_THREADSAFE,
BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT.
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-16 08:45:06 UTC (rev 3635)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-17 00:00:10 UTC (rev 3636)
@@ -2,8 +2,9 @@
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}"
ProjectSection(ProjectDependencies) = postProject
+ {78133A10-3ADF-474C-B32A-74124A976482} = {78133A10-3ADF-474C-B32A-74124A976482}
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735} = {430B1A48-8E64-43DF-8CC4-AD09C41BA735}
{5ED398C0-0529-40D5-AB2C-C7EF0769002B} = {5ED398C0-0529-40D5-AB2C-C7EF0769002B}
- {78133A10-3ADF-474C-B32A-74124A976482} = {78133A10-3ADF-474C-B32A-74124A976482}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "openvrml-gl\openvrml-gl.vcproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}"
@@ -42,6 +43,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-core", "x3d-core\x3d-core.vcproj", "{78133A10-3ADF-474C-B32A-74124A976482}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-networking", "x3d-networking\x3d-networking.vcproj", "{430B1A48-8E64-43DF-8CC4-AD09C41BA735}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -84,6 +87,10 @@
{78133A10-3ADF-474C-B32A-74124A976482}.Debug|Win32.Build.0 = Debug|Win32
{78133A10-3ADF-474C-B32A-74124A976482}.Release|Win32.ActiveCfg = Release|Win32
{78133A10-3ADF-474C-B32A-74124A976482}.Release|Win32.Build.0 = Release|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Debug|Win32.ActiveCfg = Debug|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Debug|Win32.Build.0 = Debug|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Release|Win32.ActiveCfg = Release|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
x3d-networking.vcproj.*.user
Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj 2008-09-16 08:45:06 UTC (rev 3635)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj 2008-09-17 00:00:10 UTC (rev 3636)
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x3d-networking"
- ProjectGUID="{430B1A48-8E64-43DF-8CC4-AD09C41BA735}"
- RootNamespace="x3dnetworking"
- 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-networking\load_sensor.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-networking\load_sensor.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-networking/x3d-networking.vcproj (from rev 3635, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj)
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj 2008-09-17 00:00:10 UTC (rev 3636)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="x3d-networking"
+ ProjectGUID="{430B1A48-8E64-43DF-8CC4-AD09C41BA735}"
+ RootNamespace="x3dnetworking"
+ 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-networking\load_sensor.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-networking\load_sensor.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-16 08:45:06 UTC (rev 3635)
+++ trunk/src/Makefile.am 2008-09-17 00:00:10 UTC (rev 3636)
@@ -5,7 +5,8 @@
lib_LTLIBRARIES = libopenvrml/libopenvrml.la
noinst_LTLIBRARIES = \
node/vrml97/libvrml97.la \
- node/x3d-core/libx3d-core.la
+ node/x3d-core/libx3d-core.la \
+ node/x3d-networking/libx3d-networking.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
@@ -139,6 +140,7 @@
libopenvrml_libopenvrml_la_LIBADD = \
node/vrml97/libvrml97.la \
node/x3d-core/libx3d-core.la \
+ node/x3d-networking/libx3d-networking.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
-lboost_filesystem$(BOOST_LIB_SUFFIX) \
-lltdl
@@ -334,6 +336,15 @@
node/x3d-core/metadata_string.cpp \
node/x3d-core/metadata_string.h
+node_x3d_networking_libx3d_networking_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+node_x3d_networking_libx3d_networking_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS)
+node_x3d_networking_libx3d_networking_la_SOURCES = \
+ node/x3d-networking/load_sensor.cpp \
+ node/x3d-networking/load_sensor.h
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
Modified: trunk/src/libopenvrml/openvrml/x3d_networking.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_networking.cpp 2008-09-16 08:45:06 UTC (rev 3635)
+++ trunk/src/libopenvrml/openvrml/x3d_networking.cpp 2008-09-17 00:00:10 UTC (rev 3636)
@@ -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,281 +18,21 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "browser.h"
+# include "x3d_networking.h"
+# include <x3d-networking/load_sensor.h>
+# include <boost/array.hpp>
+
# 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_networking.h"
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Class object for LoadSensor nodes.
- */
- class OPENVRML_LOCAL load_sensor_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit load_sensor_metatype(openvrml::browser & browser);
- virtual ~load_sensor_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_networking_node_metatypes(openvrml::browser & b)
{
using boost::shared_ptr;
using openvrml::node_metatype;
+ using namespace openvrml_node_x3d_networking;
b.add_node_metatype(load_sensor_metatype::id,
shared_ptr<node_metatype>(
new load_sensor_metatype(b)));
}
-
-namespace {
-
- using namespace openvrml_;
-
- class OPENVRML_LOCAL load_sensor_node :
- public abstract_node<load_sensor_node>,
- public child_node {
-
- friend class load_sensor_metatype;
-
- exposedfield<sfbool> enabled_;
- exposedfield<sftime> timeout_;
- exposedfield<mfnode> watch_list_;
- sfbool is_active_;
- sfbool_emitter is_active_emitter_;
- sfbool is_loaded_;
- sfbool_emitter is_loaded_emitter_;
- sftime load_time_;
- sftime_emitter load_time_emitter_;
- sffloat progress_;
- sffloat_emitter progress_emitter_;
-
- public:
- load_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~load_sensor_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const load_sensor_metatype::id =
- "urn:X-openvrml:node:LoadSensor";
-
- /**
- * @brief Construct.
- *
- * @param browser the browser associated with this load_sensor_metatype.
- */
- load_sensor_metatype::load_sensor_metatype(openvrml::browser & browser):
- node_metatype(load_sensor_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- load_sensor_metatype::~load_sensor_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 LoadSensor nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by load_sensor_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- load_sensor_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, 8> 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,
- "enabled"),
- node_interface(node_interface::exposedfield_id,
- field_value::sftime_id,
- "timeout"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "watchList"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isActive"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isLoaded"),
- node_interface(node_interface::eventout_id,
- field_value::sftime_id,
- "loadTime"),
- node_interface(node_interface::eventout_id,
- field_value::sffloat_id,
- "progress")
- };
- typedef node_type_impl<load_sensor_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,
- &load_sensor_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::enabled_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::timeout_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::watch_list_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::is_active_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::is_loaded_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::load_time_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::progress_emitter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @class load_sensor_node
- *
- * @brief Represents LoadSensor node instances.
- */
-
- /**
- * @var load_sensor_node::load_sensor_metatype
- *
- * @brief Class object for LoadSensor nodes.
- */
-
- /**
- * @var load_sensor_node::enabled_
- *
- * @brief enabled exposedField
- */
-
- /**
- * @var load_sensor_node::timeout_
- *
- * @brief timeout exposedField
- */
-
- /**
- * @var load_sensor_node::watch_list_
- *
- * @brief watch_list exposedField
- */
-
- /**
- * @var load_sensor_node::is_active_
- *
- * @brief is_active eventOut
- */
-
- /**
- * @var load_sensor_node::is_loaded_
- *
- * @brief is_loaded eventOut
- */
-
- /**
- * @var load_sensor_node::load_time_
- *
- * @brief load_time eventOut
- */
-
- /**
- * @var load_sensor_node::progress_
- *
- * @brief progress eventOut
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- load_sensor_node::
- load_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- bounded_volume_node(type, scope),
- abstract_node<self_t>(type, scope),
- child_node(type, scope),
- enabled_(*this, true),
- timeout_(*this),
- watch_list_(*this),
- is_active_emitter_(*this, this->is_active_),
- is_loaded_emitter_(*this, this->is_loaded_),
- load_time_emitter_(*this, this->load_time_),
- progress_emitter_(*this, this->progress_)
- {}
-
- /**
- * @brief Destroy.
- */
- load_sensor_node::~load_sensor_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
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
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
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
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
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
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
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
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
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
Deleted: trunk/src/node/x3d-networking/load_sensor.cpp
===================================================================
--- branches/node-modules/src/node/x3d-networking/load_sensor.cpp 2008-09-16 08:45:06 UTC (rev 3635)
+++ trunk/src/node/x3d-networking/load_sensor.cpp 2008-09-17 00:00:10 UTC (rev 3636)
@@ -1,265 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
-//
-// OpenVRML
-//
-// Copyright 2006, 2007 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 "load_sensor.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;
-
-namespace {
-
- /**
- * @brief Represents LoadSensor node instances.
- */
- class OPENVRML_LOCAL load_sensor_node :
- public abstract_node<load_sensor_node>,
- public child_node {
-
- friend class openvrml_node_x3d_networking::load_sensor_metatype;
-
- exposedfield<sfbool> enabled_;
- exposedfield<sftime> timeout_;
- exposedfield<mfnode> watch_list_;
- sfbool is_active_;
- sfbool_emitter is_active_emitter_;
- sfbool is_loaded_;
- sfbool_emitter is_loaded_emitter_;
- sftime load_time_;
- sftime_emitter load_time_emitter_;
- sffloat progress_;
- sffloat_emitter progress_emitter_;
-
- public:
- load_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~load_sensor_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @var load_sensor_node::load_sensor_metatype
- *
- * @brief Class object for LoadSensor nodes.
- */
-
- /**
- * @var load_sensor_node::enabled_
- *
- * @brief enabled exposedField
- */
-
- /**
- * @var load_sensor_node::timeout_
- *
- * @brief timeout exposedField
- */
-
- /**
- * @var load_sensor_node::watch_list_
- *
- * @brief watch_list exposedField
- */
-
- /**
- * @var load_sensor_node::is_active_
- *
- * @brief is_active eventOut
- */
-
- /**
- * @var load_sensor_node::is_loaded_
- *
- * @brief is_loaded eventOut
- */
-
- /**
- * @var load_sensor_node::load_time_
- *
- * @brief load_time eventOut
- */
-
- /**
- * @var load_sensor_node::progress_
- *
- * @brief progress eventOut
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- load_sensor_node::
- load_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- bounded_volume_node(type, scope),
- abstract_node<self_t>(type, scope),
- child_node(type, scope),
- enabled_(*this, true),
- timeout_(*this),
- watch_list_(*this),
- is_active_emitter_(*this, this->is_active_),
- is_loaded_emitter_(*this, this->is_loaded_),
- load_time_emitter_(*this, this->load_time_),
- progress_emitter_(*this, this->progress_)
- {}
-
- /**
- * @brief Destroy.
- */
- load_sensor_node::~load_sensor_node() OPENVRML_NOTHROW
- {}
-}
-
-
-/**
- * @brief @c node_metatype identifier.
- */
-const char * const openvrml_node_x3d_networking::load_sensor_metatype::id =
- "urn:X-openvrml:node:LoadSensor";
-
-/**
- * @brief Construct.
- *
- * @param browser the browser associated with this load_sensor_metatype.
- */
-openvrml_node_x3d_networking::load_sensor_metatype::
-load_sensor_metatype(openvrml::browser & browser):
- node_metatype(load_sensor_metatype::id, browser)
-{}
-
-/**
- * @brief Destroy.
- */
-openvrml_node_x3d_networking::load_sensor_metatype::~load_sensor_metatype()
- OPENVRML_NOTHROW
-{}
-
-/**
- * @brief Create a @c 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
- * LoadSensor nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by @c load_sensor_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
-const boost::shared_ptr<openvrml::node_type>
-openvrml_node_x3d_networking::load_sensor_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, 8> 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,
- "enabled"),
- node_interface(node_interface::exposedfield_id,
- field_value::sftime_id,
- "timeout"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "watchList"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isActive"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isLoaded"),
- node_interface(node_interface::eventout_id,
- field_value::sftime_id,
- "loadTime"),
- node_interface(node_interface::eventout_id,
- field_value::sffloat_id,
- "progress")
- };
- typedef node_type_impl<load_sensor_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,
- &load_sensor_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::enabled_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::timeout_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::watch_list_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::is_active_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::is_loaded_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::load_time_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &load_sensor_node::progress_emitter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
-}
Copied: trunk/src/node/x3d-networking/load_sensor.cpp (from rev 3635, branches/node-modules/src/node/x3d-networking/load_sensor.cpp)
===================================================================
--- trunk/src/node/x3d-networking/load_sensor.cpp (rev 0)
+++ trunk/src/node/x3d-networking/load_sensor.cpp 2008-09-17 00:00:10 UTC (rev 3636)
@@ -0,0 +1,265 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2006, 2007 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 "load_sensor.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;
+
+namespace {
+
+ /**
+ * @brief Represents LoadSensor node instances.
+ */
+ class OPENVRML_LOCAL load_sensor_node :
+ public abstract_node<load_sensor_node>,
+ public child_node {
+
+ friend class openvrml_node_x3d_networking::load_sensor_metatype;
+
+ exposedfield<sfbool> enabled_;
+ exposedfield<sftime> timeout_;
+ exposedfield<mfnode> watch_list_;
+ sfbool is_active_;
+ sfbool_emitter is_active_emitter_;
+ sfbool is_loaded_;
+ sfbool_emitter is_loaded_emitter_;
+ sftime load_time_;
+ sftime_emitter load_time_emitter_;
+ sffloat progress_;
+ sffloat_emitter progress_emitter_;
+
+ public:
+ load_sensor_node(const node_type & type,
+ const boost::shared_ptr<openvrml::scope> & scope);
+ virtual ~load_sensor_node() OPENVRML_NOTHROW;
+ };
+
+
+ /**
+ * @var load_sensor_node::load_sensor_metatype
+ *
+ * @brief Class object for LoadSensor nodes.
+ */
+
+ /**
+ * @var load_sensor_node::enabled_
+ *
+ * @brief enabled exposedField
+ */
+
+ /**
+ * @var load_sensor_node::timeout_
+ *
+ * @brief timeout exposedField
+ */
+
+ /**
+ * @var load_sensor_node::watch_list_
+ *
+ * @brief watch_list exposedField
+ */
+
+ /**
+ * @var load_sensor_node::is_active_
+ *
+ * @brief is_active eventOut
+ */
+
+ /**
+ * @var load_sensor_node::is_loaded_
+ *
+ * @brief is_loaded eventOut
+ */
+
+ /**
+ * @var load_sensor_node::load_time_
+ *
+ * @brief load_time eventOut
+ */
+
+ /**
+ * @var load_sensor_node::progress_
+ *
+ * @brief progress eventOut
+ */
+
+
+ /**
+ * @brief Construct.
+ *
+ * @param type the node_type associated with this node.
+ * @param scope the scope to which the node belongs.
+ */
+ load_sensor_node::
+ load_sensor_node(const node_type & type,
+ const boost::shared_ptr<openvrml::scope> & scope):
+ node(type, scope),
+ bounded_volume_node(type, scope),
+ abstract_node<self_t>(type, scope),
+ child_node(type, scope),
+ enabled_(*this, true),
+ timeout_(*this),
+ watch_list_(*this),
+ is_active_emitter_(*this, this->is_active_),
+ is_loaded_emitter_(*this, this->is_loaded_),
+ load_time_emitter_(*this, this->load_time_),
+ progress_emitter_(*this, this->progress_)
+ {}
+
+ /**
+ * @brief Destroy.
+ */
+ load_sensor_node::~load_sensor_node() OPENVRML_NOTHROW
+ {}
+}
+
+
+/**
+ * @brief @c node_metatype identifier.
+ */
+const char * const openvrml_node_x3d_networking::load_sensor_metatype::id =
+ "urn:X-openvrml:node:LoadSensor";
+
+/**
+ * @brief Construct.
+ *
+ * @param browser the browser associated with this load_sensor_metatype.
+ */
+openvrml_node_x3d_networking::load_sensor_metatype::
+load_sensor_metatype(openvrml::browser & browser):
+ node_metatype(load_sensor_metatype::id, browser)
+{}
+
+/**
+ * @brief Destroy.
+ */
+openvrml_node_x3d_networking::load_sensor_metatype::~load_sensor_metatype()
+ OPENVRML_NOTHROW
+{}
+
+/**
+ * @brief Create a @c 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
+ * LoadSensor nodes.
+ *
+ * @exception unsupported_interface if @p interfaces includes an interface
+ * not supported by @c load_sensor_metatype.
+ * @exception std::bad_alloc if memory allocation fails.
+ */
+const boost::shared_ptr<openvrml::node_type>
+openvrml_node_x3d_networking::load_sensor_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, 8> 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,
+ "enabled"),
+ node_interface(node_interface::exposedfield_id,
+ field_value::sftime_id,
+ "timeout"),
+ node_interface(node_interface::exposedfield_id,
+ field_value::mfnode_id,
+ "watchList"),
+ node_interface(node_interface::eventout_id,
+ field_value::sfbool_id,
+ "isActive"),
+ node_interface(node_interface::eventout_id,
+ field_value::sfbool_id,
+ "isLoaded"),
+ node_interface(node_interface::eventout_id,
+ field_value::sftime_id,
+ "loadTime"),
+ node_interface(node_interface::eventout_id,
+ field_value::sffloat_id,
+ "progress")
+ };
+ typedef node_type_impl<load_sensor_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,
+ &load_sensor_node::metadata);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::enabled_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::timeout_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_exposedfield(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::watch_list_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_eventout(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::is_active_emitter_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_eventout(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::is_loaded_emitter_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_eventout(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::load_time_emitter_);
+ } else if (*interface_ == *++supported_interface) {
+ the_node_type.add_eventout(
+ supported_interface->field_type,
+ supported_interface->id,
+ &load_sensor_node::progress_emitter_);
+ } else {
+ throw unsupported_interface(*interface_);
+ }
+ }
+ return type;
+}
Deleted: trunk/src/node/x3d-networking/load_sensor.h
===================================================================
--- branches/node-modules/src/node/x3d-networking/load_sensor.h 2008-09-16 08:45:06 UTC (rev 3635)
+++ trunk/src/node/x3d-networking/load_sensor.h 2008-09-17 00:00:10 UTC (rev 3636)
@@ -1,46 +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_NETWORKING_LOAD_SENSOR_H
-# define OPENVRML_NODE_X3D_NETWORKING_LOAD_SENSOR_H
-
-# include <openvrml/node.h>
-
-namespace openvrml_node_x3d_networking {
-
- /**
- * @brief Class object for LoadSensor nodes.
- */
- class OPENVRML_LOCAL load_sensor_metatype : public openvrml::node_metatype {
- public:
- static const char * const id;
-
- explicit load_sensor_metatype(openvrml::browser & browser);
- virtual ~load_sensor_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_NETWORKING_LOAD_SENSOR_H
Copied: trunk/src/node/x3d-networking/load_sensor.h (from rev 3635, branches/node-modules/src/node/x3d-networking/load_sensor.h)
===================================================================
--- trunk/src/node/x3d-networking/load_sensor.h (rev 0)
+++ trunk/src/node/x3d-networking/load_sensor.h 2008-09-17 00:00:10 UTC (rev 3636)
@@ -0,0 +1,46 @@
+// -*- 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_NETWORKING_LOAD_SENSOR_H
+# define OPENVRML_NODE_X3D_NETWORKING_LOAD_SENSOR_H
+
+# include <openvrml/node.h>
+
+namespace openvrml_node_x3d_networking {
+
+ /**
+ * @brief Class object for LoadSensor nodes.
+ */
+ class OPENVRML_LOCAL load_sensor_metatype : public openvrml::node_metatype {
+ public:
+ static const char * const id;
+
+ explicit load_sensor_metatype(openvrml::browser & browser);
+ virtual ~load_sensor_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_NETWORKING_LOAD_SENSOR_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
