Menu
▾
▴
SF.net SVN: openvrml:[3675] trunk
|
From: <br...@us...> - 2008-09-23 03:02:03
|
Revision: 3675
http://openvrml.svn.sourceforge.net/openvrml/?rev=3675&view=rev
Author: braden
Date: 2008-09-23 03:01:49 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Moved X3D H-Anim 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_hanim.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
trunk/src/node/x3d-h-anim/
trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
trunk/src/node/x3d-h-anim/h_anim_displacer.h
trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
trunk/src/node/x3d-h-anim/h_anim_humanoid.h
trunk/src/node/x3d-h-anim/h_anim_joint.cpp
trunk/src/node/x3d-h-anim/h_anim_joint.h
trunk/src/node/x3d-h-anim/h_anim_segment.cpp
trunk/src/node/x3d-h-anim/h_anim_segment.h
trunk/src/node/x3d-h-anim/h_anim_site.cpp
trunk/src/node/x3d-h-anim/h_anim_site.h
Removed Paths:
-------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
trunk/src/node/x3d-h-anim/h_anim_displacer.h
trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
trunk/src/node/x3d-h-anim/h_anim_humanoid.h
trunk/src/node/x3d-h-anim/h_anim_joint.cpp
trunk/src/node/x3d-h-anim/h_anim_joint.h
trunk/src/node/x3d-h-anim/h_anim_segment.cpp
trunk/src/node/x3d-h-anim/h_anim_segment.h
trunk/src/node/x3d-h-anim/h_anim_site.cpp
trunk/src/node/x3d-h-anim/h_anim_site.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-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
trunk/src/node/x3d-environmental-effects/texture_background.cpp
trunk/src/node/x3d-environmental-effects/texture_background.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-geospatial/geo_coordinate.cpp
trunk/src/node/x3d-geospatial/geo_coordinate.h
trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp
trunk/src/node/x3d-geospatial/geo_elevation_grid.h
trunk/src/node/x3d-geospatial/geo_location.cpp
trunk/src/node/x3d-geospatial/geo_location.h
trunk/src/node/x3d-geospatial/geo_lod.cpp
trunk/src/node/x3d-geospatial/geo_lod.h
trunk/src/node/x3d-geospatial/geo_metadata.cpp
trunk/src/node/x3d-geospatial/geo_metadata.h
trunk/src/node/x3d-geospatial/geo_origin.cpp
trunk/src/node/x3d-geospatial/geo_origin.h
trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp
trunk/src/node/x3d-geospatial/geo_position_interpolator.h
trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp
trunk/src/node/x3d-geospatial/geo_touch_sensor.h
trunk/src/node/x3d-geospatial/geo_viewpoint.cpp
trunk/src/node/x3d-geospatial/geo_viewpoint.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,3664-3665,3667-3668,3670-3671
+ /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,3667-3668,3670-3671,3673-3674
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-23 02:46:13 UTC (rev 3674)
+++ trunk/ChangeLog 2008-09-23 03:01:49 UTC (rev 3675)
@@ -1,10 +1,33 @@
2008-09-22 Braden McDaniel <br...@en...>
+ Moved X3D H-Anim node implementations into a convenience
+ library.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added
+ x3d-h-anim static library project.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
+ * src/Makefile.am: Added convenience library
+ node/x3d-h-anim/libx3d-h-anim.la.
+ * src/libopenvrml/openvrml/x3d_hanim.cpp: Moved node
+ implementations to separate files.
+ * src/node/x3d-h-anim/h_anim_joint.cpp
+ * src/node/x3d-h-anim/h_anim_humanoid.cpp
+ * src/node/x3d-h-anim/h_anim_site.cpp
+ * src/node/x3d-h-anim/h_anim_displacer.cpp
+ * src/node/x3d-h-anim/h_anim_segment.h
+ * src/node/x3d-h-anim/h_anim_joint.h
+ * src/node/x3d-h-anim/h_anim_humanoid.h
+ * src/node/x3d-h-anim/h_anim_site.h
+ * src/node/x3d-h-anim/h_anim_displacer.h
+ * src/node/x3d-h-anim/h_anim_segment.cpp
+
+2008-09-22 Braden McDaniel <br...@en...>
+
Moved X3D Geospatial node implementations into a convenience
library.
* ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added
- x3d-environmental-effects static library project.
+ x3d-geospatial static library project.
* ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj
* src/Makefile.am: Added convenience library
node/x3d-geospatial/libx3d-geospatial.la.
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-23 02:46:13 UTC (rev 3674)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-23 03:01:49 UTC (rev 3675)
@@ -4,6 +4,7 @@
ProjectSection(ProjectDependencies) = postProject
{CE946E0C-4880-4AB0-9170-42D6692791CC} = {CE946E0C-4880-4AB0-9170-42D6692791CC}
{78133A10-3ADF-474C-B32A-74124A976482} = {78133A10-3ADF-474C-B32A-74124A976482}
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2} = {3DA77516-5D3A-42AA-8D99-BF87643A75A2}
{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}
@@ -78,6 +79,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-geospatial", "x3d-geospatial\x3d-geospatial.vcproj", "{3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-h-anim", "x3d-h-anim\x3d-h-anim.vcproj", "{3DA77516-5D3A-42AA-8D99-BF87643A75A2}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -168,6 +171,10 @@
{3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Debug|Win32.Build.0 = Debug|Win32
{3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Release|Win32.ActiveCfg = Release|Win32
{3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Release|Win32.Build.0 = Release|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Debug|Win32.Build.0 = Debug|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Release|Win32.ActiveCfg = Release|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
x3d-h-anim.vcproj.*.user
Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj 2008-09-23 02:46:13 UTC (rev 3674)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj 2008-09-23 03:01:49 UTC (rev 3675)
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x3d-h-anim"
- ProjectGUID="{3DA77516-5D3A-42AA-8D99-BF87643A75A2}"
- RootNamespace="x3dhanim"
- 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-h-anim\h_anim_displacer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_humanoid.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_joint.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_segment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_site.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-h-anim\h_anim_displacer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_humanoid.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_joint.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_segment.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_site.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-h-anim/x3d-h-anim.vcproj (from rev 3674, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj)
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj 2008-09-23 03:01:49 UTC (rev 3675)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="x3d-h-anim"
+ ProjectGUID="{3DA77516-5D3A-42AA-8D99-BF87643A75A2}"
+ RootNamespace="x3dhanim"
+ 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-h-anim\h_anim_displacer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_humanoid.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_joint.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_segment.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_site.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-h-anim\h_anim_displacer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_humanoid.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_joint.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_segment.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-h-anim\h_anim_site.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-23 02:46:13 UTC (rev 3674)
+++ trunk/src/Makefile.am 2008-09-23 03:01:49 UTC (rev 3675)
@@ -17,7 +17,8 @@
node/x3d-event-utilities/libx3d-event-utilities.la \
node/x3d-dis/libx3d-dis.la \
node/x3d-environmental-effects/libx3d-environmental-effects.la \
- node/x3d-geospatial/libx3d-geospatial.la
+ node/x3d-geospatial/libx3d-geospatial.la \
+ node/x3d-h-anim/libx3d-h-anim.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
@@ -163,6 +164,7 @@
node/x3d-dis/libx3d-dis.la \
node/x3d-environmental-effects/libx3d-environmental-effects.la \
node/x3d-geospatial/libx3d-geospatial.la \
+ node/x3d-h-anim/libx3d-h-anim.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
-lboost_filesystem$(BOOST_LIB_SUFFIX) \
-lltdl
@@ -540,6 +542,23 @@
node/x3d-geospatial/geo_viewpoint.cpp \
node/x3d-geospatial/geo_viewpoint.h
+node_x3d_h_anim_libx3d_h_anim_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+node_x3d_h_anim_libx3d_h_anim_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS)
+node_x3d_h_anim_libx3d_h_anim_la_SOURCES = \
+ node/x3d-h-anim/h_anim_displacer.cpp \
+ node/x3d-h-anim/h_anim_displacer.h \
+ node/x3d-h-anim/h_anim_humanoid.cpp \
+ node/x3d-h-anim/h_anim_humanoid.h \
+ node/x3d-h-anim/h_anim_joint.cpp \
+ node/x3d-h-anim/h_anim_joint.h \
+ node/x3d-h-anim/h_anim_segment.cpp \
+ node/x3d-h-anim/h_anim_segment.h \
+ node/x3d-h-anim/h_anim_site.cpp \
+ node/x3d-h-anim/h_anim_site.h
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
Modified: trunk/src/libopenvrml/openvrml/x3d_hanim.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_hanim.cpp 2008-09-23 02:46:13 UTC (rev 3674)
+++ trunk/src/libopenvrml/openvrml/x3d_hanim.cpp 2008-09-23 03:01:49 UTC (rev 3675)
@@ -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,1879 +18,35 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "browser.h"
+# include "x3d_hanim.h"
+# include <x3d-h-anim/h_anim_displacer.h>
+# include <x3d-h-anim/h_anim_humanoid.h>
+# include <x3d-h-anim/h_anim_joint.h>
+# include <x3d-h-anim/h_anim_segment.h>
+# include <x3d-h-anim/h_anim_site.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_hanim.h"
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Class object for HAnimDisplacer nodes.
- */
- class OPENVRML_LOCAL hanim_displacer_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit hanim_displacer_metatype(openvrml::browser & browser);
- virtual ~hanim_displacer_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 HAnimHumanoid nodes.
- */
- class OPENVRML_LOCAL hanim_humanoid_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit hanim_humanoid_metatype(openvrml::browser & browser);
- virtual ~hanim_humanoid_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 HAnimJoint nodes.
- */
- class OPENVRML_LOCAL hanim_joint_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit hanim_joint_metatype(openvrml::browser & browser);
- virtual ~hanim_joint_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 HAnimSegment nodes.
- */
- class OPENVRML_LOCAL hanim_segment_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit hanim_segment_metatype(openvrml::browser & browser);
- virtual ~hanim_segment_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 HAnimSite nodes.
- */
- class OPENVRML_LOCAL hanim_site_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit hanim_site_metatype(openvrml::browser & browser);
- virtual ~hanim_site_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_hanim_node_metatypes(openvrml::browser & b)
{
using boost::shared_ptr;
using openvrml::node_metatype;
- b.add_node_metatype(hanim_displacer_metatype::id,
+ using namespace openvrml_node_x3d_h_anim;
+ b.add_node_metatype(h_anim_displacer_metatype::id,
shared_ptr<node_metatype>(
- new hanim_displacer_metatype(b)));
- b.add_node_metatype(hanim_humanoid_metatype::id,
+ new h_anim_displacer_metatype(b)));
+ b.add_node_metatype(h_anim_humanoid_metatype::id,
shared_ptr<node_metatype>(
- new hanim_humanoid_metatype(b)));
- b.add_node_metatype(hanim_joint_metatype::id,
+ new h_anim_humanoid_metatype(b)));
+ b.add_node_metatype(h_anim_joint_metatype::id,
shared_ptr<node_metatype>(
- new hanim_joint_metatype(b)));
- b.add_node_metatype(hanim_segment_metatype::id,
+ new h_anim_joint_metatype(b)));
+ b.add_node_metatype(h_anim_segment_metatype::id,
shared_ptr<node_metatype>(
- new hanim_segment_metatype(b)));
- b.add_node_metatype(hanim_site_metatype::id,
- shared_ptr<node_metatype>(new hanim_site_metatype(b)));
+ new h_anim_segment_metatype(b)));
+ b.add_node_metatype(h_anim_site_metatype::id,
+ shared_ptr<node_metatype>(new h_anim_site_metatype(b)));
}
-
-namespace {
- using namespace openvrml_;
-
- class OPENVRML_LOCAL hanim_displacer_node :
- public abstract_node<hanim_displacer_node> {
-
- friend class hanim_displacer_metatype;
-
- exposedfield<mfint32> coord_index_;
- exposedfield<mfvec3f> displacements_;
- exposedfield<sfstring> name_;
- exposedfield<sffloat> weight_;
-
- public:
- hanim_displacer_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~hanim_displacer_node() OPENVRML_NOTHROW;
- };
-
- class OPENVRML_LOCAL hanim_humanoid_node :
- public abstract_node<hanim_humanoid_node>,
- public child_node {
-
- friend class hanim_humanoid_metatype;
-
- exposedfield<sfvec3f> center_;
- exposedfield<mfstring> info_;
- exposedfield<mfnode> joints_;
- exposedfield<sfstring> name_;
- exposedfield<sfrotation> rotation_;
- exposedfield<sfvec3f> scale_;
- exposedfield<sfrotation> scale_orientation_;
- exposedfield<mfnode> segments_;
- exposedfield<mfnode> sites_;
- exposedfield<mfnode> skeleton_;
- exposedfield<mfnode> skin_;
- exposedfield<sfnode> skin_coord_;
- exposedfield<sfnode> skin_normal_;
- exposedfield<sfvec3f> translation_;
- exposedfield<sfstring> version_;
- exposedfield<mfnode> viewpoints_;
- sfvec3f bbox_center_;
- sfvec3f bbox_size_;
-
- public:
- hanim_humanoid_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~hanim_humanoid_node() OPENVRML_NOTHROW;
- };
-
- class OPENVRML_LOCAL hanim_joint_node :
- public abstract_node<hanim_joint_node>,
- public child_node {
-
- friend class hanim_joint_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);
- };
-
- add_children_listener add_children_listener_;
- remove_children_listener remove_children_listener_;
- exposedfield<sfvec3f> center_;
- exposedfield<mfnode> children_;
- exposedfield<mfnode> displacers_;
- exposedfield<sfrotation> limit_orientation_;
- exposedfield<mffloat> llimit_;
- exposedfield<sfstring> name_;
- exposedfield<sfrotation> rotation_;
- exposedfield<sfvec3f> scale_;
- exposedfield<sfrotation> scale_orientation_;
- exposedfield<mfint32> skin_coord_index_;
- exposedfield<mffloat> skin_coord_weight_;
- exposedfield<mffloat> stiffness_;
- exposedfield<sfvec3f> translation_;
- exposedfield<mffloat> ulimit_;
- sfvec3f bbox_center_;
- sfvec3f bbox_size_;
-
- public:
- hanim_joint_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~hanim_joint_node() OPENVRML_NOTHROW;
- };
-
- class OPENVRML_LOCAL hanim_segment_node :
- public abstract_node<hanim_segment_node>,
- public child_node {
-
- friend class hanim_segment_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);
- };
-
- add_children_listener add_children_listener_;
- remove_children_listener remove_children_listener_;
- exposedfield<sfvec3f> center_of_mass_;
- exposedfield<mfnode> children_;
- exposedfield<sfnode> coord_;
- exposedfield<mfnode> displacers_;
- exposedfield<sffloat> mass_;
- exposedfield<mffloat> moments_of_inertia_;
- exposedfield<sfstring> name_;
- sfvec3f bbox_center_;
- sfvec3f bbox_size_;
-
- public:
- hanim_segment_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~hanim_segment_node() OPENVRML_NOTHROW;
- };
-
- class OPENVRML_LOCAL hanim_site_node :
- public abstract_node<hanim_site_node>,
- public child_node {
-
- friend class hanim_site_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);
- };
-
- add_children_listener add_children_listener_;
- remove_children_listener remove_children_listener_;
- exposedfield<sfvec3f> center_;
- exposedfield<mfnode> children_;
- exposedfield<sfstring> name_;
- exposedfield<sfrotation> rotation_;
- exposedfield<sfvec3f> scale_;
- exposedfield<sfrotation> scale_orientation_;
- exposedfield<sfvec3f> translation_;
- sfvec3f bbox_center_;
- sfvec3f bbox_size_;
-
- public:
- hanim_site_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~hanim_site_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const hanim_displacer_metatype::id =
- "urn:X-openvrml:node:HAnimDisplacer";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c hanim_displacer_metatype.
- */
- hanim_displacer_metatype::hanim_displacer_metatype(openvrml::browser & browser):
- node_metatype(hanim_displacer_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- hanim_displacer_metatype::~hanim_displacer_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 HAnimDisplacer nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by hanim_displacer_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- hanim_displacer_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- OPENVRML_THROW2(unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 5> supported_interfaces_t;
- static const supported_interfaces_t supported_interfaces = {
- node_interface(node_interface::exposedfield_id,
- field_value::sfnode_id,
- "metadata"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfint32_id,
- "coordIndex"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfvec3f_id,
- "displacements"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfstring_id,
- "name"),
- node_interface(node_interface::exposedfield_id,
- field_value::sffloat_id,
- "weight")
- };
- typedef node_type_impl<hanim_displacer_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,
- &hanim_displacer_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_displacer_node::coord_index_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_displacer_node::displacements_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_displacer_node::name_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_displacer_node::weight_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const hanim_humanoid_metatype::id =
- "urn:X-openvrml:node:HAnimHumanoid";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c hanim_humanoid_metatype.
- */
- hanim_humanoid_metatype::hanim_humanoid_metatype(openvrml::browser & browser):
- node_metatype(hanim_humanoid_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- hanim_humanoid_metatype::~hanim_humanoid_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 HAnimHumanoid nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by hanim_humanoid_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- hanim_humanoid_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, 19> 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::sfvec3f_id,
- "center"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfstring_id,
- "info"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "joints"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfstring_id,
- "name"),
- 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::mfnode_id,
- "segments"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "sites"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "skeleton"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "skin"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfnode_id,
- "skinCoord"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfnode_id,
- "skinNormal"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfvec3f_id,
- "translation"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfstring_id,
- "version"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "viewpoints"),
- node_interface(node_interface::field_id,
- field_value::sfvec3f_id,
- "bboxCenter"),
- node_interface(node_interface::field_id,
- field_value::sfvec3f_id,
- "bboxSize")
- };
- typedef node_type_impl<hanim_humanoid_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,
- &hanim_humanoid_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::center_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::info_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::joints_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::name_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::rotation_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::scale_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::scale_orientation_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::segments_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::sites_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::skeleton_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::skin_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::skin_coord_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::skin_normal_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::translation_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::version_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::viewpoints_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_field(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::bbox_center_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_field(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_humanoid_node::bbox_size_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const hanim_joint_metatype::id =
- "urn:X-openvrml:node:HAnimJoint";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this @c hanim_joint_metatype.
- */
- hanim_joint_metatype::hanim_joint_metatype(openvrml::browser & browser):
- node_metatype(hanim_joint_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- hanim_joint_metatype::~hanim_joint_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 HAnimJoint nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by hanim_joint_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- hanim_joint_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, 19> 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::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::mfnode_id,
- "displacers"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfrotation_id,
- "limitOrientation"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "llimit"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfstring_id,
- "name"),
- 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::mfint32_id,
- "skinCoordIndex"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "skinCoordWeight"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "stiffness"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfvec3f_id,
- "translation"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "ulimit"),
- node_interface(node_interface::field_id,
- field_value::sfvec3f_id,
- "bboxCenter"),
- node_interface(node_interface::field_id,
- field_value::sfvec3f_id,
- "bboxSize")
- };
- typedef node_type_impl<hanim_joint_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,
- &hanim_joint_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventin(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::add_children_listener_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventin(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::remove_children_listener_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::center_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::children_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::displacers_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::limit_orientation_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::llimit_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::name_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::rotation_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::scale_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::scale_orientation_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &hanim_joint_node::skin_coord_index_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id...
[truncated message content] |
