Menu
▾
▴
SF.net SVN: openvrml:[3659] trunk
|
From: <br...@us...> - 2008-09-21 08:23:15
|
Revision: 3659
http://openvrml.svn.sourceforge.net/openvrml/?rev=3659&view=rev
Author: braden
Date: 2008-09-21 08:22:42 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Moved X3D Key Device Sensor node implementations into a convenience library.
Modified Paths:
--------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/x3d_key_device_sensor.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
trunk/src/node/x3d-key-device-sensor/
trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
trunk/src/node/x3d-key-device-sensor/key_sensor.h
trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
trunk/src/node/x3d-key-device-sensor/string_sensor.h
Removed Paths:
-------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
trunk/src/node/x3d-key-device-sensor/key_sensor.h
trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
trunk/src/node/x3d-key-device-sensor/string_sensor.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-geometry2d/arc2d.cpp
trunk/src/node/x3d-geometry2d/arc2d.h
trunk/src/node/x3d-geometry2d/arc_close2d.cpp
trunk/src/node/x3d-geometry2d/arc_close2d.h
trunk/src/node/x3d-geometry2d/circle2d.cpp
trunk/src/node/x3d-geometry2d/circle2d.h
trunk/src/node/x3d-geometry2d/disk2d.cpp
trunk/src/node/x3d-geometry2d/disk2d.h
trunk/src/node/x3d-geometry2d/polyline2d.cpp
trunk/src/node/x3d-geometry2d/polyline2d.h
trunk/src/node/x3d-geometry2d/polypoint2d.cpp
trunk/src/node/x3d-geometry2d/polypoint2d.h
trunk/src/node/x3d-geometry2d/rectangle2d.cpp
trunk/src/node/x3d-geometry2d/rectangle2d.h
trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
trunk/src/node/x3d-geometry2d/triangle_set2d.h
trunk/src/node/x3d-grouping/static_group.cpp
trunk/src/node/x3d-grouping/static_group.h
trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
trunk/src/node/x3d-interpolation/position_interpolator2d.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
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
trunk/src/node/x3d-texturing/multi_texture.cpp
trunk/src/node/x3d-texturing/multi_texture.h
trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp
trunk/src/node/x3d-texturing/multi_texture_coordinate.h
trunk/src/node/x3d-texturing/multi_texture_transform.cpp
trunk/src/node/x3d-texturing/multi_texture_transform.h
trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp
trunk/src/node/x3d-texturing/texture_coordinate_generator.h
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 08:06:57 UTC (rev 3658)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 08:22:42 UTC (rev 3659)
@@ -3,6 +3,7 @@
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}
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957} = {E20E0E24-C0B6-4448-82E0-32CCDBA88957}
{430B1A48-8E64-43DF-8CC4-AD09C41BA735} = {430B1A48-8E64-43DF-8CC4-AD09C41BA735}
{61A31C6F-23A1-4243-A338-EF749912592A} = {61A31C6F-23A1-4243-A338-EF749912592A}
{7DAC4CA0-9382-4ED0-A26E-A5F84776054C} = {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}
@@ -63,6 +64,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-interpolation", "x3d-interpolation\x3d-interpolation.vcproj", "{BFF962C6-4CC1-4DD1-965A-163EADE74986}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-key-device-sensor", "x3d-key-device-sensor\x3d-key-device-sensor.vcproj", "{E20E0E24-C0B6-4448-82E0-32CCDBA88957}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -133,6 +136,10 @@
{BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|Win32.Build.0 = Debug|Win32
{BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|Win32.ActiveCfg = Release|Win32
{BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|Win32.Build.0 = Release|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Debug|Win32.Build.0 = Debug|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Release|Win32.ActiveCfg = Release|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
x3d-key-device-sensor.vcproj.*.user
Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj 2008-09-21 08:06:57 UTC (rev 3658)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj 2008-09-21 08:22:42 UTC (rev 3659)
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x3d-key-device-sensor"
- ProjectGUID="{E20E0E24-C0B6-4448-82E0-32CCDBA88957}"
- RootNamespace="x3dkeydevicesensor"
- 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-key-device-sensor\key_sensor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-key-device-sensor\string_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-key-device-sensor\key_sensor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-key-device-sensor\string_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-key-device-sensor/x3d-key-device-sensor.vcproj (from rev 3658, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj)
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj 2008-09-21 08:22:42 UTC (rev 3659)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="x3d-key-device-sensor"
+ ProjectGUID="{E20E0E24-C0B6-4448-82E0-32CCDBA88957}"
+ RootNamespace="x3dkeydevicesensor"
+ 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-key-device-sensor\key_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-key-device-sensor\string_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-key-device-sensor\key_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-key-device-sensor\string_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-21 08:06:57 UTC (rev 3658)
+++ trunk/src/Makefile.am 2008-09-21 08:22:42 UTC (rev 3659)
@@ -12,7 +12,8 @@
node/x3d-shape/libx3d-shape.la \
node/x3d-geometry2d/libx3d-geometry2d.la \
node/x3d-texturing/libx3d-texturing.la \
- node/x3d-interpolation/libx3d-interpolation.la
+ node/x3d-interpolation/libx3d-interpolation.la \
+ node/x3d-key-device-sensor/libx3d-key-device-sensor.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
@@ -153,6 +154,7 @@
node/x3d-geometry2d/libx3d-geometry2d.la \
node/x3d-texturing/libx3d-texturing.la \
node/x3d-interpolation/libx3d-interpolation.la \
+ node/x3d-key-device-sensor/libx3d-key-device-sensor.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
-lboost_filesystem$(BOOST_LIB_SUFFIX) \
-lltdl
@@ -447,6 +449,17 @@
node/x3d-interpolation/position_interpolator2d.cpp \
node/x3d-interpolation/position_interpolator2d.h
+node_x3d_key_device_sensor_libx3d_key_device_sensor_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+node_x3d_key_device_sensor_libx3d_key_device_sensor_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS)
+node_x3d_key_device_sensor_libx3d_key_device_sensor_la_SOURCES = \
+ node/x3d-key-device-sensor/key_sensor.cpp \
+ node/x3d-key-device-sensor/key_sensor.h \
+ node/x3d-key-device-sensor/string_sensor.cpp \
+ node/x3d-key-device-sensor/string_sensor.h
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
Modified: trunk/src/libopenvrml/openvrml/x3d_key_device_sensor.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_key_device_sensor.cpp 2008-09-21 08:06:57 UTC (rev 3658)
+++ trunk/src/libopenvrml/openvrml/x3d_key_device_sensor.cpp 2008-09-21 08:22:42 UTC (rev 3659)
@@ -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,533 +18,22 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "browser.h"
+# include "x3d_key_device_sensor.h"
+# include <x3d-key-device-sensor/key_sensor.h>
+# include <x3d-key-device-sensor/string_sensor.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_key_device_sensor.h"
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Class object for KeySensor nodes.
- */
- class OPENVRML_LOCAL key_sensor_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit key_sensor_metatype(openvrml::browser & browser);
- virtual ~key_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);
- };
-
-
- /**
- * @brief Class object for StringSensor nodes.
- */
- class OPENVRML_LOCAL string_sensor_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit string_sensor_metatype(openvrml::browser & browser);
- virtual ~string_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_key_device_sensor_node_metatypes(openvrml::browser & b)
{
using boost::shared_ptr;
using openvrml::node_metatype;
+ using namespace openvrml_node_x3d_key_device_sensor;
b.add_node_metatype(key_sensor_metatype::id,
shared_ptr<node_metatype>(new key_sensor_metatype(b)));
b.add_node_metatype(string_sensor_metatype::id,
shared_ptr<node_metatype>(new string_sensor_metatype(b)));
}
-
-namespace {
-
- using namespace openvrml_;
-
- class OPENVRML_LOCAL key_sensor_node : public abstract_node<key_sensor_node>,
- public child_node {
- friend class key_sensor_metatype;
-
- exposedfield<sfbool> enabled_;
- sfint32 action_key_press_;
- sfint32_emitter action_key_press_emitter_;
- sfint32 action_key_release_;
- sfint32_emitter action_key_release_emitter_;
- sfbool alt_key_;
- sfbool_emitter alt_key_emitter_;
- sfbool control_key_;
- sfbool_emitter control_key_emitter_;
- sfbool is_active_;
- sfbool_emitter is_active_emitter_;
- sfstring key_press_;
- sfstring_emitter key_press_emitter_;
- sfstring key_release_;
- sfstring_emitter key_release_emitter_;
- sfbool shift_key_;
- sfbool_emitter shift_key_emitter_;
-
- public:
- key_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~key_sensor_node() OPENVRML_NOTHROW;
- };
-
-
- class OPENVRML_LOCAL string_sensor_node :
- public abstract_node<string_sensor_node>,
- public child_node {
-
- friend class string_sensor_metatype;
-
- exposedfield<sfbool> deletion_allowed_;
- exposedfield<sfbool> enabled_;
- sfstring entered_text_;
- sfstring_emitter entered_text_emitter_;
- sfstring final_text_;
- sfstring_emitter final_text_emitter_;
- sfbool is_active_;
- sfbool_emitter is_active_emitter_;
-
- public:
- string_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~string_sensor_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const key_sensor_metatype::id =
- "urn:X-openvrml:node:KeySensor";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this @c key_sensor_metatype.
- */
- key_sensor_metatype::key_sensor_metatype(openvrml::browser & browser):
- node_metatype(key_sensor_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- key_sensor_metatype::~key_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 KeySensor nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by key_sensor_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- key_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, 10> 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::eventout_id,
- field_value::sfint32_id,
- "actionKeyPress"),
- node_interface(node_interface::eventout_id,
- field_value::sfint32_id,
- "actionKeyRelease"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "altKey"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "controlKey"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isActive"),
- node_interface(node_interface::eventout_id,
- field_value::sfstring_id,
- "keyPress"),
- node_interface(node_interface::eventout_id,
- field_value::sfstring_id,
- "keyRelease"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "shiftKey")
- };
- typedef node_type_impl<key_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,
- &key_sensor_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::enabled_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::action_key_press_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::action_key_release_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::alt_key_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::control_key_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::is_active_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::key_press_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::key_release_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &key_sensor_node::shift_key_emitter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
- /**
- * @class key_sensor_node
- *
- * @brief Represents KeySensor node instances.
- */
-
- /**
- * @var key_sensor_node::key_sensor_metatype
- *
- * @brief Class object for KeySensor nodes.
- */
-
- /**
- * @var key_sensor_node::enabled_
- *
- * @brief enabled exposedField
- */
-
- /**
- * @var key_sensor_node::action_key_press_
- *
- * @brief action_key_press eventOut
- */
-
- /**
- * @var key_sensor_node::action_key_release_
- *
- * @brief action_key_release eventOut
- */
-
- /**
- * @var key_sensor_node::alt_key_
- *
- * @brief alt_key eventOut
- */
-
- /**
- * @var key_sensor_node::control_key_
- *
- * @brief control_key eventOut
- */
-
- /**
- * @var key_sensor_node::is_active_
- *
- * @brief is_active eventOut
- */
-
- /**
- * @var key_sensor_node::key_press_
- *
- * @brief key_press eventOut
- */
-
- /**
- * @var key_sensor_node::key_release_
- *
- * @brief key_release eventOut
- */
-
- /**
- * @var key_sensor_node::shift_key_
- *
- * @brief shift_key eventOut
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the @c node_type associated with this @c node.
- * @param scope the @c scope to which the @c node belongs.
- */
- key_sensor_node::
- key_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),
- action_key_press_emitter_(*this, this->action_key_press_),
- action_key_release_emitter_(*this, this->action_key_release_),
- alt_key_emitter_(*this, this->alt_key_),
- control_key_emitter_(*this, this->control_key_),
- is_active_emitter_(*this, this->is_active_),
- key_press_emitter_(*this, this->key_press_),
- key_release_emitter_(*this, this->key_release_),
- shift_key_emitter_(*this, this->shift_key_)
- {}
-
- /**
- * @brief Destroy.
- */
- key_sensor_node::~key_sensor_node() OPENVRML_NOTHROW
- {}
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const string_sensor_metatype::id =
- "urn:X-openvrml:node:StringSensor";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c string_sensor_metatype.
- */
- string_sensor_metatype::string_sensor_metatype(openvrml::browser & browser):
- node_metatype(string_sensor_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- string_sensor_metatype::~string_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 StringSensor nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by string_sensor_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- string_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, 6> 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,
- "deletionAllowed"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfbool_id,
- "enabled"),
- node_interface(node_interface::eventout_id,
- field_value::sfstring_id,
- "enteredText"),
- node_interface(node_interface::eventout_id,
- field_value::sfstring_id,
- "finalText"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isActive")
- };
- typedef node_type_impl<string_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,
- &string_sensor_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &string_sensor_node::deletion_allowed_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &string_sensor_node::enabled_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &string_sensor_node::entered_text_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &string_sensor_node::final_text_emitter_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &string_sensor_node::is_active_emitter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
- /**
- * @class string_sensor_node
- *
- * @brief Represents StringSensor node instances.
- */
-
- /**
- * @var string_sensor_node::string_sensor_metatype
- *
- * @brief Class object for StringSensor nodes.
- */
-
- /**
- * @var string_sensor_node::deletion_allowed_
- *
- * @brief deletion_allowed exposedField
- */
-
- /**
- * @var string_sensor_node::enabled_
- *
- * @brief enabled exposedField
- */
-
- /**
- * @var string_sensor_node::entered_text_
- *
- * @brief entered_text eventOut
- */
-
- /**
- * @var string_sensor_node::final_text_
- *
- * @brief final_text eventOut
- */
-
- /**
- * @var string_sensor_node::is_active_
- *
- * @brief is_active eventOut
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the @c node_type associated with this @c node.
- * @param scope the @c scope to which the @c node belongs.
- */
- string_sensor_node::
- string_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),
- deletion_allowed_(*this, true),
- enabled_(*this, true),
- entered_text_emitter_(*this, this->entered_text_),
- final_text_emitter_(*this, this->final_text_),
- is_active_emitter_(*this, this->is_active_)
- {}
-
- /**
- * @brief Destroy.
- */
- string_sensor_node::~string_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,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
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,3643-3644,3646-3647,3649-3650,3654-3655
+ /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/circle2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/circle2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/disk2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/disk2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polyline2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polyline2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polypoint2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polypoint2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/rectangle2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/rectangle2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.cpp:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/triangle_set2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.h:3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
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,3643-3644,3646-3647,3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-grouping/static_group.cpp:3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
/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,3643-3644,3646-3647,3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-grouping/static_group.h:3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
Property changes on: trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-interpolation/coordinate_interpolator2d.cpp:3657-3658
/trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
Property changes on: trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-interpolation/coordinate_interpolator2d.h:3657-3658
/trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
Property changes on: trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-interpolation/position_interpolator2d.cpp:3657-3658
/trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
Property changes on: trunk/src/node/x3d-interpolation/position_interpolator2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-interpolation/position_interpolator2d.h:3657-3658
/trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp:3401-3630
Deleted: trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
===================================================================
--- branches/node-modules/src/node/x3d-key-device-sensor/key_sensor.cpp 2008-09-21 08:06:57 UTC (rev 3658)
+++ trunk/src/node/x3d-key-device-sensor/key_sensor.cpp 2008-09-21 08:22:42 UTC (rev 3659)
@@ -1,305 +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 "key_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;
-using namespace std;
-
-namespace {
-
- class OPENVRML_LOCAL key_sensor_node :
- public abstract_node<key_sensor_node>,
- public child_node {
-
- friend class openvrml_node_x3d_key_device_sensor::key_sensor_metatype;
-
- exposedfield<sfbool> enabled_;
- sfint32 action_key_press_;
- sfint32_emitter action_key_press_emitter_;
- sfint32 action_key_release_;
- sfint32_emitter action_key_release_emitter_;
- sfbool alt_key_;
- sfbool_emitter alt_key_emitter_;
- sfbool control_key_;
- sfbool_emitter control_key_emitter_;
- sfbool is_active_;
- sfbool_emitter is_active_emitter_;
- sfstring key_press_;
- sfstring_emitter key_press_emitter_;
- sfstring key_release_;
- sfstring_emitter key_release_emitter_;
- sfbool shift_key_;
- sfbool_emitter shift_key_emitter_;
-
- public:
- key_sensor_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~key_sensor_node() OPENVRML_NOTHROW;
- };
-
- /**
- * @class key_sensor_node
- *
- * @brief Represents KeySensor node instances.
- */
-
- /**
- * @var key_sensor_node::key_sensor_metatype
- *
- * @brief Class object for KeySensor nodes.
- */
-
- /**
- * @var key_sensor_node::enabled_
- *
- * @brief enabled exposedField
- */
-
- /**
- * @var key_sensor_node::action_key_press_
- *
- * @brief action_key_press eventOut
- */
-
- /**
- * @var key_sensor_node::action_key_release_
- *
- * @brief action_key_release eventOut
- */
-
- /**
- * @var key_sensor_node::alt_key_
- *
- * @brief alt_key eventOut
- */
-
- /**
- * @var key_sensor_node::control_key_
- *
- * @brief control_key eventOut
- */
-
- /**
- * @var key_sensor_node::is_active_
- *
- * @brief is_active eventOut
- */
-
- /**
- * @var key_sensor_node::key_press_
- *
- * @brief key_press eventOut
- */
-
- /**
- * @var key_sensor_node::key_release_
- *
- * @brief key_release eventOut
- */
-
- /**
- * @var key_sensor_node::shift_key_
- *
- * @brief shift_key eventOut
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the @c node_type associated with this @c node.
- * @param scope the @c scope to which the @c node belongs.
- */
- key_sensor_node::
- key_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),
- action_key_press_emitter_(*this, this->action_key_press_),
- action_key_release_emitter_(*this, this->action_key_release_),
- alt_key_emitter_(*this, this->alt_key_),
- control_key_emitter_(*this, this->control_key_),
- is_active_emitter_(*this, this->is_active_),
- key_press_emitter_(*this, this->key_press_),
- key_release_emitter_(*this, this->key_release_),
- shift_key_emitter_(*this, this->shift_key_)
- {}
-
- /**
- * @brief Destroy.
- */
- key_sensor_node::~key_sensor_node() OPENVRML_NOTHROW
- {}
-}
-
-
-/**
- * @brief @c node_metatype identifier.
- */
-const char * const
-openvrml_node_x3d_key_device_sensor::key_sensor_metatype::id =
- "urn:X-openvrml:node:KeySensor";
-
-/**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this @c key_sensor_metatype.
- */
-openvrml_node_x3d_key_device_sensor::key_sensor_metatype::
-key_sensor_metatype(openvrml::browser & browser):
- node_metatype(key_sensor_metatype::id, browser)
-{}
-
-/**
- * @brief Destroy.
- */
-openvrml_node_x3d_key_device_sensor::key_sensor_metatype::
-~key_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 node_type capable of creating KeySensor nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by @c key_sensor_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
-const boost::shared_ptr<openvrml::node_type>
-openvrml_node_x3d_key_device_sensor::key_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, 10> 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::eventout_id,
- field_value::sfint32_id,
- "actionKeyPress"),
- node_interface(node_interface::eventout_id,
- field_value::sfint32_id,
- "actionKeyRelease"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "altKey"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "controlKey"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "isActive"),
- node_interface(node_interface::eventout_id,
- field_value::sfstring_id,
- "keyPress"),
- node_interface(node_interface::eventout_id,
- field_value::sfstring_id,
- "keyRelease"),
- node_interface(node_interface::eventout_id,
- field_value::sfbool_id,
- "shiftKey")
- };
- typedef node_type_impl<key_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_...
[truncated message content] |
