Menu
▾
▴
SF.net SVN: openvrml:[3988] branches/0.18
|
From: <br...@us...> - 2009-08-07 08:08:14
|
Revision: 3988
http://openvrml.svn.sourceforge.net/openvrml/?rev=3988&view=rev
Author: braden
Date: 2009-08-07 08:08:03 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Modified openvrml::local::dl interface to use boost::filesystem::path and std::string.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/Makefile.am
branches/0.18/src/libopenvrml/openvrml/local/conf.cpp
branches/0.18/src/libopenvrml/openvrml/local/conf.h
branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
branches/0.18/src/libopenvrml/openvrml/script.cpp
branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h
Property Changed:
----------------
branches/0.18/
branches/0.18/src/libopenvrml/openvrml/bad_url.cpp
branches/0.18/src/libopenvrml/openvrml/bad_url.h
branches/0.18/src/libopenvrml/openvrml/local/proto.cpp
branches/0.18/src/libopenvrml/openvrml/local/proto.h
branches/0.18/src/libopenvrml/openvrml/scene.cpp
branches/0.18/src/libopenvrml/openvrml/scene.h
branches/0.18/src/libopenvrml/openvrml/script.cpp
branches/0.18/src/mozilla-plugin/
branches/0.18/src/node/vrml97/register_node_metatypes.cpp
branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp
branches/0.18/src/node/x3d-cad-geometry/cad_face.h
branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp
branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h
branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp
branches/0.18/src/node/x3d-core/metadata_double.cpp
branches/0.18/src/node/x3d-core/metadata_double.h
branches/0.18/src/node/x3d-core/metadata_float.cpp
branches/0.18/src/node/x3d-core/metadata_float.h
branches/0.18/src/node/x3d-core/metadata_integer.cpp
branches/0.18/src/node/x3d-core/metadata_integer.h
branches/0.18/src/node/x3d-core/metadata_set.cpp
branches/0.18/src/node/x3d-core/metadata_set.h
branches/0.18/src/node/x3d-core/metadata_string.cpp
branches/0.18/src/node/x3d-core/metadata_string.h
branches/0.18/src/node/x3d-core/register_node_metatypes.cpp
branches/0.18/src/node/x3d-dis/espdu_transform.cpp
branches/0.18/src/node/x3d-dis/espdu_transform.h
branches/0.18/src/node/x3d-dis/receiver_pdu.cpp
branches/0.18/src/node/x3d-dis/receiver_pdu.h
branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp
branches/0.18/src/node/x3d-dis/signal_pdu.cpp
branches/0.18/src/node/x3d-dis/signal_pdu.h
branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp
branches/0.18/src/node/x3d-dis/transmitter_pdu.h
branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp
branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp
branches/0.18/src/node/x3d-environmental-effects/texture_background.h
branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_filter.h
branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h
branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h
branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h
branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp
branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h
branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp
branches/0.18/src/node/x3d-event-utilities/integer_trigger.h
branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp
branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp
branches/0.18/src/node/x3d-event-utilities/time_trigger.h
branches/0.18/src/node/x3d-geometry2d/arc2d.cpp
branches/0.18/src/node/x3d-geometry2d/arc2d.h
branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp
branches/0.18/src/node/x3d-geometry2d/arc_close2d.h
branches/0.18/src/node/x3d-geometry2d/circle2d.cpp
branches/0.18/src/node/x3d-geometry2d/circle2d.h
branches/0.18/src/node/x3d-geometry2d/disk2d.cpp
branches/0.18/src/node/x3d-geometry2d/disk2d.h
branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp
branches/0.18/src/node/x3d-geometry2d/polyline2d.h
branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp
branches/0.18/src/node/x3d-geometry2d/polypoint2d.h
branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp
branches/0.18/src/node/x3d-geometry2d/rectangle2d.h
branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp
branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp
branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h
branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp
branches/0.18/src/node/x3d-geospatial/geo_coordinate.h
branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp
branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h
branches/0.18/src/node/x3d-geospatial/geo_location.cpp
branches/0.18/src/node/x3d-geospatial/geo_location.h
branches/0.18/src/node/x3d-geospatial/geo_lod.cpp
branches/0.18/src/node/x3d-geospatial/geo_lod.h
branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp
branches/0.18/src/node/x3d-geospatial/geo_metadata.h
branches/0.18/src/node/x3d-geospatial/geo_origin.cpp
branches/0.18/src/node/x3d-geospatial/geo_origin.h
branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp
branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h
branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp
branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h
branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp
branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h
branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp
branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp
branches/0.18/src/node/x3d-grouping/static_group.cpp
branches/0.18/src/node/x3d-grouping/static_group.h
branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h
branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h
branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_joint.h
branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_segment.h
branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_site.h
branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp
branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h
branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp
branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h
branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp
branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp
branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h
branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp
branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h
branches/0.18/src/node/x3d-networking/load_sensor.cpp
branches/0.18/src/node/x3d-networking/load_sensor.h
branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp
branches/0.18/src/node/x3d-nurbs/contour2d.cpp
branches/0.18/src/node/x3d-nurbs/contour2d.h
branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp
branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h
branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp
branches/0.18/src/node/x3d-nurbs/coordinate_double.h
branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_curve.h
branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h
branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h
branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h
branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_set.h
branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h
branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h
branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h
branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h
branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h
branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp
branches/0.18/src/node/x3d-rendering/color_rgba.cpp
branches/0.18/src/node/x3d-rendering/color_rgba.h
branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h
branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp
branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h
branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h
branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp
branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp
branches/0.18/src/node/x3d-rendering/triangle_fan_set.h
branches/0.18/src/node/x3d-rendering/triangle_set.cpp
branches/0.18/src/node/x3d-rendering/triangle_set.h
branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp
branches/0.18/src/node/x3d-rendering/triangle_strip_set.h
branches/0.18/src/node/x3d-shape/fill_properties.cpp
branches/0.18/src/node/x3d-shape/fill_properties.h
branches/0.18/src/node/x3d-shape/line_properties.cpp
branches/0.18/src/node/x3d-shape/line_properties.h
branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp
branches/0.18/src/node/x3d-texturing/multi_texture.cpp
branches/0.18/src/node/x3d-texturing/multi_texture.h
branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp
branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h
branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp
branches/0.18/src/node/x3d-texturing/multi_texture_transform.h
branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp
branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp
branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/ChangeLog 2009-08-07 08:08:03 UTC (rev 3988)
@@ -1,3 +1,57 @@
+2009-08-07 Braden McDaniel <br...@en...>
+
+ Modified openvrml::local::dl interface to use
+ boost::filesystem::path and std::string.
+
+ * src/Makefile.am
+ (local_libopenvrml_dl_la_LIBADD): Added libboost_filesystem
+ dependency.
+ * src/libopenvrml/openvrml/local/conf.cpp
+ (openvrml::local::conf::datadir()): Return a
+ boost::filesystem::path.
+ (openvrml::local::conf::node_path()): Return a std::vector of
+ boost::filesystem::path to represent the node module search path.
+ (openvrml::local::conf::script_path()): Return a std::vector of
+ boost::filesystem::path to represent the script module search
+ path.
+ * src/libopenvrml/openvrml/local/conf.h
+ (openvrml::local::conf::datadir()): Return a
+ boost::filesystem::path.
+ (openvrml::local::conf::node_path()): Return a std::vector of
+ boost::filesystem::path to represent the node module search path.
+ (openvrml::local::conf::script_path()): Return a std::vector of
+ boost::filesystem::path to represent the script module search
+ path.
+ * src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
+ (openvrml_open_node_module(const std::string &, void *)): Changed
+ signature to use std::string.
+ (openvrml::local::node_metatype_registry_impl::node_metatype_registry_impl(openvrml::browser&)):
+ Use a std::vector of boost::filesystem::path to represent the node
+ module search path.
+ * src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
+ (node_metatype_registry_impl): Use std::string in the signature of
+ openvrml_open_node_module; changed type of sym to std::string.
+ * src/local/libopenvrml-dl/openvrml/local/dl.cpp
+ (openvrml::local::dl::foreachfile(const
+ std::vector<boost::filesystem::path> &, int (*)(const
+ std::string&, void *), void *)): Use boost::filesystem::path and
+ std::string.
+ (openvrml::local::dl::prepend_to_searchpath(const
+ boost::filesystem::path &)): Use boost::filesystem::path.
+ (openvrml::local::dl::open(const std::string &)): Use std::string.
+ (openvrml::local::dl::sym(handle, const std::string &)): Use
+ std::string.
+ * src/local/libopenvrml-dl/openvrml/local/dl.h
+ (openvrml::local::dl::foreachfile(const
+ std::vector<boost::filesystem::path> &, int (*)(const
+ std::string&, void *), void *)): Use boost::filesystem::path and
+ std::string.
+ (openvrml::local::dl::prepend_to_searchpath(const
+ boost::filesystem::path &)): Use boost::filesystem::path.
+ (openvrml::local::dl::open(const std::string &)): Use std::string.
+ (openvrml::local::dl::sym(handle, const std::string &)): Use
+ std::string.
+
2009-08-03 Braden McDaniel <br...@en...>
Converted Java scripting backend to use libopenvrml-dl to load
Modified: branches/0.18/src/Makefile.am
===================================================================
--- branches/0.18/src/Makefile.am 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/Makefile.am 2009-08-07 08:08:03 UTC (rev 3988)
@@ -130,7 +130,9 @@
local_libopenvrml_dl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml
-local_libopenvrml_dl_la_LIBADD = -lltdl
+local_libopenvrml_dl_la_LIBADD = \
+ -lboost_filesystem$(BOOST_LIB_SUFFIX) \
+ -lltdl
openvrmlscriptdir = $(pkglibdir)/script
Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
/trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
/trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Modified: branches/0.18/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2009-08-07 08:08:03 UTC (rev 3988)
@@ -21,6 +21,7 @@
# include "conf.h"
# include <boost/multi_index/detail/scope_guard.hpp>
# include <boost/ref.hpp>
+# include <boost/tokenizer.hpp>
# ifdef _WIN32
# include <windows.h>
# include <vector>
@@ -132,10 +133,10 @@
# endif
}
-const std::string openvrml::local::conf::datadir()
+const boost::filesystem::path openvrml::local::conf::datadir()
OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
{
- std::string result;
+ boost::filesystem::path result;
try {
result = get_env("OPENVRML_DATADIR");
} catch (const no_environment_var &) {
@@ -156,25 +157,56 @@
':';
# endif
- OPENVRML_LOCAL void append_to_path(std::string & path,
- const std::string & appended_part)
- OPENVRML_THROW1(std::bad_alloc)
- {
- if (!path.empty() && !appended_part.empty()) {
- path += path_separator;
+ struct OPENVRML_LOCAL search_path_tokenizer {
+ template <typename Iterator, typename Token>
+ bool operator()(Iterator & next, Iterator end, Token & tok)
+ {
+ while (next != end) {
+ if (*next == path_separator) {
+ ++next;
+ break;
+ }
+ this->tok_.push_back(*next);
+ ++next;
+ }
+ if (!this->tok_.empty()) {
+ tok = this->tok_;
+ this->tok_.clear();
+ return true;
+ }
+ return false;
}
- path += appended_part;
- }
+
+ void reset()
+ {
+ this->tok_.clear();
+ }
+
+ private:
+ std::string tok_;
+ };
}
-const std::string openvrml::local::conf::node_path()
+const std::vector<boost::filesystem::path> openvrml::local::conf::node_path()
OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
{
+ using std::back_inserter;
+ using std::copy;
+ using boost::filesystem::path;
+ typedef boost::tokenizer<search_path_tokenizer> tokenizer_t;
+
+ std::vector<path> result;
+ search_path_tokenizer tokenizer_func;
+
std::string env_path;
try {
env_path = get_env("OPENVRML_NODE_PATH");
} catch (const no_environment_var &) {}
+ tokenizer_t env_path_tokenizer(env_path, tokenizer_func);
+ copy(env_path_tokenizer.begin(), env_path_tokenizer.end(),
+ back_inserter(result));
+
std::string system_path;
# ifdef _WIN32
try {
@@ -184,19 +216,33 @@
system_path = OPENVRML_PKGLIBDIR_ "/node";
# endif
- std::string result = env_path;
- append_to_path(result, system_path);
+ tokenizer_t system_path_tokenizer(system_path, tokenizer_func);
+ copy(system_path_tokenizer.begin(), system_path_tokenizer.end(),
+ back_inserter(result));
+
return result;
}
-const std::string openvrml::local::conf::script_path()
+const std::vector<boost::filesystem::path> openvrml::local::conf::script_path()
OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
{
+ using std::back_inserter;
+ using std::copy;
+ using boost::filesystem::path;
+ typedef boost::tokenizer<search_path_tokenizer> tokenizer_t;
+
+ std::vector<path> result;
+ search_path_tokenizer tokenizer_func;
+
std::string env_path;
try {
env_path = get_env("OPENVRML_SCRIPT_PATH");
} catch (const no_environment_var &) {}
+ tokenizer_t env_path_tokenizer(env_path, tokenizer_func);
+ copy(env_path_tokenizer.begin(), env_path_tokenizer.end(),
+ back_inserter(result));
+
std::string system_path;
# ifdef _WIN32
try {
@@ -206,7 +252,9 @@
system_path = OPENVRML_PKGLIBDIR_ "/script";
# endif
- std::string result = env_path;
- append_to_path(result, system_path);
+ tokenizer_t system_path_tokenizer(system_path, tokenizer_func);
+ copy(system_path_tokenizer.begin(), system_path_tokenizer.end(),
+ back_inserter(result));
+
return result;
}
Modified: branches/0.18/src/libopenvrml/openvrml/local/conf.h
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/conf.h 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/libopenvrml/openvrml/local/conf.h 2009-08-07 08:08:03 UTC (rev 3988)
@@ -22,8 +22,9 @@
# define OPENVRML_LOCAL_CONF_H
# include <openvrml-common.h>
+# include <boost/filesystem/path.hpp>
# include <stdexcept>
-# include <string>
+# include <vector>
namespace openvrml {
@@ -31,11 +32,15 @@
namespace conf {
- OPENVRML_LOCAL const std::string datadir()
+ OPENVRML_LOCAL const boost::filesystem::path datadir()
OPENVRML_THROW2(std::runtime_error, std::bad_alloc);
- OPENVRML_LOCAL const std::string node_path()
+
+ OPENVRML_LOCAL
+ const std::vector<boost::filesystem::path> node_path()
OPENVRML_THROW2(std::runtime_error, std::bad_alloc);
- OPENVRML_LOCAL const std::string script_path()
+
+ OPENVRML_LOCAL
+ const std::vector<boost::filesystem::path> script_path()
OPENVRML_THROW2(std::runtime_error, std::bad_alloc);
}
}
Modified: branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2009-08-07 08:08:03 UTC (rev 3988)
@@ -27,10 +27,10 @@
using namespace boost::multi_index::detail; // for scope_guard
-const char openvrml::local::node_metatype_registry_impl::sym[33] =
+const std::string openvrml::local::node_metatype_registry_impl::sym =
"openvrml_register_node_metatypes";
-int openvrml_open_node_module(const char * const filename, void * const data)
+int openvrml_open_node_module(const std::string & filename, void * const data)
{
using openvrml::node_metatype_registry;
using namespace openvrml::local;
@@ -75,9 +75,9 @@
throw std::runtime_error("dlinit_failure");
}
- const std::string node_path = conf::node_path();
+ const std::vector<boost::filesystem::path> & node_path = conf::node_path();
- result = dl::foreachfile(node_path.c_str(),
+ result = dl::foreachfile(node_path,
openvrml_open_node_module,
this);
assert(result == 0); // We always return 0 from the callback.
Modified: branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h 2009-08-07 08:08:03 UTC (rev 3988)
@@ -24,8 +24,9 @@
# include <openvrml/local/dl.h>
# include <openvrml/node.h>
-extern "C" OPENVRML_LOCAL int openvrml_open_node_module(const char * filename,
- void * data);
+extern "C"
+OPENVRML_LOCAL
+int openvrml_open_node_module(const std::string & filename, void * data);
namespace openvrml {
@@ -36,8 +37,10 @@
namespace local {
class OPENVRML_LOCAL node_metatype_registry_impl : boost::noncopyable {
- friend int (::openvrml_open_node_module)(const char * filename,
- void * data);
+ friend
+ int (::openvrml_open_node_module)(const std::string & filename,
+ void * data);
+
mutable boost::shared_mutex mutex_;
openvrml::browser & browser_;
@@ -50,7 +53,7 @@
mutable node_metatype_map_t node_metatype_map_;
public:
- static const char sym[33];
+ static const std::string sym;
explicit node_metatype_registry_impl(openvrml::browser & b);
~node_metatype_registry_impl() OPENVRML_NOTHROW;
Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
/trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
/trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Modified: branches/0.18/src/libopenvrml/openvrml/script.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/script.cpp 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/libopenvrml/openvrml/script.cpp 2009-08-07 08:08:03 UTC (rev 3988)
@@ -361,7 +361,7 @@
* instantiate @c script_factory_registry.
*/
-extern "C" int openvrml_get_script_factory(const char * filename, void * data);
+extern "C" int openvrml_get_script_factory(const std::string & filename, void * data);
/**
* @internal
@@ -373,7 +373,7 @@
class openvrml::script_factory_registry::impl :
boost::noncopyable {
- friend int (::openvrml_get_script_factory)(const char * filename,
+ friend int (::openvrml_get_script_factory)(const std::string & filename,
void * data);
typedef std::set<local::dl::handle> module_handle_set;
@@ -403,7 +403,7 @@
find_using_uri_scheme(const std::string & uri_scheme) const;
};
-int openvrml_get_script_factory(const char * const filename, void * data)
+int openvrml_get_script_factory(const std::string & filename, void * data)
{
assert(data);
@@ -442,9 +442,10 @@
throw std::runtime_error("dlinit failure");
}
- const std::string script_path = local::conf::script_path();
+ const std::vector<boost::filesystem::path> & script_path =
+ local::conf::script_path();
- result = dl::foreachfile(script_path.c_str(),
+ result = dl::foreachfile(script_path,
openvrml_get_script_factory,
this);
assert(result == 0); // We always return 0 from the callback.
Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-07 08:08:03 UTC (rev 3988)
@@ -23,6 +23,7 @@
# include <boost/ref.hpp>
# include <boost/tokenizer.hpp>
# include <boost/multi_index/detail/scope_guard.hpp>
+# include <sstream>
using namespace boost::multi_index::detail; // for scope_guard
@@ -45,75 +46,55 @@
}
namespace {
-
- struct OPENVRML_LOCAL win32_search_path_tokenizer {
- win32_search_path_tokenizer()
- {}
-
- template <typename Iterator, typename Token>
- bool operator()(Iterator & next, Iterator end, Token & tok)
- {
- while (next != end) {
- if (*next == ';') {
- ++next;
- break;
- }
- this->tok_.push_back(*next);
- ++next;
- }
- if (!this->tok_.empty()) {
- tok = this->tok_;
- this->tok_.clear();
- return true;
- }
- return false;
- }
-
- void reset()
- {
- this->tok_.clear();
- }
-
- private:
- std::string tok_;
+ struct ltforeachfile_data {
+ int (*func)(const std::string & filename, void * data);
+ void * data;
};
}
+extern "C"
+OPENVRML_LOCAL
+int openvrml_dl_ltforeachfile(const char * filename, void * data)
+{
+ ltforeachfile_data * const d = static_cast<ltforeachfile_data *>(data);
+ return (d->func)(filename, d->data);
+}
+
int
-openvrml::local::dl::foreachfile(const char * search_path,
- int (*func)(const char * filename, void * data),
- void * data)
+openvrml::local::dl::
+foreachfile(const std::vector<boost::filesystem::path> & search_path,
+ int (*func)(const std::string & filename, void * data),
+ void * data)
{
# ifdef _WIN32
using boost::filesystem::path;
using boost::filesystem::directory_iterator;
typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t;
- std::vector<path> search_dirs;
- win32_search_path_tokenizer tokenizer_func;
- std::string search_path_str(search_path);
- tokenizer_t tokenizer(search_path_str, tokenizer_func);
- for (tokenizer_t::const_iterator token = tokenizer.begin();
- token != tokenizer.end();
- ++token) {
- search_dirs.push_back(path(*token));
- }
-
int result = 0;
- for (std::vector<path>::const_iterator dir = search_dirs.begin();
- dir != search_dirs.end();
+ for (std::vector<path>::const_iterator dir = search_path.begin();
+ dir != search_path.end();
++dir) try {
- for (directory_iterator entry(*dir);
- entry != directory_iterator();
- ++entry) {
- result = (func)(entry->path().external_file_string().c_str(),
- data);
- if (result != 0) { return result; }
- }
- } catch (boost::filesystem::filesystem_error &) {}
+ for (directory_iterator entry(*dir);
+ entry != directory_iterator();
+ ++entry) {
+ result = (func)(entry->path().external_file_string(), data);
+ if (result != 0) { return result; }
+ }
+ } catch (boost::filesystem::filesystem_error &) {}
return result;
# else
- return lt_dlforeachfile(search_path, func, data);
+ std::ostringstream path;
+ std::vector<boost::filesystem::path>::const_iterator dir =
+ search_path.begin();
+ while (dir != search_path.end()) {
+ path << *dir;
+ if (++dir != search_path.end()) { path << LT_PATHSEP_CHAR; }
+ }
+ ltforeachfile_data ltdata = { func, data };
+ return lt_dlforeachfile(path.str().c_str(),
+ openvrml_dl_ltforeachfile,
+ <data);
# endif
}
@@ -122,24 +103,26 @@
*
* @brief Prepend @p dir to the dynamic library search path.
*/
-int openvrml::local::dl::prepend_to_searchpath(const char * const dir)
+int
+openvrml::local::dl::prepend_to_searchpath(const boost::filesystem::path & dir)
{
# ifdef _WIN32
- return SetDllDirectory(dir);
+ return SetDllDirectory(dir.directory_string().c_str());
# else
const char * const before = lt_dlgetsearchpath();
- return lt_dlinsertsearchdir(before, dir);
+ return lt_dlinsertsearchdir(before, dir.directory_string().c_str());
# endif
}
-openvrml::local::dl::handle openvrml::local::dl::open(const char * filename)
+openvrml::local::dl::handle
+openvrml::local::dl::open(const std::string & filename)
{
# ifdef _WIN32
- const char * last_dot = strrchr(filename, '.');
- if (strcmp(last_dot, ".dll") != 0) { return 0; }
- return LoadLibrary(filename);
+ std::string::size_type last_dot_index = filename.find_last_of('.');
+ if (filename.substr(last_dot_index) != ".dll") { return 0; }
+ return LoadLibrary(filename.c_str());
# else
- return lt_dlopenext(filename);
+ return lt_dlopenext(filename.c_str());
# endif
}
@@ -177,11 +160,11 @@
# endif
}
-void * openvrml::local::dl::sym(handle h, const char * name)
+void * openvrml::local::dl::sym(handle h, const std::string & name)
{
# ifdef _WIN32
- return GetProcAddress(h, name);
+ return GetProcAddress(h, name.c_str());
# else
- return lt_dlsym(h, name);
+ return lt_dlsym(h, name.c_str());
# endif
}
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-07 07:58:00 UTC (rev 3987)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-07 08:08:03 UTC (rev 3988)
@@ -27,7 +27,9 @@
# else
# include <ltdl.h>
# endif
+# include <boost/filesystem/path.hpp>
# include <string>
+# include <vector>
namespace openvrml {
@@ -40,11 +42,14 @@
OPENVRML_LOCAL int exit();
OPENVRML_LOCAL
- int foreachfile(const char * search_path,
- int (*func)(const char * filename, void * data),
- void * data);
+ int
+ foreachfile(
+ const std::vector<boost::filesystem::path> & search_path,
+ int (*func)(const std::string & filename, void * data),
+ void * data);
- OPENVRML_LOCAL int prepend_to_searchpath(const char * dir);
+ OPENVRML_LOCAL
+ int prepend_to_searchpath(const boost::filesystem::path & dir);
# ifdef _WIN32
typedef HMODULE handle;
@@ -52,13 +57,13 @@
typedef lt_dlhandle handle;
# endif
- OPENVRML_LOCAL handle open(const char * filename);
+ OPENVRML_LOCAL handle open(const std::string & filename);
OPENVRML_LOCAL const std::string error();
OPENVRML_LOCAL int close(handle);
- OPENVRML_LOCAL void * sym(handle, const char * name);
+ OPENVRML_LOCAL void * sym(handle, const std::string & name);
}
}
}
Property changes on: branches/0.18/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
/trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
/trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
/trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
/trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734
/trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734
/trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734
/trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734
/trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987
Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
/trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985
+ /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/si...
[truncated message content] |
