Menu
▾
▴
SF.net SVN: openvrml:[3652] trunk
|
From: <br...@us...> - 2008-09-21 05:29:36
|
Revision: 3652
http://openvrml.svn.sourceforge.net/openvrml/?rev=3652&view=rev
Author: braden
Date: 2008-09-21 05:29:16 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Moved X3D Texturing 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_texturing.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
trunk/src/node/x3d-texturing/
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
Removed Paths:
-------------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
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 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
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647
+ /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-21 05:18:58 UTC (rev 3651)
+++ trunk/ChangeLog 2008-09-21 05:29:16 UTC (rev 3652)
@@ -1,3 +1,24 @@
+2008-09-21 Braden McDaniel <br...@en...>
+
+ Moved X3D Texturing node implementations into a convenience
+ library.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Added
+ x3d-texturing static library project.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
+ * src/Makefile.am: Added convenience library
+ node/x3d-texturing/libx3d-texturing.la.
+ * src/libopenvrml/openvrml/x3d_texturing.cpp: Moved node
+ implementations to separate files.
+ * src/node/x3d-texturing/multi_texture.h
+ * src/node/x3d-texturing/multi_texture_coordinate.cpp
+ * src/node/x3d-texturing/texture_coordinate_generator.h
+ * src/node/x3d-texturing/multi_texture_transform.cpp
+ * src/node/x3d-texturing/multi_texture_coordinate.h
+ * src/node/x3d-texturing/multi_texture.cpp
+ * src/node/x3d-texturing/multi_texture_transform.h
+ * src/node/x3d-texturing/texture_coordinate_generator.cpp
+
2008-09-20 Braden McDaniel <br...@en...>
Moved X3D Geometry2D node implementations into a convenience
@@ -7,7 +28,7 @@
x3d-geometry2d static library project.
* ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj
* src/Makefile.am: Added convenience library
- node/x3d-shape/libx3d-geometry2d.la.
+ node/x3d-geometry2d/libx3d-geometry2d.la.
* src/libopenvrml/openvrml/x3d_geometry2d.cpp: Moved node
implementations to separate files.
* src/node/x3d-geometry2d/rectangle2d.h
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 05:18:58 UTC (rev 3651)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-21 05:29:16 UTC (rev 3652)
@@ -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}
+ {20B850E9-E417-49A2-A66C-38827401597B} = {20B850E9-E417-49A2-A66C-38827401597B}
{1D32E4EB-6613-4270-8295-7113712BC6C5} = {1D32E4EB-6613-4270-8295-7113712BC6C5}
EndProjectSection
EndProject
@@ -57,6 +58,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-geometry2d", "x3d-geometry2d\x3d-geometry2d.vcproj", "{61A31C6F-23A1-4243-A338-EF749912592A}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-texturing", "x3d-texturing\x3d-texturing.vcproj", "{20B850E9-E417-49A2-A66C-38827401597B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -119,6 +122,10 @@
{61A31C6F-23A1-4243-A338-EF749912592A}.Debug|Win32.Build.0 = Debug|Win32
{61A31C6F-23A1-4243-A338-EF749912592A}.Release|Win32.ActiveCfg = Release|Win32
{61A31C6F-23A1-4243-A338-EF749912592A}.Release|Win32.Build.0 = Release|Win32
+ {20B850E9-E417-49A2-A66C-38827401597B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
x3d-texturing.vcproj.*.user
Deleted: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj 2008-09-21 04:11:28 UTC (rev 3650)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj 2008-09-21 05:29:16 UTC (rev 3652)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x3d-texturing"
- ProjectGUID="{20B850E9-E417-49A2-A66C-38827401597B}"
- RootNamespace="x3dtexturing"
- 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-texturing\multi_texture.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_coordinate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_transform.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-texturing\texture_coordinate_generator.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-texturing\multi_texture.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_coordinate.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_transform.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\x3d-texturing\texture_coordinate_generator.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-texturing/x3d-texturing.vcproj (from rev 3650, branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj)
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj 2008-09-21 05:29:16 UTC (rev 3652)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="x3d-texturing"
+ ProjectGUID="{20B850E9-E417-49A2-A66C-38827401597B}"
+ RootNamespace="x3dtexturing"
+ 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-texturing\multi_texture.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_coordinate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_transform.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-texturing\texture_coordinate_generator.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-texturing\multi_texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_coordinate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-texturing\multi_texture_transform.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\x3d-texturing\texture_coordinate_generator.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 05:18:58 UTC (rev 3651)
+++ trunk/src/Makefile.am 2008-09-21 05:29:16 UTC (rev 3652)
@@ -10,7 +10,8 @@
node/x3d-grouping/libx3d-grouping.la \
node/x3d-rendering/libx3d-rendering.la \
node/x3d-shape/libx3d-shape.la \
- node/x3d-geometry2d/libx3d-geometry2d.la
+ node/x3d-geometry2d/libx3d-geometry2d.la \
+ node/x3d-texturing/libx3d-texturing.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
@@ -149,6 +150,7 @@
node/x3d-rendering/libx3d-rendering.la \
node/x3d-shape/libx3d-shape.la \
node/x3d-geometry2d/libx3d-geometry2d.la \
+ node/x3d-texturing/libx3d-texturing.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
-lboost_filesystem$(BOOST_LIB_SUFFIX) \
-lltdl
@@ -417,6 +419,21 @@
node/x3d-geometry2d/triangle_set2d.cpp \
node/x3d-geometry2d/triangle_set2d.h
+node_x3d_texturing_libx3d_texturing_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+node_x3d_texturing_libx3d_texturing_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS)
+node_x3d_texturing_libx3d_texturing_la_SOURCES = \
+ node/x3d-texturing/multi_texture.cpp \
+ node/x3d-texturing/multi_texture.h \
+ node/x3d-texturing/multi_texture_coordinate.cpp \
+ node/x3d-texturing/multi_texture_coordinate.h \
+ node/x3d-texturing/multi_texture_transform.cpp \
+ node/x3d-texturing/multi_texture_transform.h \
+ node/x3d-texturing/texture_coordinate_generator.cpp \
+ node/x3d-texturing/texture_coordinate_generator.h
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
Modified: trunk/src/libopenvrml/openvrml/x3d_texturing.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_texturing.cpp 2008-09-21 05:18:58 UTC (rev 3651)
+++ trunk/src/libopenvrml/openvrml/x3d_texturing.cpp 2008-09-21 05:29:16 UTC (rev 3652)
@@ -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
@@ -22,98 +22,21 @@
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <private.h>
# include "browser.h"
-# include "node_impl_util.h"
# include "x3d_texturing.h"
+# include <x3d-texturing/multi_texture.h>
+# include <x3d-texturing/multi_texture_coordinate.h>
+# include <x3d-texturing/multi_texture_transform.h>
+# include <x3d-texturing/texture_coordinate_generator.h>
-using namespace openvrml;
-using namespace openvrml::node_impl_util;
-using namespace std;
-
-namespace {
-
- /**
- * @brief Class object for MultiTexture nodes.
- */
- class OPENVRML_LOCAL multi_texture_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit multi_texture_metatype(openvrml::browser & browser);
- virtual ~multi_texture_metatype() throw ();
-
- private:
- virtual const boost::shared_ptr<node_type>
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc);
- };
-
-
- /**
- * @brief Class object for MultiTextureCoordinate nodes.
- */
- class OPENVRML_LOCAL multi_texture_coordinate_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit multi_texture_coordinate_metatype(openvrml::browser & browser);
- virtual ~multi_texture_coordinate_metatype() throw ();
-
- private:
- virtual const boost::shared_ptr<node_type>
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc);
- };
-
-
- /**
- * @brief Class object for MultiTextureTransform nodes.
- */
- class OPENVRML_LOCAL multi_texture_transform_metatype : public node_metatype {
- public:
- static const char * const id;
-
- explicit multi_texture_transform_metatype(openvrml::browser & browser);
- virtual ~multi_texture_transform_metatype() throw ();
-
- private:
- virtual const boost::shared_ptr<node_type>
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc);
- };
-
-
- /**
- * @brief Class object for TextureCoordinateGenerator nodes.
- */
- class OPENVRML_LOCAL texture_coordinate_generator_metatype :
- public node_metatype {
- public:
- static const char * const id;
-
- explicit texture_coordinate_generator_metatype(
- openvrml::browser & browser);
- virtual ~texture_coordinate_generator_metatype() throw ();
-
- private:
- virtual const boost::shared_ptr<node_type>
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc);
- };
-}
-
void register_texturing_node_metatypes(openvrml::browser & b)
{
using boost::shared_ptr;
using openvrml::node_metatype;
+ using namespace openvrml_node_x3d_texturing;
b.add_node_metatype(multi_texture_metatype::id,
- shared_ptr<node_metatype>(new multi_texture_metatype(b)));
+ shared_ptr<node_metatype>(
+ new multi_texture_metatype(b)));
b.add_node_metatype(
multi_texture_coordinate_metatype::id,
shared_ptr<node_metatype>(new multi_texture_coordinate_metatype(b)));
@@ -122,633 +45,6 @@
shared_ptr<node_metatype>(new multi_texture_transform_metatype(b)));
b.add_node_metatype(
texture_coordinate_generator_metatype::id,
- shared_ptr<node_metatype>(new texture_coordinate_generator_metatype(b)));
+ shared_ptr<node_metatype>(
+ new texture_coordinate_generator_metatype(b)));
}
-
-namespace {
-
- using namespace openvrml_;
-
- class OPENVRML_LOCAL multi_texture_node :
- public abstract_node<multi_texture_node> {
-
- friend class multi_texture_metatype;
-
- exposedfield<sffloat> alpha_;
- exposedfield<sfcolor> color_;
- exposedfield<mfstring> function_;
- exposedfield<mfstring> mode_;
- exposedfield<mfstring> source_;
- exposedfield<mfnode> texture_;
-
- public:
- multi_texture_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~multi_texture_node() throw ();
- };
-
-
- class OPENVRML_LOCAL multi_texture_coordinate_node :
- public abstract_node<multi_texture_coordinate_node> {
-
- friend class multi_texture_coordinate_metatype;
-
- exposedfield<mfnode> tex_coord_;
-
- public:
- multi_texture_coordinate_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~multi_texture_coordinate_node() throw ();
- };
-
-
- class OPENVRML_LOCAL multi_texture_transform_node :
- public abstract_node<multi_texture_transform_node> {
- friend class multi_texture_transform_metatype;
-
- exposedfield<mfnode> texture_transform_;
-
- public:
- multi_texture_transform_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~multi_texture_transform_node() throw ();
- };
-
-
- class OPENVRML_LOCAL texture_coordinate_generator_node :
- public abstract_node<texture_coordinate_generator_node> {
- friend class texture_coordinate_generator_metatype;
-
- exposedfield<sfstring> mode_;
- exposedfield<mffloat> parameter_;
-
- public:
- texture_coordinate_generator_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope);
- virtual ~texture_coordinate_generator_node() throw ();
- };
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const multi_texture_metatype::id =
- "urn:X-openvrml:node:MultiTexture";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c multi_texture_metatype.
- */
- multi_texture_metatype::multi_texture_metatype(openvrml::browser & browser):
- node_metatype(multi_texture_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- multi_texture_metatype::~multi_texture_metatype() throw ()
- {}
-
- /**
- * @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 MultiTexture nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by multi_texture_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- multi_texture_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 7> 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::sffloat_id,
- "alpha"),
- node_interface(node_interface::exposedfield_id,
- field_value::sfcolor_id,
- "color"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfstring_id,
- "function"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfstring_id,
- "mode"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfstring_id,
- "source"),
- node_interface(node_interface::exposedfield_id,
- field_value::mfnode_id,
- "texture")
- };
- typedef node_type_impl<multi_texture_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,
- &multi_texture_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_node::alpha_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_node::color_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_node::function_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_node::mode_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_node::source_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_node::texture_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const multi_texture_coordinate_metatype::id =
- "urn:X-openvrml:node:MultiTextureCoordinate";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c multi_texture_coordinate_metatype.
- */
- multi_texture_coordinate_metatype::
- multi_texture_coordinate_metatype(openvrml::browser & browser):
- node_metatype(multi_texture_coordinate_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- multi_texture_coordinate_metatype::~multi_texture_coordinate_metatype() throw ()
- {}
-
- /**
- * @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 MultiTextureCoordinate nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by multi_texture_coordinate_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- multi_texture_coordinate_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 2> 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::mfnode_id,
- "texCoord")
- };
- typedef node_type_impl<multi_texture_coordinate_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,
- &multi_texture_coordinate_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_coordinate_node::tex_coord_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const multi_texture_transform_metatype::id =
- "urn:X-openvrml:node:MultiTextureTransform";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c multi_texture_transform_metatype.
- */
- multi_texture_transform_metatype::
- multi_texture_transform_metatype(openvrml::browser & browser):
- node_metatype(multi_texture_transform_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- multi_texture_transform_metatype::~multi_texture_transform_metatype() throw ()
- {}
-
- /**
- * @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 MultiTextureTransform nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by multi_texture_transform_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- multi_texture_transform_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 2> 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::mfnode_id,
- "textureTransform")
- };
- typedef node_type_impl<multi_texture_transform_node> node_type_t;
-
- const boost::shared_ptr<node_type> type(new node_type_t(*this, id));
- node_type_t & the_node_type = static_cast<node_type_t &>(*type);
-
- for (node_interface_set::const_iterator interface_(interfaces.begin());
- interface_ != interfaces.end();
- ++interface_) {
- supported_interfaces_t::const_iterator supported_interface =
- supported_interfaces.begin() - 1;
- if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_transform_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &multi_texture_transform_node::texture_transform_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @brief @c node_metatype identifier.
- */
- const char * const texture_coordinate_generator_metatype::id =
- "urn:X-openvrml:node:TextureCoordinateGenerator";
-
- /**
- * @brief Construct.
- *
- * @param browser the @c browser associated with this
- * @c texture_coordinate_generator_metatype.
- */
- texture_coordinate_generator_metatype::
- texture_coordinate_generator_metatype(openvrml::browser & browser):
- node_metatype(texture_coordinate_generator_metatype::id, browser)
- {}
-
- /**
- * @brief Destroy.
- */
- texture_coordinate_generator_metatype::~texture_coordinate_generator_metatype() throw ()
- {}
-
- /**
- * @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 TextureCoordinateGenerator nodes.
- *
- * @exception unsupported_interface if @p interfaces includes an interface
- * not supported by texture_coordinate_generator_metatype.
- * @exception std::bad_alloc if memory allocation fails.
- */
- const boost::shared_ptr<openvrml::node_type>
- texture_coordinate_generator_metatype::
- do_create_type(const std::string & id,
- const node_interface_set & interfaces) const
- throw (unsupported_interface, std::bad_alloc)
- {
- typedef boost::array<node_interface, 3> 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::sfstring_id,
- "mode"),
- node_interface(node_interface::exposedfield_id,
- field_value::mffloat_id,
- "parameter")
- };
- typedef node_type_impl<texture_coordinate_generator_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,
- &texture_coordinate_generator_node::metadata);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &texture_coordinate_generator_node::mode_);
- } else if (*interface_ == *++supported_interface) {
- the_node_type.add_exposedfield(
- supported_interface->field_type,
- supported_interface->id,
- &texture_coordinate_generator_node::parameter_);
- } else {
- throw unsupported_interface(*interface_);
- }
- }
- return type;
- }
-
-
- /**
- * @class multi_texture_node
- *
- * @brief Represents MultiTexture node instances.
- */
-
- /**
- * @var multi_texture_node::MultiTexture_metatype
- *
- * @brief Class object for MultiTexture nodes.
- */
-
- /**
- * @var multi_texture_node::alpha_
- *
- * @brief alpha exposedField
- */
-
- /**
- * @var multi_texture_node::color_
- *
- * @brief color exposedField
- */
-
- /**
- * @var multi_texture_node::function_
- *
- * @brief function exposedField
- */
-
- /**
- * @var multi_texture_node::mode_
- *
- * @brief mode exposedField
- */
-
- /**
- * @var multi_texture_node::source_
- *
- * @brief source exposedField
- */
-
- /**
- * @var multi_texture_node::texture_
- *
- * @brief texture exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- multi_texture_node::
- multi_texture_node(const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- alpha_(*this, 1),
- color_(*this, make_color(1.0, 1.0, 1.0)),
- function_(*this),
- mode_(*this),
- source_(*this),
- texture_(*this)
- {}
-
- /**
- * @brief Destroy.
- */
- multi_texture_node::~multi_texture_node() throw ()
- {}
-
-
- /**
- * @class multi_texture_coordinate_node
- *
- * @brief Represents MultiTextureCoordinate node instances.
- */
-
- /**
- * @var multi_texture_coordinate_node::multi_texture_coordinate_metatype
- *
- * @brief Class object for MultiTextureCoordinate nodes.
- */
-
- /**
- * @var multi_texture_coordinate_node::tex_coord_
- *
- * @brief tex_coord exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- multi_texture_coordinate_node::
- multi_texture_coordinate_node(
- const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- tex_coord_(*this)
- {}
-
- /**
- * @brief Destroy.
- */
- multi_texture_coordinate_node::~multi_texture_coordinate_node() throw ()
- {}
-
-
- /**
- * @class multi_texture_transform_node
- *
- * @brief Represents MultiTextureTransform node instances.
- */
-
- /**
- * @var multi_texture_transform_node::multi_texture_transform_metatype
- *
- * @brief Class object for MultiTextureTransform nodes.
- */
-
- /**
- * @var multi_texture_transform_node::texture_transform_
- *
- * @brief texture_transform exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- multi_texture_transform_node::
- multi_texture_transform_node(
- const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- texture_transform_(*this)
- {}
-
- /**
- * @brief Destroy.
- */
- multi_texture_transform_node::~multi_texture_transform_node() throw ()
- {}
-
-
- /**
- * @class texture_coordinate_generator_node
- *
- * @brief Represents TextureCoordinateGenerator node instances.
- */
-
- /**
- * @var texture_coordinate_generator_node::texture_coordinate_generator_metatype
- *
- * @brief Class object for TextureCoordinateGenerator nodes.
- */
-
- /**
- * @var texture_coordinate_generator_node::mode_
- *
- * @brief mode exposedField
- */
-
- /**
- * @var texture_coordinate_generator_node::parameter_
- *
- * @brief parameter exposedField
- */
-
-
- /**
- * @brief Construct.
- *
- * @param type the node_type associated with this node.
- * @param scope the scope to which the node belongs.
- */
- texture_coordinate_generator_node::
- texture_coordinate_generator_node(
- const node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope):
- node(type, scope),
- abstract_node<self_t>(type, scope),
- mode_(*this, "SPHERE"),
- parameter_(*this)
- {}
-
- /**
- * @brief Destroy.
- */
- texture_coordinate_generator_node::~texture_coordinate_generator_node() throw ()
- {}
-}
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
+ /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
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
+ /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/circle2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/circle2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/disk2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/disk2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polyline2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polyline2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polypoint2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/polypoint2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/rectangle2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/rectangle2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/rectangle2d.h:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.cpp:3649-3650
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/triangle_set2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.h:3649-3650
/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
/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
/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
/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
/trunk/src/libopenvrml/openvrml/x3d_grouping.cpp:3401-3630
Property changes on: trunk/src/node/x3d-networking/load_sensor.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-networking/load_sensor.cpp:3637-3638,3640-3641,3643-3644,3646-3647
+ /branches/node-modules/src/node/x3d-networking/load_sensor.cpp:3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
Property changes on: trunk/src/node/x3d-networking/load_sensor.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-networking/load_sensor.h:3637-3638,3640-3641,3643-3644,3646-3647
+ /branches/node-modules/src/node/x3d-networking/load_sensor.h:3637-3638,3640-3641,3643-3644,3646-3647,3649-3650
Property changes on: trunk/src/node/x3d-rendering/color_rgba.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-rendering/color_rgba.cpp:3643-3644,3646-3647
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/color_rgba.cpp:3643-3644,3646-3647,3649-3650
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/color_rgba.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-rendering/color_rgba.h:3643-3644,3646-3647
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/color_rgba.h:3643-3644,3646-3647,3649-3650
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.cpp:3643-3644,3646-3647
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.cpp:3643-3644,3646-3647,3649-3650
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.h:3643-3644,3646-3647
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.h:3643-3644,3646-3647,3649-3650
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
Property changes on: trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-rendering/indexed_triangle_set.cpp:3643-3644,3646-3647
/trunk/src/libopenvrml/openvrml/x3d_rendering.cpp:3401-3630
+ /branches/node-modules/src/n...
[truncated message content] |
