Menu
▾
▴
SF.net SVN: openvrml:[3735] branches/node-modules
|
From: <br...@us...> - 2008-10-10 07:55:09
|
Revision: 3735
http://openvrml.svn.sourceforge.net/openvrml/?rev=3735&view=rev
Author: braden
Date: 2008-10-10 07:55:02 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Sync with trunk.
Modified Paths:
--------------
branches/node-modules/ChangeLog
branches/node-modules/NEWS
branches/node-modules/README
branches/node-modules/configure.ac
branches/node-modules/doc/Doxyfile
branches/node-modules/doc/Makefile.am
branches/node-modules/doc/doxygen-footer
branches/node-modules/doc/doxygen-header
branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
branches/node-modules/m4/acx_pthread.m4
branches/node-modules/m4/ax_check_gl.m4
branches/node-modules/mozilla-plugin/configure.ac
branches/node-modules/mozilla-plugin/src/openvrml.cpp
branches/node-modules/src/Makefile.am
branches/node-modules/src/libopenvrml/openvrml/browser.cpp
branches/node-modules/src/libopenvrml/openvrml/local/dl.cpp
branches/node-modules/src/libopenvrml/openvrml/local/uri.cpp
branches/node-modules/src/libopenvrml/openvrml/local/uri.h
branches/node-modules/src/libopenvrml/openvrml/local/xml_reader.cpp
branches/node-modules/src/libopenvrml/openvrml/node.cpp
branches/node-modules/src/libopenvrml/openvrml/node.h
branches/node-modules/src/libopenvrml/openvrml/scene.cpp
branches/node-modules/src/libopenvrml/openvrml/script.cpp
branches/node-modules/src/libopenvrml/openvrml/viewer.cpp
branches/node-modules/src/openvrml-player/curlbrowserhost.cpp
branches/node-modules/src/openvrml-xembed/browser-factory.xml
branches/node-modules/src/openvrml-xembed/browserfactory.cpp
branches/node-modules/src/openvrml-xembed/browserfactory.h
branches/node-modules/src/openvrml-xembed/main.cpp
branches/node-modules/src/script/java.cpp
Added Paths:
-----------
branches/node-modules/doc/manual/x3d-white-on-black.png
branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp
branches/node-modules/src/libopenvrml/openvrml/local/proto.h
Removed Paths:
-------------
branches/node-modules/doc/fdl.texi
branches/node-modules/doc/openvrml-xembed.texi
Property Changed:
----------------
branches/node-modules/
branches/node-modules/doc/
branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp
branches/node-modules/src/libopenvrml/openvrml/bad_url.h
branches/node-modules/src/libopenvrml/openvrml/scene.cpp
branches/node-modules/src/libopenvrml/openvrml/scene.h
branches/node-modules/src/libopenvrml/openvrml/script.cpp
branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp
branches/node-modules/src/node/x3d-cad-geometry/cad_face.h
branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp
branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h
branches/node-modules/src/node/x3d-core/metadata_double.cpp
branches/node-modules/src/node/x3d-core/metadata_double.h
branches/node-modules/src/node/x3d-core/metadata_float.cpp
branches/node-modules/src/node/x3d-core/metadata_float.h
branches/node-modules/src/node/x3d-core/metadata_integer.cpp
branches/node-modules/src/node/x3d-core/metadata_integer.h
branches/node-modules/src/node/x3d-core/metadata_set.cpp
branches/node-modules/src/node/x3d-core/metadata_set.h
branches/node-modules/src/node/x3d-core/metadata_string.cpp
branches/node-modules/src/node/x3d-core/metadata_string.h
branches/node-modules/src/node/x3d-dis/espdu_transform.cpp
branches/node-modules/src/node/x3d-dis/espdu_transform.h
branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp
branches/node-modules/src/node/x3d-dis/receiver_pdu.h
branches/node-modules/src/node/x3d-dis/signal_pdu.cpp
branches/node-modules/src/node/x3d-dis/signal_pdu.h
branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp
branches/node-modules/src/node/x3d-dis/transmitter_pdu.h
branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp
branches/node-modules/src/node/x3d-environmental-effects/texture_background.h
branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp
branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h
branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp
branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h
branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp
branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h
branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp
branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h
branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp
branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h
branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp
branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h
branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp
branches/node-modules/src/node/x3d-event-utilities/time_trigger.h
branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp
branches/node-modules/src/node/x3d-geometry2d/arc2d.h
branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp
branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h
branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp
branches/node-modules/src/node/x3d-geometry2d/circle2d.h
branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp
branches/node-modules/src/node/x3d-geometry2d/disk2d.h
branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp
branches/node-modules/src/node/x3d-geometry2d/polyline2d.h
branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp
branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h
branches/node-modules/src/node/x3d-geometry2d/rectangle2d.cpp
branches/node-modules/src/node/x3d-geometry2d/rectangle2d.h
branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.cpp
branches/node-modules/src/node/x3d-geometry2d/triangle_set2d.h
branches/node-modules/src/node/x3d-geospatial/geo_coordinate.cpp
branches/node-modules/src/node/x3d-geospatial/geo_coordinate.h
branches/node-modules/src/node/x3d-geospatial/geo_elevation_grid.cpp
branches/node-modules/src/node/x3d-geospatial/geo_elevation_grid.h
branches/node-modules/src/node/x3d-geospatial/geo_location.cpp
branches/node-modules/src/node/x3d-geospatial/geo_location.h
branches/node-modules/src/node/x3d-geospatial/geo_lod.cpp
branches/node-modules/src/node/x3d-geospatial/geo_lod.h
branches/node-modules/src/node/x3d-geospatial/geo_metadata.cpp
branches/node-modules/src/node/x3d-geospatial/geo_metadata.h
branches/node-modules/src/node/x3d-geospatial/geo_origin.cpp
branches/node-modules/src/node/x3d-geospatial/geo_origin.h
branches/node-modules/src/node/x3d-geospatial/geo_position_interpolator.cpp
branches/node-modules/src/node/x3d-geospatial/geo_position_interpolator.h
branches/node-modules/src/node/x3d-geospatial/geo_touch_sensor.cpp
branches/node-modules/src/node/x3d-geospatial/geo_touch_sensor.h
branches/node-modules/src/node/x3d-geospatial/geo_viewpoint.cpp
branches/node-modules/src/node/x3d-geospatial/geo_viewpoint.h
branches/node-modules/src/node/x3d-grouping/static_group.cpp
branches/node-modules/src/node/x3d-grouping/static_group.h
branches/node-modules/src/node/x3d-h-anim/h_anim_displacer.cpp
branches/node-modules/src/node/x3d-h-anim/h_anim_displacer.h
branches/node-modules/src/node/x3d-h-anim/h_anim_humanoid.cpp
branches/node-modules/src/node/x3d-h-anim/h_anim_humanoid.h
branches/node-modules/src/node/x3d-h-anim/h_anim_joint.cpp
branches/node-modules/src/node/x3d-h-anim/h_anim_joint.h
branches/node-modules/src/node/x3d-h-anim/h_anim_segment.cpp
branches/node-modules/src/node/x3d-h-anim/h_anim_segment.h
branches/node-modules/src/node/x3d-h-anim/h_anim_site.cpp
branches/node-modules/src/node/x3d-h-anim/h_anim_site.h
branches/node-modules/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
branches/node-modules/src/node/x3d-interpolation/coordinate_interpolator2d.h
branches/node-modules/src/node/x3d-interpolation/position_interpolator2d.cpp
branches/node-modules/src/node/x3d-interpolation/position_interpolator2d.h
branches/node-modules/src/node/x3d-key-device-sensor/key_sensor.cpp
branches/node-modules/src/node/x3d-key-device-sensor/key_sensor.h
branches/node-modules/src/node/x3d-key-device-sensor/string_sensor.cpp
branches/node-modules/src/node/x3d-key-device-sensor/string_sensor.h
branches/node-modules/src/node/x3d-networking/load_sensor.cpp
branches/node-modules/src/node/x3d-networking/load_sensor.h
branches/node-modules/src/node/x3d-nurbs/contour2d.cpp
branches/node-modules/src/node/x3d-nurbs/contour2d.h
branches/node-modules/src/node/x3d-nurbs/contour_polyline2d.cpp
branches/node-modules/src/node/x3d-nurbs/contour_polyline2d.h
branches/node-modules/src/node/x3d-nurbs/coordinate_double.cpp
branches/node-modules/src/node/x3d-nurbs/coordinate_double.h
branches/node-modules/src/node/x3d-nurbs/nurbs_curve.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_curve.h
branches/node-modules/src/node/x3d-nurbs/nurbs_curve2d.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_curve2d.h
branches/node-modules/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
branches/node-modules/src/node/x3d-nurbs/nurbs_patch_surface.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_patch_surface.h
branches/node-modules/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_position_interpolator.h
branches/node-modules/src/node/x3d-nurbs/nurbs_set.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_set.h
branches/node-modules/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_surface_interpolator.h
branches/node-modules/src/node/x3d-nurbs/nurbs_swept_surface.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_swept_surface.h
branches/node-modules/src/node/x3d-nurbs/nurbs_swung_surface.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_swung_surface.h
branches/node-modules/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_texture_coordinate.h
branches/node-modules/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
branches/node-modules/src/node/x3d-nurbs/nurbs_trimmed_surface.h
branches/node-modules/src/node/x3d-rendering/color_rgba.cpp
branches/node-modules/src/node/x3d-rendering/color_rgba.h
branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
branches/node-modules/src/node/x3d-rendering/indexed_triangle_fan_set.h
branches/node-modules/src/node/x3d-rendering/indexed_triangle_set.cpp
branches/node-modules/src/node/x3d-rendering/indexed_triangle_set.h
branches/node-modules/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
branches/node-modules/src/node/x3d-rendering/indexed_triangle_strip_set.h
branches/node-modules/src/node/x3d-rendering/triangle_fan_set.cpp
branches/node-modules/src/node/x3d-rendering/triangle_fan_set.h
branches/node-modules/src/node/x3d-rendering/triangle_set.cpp
branches/node-modules/src/node/x3d-rendering/triangle_set.h
branches/node-modules/src/node/x3d-rendering/triangle_strip_set.cpp
branches/node-modules/src/node/x3d-rendering/triangle_strip_set.h
branches/node-modules/src/node/x3d-shape/fill_properties.cpp
branches/node-modules/src/node/x3d-shape/fill_properties.h
branches/node-modules/src/node/x3d-shape/line_properties.cpp
branches/node-modules/src/node/x3d-shape/line_properties.h
branches/node-modules/src/node/x3d-texturing/multi_texture.cpp
branches/node-modules/src/node/x3d-texturing/multi_texture.h
branches/node-modules/src/node/x3d-texturing/multi_texture_coordinate.cpp
branches/node-modules/src/node/x3d-texturing/multi_texture_coordinate.h
branches/node-modules/src/node/x3d-texturing/multi_texture_transform.cpp
branches/node-modules/src/node/x3d-texturing/multi_texture_transform.h
branches/node-modules/src/node/x3d-texturing/texture_coordinate_generator.cpp
branches/node-modules/src/node/x3d-texturing/texture_coordinate_generator.h
Property changes on: branches/node-modules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local:3677-3689
/trunk:3401-3691
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732
/branches/local:3677-3689
/trunk:3401-3734
Modified: branches/node-modules/ChangeLog
===================================================================
--- branches/node-modules/ChangeLog 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/ChangeLog 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,3 +1,259 @@
+2008-10-09 Braden McDaniel <br...@en...>
+
+ Updates for 0.17.9 release.
+
+ * NEWS
+ * README
+ * doc/Doxyfile
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * src/Makefile.am: Updated libopenvrml libtool library version to
+ 8:7:0; updated libopenvrml-gl libtool library version to 7:3:0.
+
+2008-10-09 Braden McDaniel <br...@en...>
+
+ Removed obsolete texinfo documentation for openvrml-xembed.
+
+ * doc/Makefile.am
+ * doc/openvrml-xembed.texi: Removed.
+ * doc/fdl.texi: Removed.
+
+2008-10-08 Braden McDaniel <br...@en...>
+
+ * configure.ac: Fail if dbus-glib isn't found.
+
+2008-10-07 Braden McDaniel <br...@en...>
+
+ * configure.ac: Removed redundant AC_ARG_VAR for JAVA_HOME.
+
+2008-10-06 Braden McDaniel <br...@en...>
+
+ Process org.openvrml.BrowserControl.service.in with sed (rather
+ than config.status) so that substitutions that expand to make
+ macros get fully resolved.
+
+ * configure.ac: Removed
+ src/openvrml-xembed/org.openvrml.BrowserControl.service from
+ AC_CONFIG_FILES.
+ * src/Makefile.am: Added rules to create
+ org.openvrml.BrowserControl.service from
+ org.openvrml.BrowserControl.service.in.
+
+2008-10-06 Braden McDaniel <br...@en...>
+
+ * doc/Makefile.am: install/distcheck fixes for javadoc
+ documentation.
+
+2008-10-06 Braden McDaniel <br...@en...>
+
+ Updated to 20081006 release of Autoconf GL Macros.
+
+ * m4/ax_check_gl.m4
+
+2008-10-05 Braden McDaniel <br...@en...>
+
+ Updated to 20081005 release of Autoconf GL Macros.
+
+ * m4/acx_pthread.m4
+ * m4/ax_check_gl.m4
+
+2008-10-05 Braden McDaniel <br...@en...>
+
+ Need to use dbus_g_proxy_new_for_name rather than
+ _new_for_name_owner in order for activation to work.
+
+ * mozilla-plugin/src/openvrml.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Use dbus_g_proxy_new_for_name to get the
+ org.openvrml.BrowserFactory proxy.
+ * src/openvrml-player/curlbrowserhost.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Use dbus_g_proxy_new_for_name to get the
+ org.openvrml.BrowserFactory proxy.
+
+2008-10-04 Braden McDaniel <br...@en...>
+
+ If we set the absolute path of session_bus_servicesdir, the
+ resulting Automake code is not DESTDIR-aware. While we could take
+ care of this in install-local, it's probably safe to hard-code a
+ relative path for this.
+
+ * configure.ac: Don't AC_SUBST session_bus_servicesdir.
+ * src/Makefile.am: Hard code the relative path of
+ session_bus_servicesdir.
+
+2008-10-03 Braden McDaniel <br...@en...>
+
+ * src/Makefile.am
+ (openvrml_player_openvrml_player_CPPFLAGS): Can't safely use
+ builddir for relative paths; and we don't need it anyway.
+
+2008-10-02 Braden McDaniel <br...@en...>
+
+ Use jlong in JNI function signatures to ensure consistency with
+ javah output.
+
+ * src/script/java.cpp
+ (Java_vrml_field_SFString_createPeer(JNIEnv *, jclass, jstring)):
+ Use jlong for the return type.
+ (Java_vrml_field_SFTime_createPeer(JNIEnv *, jclass, jdouble)):
+ Use jlong for the return type.
+
+2008-10-02 Braden McDaniel <br...@en...>
+
+ Keep track of host instances in openvrml-xembed and shut down when
+ the last one terminates.
+
+ * src/openvrml-xembed/browser-factory.xml: Added
+ "org.freedesktop.DBus.GLib.Async" annotation to CreateControl
+ method. This allows us to use DBusGMethodInvocation in the method
+ implementation.
+ * src/openvrml-xembed/browserfactory.cpp
+ (openvrml_xembed_error_quark()): GQuark for the GErrors we
+ generate.
+ (OpenvrmlXembedError): GError codes.
+ (intrusive_ptr_add_ref(GObject *)): Added so that
+ boost::intrusive_ptr can be used with GObject.
+ (intrusive_ptr_release(GObject *)): Added so that
+ boost::intrusive_ptr can be used with GObject.
+ (OpenvrmlXembedBrowserFactoryPrivate_): Moved
+ OpenvrmlXembedBrowserFactory data members to a private struct.
+ hosts is a map of the unique bus identifiers of hosts to a map of
+ the controls instantiated by the host.
+ (openvrml_xembed_browser_factory_constructor(GType, guint,
+ GObjectConstructParam *)): Instantiate the hosts map in the
+ constructor function.
+ (openvrml_xembed_browser_factory_finalize(GObject *)): Destroy the
+ hosts map and unref the DBus proxy.
+ (openvrml_xembed_browser_factory_init(OpenvrmlXembedBrowserFactory *)):
+ Use the DBus proxy associated with the
+ OpenvrmlXembedBrowserFactory instance; connect to the
+ org.freedesktop.DBus.NameOwnerChanged signal.
+ (openvrml_xembed_browser_factory_class_init(OpenvrmlXembedBrowserFactoryClass *)):
+ Set constructor and finalize functions; set up private data.
+ (on_host_shutdown_data): Added host_name to hold the unique bus
+ identifier of the host.
+ (delete_on_host_shutdown_data): on_host_shutdown_data now owns the
+ control_obj_path and host_name strings; free them.
+ (openvrml_xembed_browser_factory_create_control(OpenvrmlXembedBrowserFactory *,
+ const char *, const char *, guint, gboolean,
+ DBusGMethodInvocation *)): Get the host's unique bus identifier
+ and track it in the hosts map.
+ (openvrml_xembed_browser_factory_on_host_shutdown_event(DBusGProxy *,
+ gpointer)): Erase the shut down control from the hosts map. The
+ intrusive_ptr will unref it.
+ (openvrml_xembed_browser_factory_name_owner_changed(DBusGProxy *,
+ const gchar *, const gchar *, const gchar *, gpointer)): Erase the
+ host leaving the bus from the hosts map; this cleans up resources
+ associated with the host. Quit when the last host leaves.
+ * src/openvrml-xembed/browserfactory.h
+ (OPENVRML_XEMBED_BROWSER_FACTORY_CLASS): Fixed missing third
+ parameter to G_TYPE_CHECK_CLASS_CAST.
+ (OpenvrmlXembedBrowserFactory_): Moved data members to private
+ struct.
+ (openvrml_xembed_browser_factory_create_control(OpenvrmlXembedBrowserFactory *,
+ const char *, const char *, guint, gboolean,
+ DBusGMethodInvocation *)): Changed signature per
+ "org.freedesktop.DBus.GLib.Async" annotation.
+ * src/openvrml-xembed/main.cpp
+ (main(int, char *[])): Removed redundant name request; this is
+ taken care of in the OpenvrmlXembedBrowserFactory implementation.
+ Don't unref the browser_factory; this seems not to play well with
+ dbus_g_connection_register_g_object.
+
+2008-09-30 Braden McDaniel <br...@en...>
+
+ In the spirit of not returning mutable instances by value, change
+ uri's std::string conversion operator to convert to a const
+ std::string.
+
+ * src/libopenvrml/openvrml/local/uri.cpp
+ * src/libopenvrml/openvrml/local/uri.h
+
+2008-09-30 Braden McDaniel <br...@en...>
+
+ Moved openvrml::local::uri::resolve_against to
+ openvrml::local::resolve_against (i.e., made it a nonmember
+ function).
+
+ * src/libopenvrml/openvrml/local/uri.cpp
+ * src/libopenvrml/openvrml/local/uri.h
+ * src/libopenvrml/openvrml/scene.cpp
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/script.cpp
+
+2008-09-28 Braden McDaniel <br...@en...>
+
+ Updated version to 0.17.99.
+
+ * configure.ac
+ * doc/Doxyfile
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+ * mozilla-plugin/configure.ac
+
+2008-09-28 Braden McDaniel <br...@en...>
+
+ More documentation improvements.
+
+ * src/libopenvrml/openvrml/viewer.cpp
+ * doc/Makefile.am
+ (CUSTOMIZED_IMAGES): Added x3d-white-on-black.png.
+
+2008-09-27 Braden McDaniel <br...@en...>
+
+ Documentation improvements. No longer use the Doxygen default
+ style sheet at all. Also, added X3D link to the page footer.
+
+ * doc/Doxyfile
+ * doc/doxygen-footer
+ * doc/doxygen-header
+ * doc/manual/x3d-white-on-black.png
+ * src/libopenvrml/openvrml/local/proto.cpp
+ * src/libopenvrml/openvrml/local/proto.h
+ * src/libopenvrml/openvrml/node.cpp
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/script.cpp
+
+2008-09-27 Braden McDaniel <br...@en...>
+
+ Fixes for the Visual C++ build.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * src/libopenvrml/openvrml/local/dl.cpp
+ * src/libopenvrml/openvrml/local/uri.cpp
+ * src/libopenvrml/openvrml/local/xml_reader.cpp
+
+2008-09-26 Braden McDaniel <br...@en...>
+
+ Moved proto_node class from an inner class of
+ openvrml::local::proto_node_metatype to the openvrml::local
+ namespace. proto_node needs access to the private parts of
+ openvrml::node; and gcc 4.0 requires us to grant friendship to
+ proto_node specifically (rather than granting friendship to
+ proto_node_metatype when proto_node is an inner class of it). We
+ need to be able to forward-declare proto_node (the public header
+ node.h cannot include the private proto.h); and to accommodate
+ that, proto_node cannot be an inner class.
+
+ * src/libopenvrml/openvrml/local/proto.cpp
+ * src/libopenvrml/openvrml/local/proto.h
+ * src/libopenvrml/openvrml/node.h
+
+2008-09-26 Braden McDaniel <br...@en...>
+
+ Moved PROTO implementation classes to the openvrml::local
+ namespace and out of browser.cpp.
+
+ * src/Makefile.am
+ (libopenvrml_libopenvrml_la_SOURCES): Added
+ libopenvrml/openvrml/local/proto.{cpp,h}.
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/local/proto.cpp
+ * src/libopenvrml/openvrml/local/proto.h
+ * src/libopenvrml/openvrml/node.h
+
2008-09-24 Braden McDaniel <br...@en...>
Moved dlopen/LoadLibrary wrapper functions, the XML parser
Modified: branches/node-modules/NEWS
===================================================================
--- branches/node-modules/NEWS 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/NEWS 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,3 +1,9 @@
+Changes new in version 0.17.9, 9 October, 2008
+========================================================================
+
+- Use D-Bus for communication with the OpenVRML XEmbed control.
+
+
Changes new in version 0.17.8, 13 August, 2008
========================================================================
Modified: branches/node-modules/README
===================================================================
--- branches/node-modules/README 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/README 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.17.8
+OpenVRML library version 0.17.9
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Braden McDaniel <br...@en...>
Modified: branches/node-modules/configure.ac
===================================================================
--- branches/node-modules/configure.ac 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/configure.ac 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,4 +1,4 @@
-AC_INIT([OpenVRML], [0.17.8], [ope...@li...])
+AC_INIT([OpenVRML], [0.17.99], [ope...@li...])
AC_PREREQ([2.59])
AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
AC_CONFIG_MACRO_DIR([m4])
@@ -10,7 +10,6 @@
[models/textures/Makefile]
[lib/Makefile]
[src/Makefile]
- [src/openvrml-xembed/org.openvrml.BrowserControl.service]
[src/libopenvrml/openvrml-config.h]
[src/libopenvrml-gl/openvrml-gl-config.h]
[src/script/Makefile]
@@ -167,9 +166,8 @@
#
PKG_CHECK_MODULES([DBUS_G], [dbus-glib-1 glib-2.0 >= 2.6], ,
[have_dbus_glib=no])
+AC_ARG_VAR([DBUS_BINDING_TOOL], [Generate stub code for dbus-glib])
AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool])
-session_bus_servicesdir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-AC_SUBST([session_bus_servicesdir])
#
# openvrml-player uses GtkBuilder, which was introduced in GTK+ 2.12.
@@ -328,7 +326,6 @@
AC_ARG_ENABLE([script-node-java],
[AC_HELP_STRING([--disable-script-node-java],
[disable Script node Java support])])
-AC_ARG_VAR([JAVA_HOME], [Java Runtime Environment (JRE) location])
case $target_cpu in
x86_64) OPENVRML_JVM_ARCH=amd64 ;;
i?86) OPENVRML_JVM_ARCH=i386 ;;
@@ -377,7 +374,9 @@
[AC_HELP_STRING([--disable-xembed],
[do not build the XEmbed control])])
AS_IF([test X$enable_xembed != Xno],
- [AS_IF([test X$have_gtk = Xno],
+ [AS_IF([test X$have_dbus_glib = Xno],
+ [AC_MSG_FAILURE([D-Bus GLib bindings are required to build the XEmbed control])])
+ AS_IF([test X$have_gtk = Xno],
[AC_MSG_FAILURE([GTK+ is required to build the XEmbed control])])
AS_IF([test X$enable_gl_renderer = Xno],
[AC_MSG_FAILURE([the XEmbed control cannot be built without the GL renderer])])])
Property changes on: branches/node-modules/doc
___________________________________________________________________
Modified: svn:ignore
- *.info
Makefile
Makefile.in
mdate-sh
stamp-vti
texinfo.tex
version.texi
+ Makefile
Makefile.in
javadoc
Modified: branches/node-modules/doc/Doxyfile
===================================================================
--- branches/node-modules/doc/Doxyfile 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/doc/Doxyfile 2008-10-10 07:55:02 UTC (rev 3735)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenVRML
-PROJECT_NUMBER = 0.17.8
+PROJECT_NUMBER = 0.17.99
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
@@ -93,7 +93,7 @@
FILE_PATTERNS = *.cpp \
*.h
RECURSIVE = YES
-EXCLUDE =
+EXCLUDE = ../src/libopenvrml/openvrml/local
EXCLUDE_SYMLINKS = NO
EXCLUDE_SYMBOLS =
EXAMPLE_PATH = ../examples
Modified: branches/node-modules/doc/Makefile.am
===================================================================
--- branches/node-modules/doc/Makefile.am 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/doc/Makefile.am 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,6 +1,3 @@
-info_TEXINFOS = openvrml-xembed.texi
-openvrml_xembed_TEXINFOS = fdl.texi
-
docdir = $(datadir)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
javadocdir = $(datadir)/javadoc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
@@ -72,12 +69,41 @@
CUSTOMIZED_IMAGES = \
$(srcdir)/manual/OGL_sm_wht.png \
+ $(srcdir)/manual/x3d-white-on-black.png \
$(srcdir)/manual/tab_b-openvrml.png \
$(srcdir)/manual/tab_l-openvrml.png \
$(srcdir)/manual/tab_r-openvrml.png
-EXTRA_DIST = $(DOCUMENTATION_FILES) $(DOXYGEN_OUTPUT_FILES) $(CUSTOMIZED_IMAGES) javadoc
+JAVADOC_FILES = \
+ $(srcdir)/javadoc/*.html \
+ $(srcdir)/javadoc/package-list \
+ $(srcdir)/javadoc/stylesheet.css
+JAVADOC_RESOURCES_FILES = \
+ $(srcdir)/javadoc/resources/inherit.gif
+
+JAVADOC_VRML_FILES = \
+ $(srcdir)/javadoc/vrml/*.html
+
+JAVADOC_VRML_FIELD_FILES = \
+ $(srcdir)/javadoc/vrml/field/*.html
+
+JAVADOC_VRML_NODE_FILES = \
+ $(srcdir)/javadoc/vrml/node/*.html
+
+JAVADOC_OUTPUT_FILES = \
+ $(JAVADOC_FILES) \
+ $(JAVADOC_RESOURCES_FILES) \
+ $(JAVADOC_VRML_FILES) \
+ $(JAVADOC_VRML_FIELD_FILES) \
+ $(JAVADOC_VRML_NODE_FILES)
+
+EXTRA_DIST = \
+ $(DOCUMENTATION_FILES) \
+ $(DOXYGEN_OUTPUT_FILES) \
+ $(CUSTOMIZED_IMAGES) \
+ $(JAVADOC_OUTPUT_FILES)
+
MAINTAINERCLEANFILES = $(DOXYGEN_OUTPUT_FILES)
.PHONY: html-local doxygen-html javadoc-html
@@ -88,16 +114,33 @@
javadoc-html:
rm -rf $(srcdir)/javadoc
- cd $(srcdir) && javadoc -sourcepath ../src/script/java -link $(datadir)/javadoc/java -d javadoc vrml vrml.field vrml.node
+ cd $(srcdir) \
+ && javadoc -sourcepath ../src/script/java \
+ -link $(javadocdir)/java \
+ -d javadoc \
+ vrml vrml.field vrml.node
html-local: doxygen-html javadoc-html
installdirs-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)/manual $(DESTDIR)$(javadocdir)/vrml/node $(DESTDIR)$(javadocdir)/vrml/field
+ $(mkinstalldirs) $(DESTDIR)$(docdir)/manual \
+ $(DESTDIR)$(javadocdir)/resources \
+ $(DESTDIR)$(javadocdir)/vrml/node \
+ $(DESTDIR)$(javadocdir)/vrml/field
install-data-local: installdirs-local
- $(INSTALL_DATA) $(DOXYGEN_OUTPUT_FILES) $(CUSTOMIZED_IMAGES) $(DESTDIR)$(docdir)/manual
- $(INSTALL_DATA) $(srcdir)/javadoc/* $(DESTDIR)$(javadocdir)
+ $(INSTALL_DATA) $(DOXYGEN_OUTPUT_FILES) $(CUSTOMIZED_IMAGES) \
+ $(DESTDIR)$(docdir)/manual
+ $(INSTALL_DATA) $(JAVADOC_FILES) \
+ $(DESTDIR)$(javadocdir)
+ $(INSTALL_DATA) $(JAVADOC_RESOURCES_FILES) \
+ $(DESTDIR)$(javadocdir)/resources
+ $(INSTALL_DATA) $(JAVADOC_VRML_FILES) \
+ $(DESTDIR)$(javadocdir)/vrml
+ $(INSTALL_DATA) $(JAVADOC_VRML_FIELD_FILES) \
+ $(DESTDIR)$(javadocdir)/vrml/field
+ $(INSTALL_DATA) $(JAVADOC_VRML_NODE_FILES) \
+ $(DESTDIR)$(javadocdir)/vrml/node
uninstall-local:
- rm -rf $(DESTDIR)$(docdir)/manual
+ rm -rf $(DESTDIR)$(docdir)/manual $(DESTDIR)$(javadocdir)
Modified: branches/node-modules/doc/doxygen-footer
===================================================================
--- branches/node-modules/doc/doxygen-footer 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/doc/doxygen-footer 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,5 +1,5 @@
</div>
-<address class="footer"><span class="images"><a href="http://opengl.org"><img src="OGL_sm_wht.png" width="68" height="32" border="0" alt="OpenGL"></a><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&type=3" width="125" height="37" border="0" alt="SourceForge.net"></a></span><a href="http://sourceforge.net/tracker/?func=add&group_id=7151&atid=107151">Report error</a><br>Generated $datetime by Doxygen $doxygenversion</address>
+<address class="footer"><span class="images"><a href="http://web3d.org/x3d/"><img src="x3d-white-on-black.png" width="43" height="32" border="0" alt="X3D"></a><a href="http://opengl.org"><img src="OGL_sm_wht.png" width="68" height="32" border="0" alt="OpenGL"></a><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&type=3" width="125" height="37" border="0" alt="SourceForge.net"></a></span><a href="http://sourceforge.net/tracker/?func=add&group_id=7151&atid=107151">Report error</a><br>Generated $datetime by Doxygen $doxygenversion</address>
<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
<script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
</body>
Modified: branches/node-modules/doc/doxygen-header
===================================================================
--- branches/node-modules/doc/doxygen-header 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/doc/doxygen-header 2008-10-10 07:55:02 UTC (rev 3735)
@@ -12,18 +12,13 @@
<link rel="index" href="functions" title="OpenVRML Compound Members">
<link rel="appendix" href="conformance" title="Conformance Test Results">
<style type="text/css">
-@import url("doxygen.css");
@import url("tabs.css");
@import url("http://openvrml.org/openvrml.css");
-body, td {
- font-size: 100%;
+table {
+ width: 100%;
}
-p, center, td, th, ul, dl, div {
- font-family: inherit;
-}
-
h2 {
border-bottom-style: solid;
border-bottom-width: 1px;
@@ -47,22 +42,22 @@
padding-bottom: 0.5em;
}
-div.nav a.el:link, div.nav a.el:visited,
-div.navpath a.el:link, div.navpath a.el:visited {
+div.nav :link, div.nav :visited,
+div.navpath :link, div.navpath :visited {
border-width: 1px;
border-style: solid;
border-color: silver;
padding: 2px;
}
-div.nav a.el:link:hover, div.nav a.el:visited:hover,
-div.navpath a.el:link:hover, div.navpath a.el:visited:hover {
+div.nav :link:hover, div.nav :visited:hover,
+div.navpath :link:hover, div.navpath :visited:hover {
border-style: outset;
border-color: gray;
}
-div.nav a.el:active,
-div.navpath a.el:active {
+div.nav :active,
+div.navpath :active {
border-style: inset;
border-color: gray;
}
@@ -71,70 +66,26 @@
background-color: transparent;
}
-div.qindex {
- background-color: transparent;
- border: none;
-}
-a {
- color: inherit;
-}
-a.qindex {
+.el {
text-decoration: inherit;
- color: inherit;
- padding: 0;
-}
-a.qindex:visited {
- text-decoration: inherit;
- font-weight: inherit;
- color: inherit;
- padding: 0;
-}
-a.qindex:hover {
- text-decoration: inherit;
- background-color: transparent;
- padding: 0;
-}
-a.qindexHL {
- text-decoration: inherit;
- font-weight: inherit;
- background-color: transparent;
- color: inherit;
- padding: 0;
-}
-a.qindexHL:hover {
- text-decoration: inherit;
- background-color: transparent;
- color: inherit;
- padding: 0;
-}
-a.qindexHL:visited {
- text-decoration: inherit;
- background-color: transparent;
- color: inherit;
-}
-a.el {
- text-decoration: inherit;
font-weight: inherit
}
-a.elRef {
+.elRef {
font-weight: inherit
}
-a.code:link, a.code:visited {
+.code:link, .code:visited {
text-decoration: inherit;
font-weight: inherit;
color: inherit;
}
-a.codeRef:link {
+.codeRef:link {
font-weight: normal;
color: inherit;
}
-a {
- color: inherit;
-}
-a:visited {
+:visited {
color: silver;
}
-a:hover {
+:link:hover {
color: inherit;
text-decoration: inherit;
background-color: transparent;
@@ -144,18 +95,6 @@
line-height: 1.2em;
}
-div.qindex {
- font-size: smaller;
-}
-
-div.qindex .qindex:link, div.qindex .qindex:visited {
- font-weight: inherit;
-}
-
-div.qindex .qindexHL:link, div.qindex .qindexHL:visited {
- font-weight: bold;
-}
-
td.memItemLeft, td.memItemRight,
td.memTemplParams, td.memTemplItemLeft, td.memTemplItemRight,
.memtemplate, .memname td {
@@ -164,8 +103,30 @@
td.memItemLeft, td.memItemRight, td.mdescLeft, td.mdescRight {
background-color: rgb(95%, 95%, 95%);
+ border-color: rgb(65%, 65%, 65%);
+ border-width: 1px;
+ font-size: smaller;
}
+.memItemLeft {
+ margin-top: 0.5em;
+ border-top-style: solid;
+}
+.mdescLeft {
+ border-bottom-style: solid;
+}
+.memItemRight {
+ border-top-style: solid;
+ margin-top: 0.5em;
+}
+.mdescRight {
+ border-bottom-style: solid;
+}
+
+.mdescRight {
+ font-style: italic;
+}
+
.mdTable {
background-color: rgb(95%, 95%, 95%);
}
@@ -188,16 +149,41 @@
}
.memitem {
- background-color: rgb(95%, 95%, 95%);
- border-color: rgb(80%, 80%, 80%);
+ padding: 0;
}
+.memitem table {
+ width: auto;
+}
+
+.memproto, .memdoc {
+ border-width: 1px;
+ border-color: rgb(65%, 65%, 65%);
+}
+
.memproto {
background-color: rgb(90%, 90%, 90%);
- border-color: rgb(65%, 65%, 65%);
font-weight: inherit;
+ font-size: smaller;
+ border-top-style: solid;
+ border-left-style: solid;
+ border-right-style: solid;
+ -webkit-border-top-left-radius: 0.6em;
+ -webkit-border-top-right-radius: 0.6em;
+ -moz-border-radius-topleft: 0.6em;
+ -moz-border-radius-topright: 0.6em;
}
+.memdoc {
+ background-color: rgb(95%, 95%, 95%);
+ padding: 2px 5px;
+ border-style: solid;
+ -webkit-border-bottom-left-radius: 0.6em;
+ -webkit-border-bottom-right-radius: 0.6em;
+ -moz-border-radius-bottomleft: 0.6em;
+ -moz-border-radius-bottomright: 0.6em;
+}
+
.memname {
font-weight: inherit;
}
Modified: branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2008-10-10 07:55:02 UTC (rev 3735)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,6,0,0
- PRODUCTVERSION 0,17,8,0
+ FILEVERSION 8,7,0,0
+ PRODUCTVERSION 0,17,99,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML Library"
- VALUE "FileVersion", "8, 6, 0, 0"
+ VALUE "FileVersion", "8, 7, 0, 0"
VALUE "InternalName", "openvrml"
VALUE "LegalCopyright", "Copyright (C) 2008"
VALUE "OriginalFilename", "openvrml.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.17.8"
+ VALUE "ProductVersion", "0.17.99"
END
END
BLOCK "VarFileInfo"
Modified: branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-10-10 07:55:02 UTC (rev 3735)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\""
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\""
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -127,7 +127,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -191,6 +191,10 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\bad_url.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\basetypes.cpp"
>
<FileConfiguration
@@ -220,6 +224,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\dl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.cpp"
>
</File>
@@ -244,6 +252,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\proto.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.cpp"
>
</File>
@@ -252,10 +264,22 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scene.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.cpp"
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\script.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\uri.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\viewer.cpp"
>
</File>
@@ -351,12 +375,20 @@
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_texturing.cpp"
>
</File>
+ <File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\xml_reader.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\bad_url.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\basetypes.h"
>
</File>
@@ -373,6 +405,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\dl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.h"
>
</File>
@@ -409,6 +445,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\proto.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.h"
>
</File>
@@ -417,6 +457,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scene.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.h"
>
</File>
@@ -425,6 +469,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\uri.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\viewer.h"
>
</File>
@@ -504,6 +552,10 @@
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_vrml_grammar.h"
>
</File>
+ <File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\xml_reader.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
Modified: branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2008-10-10 07:55:02 UTC (rev 3735)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,2,0,0
- PRODUCTVERSION 0,17,8,0
+ FILEVERSION 7,3,0,0
+ PRODUCTVERSION 0,17,99,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
- VALUE "FileVersion", "7, 2, 0, 0"
+ VALUE "FileVersion", "7, 3, 0, 0"
VALUE "InternalName", "openvrml-gl"
VALUE "LegalCopyright", "Copyright (C) 2008"
VALUE "OriginalFilename", "openvrml-gl.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.17.8"
+ VALUE "ProductVersion", "0.17.99"
END
END
BLOCK "VarFileInfo"
Modified: branches/node-modules/m4/acx_pthread.m4
===================================================================
--- branches/node-modules/m4/acx_pthread.m4 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/m4/acx_pthread.m4 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,4 +1,6 @@
-##### http://autoconf-archive.cryp.to/acx_pthread.html
+# ===========================================================================
+# http://autoconf-archive.cryp.to/acx_pthread.html
+# ===========================================================================
#
# SYNOPSIS
#
@@ -6,82 +8,76 @@
#
# DESCRIPTION
#
-# This macro figures out how to build C programs using POSIX threads.
-# It sets the PTHREAD_LIBS output variable to the threads library and
-# linker flags, and the PTHREAD_CFLAGS output variable to any special
-# C compiler flags that are needed. (The user can also force certain
-# compiler flags/libs to be tested by setting these environment
-# variables.)
+# This macro figures out how to build C programs using POSIX threads. It
+# sets the PTHREAD_LIBS output variable to the threads library and linker
+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+# flags that are needed. (The user can also force certain compiler
+# flags/libs to be tested by setting these environment variables.)
#
# Also sets PTHREAD_CC to any special C compiler that is needed for
-# multi-threaded programs (defaults to the value of CC otherwise).
-# (This is necessary on AIX to use the special cc_r compiler alias.)
+# multi-threaded programs (defaults to the value of CC otherwise). (This
+# is necessary on AIX to use the special cc_r compiler alias.)
#
-# NOTE: You are assumed to not only compile your program with these
-# flags, but also link it with them as well. e.g. you should link
-# with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-# $LIBS
+# NOTE: You are assumed to not only compile your program with these flags,
+# but also link it with them as well. e.g. you should link with
+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
#
-# If you are only building threads programs, you may wish to use
-# these variables in your default LIBS, CFLAGS, and CC:
+# If you are only building threads programs, you may wish to use these
+# variables in your default LIBS, CFLAGS, and CC:
#
# LIBS="$PTHREAD_LIBS $LIBS"
# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
# CC="$PTHREAD_CC"
#
-# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-# constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
#
-# ACTION-IF-FOUND is a list of shell commands to run if a threads
-# library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-# run it if it is not found. If ACTION-IF-FOUND is not specified, the
-# default action will define HAVE_PTHREAD.
+# ACTION-IF-FOUND is a list of shell commands to run if a threads library
+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+# is not found. If ACTION-IF-FOUND is not specified, the default action
+# will define HAVE_PTHREAD.
#
-# Please let the authors know if this macro fails on any platform, or
-# if you have any other suggestions or comments. This macro was based
-# on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/)
-# (with help from M. Frigo), as well as ac_pthread and hb_pthread
-# macros posted by Alejandro Forero Cuervo to the autoconf macro
-# repository. We are also grateful for the helpful feedback of
-# numerous users.
+# Please let the authors know if this macro fails on any platform, or if
+# you have any other suggestions or comments. This macro was based on work
+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+# Alejandro Forero Cuervo to the autoconf macro repository. We are also
+# grateful for the helpful feedback of numerous users.
#
# LAST MODIFICATION
#
-# 2007-07-29
+# 2008-04-12
#
# COPYLEFT
#
-# Copyright (c) 2007 Steven G. Johnson <st...@al...>
+# Copyright (c) 2008 Steven G. Johnson <st...@al...>
#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
AC_DEFUN([ACX_PTHREAD], [
AC_REQUIRE([AC_CANONICAL_HOST])
Modified: branches/node-modules/m4/ax_check_gl.m4
===================================================================
--- branches/node-modules/m4/ax_check_gl.m4 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/m4/ax_check_gl.m4 2008-10-10 07:55:02 UTC (rev 3735)
@@ -10,7 +10,7 @@
dnl "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
dnl definitions may not be mutually exclusive.
dnl
-dnl version: 2.0
+dnl version: 2.2
dnl author: Braden McDaniel <br...@en...>
dnl
dnl This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,8 @@
dnl License when using or distributing such scripts.
dnl
AC_DEFUN([AX_CHECK_GL],
-[AC_REQUIRE([AC_PATH_X])dnl
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PATH_X])dnl
AC_REQUIRE([ACX_PTHREAD])dnl
AC_LANG_PUSH([C])
@@ -75,6 +76,10 @@
AC_CACHE_CHECK([for OpenGL library], [ax_cv_check_gl_libgl],
[ax_cv_check_gl_libgl="no"
+case $host_cpu in
+ x86_64) ax_check_gl_libdir=lib64 ;;
+ *) ax_check_gl_libdir=lib ;;
+esac
ax_save_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}"
ax_save_LIBS="${LIBS}"
@@ -85,13 +90,14 @@
[ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
[ax_try_lib="${ax_lib}"])
LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
- AC_LINK_IFELSE(
-[AX_CHECK_GL_PROGRAM],
-[ax_cv_check_gl_libgl="${ax_try_lib}"; break],
-[ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib'
-LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break])])
+ [ax_cv_check_gl_libgl="${ax_try_lib}"; break],
+ [ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}"
+AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_nvidia_flags}"; break],
+ [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}"
+AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break])])])
done
AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes],
Modified: branches/node-modules/mozilla-plugin/configure.ac
===================================================================
--- branches/node-modules/mozilla-plugin/configure.ac 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/mozilla-plugin/configure.ac 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1,5 +1,5 @@
AC_PREREQ([2.53])
-AC_INIT([OpenVRML Mozilla Plugin], [0.17.8],
+AC_INIT([OpenVRML Mozilla Plugin], [0.17.99],
[ope...@li...])
AC_COPYRIGHT([Portions copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
Modified: branches/node-modules/mozilla-plugin/src/openvrml.cpp
===================================================================
--- branches/node-modules/mozilla-plugin/src/openvrml.cpp 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/mozilla-plugin/src/openvrml.cpp 2008-10-10 07:55:02 UTC (rev 3735)
@@ -1160,11 +1160,10 @@
throw ()
{
DBusGProxy * browser_factory =
- dbus_g_proxy_new_for_name_owner(connection,
- "org.openvrml.BrowserControl",
- "/BrowserFactory",
- "org.openvrml.BrowserFactory",
- error);
+ dbus_g_proxy_new_for_name(connection,
+ "org.openvrml.BrowserControl",
+ "/BrowserFactory",
+ "org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
scope_guard browser_factory_guard =
make_guard(g_object_unref, G_OBJECT(browser_factory));
Modified: branches/node-modules/src/Makefile.am
===================================================================
--- branches/node-modules/src/Makefile.am 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/src/Makefile.am 2008-10-10 07:55:02 UTC (rev 3735)
@@ -84,8 +84,8 @@
openvrml-xembed/plugin_streambuf.h \
openvrml-player/filechooserdialog.h
-LIBOPENVRML_LIBRARY_VERSION = 8:6:0
-LIBOPENVRML_GL_LIBRARY_VERSION = 7:2:0
+LIBOPENVRML_LIBRARY_VERSION = 8:7:0
+LIBOPENVRML_GL_LIBRARY_VERSION = 7:3:0
# | | |
# +------+ | +---+
# | | |
@@ -155,7 +155,9 @@
libopenvrml/openvrml/local/uri.cpp \
libopenvrml/openvrml/local/uri.h \
libopenvrml/openvrml/local/xml_reader.cpp \
- libopenvrml/openvrml/local/xml_reader.h
+ libopenvrml/openvrml/local/xml_reader.h \
+ libopenvrml/openvrml/local/proto.cpp \
+ libopenvrml/openvrml/local/proto.h
libopenvrml_libopenvrml_la_LDFLAGS = \
-version-info $(LIBOPENVRML_LIBRARY_VERSION) \
@@ -635,6 +637,7 @@
if ENABLE_XEMBED
libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
+session_bus_servicesdir = $(datadir)/dbus-1/services
session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
BUILT_SOURCES += \
openvrml-xembed/browser-server-glue.h \
@@ -695,6 +698,16 @@
--output=$@ \
$?
+edit = sed -e 's|@libexecdir[@]|$(libexecdir)|g'
+
+openvrml-xembed/org.openvrml.BrowserControl.service: Makefile
+ rm -f $@ $@.tmp
+ $(edit) '$(srcdir)/$@.in' > $@.tmp
+ chmod a-w $@.tmp
+ mv $@.tmp $@
+
+openvrml-xembed/org.openvrml.BrowserControl.service: $(srcdir)/openvrml-xembed/org.openvrml.BrowserControl.service.in
+
if ENABLE_PLAYER
bin_PROGRAMS = openvrml-player/openvrml-player
BUILT_SOURCES += \
@@ -707,8 +720,8 @@
-DGNOME_DISABLE_DEPRECATED \
-DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \
-DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" \
- -I$(builddir)/openvrml-player \
- -I$(builddir)/libopenvrml \
+ -Iopenvrml-player \
+ -Ilibopenvrml \
-I$(srcdir)/libopenvrml
openvrml_player_openvrml_player_CXXFLAGS = \
$(DBUS_G_CFLAGS) \
Property changes on: branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/libopenvrml/openvrml/bad_url.cpp:3401-3691
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3401-3734
Property changes on: branches/node-modules/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
- /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:3401-3691
+ /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:3401-3734
Modified: branches/node-modules/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- branches/node-modules/src/libopenvrml/openvrml/browser.cpp 2008-10-10 07:37:06 UTC (rev 3734)
+++ branches/node-modules/src/libopenvrml/openvrml/browser.cpp 2008-10-10 07:55:02 UTC (rev 3735)
@@ -42,6 +42,7 @@
# include "x3d_cad_geometry.h"
...
[truncated message content] |