Menu
▾
▴
SF.net SVN: openvrml:[3656] trunk
|
From: <br...@us...> - 2008-09-21 06:39:51
|
Revision: 3656
http://openvrml.svn.sourceforge.net/openvrml/?rev=3656&view=rev
Author: braden
Date: 2008-09-21 06:39:42 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Moved X3D Interpolation 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_interpolation.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
trunk/src/node/x3d-interpolation/
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
Removed Paths:
-------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
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
Property Changed:
----------------
trunk/
trunk/src/node/x3d-core/metadata_double.cpp
trunk/src/node/x3d-core/metadata_double.h
trunk/src/node/x3d-core/metadata_float.cpp
trunk/src/node/x3d-core/metadata_float.h
trunk/src/node/x3d-core/metadata_integer.cpp
trunk/src/node/x3d-core/metadata_integer.h
trunk/src/node/x3d-core/metadata_set.cpp
trunk/src/node/x3d-core/metadata_set.h
trunk/src/node/x3d-core/metadata_string.cpp
trunk/src/node/x3d-core/metadata_string.h
trunk/src/node/x3d-geometry2d/arc2d.cpp
trunk/src/node/x3d-geometry2d/arc2d.h
trunk/src/node/x3d-geometry2d/arc_close2d.cpp
trunk/src/node/x3d-geometry2d/arc_close2d.h
trunk/src/node/x3d-geometry2d/circle2d.cpp
trunk/src/node/x3d-geometry2d/circle2d.h
trunk/src/node/x3d-geometry2d/disk2d.cpp
trunk/src/node/x3d-geometry2d/disk2d.h
trunk/src/node/x3d-geometry2d/polyline2d.cpp
trunk/src/node/x3d-geometry2d/polyline2d.h
trunk/src/node/x3d-geometry2d/polypoint2d.cpp
trunk/src/node/x3d-geometry2d/polypoint2d.h
trunk/src/node/x3d-geometry2d/rectangle2d.cpp
trunk/src/node/x3d-geometry2d/rectangle2d.h
trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
trunk/src/node/x3d-geometry2d/triangle_set2d.h
trunk/src/node/x3d-grouping/static_group.cpp
trunk/src/node/x3d-grouping/static_group.h
trunk/src/node/x3d-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
+ /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-21 06:33:33 UTC (rev 3655)
+++ trunk/ChangeLog 2008-09-21 06:39:42 UTC (rev 3656)
@@ -1,5 +1,22 @@
2008-09-21 Braden McDaniel <br...@en...>
+ Moved X3D Interpolation node implementations into a convenience
+ library.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added
+ x3d-interpolation static library project.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
+ * src/Makefile.am: Added convenience library
+ node/x3d-interpolation/libx3d-interpolation.la.
+ * src/libopenvrml/openvrml/x3d_interpolation.cpp: Moved node
+ implementations to separate files.
+ * src/node/x3d-interpolation/coordinate_interpolator2d.cpp
+ * src/node/x3d-interpolation/position_interpolator2d.h
+ * src/node/x3d-interpolation/coordinate_interpolator2d.h
+ * src/node/x3d-interpolation/position_interpolator2d.cpp
+
+2008-09-21 Braden McDaniel <br...@en...>
+
Removed unnecessary includes.
* src/libopenvrml/openvrml/x3d_geometry2d.cpp
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 06:33:33 UTC (rev 3655)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 06:39:42 UTC (rev 3656)
@@ -8,6 +8,7 @@
{7DAC4CA0-9382-4ED0-A26E-A5F84776054C} = {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}
{5ED398C0-0529-40D5-AB2C-C7EF0769002B} = {5ED398C0-0529-40D5-AB2C-C7EF0769002B}
{95D646C4-B759-469D-BDBB-A370A5778CA5} = {95D646C4-B759-469D-BDBB-A370A5778CA5}
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986} = {BFF962C6-4CC1-4DD1-965A-163EADE74986}
{20B850E9-E417-49A2-A66C-38827401597B} = {20B850E9-E417-49A2-A66C-38827401597B}
{1D32E4EB-6613-4270-8295-7113712BC6C5} = {1D32E4EB-6613-4270-8295-7113712BC6C5}
EndProjectSection
@@ -60,6 +61,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-texturing", "x3d-texturing\x3d-texturing.vcproj", "{20B850E9-E417-49A2-A66C-38827401597B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-interpolation", "x3d-interpolation\x3d-interpolation.vcproj", "{BFF962C6-4CC1-4DD1-965A-163EADE74986}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -126,6 +129,10 @@
{20B850E9-E417-49A2-A66C-38827401597B}.Debug|Win32.Build.0 = Debug|Win32
{20B850E9-E417-49A2-A66C-38827401597B}.Release|Win32.ActiveCfg = Release|Win32
{20B850E9-E417-49A2-A66C-38827401597B}.Release|Win32.Build.0 = Release|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|Win32.Build.0 = Debug|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|Win32.ActiveCfg = Release|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
x3d-interpolation.vcproj.*.user
Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj 2008-09-21 06:33:33 UTC (rev 3655)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj 2008-09-21 06:39:42 UTC (rev 3656)
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x3d-interpolation"
- ProjectGUID="{BFF962C6-4CC1-4DD1-965A-163EADE74986}"
- RootNamespace="x3dinterpolation"
- 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-interpolation\coordinate_interpolator2d.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-interpolation\position_interpolator2d.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-interpolation\coordinate_interpolator2d.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-interpolation\position_interpolator2d.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-interpolation/x3d-interpolation.vcproj (from rev 3655, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj)
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj 2008-09-21 06:39:42 UTC (rev 3656)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="x3d-interpolation"
+ ProjectGUID="{BFF962C6-4CC1-4DD1-965A-163EADE74986}"
+ RootNamespace="x3dinterpolation"
+ 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-interpolation\coordinate_interpolator2d.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-interpolation\position_interpolator2d.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-interpolation\coordinate_interpolator2d.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-interpolation\position_interpolator2d.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 06:33:33 UTC (rev 3655)
+++ trunk/src/Makefile.am 2008-09-21 06:39:42 UTC (rev 3656)
@@ -11,7 +11,8 @@
node/x3d-rendering/libx3d-rendering.la \
node/x3d-shape/libx3d-shape.la \
node/x3d-geometry2d/libx3d-geometry2d.la \
- node/x3d-texturing/libx3d-texturing.la
+ node/x3d-texturing/libx3d-texturing.la \
+ node/x3d-interpolation/libx3d-interpolation.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
@@ -151,6 +152,7 @@
node/x3d-shape/libx3d-shape.la \
node/x3d-geometry2d/libx3d-geometry2d.la \
node/x3d-texturing/libx3d-texturing.la \
+ node/x3d-interpolation/libx3d-interpolation.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
-lboost_filesystem$(BOOST_LIB_SUFFIX) \
-lltdl
@@ -434,6 +436,17 @@
node/x3d-texturing/texture_coordinate_generator.cpp \
node/x3d-texturing/texture_coordinate_generator.h
+node_x3d_interpolation_libx3d_interpolation_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+node_x3d_interpolation_libx3d_interpolation_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS)
+node_x3d_interpolation_libx3d_interpolation_la_SOURCES = \
+ node/x3d-interpolation/coordinate_interpolator2d.cpp \
+ node/x3d-interpolation/coordinate_interpolator2d.h \
+ node/x3d-interpolation/position_interpolator2d.cpp \
+ node/x3d-interpolation/position_interpolator2d.h
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
Modified: trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp 2008-09-21 06:33:33 UTC (rev 3655)
+++ trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp 2008-09-21 06:39:42 UTC (rev 3656)
@@ -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,64 +18,20 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "browser.h"
+# include "x3d_interpolation.h"
+# include <x3d-interpolation/coordinate_interpolator2d.h>
+# include <x3d-interpolation/position_interpolator2d.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_interpolation.h"
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Class object for CoordinateInterpolator2D nodes.
- */
- class OPENVRML_LOCAL coordinate_interpolator2d_metatype :
- public node_metatype {
- public:
- static const char * const id;
-
- explicit coordinate_interpolator2d_metatype(openvrml::browser & browser);
- virtual ~coordinate_interpolator2d_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 PositionInterpolator2D nodes.
- */
- class OPENVRML_LOCAL position_interpolator2d_metatype :
- public node_metatype {
- public:
- static const char * const id;
-
- explicit position_interpolator2d_metatype(openvrml::browser & browser);
- virtual ~position_interpolator2d_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_interpolation_node_metatypes(openvrml::browser & b)
{
using boost::shared_ptr;
using openvrml::node_metatype;
+ using namespace openvrml_node_x3d_interpolation;
b.add_node_metatype(coordinate_interpolator2d_metatype::id,
shared_ptr<node_metatype>(
new coordinate_interpolator2d_metatype(b)));
@@ -83,451 +39,3 @@
shared_ptr<node_metatype>(
new position_interpolator2d_metatype(b)));
}
-
-namespace {
-
- using namespace openvrml_;
-
- class OPENVRML_LOCAL coordinate_interpolator2d_node :
- public abstract_node<coordinate_interpolator2d_node>,
- public child_node {
-
- friend class coordinate_interpolator2d_metatype;
-
- class set_fraction_listener : public event_listener_base<self_t>,
- public sffloat_listener {
- public:
- explicit set_fraction_listener(self_t & node);
- virtual ~set_fraction_listener() OPENVRML_NOTHROW;
-
- private:
- virtual void do_process_event(const sffloat & fraction,
- double timestamp)
- OPENVRML_THROW1(std::bad_alloc);
- };
-
- set_fraction_listener set_fraction_listener_;
- exposedfield<mffloat> key_;
- exposedfield<mfvec2f> key_value_;
- mfvec2f value_changed_;
- mfvec2f_emitter value_changed_emitter_;
-
- public:
- coordinate_interpolator2d_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~coordinate_interpolator2d_node() OPENVRML_NOTHROW;
- };
-
- class OPENVRML_LOCAL position_interpolator2d_node :
- public abstract_node<position_interpolator2d_node>,
- public child_node {
-
- friend class position_interpolator2d_metatype;
-
- class set_fraction_listener : public event_listener_base<self_t>,
- public sffloat_listener {
- public:
- explicit set_fraction_listener(self_t & node);
- virtual ~set_fraction_listener() OPENVRML_NOTHROW;
-
- private:
- virtual void do_process_event(const sffloat & fraction,
- double timestamp)
- OPENVRML_THROW1(std::bad_alloc);
- };
-
- set_fraction_listener set_fraction_listener_;
- exposedfield<mffloat> key_;
- exposedfield<mfvec2f> key_value_;
- sfvec2f value_changed_;
- sfvec2f_emitter value_changed_emitter_;
-
- public:
- position_interpolator2d_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~position_interpolator2d_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const coordinate_interpolator2d_metatype::id =
- "urn:X-openvrml:node:CoordinateInterpolator2D";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c coordinate_interpolator2d_metatype.
- */
- coordinate_interpolator2d_metatype::
- coordinate_interpolator2d_metatype(openvrml::browser & browser):
- node_metatype(coordinate_interpolator2d_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- coordinate_interpolator2d_metatype::~coordinate_interpolator2d_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 CoordinateInterpolator2D nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by coordinate_interpolator2d_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- coordinate_interpolator2d_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::eventin_id,
- field_value::sffloat_id,
- "set_fraction"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "key"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfvec2f_id,
- "keyValue"),
- node_interface(node_interface::eventout_id,
- field_value::mfvec2f_id,
- "value_changed")
- };
- typedef node_type_impl<coordinate_interpolator2d_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,
- &coordinate_interpolator2d_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventin(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::set_fraction_listener_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::key_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::key_value_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::value_changed_emitter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const position_interpolator2d_metatype::id =
- "urn:X-openvrml:node:PositionInterpolator2D";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c position_interpolator2d_metatype.
- */
- position_interpolator2d_metatype::
- position_interpolator2d_metatype(openvrml::browser & browser):
- node_metatype(position_interpolator2d_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- position_interpolator2d_metatype::~position_interpolator2d_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 PositionInterpolator2D nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by position_interpolator2d_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- position_interpolator2d_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::eventin_id,
- field_value::sffloat_id,
- "set_fraction"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "key"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfvec2f_id,
- "keyValue"),
- node_interface(node_interface::eventout_id,
- field_value::sfvec2f_id,
- "value_changed")
- };
- typedef node_type_impl<position_interpolator2d_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,
- &position_interpolator2d_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventin(
- supported_interface->field_type,
- supported_interface->id,
- &position_interpolator2d_node::set_fraction_listener_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &position_interpolator2d_node::key_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &position_interpolator2d_node::key_value_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &position_interpolator2d_node::value_changed_emitter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @class coordinate_interpolator2d_node
- *
- * @brief Represents CoordinateInterpolator2D node instances.
- */
-
- /**
- * @var coordinate_interpolator2d_node::coordinate_interpolator2d_metatype
- *
- * @brief Class object for CoordinateInterpolator2D nodes.
- */
-
- /**
- * @var coordinate_interpolator2d_node::set_fraction_listener coordinate_interpolator2d_node::set_fraction_listener_
- *
- * @brief set_fraction eventIn listener.
- */
-
- /**
- * @var openvrml::node_impl_util::abstract_node<coordinate_interpolator2d_node>::exposedfield<mffloat> coordinate_interpolator2d_node::key_
- *
- * @brief key exposedField
- */
-
- /**
- * @var openvrml::node_impl_util::abstract_node<coordinate_interpolator2d_node>::exposedfield<mfvec2f> coordinate_interpolator2d_node::key_value_
- *
- * @brief key_value exposedField
- */
-
- /**
- * @var openvrml::mfvec2f coordinate_interpolator2d_node::value_changed_
- *
- * @brief value_changed eventOut
- */
-
- /**
- * @var openvrml::node_impl_util::abstract_node<coordinate_interpolator2d_node>::mfvec2f_emitter coordinate_interpolator2d_node::value_changed_emitter_
- *
- * @brief value_changed eventOut emitter.
- */
-
- coordinate_interpolator2d_node::set_fraction_listener::
- set_fraction_listener(self_t & node):
- node_event_listener(node),
- event_listener_base<self_t>(node),
- sffloat_listener(node)
- {}
-
- coordinate_interpolator2d_node::set_fraction_listener::
- ~set_fraction_listener() OPENVRML_NOTHROW
- {}
-
- void coordinate_interpolator2d_node::set_fraction_listener::
- do_process_event(const sffloat & /* fraction */, const double /* timestamp */)
- OPENVRML_THROW1(std::bad_alloc)
- {
- //TODO: add logic here
- }
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- coordinate_interpolator2d_node::
- coordinate_interpolator2d_node(
- const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- bounded_volume_node(type, scope),
- abstract_node<self_t>(type, scope),
- child_node(type, scope),
- set_fraction_listener_(*this),
- key_(*this),
- key_value_(*this),
- value_changed_emitter_(*this, this->value_changed_)
- {}
-
- /**
- * @brief Destroy.
- */
- coordinate_interpolator2d_node::~coordinate_interpolator2d_node()
- OPENVRML_NOTHROW
- {}
-
-
- /**
- * @class position_interpolator2d_node
- *
- * @brief Represents PositionInterpolator2D node instances.
- */
-
- /**
- * @var position_interpolator2d_node::position_interpolator2d_metatype
- *
- * @brief Class object for PositionInterpolator2D nodes.
- */
-
- /**
- * @var position_interpolator2d_node::set_fraction_listener position_interpolator2d_node::set_fraction_listener_
- *
- * @brief set_fraction eventIn listener.
- */
-
- /**
- * @var openvrml::node_impl_utils::abstract_node<position_interpolator2d_node>::exposedfield<mffloat> position_interpolator2d_node::key_
- *
- * @brief key exposedField
- */
-
- /**
- * @var openvrml::node_impl_utils::abstract_node<position_interpolator2d_node>::exposedfield<mfvec2f> position_interpolator2d_node::key_value_
- *
- * @brief key_value exposedField
- */
-
- /**
- * @var openvrml::sfvec2f position_interpolator2d_node::value_changed_
- *
- * @brief value_changed eventOut
- */
-
- /**
- * @var openvrml::node_impl_utils::abstract_node<position_interpolator2d_node>::sfvec2f_emitter position_interpolator2d_node::value_changed_emitter_
- *
- * @brief value_changed eventOut emitter.
- */
-
- position_interpolator2d_node::set_fraction_listener::
- set_fraction_listener(self_t & node):
- node_event_listener(node),
- event_listener_base<self_t>(node),
- sffloat_listener(node)
- {}
-
- position_interpolator2d_node::set_fraction_listener::
- ~set_fraction_listener() OPENVRML_NOTHROW
- {}
-
- void position_interpolator2d_node::set_fraction_listener::
- do_process_event(const sffloat & /* fraction */, const double /* timestamp */)
- OPENVRML_THROW1(std::bad_alloc)
- {
- //TODO: add logic here
- }
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- position_interpolator2d_node::
- position_interpolator2d_node(
- const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- bounded_volume_node(type, scope),
- abstract_node<self_t>(type, scope),
- child_node(type, scope),
- set_fraction_listener_(*this),
- key_(*this),
- key_value_(*this),
- value_changed_emitter_(*this, this->value_changed_)
- {}
-
- /**
- * @brief Destroy.
- */
- position_interpolator2d_node::~position_interpolator2d_node() OPENVRML_NOTHROW
- {}
-}
Property changes on: trunk/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
+ /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/circle2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/circle2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/disk2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/disk2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polyline2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polyline2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polypoint2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polypoint2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/rectangle2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/rectangle2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.cpp:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/triangle_set2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.h:3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-grouping/static_group.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-grouping/static_group.cpp:3640-3641,3643-3644,3646-3647,3649-3650
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-grouping/static_group.cpp:3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
Property changes on: trunk/src/node/x3d-grouping/static_group.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-grouping/static_group.h:3640-3641,3643-3644,3646-3647,3649-3650
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-grouping/static_group.h:3640-3641,3643-3644,3646-3647,3649-3650,3654-3655
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
Deleted: trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
===================================================================
--- branches/node-modules/src/node/x3d-interpolation/coordinate_interpolator2d.cpp 2008-09-21 06:33:33 UTC (rev 3655)
+++ trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp 2008-09-21 06:39:42 UTC (rev 3656)
@@ -1,257 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
-//
-// OpenVRML
-//
-// Copyright 2006, 2007, 2008 Braden McDaniel
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or (at your
-// option) any later version.
-//
-// This library is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-// License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library; if not, see <http://www.gnu.org/licenses/>.
-//
-
-# include "coordinate_interpolator2d.h"
-# include <openvrml/node_impl_util.h>
-# include <boost/array.hpp>
-
-# ifdef HAVE_CONFIG_H
-# include <config.h>
-# endif
-
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Represents CoordinateInterpolator2D node instances.
- */
- class OPENVRML_LOCAL coordinate_interpolator2d_node :
- public abstract_node<coordinate_interpolator2d_node>,
- public child_node {
-
- friend
- class openvrml_node_x3d_interpolation::coordinate_interpolator2d_metatype;
-
- class set_fraction_listener : public event_listener_base<self_t>,
- public sffloat_listener {
- public:
- explicit set_fraction_listener(self_t & node);
- virtual ~set_fraction_listener() OPENVRML_NOTHROW;
-
- private:
- virtual void do_process_event(const sffloat & fraction,
- double timestamp)
- OPENVRML_THROW1(std::bad_alloc);
- };
-
- set_fraction_listener set_fraction_listener_;
- exposedfield<mffloat> key_;
- exposedfield<mfvec2f> key_value_;
- mfvec2f value_changed_;
- mfvec2f_emitter value_changed_emitter_;
-
- public:
- coordinate_interpolator2d_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~coordinate_interpolator2d_node() OPENVRML_NOTHROW;
- };
-
-
- /**
- * @var coordinate_interpolator2d_node::coordinate_interpolator2d_metatype
- *
- * @brief Class object for CoordinateInterpolator2D nodes.
- */
-
- /**
- * @var coordinate_interpolator2d_node::set_fraction_listener coordinate_interpolator2d_node::set_fraction_listener_
- *
- * @brief set_fraction eventIn listener.
- */
-
- /**
- * @var openvrml::node_impl_util::abstract_node<coordinate_interpolator2d_node>::exposedfield<mffloat> coordinate_interpolator2d_node::key_
- *
- * @brief key exposedField
- */
-
- /**
- * @var openvrml::node_impl_util::abstract_node<coordinate_interpolator2d_node>::exposedfield<mfvec2f> coordinate_interpolator2d_node::key_value_
- *
- * @brief key_value exposedField
- */
-
- /**
- * @var openvrml::mfvec2f coordinate_interpolator2d_node::value_changed_
- *
- * @brief value_changed eventOut
- */
-
- /**
- * @var openvrml::node_impl_util::abstract_node<coordinate_interpolator2d_node>::mfvec2f_emitter coordinate_interpolator2d_node::value_changed_emitter_
- *
- * @brief value_changed eventOut emitter.
- */
-
- coordinate_interpolator2d_node::set_fraction_listener::
- set_fraction_listener(self_t & node):
- node_event_listener(node),
- event_listener_base<self_t>(node),
- sffloat_listener(node)
- {}
-
- coordinate_interpolator2d_node::set_fraction_listener::
- ~set_fraction_listener() OPENVRML_NOTHROW
- {}
-
- void coordinate_interpolator2d_node::set_fraction_listener::
- do_process_event(const sffloat & /* fraction */, const double /* timestamp */)
- OPENVRML_THROW1(std::bad_alloc)
- {
- //TODO: add logic here
- }
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- coordinate_interpolator2d_node::
- coordinate_interpolator2d_node(
- const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- bounded_volume_node(type, scope),
- abstract_node<self_t>(type, scope),
- child_node(type, scope),
- set_fraction_listener_(*this),
- key_(*this),
- key_value_(*this),
- value_changed_emitter_(*this, this->value_changed_)
- {}
-
- /**
- * @brief Destroy.
- */
- coordinate_interpolator2d_node::~coordinate_interpolator2d_node()
- OPENVRML_NOTHROW
- {}
-}
-
-
-/**
- * @brief @c node_metatype identifier.
- */
-const char * const
-openvrml_node_x3d_interpolation::coordinate_interpolator2d_metatype::id =
- "urn:X-openvrml:node:CoordinateInterpolator2D";
-
-/**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c coordinate_interpolator2d_metatype.
- */
-openvrml_node_x3d_interpolation::coordinate_interpolator2d_metatype::
-coordinate_interpolator2d_metatype(openvrml::browser & browser):
- node_metatype(coordinate_interpolator2d_metatype::id, browser)
-{}
-
-/**
- * @brief Destroy.
- */
-openvrml_node_x3d_interpolation::coordinate_interpolator2d_metatype::
-~coordinate_interpolator2d_metatype()
- OPENVRML_NOTHROW
-{}
-
-/**
- * @brief Create a @c node_type.
- *
- * @param id the name for the new @c node_type.
- * @param interfaces the interfaces for the new @c node_type.
- *
- * @return a @c node_type capable of creating CoordinateInterpolator2D nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by
- * @c coordinate_interpolator2d_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
-const boost::shared_ptr<openvrml::node_type>
-openvrml_node_x3d_interpolation::coordinate_interpolator2d_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::eventin_id,
- field_value::sffloat_id,
- "set_fraction"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "key"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfvec2f_id,
- "keyValue"),
- node_interface(node_interface::eventout_id,
- field_value::mfvec2f_id,
- "value_changed")
- };
- typedef node_type_impl<coordinate_interpolator2d_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,
- &coordinate_interpolator2d_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventin(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::set_fraction_listener_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::key_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::key_value_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_eventout(
- supported_interface->field_type,
- supported_interface->id,
- &coordinate_interpolator2d_node::va...
[truncated message content] |
