From: <br...@us...> - 2008-09-22 00:38:04
|
Revision: 3666 http://openvrml.svn.sourceforge.net/openvrml/?rev=3666&view=rev Author: braden Date: 2008-09-22 00:37:53 +0000 (Mon, 22 Sep 2008) Log Message: ----------- Moved X3D DIS 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_dis.cpp Added Paths: ----------- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj trunk/src/node/x3d-dis/ trunk/src/node/x3d-dis/espdu_transform.cpp trunk/src/node/x3d-dis/espdu_transform.h trunk/src/node/x3d-dis/receiver_pdu.cpp trunk/src/node/x3d-dis/receiver_pdu.h trunk/src/node/x3d-dis/signal_pdu.cpp trunk/src/node/x3d-dis/signal_pdu.h trunk/src/node/x3d-dis/transmitter_pdu.cpp trunk/src/node/x3d-dis/transmitter_pdu.h Removed Paths: ------------- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj trunk/src/node/x3d-dis/espdu_transform.cpp trunk/src/node/x3d-dis/espdu_transform.h trunk/src/node/x3d-dis/receiver_pdu.cpp trunk/src/node/x3d-dis/receiver_pdu.h trunk/src/node/x3d-dis/signal_pdu.cpp trunk/src/node/x3d-dis/signal_pdu.h trunk/src/node/x3d-dis/transmitter_pdu.cpp trunk/src/node/x3d-dis/transmitter_pdu.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-event-utilities/boolean_filter.cpp trunk/src/node/x3d-event-utilities/boolean_filter.h trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp trunk/src/node/x3d-event-utilities/boolean_sequencer.h trunk/src/node/x3d-event-utilities/boolean_toggle.cpp trunk/src/node/x3d-event-utilities/boolean_toggle.h trunk/src/node/x3d-event-utilities/boolean_trigger.cpp trunk/src/node/x3d-event-utilities/boolean_trigger.h trunk/src/node/x3d-event-utilities/integer_sequencer.cpp trunk/src/node/x3d-event-utilities/integer_sequencer.h trunk/src/node/x3d-event-utilities/integer_trigger.cpp trunk/src/node/x3d-event-utilities/integer_trigger.h trunk/src/node/x3d-event-utilities/time_trigger.cpp trunk/src/node/x3d-event-utilities/time_trigger.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-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 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,3657-3658,3661-3662 + /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-21 23:21:48 UTC (rev 3665) +++ trunk/ChangeLog 2008-09-22 00:37:53 UTC (rev 3666) @@ -1,5 +1,26 @@ 2008-09-21 Braden McDaniel <br...@en...> + Moved X3D DIS node implementations into a convenience + library. + + * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added + x3d-dis static library project. + * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj + * src/Makefile.am: Added convenience library + node/x3d-dis/libx3d-dis.la. + * src/libopenvrml/openvrml/x3d_dis.cpp: Moved node implementations + to separate files. + * src/node/x3d-dis/espdu_transform.cpp + * src/node/x3d-dis/espdu_transform.h + * src/node/x3d-dis/receiver_pdu.cpp + * src/node/x3d-dis/receiver_pdu.h + * src/node/x3d-dis/signal_pdu.cpp + * src/node/x3d-dis/signal_pdu.h + * src/node/x3d-dis/transmitter_pdu.cpp + * src/node/x3d-dis/transmitter_pdu.h + +2008-09-21 Braden McDaniel <br...@en...> + Moved X3D Event Utilities node implementations into a convenience library. Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln =================================================================== --- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 23:21:48 UTC (rev 3665) +++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-22 00:37:53 UTC (rev 3666) @@ -5,6 +5,7 @@ {CE946E0C-4880-4AB0-9170-42D6692791CC} = {CE946E0C-4880-4AB0-9170-42D6692791CC} {78133A10-3ADF-474C-B32A-74124A976482} = {78133A10-3ADF-474C-B32A-74124A976482} {E20E0E24-C0B6-4448-82E0-32CCDBA88957} = {E20E0E24-C0B6-4448-82E0-32CCDBA88957} + {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5} = {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5} {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} @@ -69,6 +70,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-event-utilities", "x3d-event-utilities\x3d-event-utilities.vcproj", "{CE946E0C-4880-4AB0-9170-42D6692791CC}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-dis", "x3d-dis\x3d-dis.vcproj", "{D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -147,6 +150,10 @@ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Debug|Win32.Build.0 = Debug|Win32 {CE946E0C-4880-4AB0-9170-42D6692791CC}.Release|Win32.ActiveCfg = Release|Win32 {CE946E0C-4880-4AB0-9170-42D6692791CC}.Release|Win32.Build.0 = Release|Win32 + {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Debug|Win32.Build.0 = Debug|Win32 + {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Release|Win32.ActiveCfg = Release|Win32 + {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis ___________________________________________________________________ Added: svn:ignore + Debug Release x3d-dis.vcproj.*.user Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj =================================================================== --- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj 2008-09-21 23:21:48 UTC (rev 3665) +++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj 2008-09-22 00:37:53 UTC (rev 3666) @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="x3d-dis" - ProjectGUID="{D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}" - RootNamespace="x3ddis" - 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-dis\espdu_transform.cpp" - > - </File> - <File - RelativePath="..\..\..\..\..\src\node\x3d-dis\receiver_pdu.cpp" - > - </File> - <File - RelativePath="..\..\..\..\..\src\node\x3d-dis\signal_pdu.cpp" - > - </File> - <File - RelativePath="..\..\..\..\..\src\node\x3d-dis\transmitter_pdu.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-dis\espdu_transform.h" - > - </File> - <File - RelativePath="..\..\..\..\..\src\node\x3d-dis\receiver_pdu.h" - > - </File> - <File - RelativePath="..\..\..\..\..\src\node\x3d-dis\signal_pdu.h" - > - </File> - <File - RelativePath="..\..\..\..\..\src\node\x3d-dis\transmitter_pdu.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-dis/x3d-dis.vcproj (from rev 3665, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj) =================================================================== --- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj (rev 0) +++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj 2008-09-22 00:37:53 UTC (rev 3666) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="x3d-dis" + ProjectGUID="{D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}" + RootNamespace="x3ddis" + 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-dis\espdu_transform.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\node\x3d-dis\receiver_pdu.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\node\x3d-dis\signal_pdu.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\node\x3d-dis\transmitter_pdu.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-dis\espdu_transform.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\node\x3d-dis\receiver_pdu.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\node\x3d-dis\signal_pdu.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\node\x3d-dis\transmitter_pdu.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 23:21:48 UTC (rev 3665) +++ trunk/src/Makefile.am 2008-09-22 00:37:53 UTC (rev 3666) @@ -14,7 +14,8 @@ node/x3d-texturing/libx3d-texturing.la \ node/x3d-interpolation/libx3d-interpolation.la \ node/x3d-key-device-sensor/libx3d-key-device-sensor.la \ - node/x3d-event-utilities/libx3d-event-utilities.la + node/x3d-event-utilities/libx3d-event-utilities.la \ + node/x3d-dis/libx3d-dis.la if ENABLE_GL_RENDERER lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la endif @@ -157,6 +158,7 @@ node/x3d-interpolation/libx3d-interpolation.la \ node/x3d-key-device-sensor/libx3d-key-device-sensor.la \ node/x3d-event-utilities/libx3d-event-utilities.la \ + node/x3d-dis/libx3d-dis.la \ -lboost_thread$(BOOST_LIB_SUFFIX) \ -lboost_filesystem$(BOOST_LIB_SUFFIX) \ -lltdl @@ -483,6 +485,21 @@ node/x3d-event-utilities/time_trigger.cpp \ node/x3d-event-utilities/time_trigger.h +node_x3d_dis_libx3d_dis_la_CPPFLAGS = \ + -I$(top_builddir)/src/libopenvrml \ + -I$(top_srcdir)/src/libopenvrml +node_x3d_dis_libx3d_dis_la_CXXFLAGS = \ + $(PTHREAD_CFLAGS) +node_x3d_dis_libx3d_dis_la_SOURCES = \ + node/x3d-dis/espdu_transform.cpp \ + node/x3d-dis/espdu_transform.h \ + node/x3d-dis/receiver_pdu.cpp \ + node/x3d-dis/receiver_pdu.h \ + node/x3d-dis/signal_pdu.cpp \ + node/x3d-dis/signal_pdu.h \ + node/x3d-dis/transmitter_pdu.cpp \ + node/x3d-dis/transmitter_pdu.h + libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml \ Modified: trunk/src/libopenvrml/openvrml/x3d_dis.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/x3d_dis.cpp 2008-09-21 23:21:48 UTC (rev 3665) +++ trunk/src/libopenvrml/openvrml/x3d_dis.cpp 2008-09-22 00:37:53 UTC (rev 3666) @@ -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,98 +18,22 @@ // along with this library; if not, see <http://www.gnu.org/licenses/>. // +# include "x3d_dis.h" +# include "browser.h" +# include <x3d-dis/espdu_transform.h> +# include <x3d-dis/receiver_pdu.h> +# include <x3d-dis/signal_pdu.h> +# include <x3d-dis/transmitter_pdu.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_dis.h" - -using namespace openvrml; -using namespace openvrml::node_impl_util; -using namespace std; - -namespace { - - /** - * @brief Class object for EspduTransform nodes. - */ - class OPENVRML_LOCAL espdu_transform_metatype : public node_metatype { - public: - static const char * const id; - - explicit espdu_transform_metatype(openvrml::browser & browser); - virtual ~espdu_transform_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 ReceiverPdu nodes. - */ - class OPENVRML_LOCAL receiver_pdu_metatype : public node_metatype { - public: - static const char * const id; - - explicit receiver_pdu_metatype(openvrml::browser & browser); - virtual ~receiver_pdu_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 SignalPdu nodes. - */ - class OPENVRML_LOCAL signal_pdu_metatype : public node_metatype { - public: - static const char * const id; - - explicit signal_pdu_metatype(openvrml::browser & browser); - virtual ~signal_pdu_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 TransmitterPdu nodes. - */ - class OPENVRML_LOCAL transmitter_pdu_metatype : public node_metatype { - public: - static const char * const id; - - explicit transmitter_pdu_metatype(openvrml::browser & browser); - virtual ~transmitter_pdu_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_dis_node_metatypes(openvrml::browser & b) { using boost::shared_ptr; using openvrml::node_metatype; + using namespace openvrml_node_x3d_dis; b.add_node_metatype(espdu_transform_metatype::id, shared_ptr<node_metatype>( new espdu_transform_metatype(b))); @@ -122,3781 +46,3 @@ shared_ptr<node_metatype>( new transmitter_pdu_metatype(b))); } - -namespace { - using namespace openvrml_; - - class OPENVRML_LOCAL espdu_transform_node : - public abstract_node<espdu_transform_node>, - public child_node { - - friend class espdu_transform_metatype; - - class add_children_listener : public event_listener_base<self_t>, - public mfnode_listener { - public: - explicit add_children_listener(self_t & node); - virtual ~add_children_listener() OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const mfnode & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class remove_children_listener : public event_listener_base<self_t>, - public mfnode_listener { - public: - explicit remove_children_listener(self_t & node); - virtual ~remove_children_listener() OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const mfnode & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value0_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value0_listener(self_t & node); - virtual ~set_articulation_parameter_value0_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value1_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value1_listener(self_t & node); - virtual ~set_articulation_parameter_value1_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value2_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value2_listener(self_t & node); - virtual ~set_articulation_parameter_value2_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value3_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value3_listener(self_t & node); - virtual ~set_articulation_parameter_value3_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value4_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value4_listener(self_t & node); - virtual ~set_articulation_parameter_value4_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value5_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value5_listener(self_t & node); - virtual ~set_articulation_parameter_value5_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value6_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value6_listener(self_t & node); - virtual ~set_articulation_parameter_value6_listener() - OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - class set_articulation_parameter_value7_listener : - public event_listener_base<self_t>, - public sffloat_listener { - public: - explicit set_articulation_parameter_value7_listener(self_t & node); - virtual ~set_articulation_parameter_value7_listener() OPENVRML_NOTHROW; - - private: - virtual void do_process_event(const sffloat & fraction, - double timestamp) - OPENVRML_THROW1(std::bad_alloc); - }; - - add_children_listener add_children_listener_; - remove_children_listener remove_children_listener_; - set_articulation_parameter_value0_listener set_articulation_parameter_value0_listener_; - set_articulation_parameter_value1_listener set_articulation_parameter_value1_listener_; - set_articulation_parameter_value2_listener set_articulation_parameter_value2_listener_; - set_articulation_parameter_value3_listener set_articulation_parameter_value3_listener_; - set_articulation_parameter_value4_listener set_articulation_parameter_value4_listener_; - set_articulation_parameter_value5_listener set_articulation_parameter_value5_listener_; - set_articulation_parameter_value6_listener set_articulation_parameter_value6_listener_; - set_articulation_parameter_value7_listener set_articulation_parameter_value7_listener_; - exposedfield<sfstring> address_; - exposedfield<sfint32> application_id_; - exposedfield<sfint32> articulation_parameter_count_; - exposedfield<mfint32> articulation_parameter_designator_array_; - exposedfield<mfint32> articulation_parameter_change_indicator_array_; - exposedfield<mfint32> articulation_parameter_id_part_attached_to_array_; - exposedfield<mfint32> articulation_parameter_type_array_; - exposedfield<mffloat> articulation_parameter_array_; - exposedfield<sfvec3f> center_; - exposedfield<mfnode> children_; - exposedfield<sfint32> collision_type_; - exposedfield<sfint32> dead_reckoning_; - exposedfield<sfvec3f> detonation_location_; - exposedfield<sfvec3f> detonation_relative_location_; - exposedfield<sfint32> detonation_result_; - exposedfield<sfint32> entity_category_; - exposedfield<sfint32> entity_country_; - exposedfield<sfint32> entity_domain_; - exposedfield<sfint32> entity_extra_; - exposedfield<sfint32> entity_id_; - exposedfield<sfint32> entity_kind_; - exposedfield<sfint32> entity_specific_; - exposedfield<sfint32> entity_sub_category_; - exposedfield<sfint32> event_application_id_; - exposedfield<sfint32> event_entity_id_; - exposedfield<sfint32> event_number_; - exposedfield<sfint32> event_site_id_; - exposedfield<sfbool> fired1_; - exposedfield<sfbool> fired2_; - exposedfield<sfint32> fire_mission_index_; - exposedfield<sffloat> firing_range_; - exposedfield<sfint32> firing_rate_; - exposedfield<sfint32> force_id_; - exposedfield<sfint32> fuse_; - exposedfield<sfvec3f> linear_velocity_; - exposedfield<sfvec3f> linear_acceleration_; - exposedfield<sfstring> marking_; - exposedfield<sfstring> multicast_relay_host_; - exposedfield<sfint32> multicast_relay_port_; - exposedfield<sfint32> munition_application_id_; - exposedfield<sfvec3f> munition_end_point_; - exposedfield<sfint32> munition_entity_id_; - exposedfield<sfint32> munition_quantity_; - exposedfield<sfint32> munition_site_id_; - exposedfield<sfvec3f> munition_start_point_; - exposedfield<sfstring> network_mode_; - exposedfield<sfint32> port_; - exposedfield<sftime> read_interval_; - exposedfield<sfrotation> rotation_; - exposedfield<sfvec3f> scale_; - exposedfield<sfrotation> scale_orientation_; - exposedfield<sfint32> site_id_; - exposedfield<sfvec3f> translation_; - exposedfield<sfint32> warhead_; - exposedfield<sftime> write_interval_; - sffloat articulation_parameter_value0_changed_; - sffloat_emitter articulation_parameter_value0_changed_emitter_; - sffloat articulation_parameter_value1_changed_; - sffloat_emitter articulation_parameter_value1_changed_emitter_; - sffloat articulation_parameter_value2_changed_; - sffloat_emitter articulation_parameter_value2_changed_emitter_; - sffloat articulation_parameter_value3_changed_; - sffloat_emitter articulation_parameter_value3_changed_emitter_; - sffloat articulation_parameter_value4_changed_; - sffloat_emitter articulation_parameter_value4_changed_emitter_; - sffloat articulation_parameter_value5_changed_; - sffloat_emitter articulation_parameter_value5_changed_emitter_; - sffloat articulation_parameter_value6_changed_; - sffloat_emitter articulation_parameter_value6_changed_emitter_; - sffloat articulation_parameter_value7_changed_; - sffloat_emitter articulation_parameter_value7_changed_emitter_; - sftime collide_time_; - sftime_emitter collide_time_emitter_; - sftime detonate_time_; - sftime_emitter detonate_time_emitter_; - sftime fired_time_; - sftime_emitter fired_time_emitter_; - sfbool is_active_; - sfbool_emitter is_active_emitter_; - sfbool is_collided_; - sfbool_emitter is_collided_emitter_; - sfbool is_detonated_; - sfbool_emitter is_detonated_emitter_; - sfbool is_network_reader_; - sfbool_emitter is_network_reader_emitter_; - sfbool is_network_writer_; - sfbool_emitter is_network_writer_emitter_; - sfbool is_rtp_header_heard_; - sfbool_emitter is_rtp_header_heard_emitter_; - sfbool is_stand_alone_; - sfbool_emitter is_stand_alone_emitter_; - sftime timestamp_; - sftime_emitter timestamp_emitter_; - sfvec3f bbox_center_; - sfvec3f bbox_size_; - sfbool rtp_header_expected_; - - public: - espdu_transform_node(const node_type & type, - const boost::shared_ptr<openvrml::scope> & scope); - virtual ~espdu_transform_node() OPENVRML_NOTHROW; - }; - - class OPENVRML_LOCAL receiver_pdu_node : - public abstract_node<receiver_pdu_node>, - public child_node { - - friend class receiver_pdu_metatype; - - exposedfield<sfstring> address_; - exposedfield<sfint32> application_id_; - exposedfield<sfint32> entity_id_; - exposedfield<sfstring> multicast_relay_host_; - exposedfield<sfint32> multicast_relay_port_; - exposedfield<sfstring> network_mode_; - exposedfield<sfint32> port_; - exposedfield<sfint32> radio_id_; - exposedfield<sffloat> read_interval_; - exposedfield<sffloat> received_power_; - exposedfield<sfint32> receiver_state_; - exposedfield<sfbool> rtp_header_expected_; - exposedfield<sfint32> site_id_; - exposedfield<sfint32> transmitter_application_id_; - exposedfield<sfint32> transmitter_entity_id_; - exposedfield<sfint32> transmitter_radio_id_; - exposedfield<sfint32> transmitter_site_id_; - exposedfield<sfint32> which_geometry_; - exposedfield<sffloat> write_interval_; - sfbool is_active_; - sfbool_emitter is_active_emitter_; - sfbool is_network_reader_; - sfbool_emitter is_network_reader_emitter_; - sfbool is_network_writer_; - sfbool_emitter is_network_writer_emitter_; - sfbool is_rtp_header_heard_; - sfbool_emitter is_rtp_header_heard_emitter_; - sfbool is_stand_alone_; - sfbool_emitter is_stand_alone_emitter_; - sftime timestamp_; - sftime_emitter timestamp_emitter_; - sfvec3f bbox_center_; - sfvec3f bbox_size_; - - public: - receiver_pdu_node(const node_type & type, - const boost::shared_ptr<openvrml::scope> & scope); - virtual ~receiver_pdu_node() OPENVRML_NOTHROW; - }; - - class OPENVRML_LOCAL signal_pdu_node : - public abstract_node<signal_pdu_node>, - public child_node { - - friend class signal_pdu_metatype; - - exposedfield<sfstring> address_; - exposedfield<sfint32> application_id_; - exposedfield<mfint32> data_; - exposedfield<sfint32> data_length_; - exposedfield<sfint32> encoding_scheme_; - exposedfield<sfint32> entity_id_; - exposedfield<sfstring> multicast_relay_host_; - exposedfield<sfint32> multicast_relay_port_; - exposedfield<sfstring> network_mode_; - exposedfield<sfint32> port_; - exposedfield<sfint32> radio_id_; - exposedfield<sffloat> read_interval_; - exposedfield<sfbool> rtp_header_expected_; - exposedfield<sfint32> sample_rate_; - exposedfield<sfint32> samples_; - exposedfield<sfint32> site_id_; - exposedfield<sfint32> tdl_type_; - exposedfield<sfint32> which_geometry_; - exposedfield<sffloat> write_interval_; - sfbool is_active_; - sfbool_emitter is_active_emitter_; - sfbool is_network_reader_; - sfbool_emitter is_network_reader_emitter_; - sfbool is_network_writer_; - sfbool_emitter is_network_writer_emitter_; - sfbool is_rtp_header_heard_; - sfbool_emitter is_rtp_header_heard_emitter_; - sfbool is_stand_alone_; - sfbool_emitter is_stand_alone_emitter_; - sftime timestamp_; - sftime_emitter timestamp_emitter_; - sfvec3f bbox_center_; - sfvec3f bbox_size_; - - public: - signal_pdu_node(const node_type & type, - const boost::shared_ptr<openvrml::scope> & scope); - virtual ~signal_pdu_node() OPENVRML_NOTHROW; - }; - - class OPENVRML_LOCAL transmitter_pdu_node : - public abstract_node<transmitter_pdu_node>, - public child_node { - - friend class transmitter_pdu_metatype; - - exposedfield<sfstring> address_; - exposedfield<sfvec3f> antenna_location_; - exposedfield<mfint32> antenna_pattern_length_; - exposedfield<mfint32> antenna_pattern_type_; - exposedfield<sfint32> application_id_; - exposedfield<mfint32> crypto_key_id_; - exposedfield<mfint32> crypto_system_; - exposedfield<sfint32> entity_id_; - exposedfield<mfint32> frequency_; - exposedfield<mfint32> input_source_; - exposedfield<mfint32> length_of_modulation_parameters_; - exposedfield<mfint32> modulation_type_detail_; - exposedfield<mfint32> modulation_type_major_; - exposedfield<mfint32> modulation_type_spread_spectrum_; - exposedfield<mfint32> modulation_type_system_; - exposedfield<sfstring> multicast_relay_host_; - exposedfield<sfint32> multicast_relay_port_; - exposedfield<sfstring> network_mode_; - exposedfield<sfint32> port_; - exposedfield<sfint32> power_; - exposedfield<sfint32> radio_entity_type_category_; - exposedfield<sfint32> radio_entity_type_country_; - exposedfield<sfint32> radio_entity_type_domain_; - exposedfield<sfint32> radio_entity_type_kind_; - exposedfield<sfint32> radio_entity_type_nomenclature_; - exposedfield<sfint32> radio_entity_type_nomenclature_version_; - exposedfield<sfint32> radio_id_; - exposedfield<sffloat> read_interval_; - exposedfield<sfvec3f> relative_antenna_location_; - exposedfield<sfbool> rtp_header_expected_; - exposedfield<sfint32> site_id_; - exposedfield<sffloat> transmit_frequency_bandwidth_; - exposedfield<sfint32> transmit_state_; - exposedfield<sfint32> which_geometry_; - exposedfield<sffloat> write_interval_; - sfbool is_active_; - sfbool_emitter is_active_emitter_; - sfbool is_network_reader_; - sfbool_emitter is_network_reader_emitter_; - sfbool is_network_writer_; - sfbool_emitter is_network_writer_emitter_; - sfbool is_rtp_header_heard_; - sfbool_emitter is_rtp_header_heard_emitter_; - sfbool is_stand_alone_; - sfbool_emitter is_stand_alone_emitter_; - sftime timestamp_; - sftime_emitter timestamp_emitter_; - sfvec3f bbox_center_; - sfvec3f bbox_size_; - - public: - transmitter_pdu_node(const node_type & type, - const boost::shared_ptr<openvrml::scope> & scope); - virtual ~transmitter_pdu_node() OPENVRML_NOTHROW; - }; - - - /** - * @brief @c node_metatype identifier. - */ - const char * const espdu_transform_metatype::id = - "urn:X-openvrml:node:EspduTransform"; - - /** - * @brief Construct. - * - * @param browser the @c browser associated with this - * @c espdu_transform_metatype. - */ - espdu_transform_metatype::espdu_transform_metatype(openvrml::browser & browser): - node_metatype(espdu_transform_metatype::id, browser) - {} - - /** - * @brief Destroy. - */ - espdu_transform_metatype::~espdu_transform_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 @c node_type capable of creating EspduTransform nodes. - * - * @exception unsupported_interface if @p interfaces includes an interface - * not supported by espdu_transform_metatype. - * @exception std::bad_alloc if memory allocation fails. - */ - const boost::shared_ptr<openvrml::node_type> - espdu_transform_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, 88> 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::eventin_id, - field_value::mfnode_id, - "addChildren"), - node_interface(node_interface::eventin_id, - field_value::mfnode_id, - "removeChildren"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue0"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue1"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue2"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue3"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue4"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue5"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue6"), - node_interface(node_interface::eventin_id, - field_value::sffloat_id, - "set_articulationParameterValue7"), - node_interface(node_interface::exposedfield_id, - field_value::sfstring_id, - "address"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "applicationID"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "articulationParameterCount"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "articulationParameterDesignatorArray"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "articulationParameterChangeIndicatorArray"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "articulationParameterIdPartAttachedToArray"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "articulationParameterTypeArray"), - node_interface(node_interface::exposedfield_id, - field_value::mffloat_id, - "articulationParameterArray"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "center"), - node_interface(node_interface::exposedfield_id, - field_value::mfnode_id, - "children"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "collisionType"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "deadReckoning"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "detonationLocation"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "detonationRelativeLocation"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "detonationResult"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entityCategory"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entityCountry"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entityDomain"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entityExtra"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entityID"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entityKind"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entitySpecific"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "entitySubCategory"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "eventApplicationID"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "eventEntityID"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "eventNumber"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "eventSiteID"), - node_interface(node_interface::exposedfield_id, - field_value::sfbool_id, - "fired1"), - node_interface(node_interface::exposedfield_id, - field_value::sfbool_id, - "fired2"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "fireMissionIndex"), - node_interface(node_interface::exposedfield_id, - field_value::sffloat_id, - "firingRange"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "firingRate"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "forceID"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "fuse"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "linearVelocity"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "linearAcceleration"), - node_interface(node_interface::exposedfield_id, - field_value::sfstring_id, - "marking"), - node_interface(node_interface::exposedfield_id, - field_value::sfstring_id, - "multicastRelayHost"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "multicastRelayPort"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "munitionApplicationID"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "munitionEndPoint"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "munitionEntityID"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "munitionQuantity"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "munitionSiteID"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "munitionStartPoint"), - node_interface(node_interface::exposedfield_id, - field_value::sfstring_id, - "networkMode"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "port"), - node_interface(node_interface::exposedfield_id, - field_value::sftime_id, - "readInterval"), - node_interface(node_interface::exposedfield_id, - field_value::sfrotation_id, - "rotation"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "scale"), - node_interface(node_interface::exposedfield_id, - field_value::sfrotation_id, - "scaleOrientation"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "siteID"), - node_interface(node_interface::exposedfield_id, - field_value::sfvec3f_id, - "translation"), - node_interface(node_interface::exposedfield_id, - field_value::sfint32_id, - "warhead"), - node_interface(node_interface::exposedfield_id, - field_value::sftime_id, - "writeInterval"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue0_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue1_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue2_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue3_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue4_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue5_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue6_changed"), - node_interface(node_interface::eventout_id, - field_value::sffloat_id, - "articulationParameterValue7_changed"), - node_interface(node_interface::eventout_id, - field_value::sftime_id, - "collideTime"), - node_interface(node_interface::eventout_id, - field_value::sftime_id, - "detonateTime"), - node_interface(node_interface::eventout_id, - field_value::sftime_id, - "firedTime"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isActive"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isCollided"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isDetonated"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isNetworkReader"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isNetworkWriter"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isRtpHeaderHeard"), - node_interface(node_interface::eventout_id, - field_value::sfbool_id, - "isStandAlone"), - node_interface(node_interface::eventout_id, - field_value::sftime_id, - "timestamp"), - node_interface(node_interface::field_id, - field_value::sfvec3f_id, - "bboxCenter"), - node_interface(node_interface::field_id, - field_value::sfvec3f_id, - "bboxSize"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "rtpHeaderExpected") - }; - typedef node_type_impl<espdu_transform_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, - &espdu_transform_node::metadata); - } else if (*interface_ == *++supported_interface) { - the_node_type.add_eventin( - supported_interface->field_type, - supported_interface->id, - &espdu_transform_node::add_children_listener_); - } else if (*interface_ == *++supported_interface) { - the_node_type.add_eventin( - supported_interface->field_type, - supported_interface->id, - &espdu_transform_node::remove_children_listener_); - } else if (*interface_ == *++supported_interface) { - the_node_type.add_eventin( - supported_interface->field_type, - supported_interface->id, - &espdu_transform_node::se... [truncated message content] |