Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: <br...@us...> - 2009-03-18 03:24:17
|
Revision: 3841
http://openvrml.svn.sourceforge.net/openvrml/?rev=3841&view=rev
Author: braden
Date: 2009-03-18 03:24:04 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Rely on an installed GtkGLExt.
Modified Paths:
--------------
trunk/bootstrap
Modified: trunk/bootstrap
===================================================================
--- trunk/bootstrap 2009-03-17 07:11:30 UTC (rev 3840)
+++ trunk/bootstrap 2009-03-18 03:24:04 UTC (rev 3841)
@@ -1,3 +1,2 @@
#!/bin/sh
-( cd lib/gtkglext && gtkdocize )
autoreconf --install --symlink
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-17 07:11:36
|
Revision: 3840
http://openvrml.svn.sourceforge.net/openvrml/?rev=3840&view=rev
Author: braden
Date: 2009-03-17 07:11:30 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Rely on an installed GtkGLExt.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-17 07:10:58 UTC (rev 3839)
+++ trunk/ChangeLog 2009-03-17 07:11:30 UTC (rev 3840)
@@ -1,5 +1,24 @@
2009-03-17 Braden McDaniel <br...@en...>
+ Rely on an installed GtkGLExt.
+
+ * Makefile.am
+ (SUBDIRS): Removed libs.
+ * configure.ac: Check for GtkGLExt; emit GTKGL_{CFLAGS,LIBS}
+ instead of GTK_{CFLAGS,LIBS}; removed lib/gtkglext from
+ AC_CONFIG_SUBDIRS.
+ * lib/gtkglext: Removed.
+ * src/Makefile.am
+ (openvrml_xembed_openvrml_xembed_CXXFLAGS): Replaced GTK_CFLAGS
+ and GL_CFLAGS with GTKGL_CFLAGS.
+ (openvrml_xembed_openvrml_xembed_LDFLAGS): Replaced GTK_LIBS and
+ GL_LIBS with GTKGL_LIBS.
+ (openvrml_xembed_openvrml_xembed_LDADD): Removed references to
+ GtkGLExt libraries in OpenVRML's build tree; we link with the
+ system ones instead via GTKGL_LIBS.
+
+2009-03-17 Braden McDaniel <br...@en...>
+
Updates for 0.17.12 release.
* NEWS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-17 07:11:04
|
Revision: 3839
http://openvrml.svn.sourceforge.net/openvrml/?rev=3839&view=rev
Author: braden
Date: 2009-03-17 07:10:58 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Rely on an installed GtkGLExt.
Modified Paths:
--------------
trunk/Makefile.am
trunk/configure.ac
trunk/src/Makefile.am
Removed Paths:
-------------
trunk/lib/
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-03-17 05:55:19 UTC (rev 3838)
+++ trunk/Makefile.am 2009-03-17 07:10:58 UTC (rev 3839)
@@ -1,4 +1,4 @@
-SUBDIRS = doc ide-projects models lib src mozilla-plugin data examples tests
+SUBDIRS = doc ide-projects models src mozilla-plugin data examples tests
ACLOCAL_AMFLAGS = -I m4
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-03-17 05:55:19 UTC (rev 3838)
+++ trunk/configure.ac 2009-03-17 07:10:58 UTC (rev 3839)
@@ -8,7 +8,6 @@
[models/Makefile]
[models/audio/Makefile]
[models/textures/Makefile]
- [lib/Makefile]
[src/Makefile]
[src/libopenvrml/openvrml-config.h]
[src/libopenvrml-gl/openvrml-gl-config.h]
@@ -172,7 +171,8 @@
#
# openvrml-player uses GtkBuilder, which was introduced in GTK+ 2.12.
#
-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0 >= 2.6], ,
+PKG_CHECK_MODULES([GTKGL],
+ [gtkglext-1.0 gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0 >= 2.6], ,
[have_gtk=no])
#
# openvrml-player uses GNOME_PARAM_GOPTION_CONTEXT, which was
@@ -452,13 +452,8 @@
])
AC_SUBST([OPENVRML_JAVASCRIPT_RPATH])
-if test X$enable_xembed != Xno; then
- gtkglext_subdir=gtkglext
-fi
-AC_SUBST([gtkglext_subdir])
+AC_CONFIG_SUBDIRS([mozilla-plugin])
-AC_CONFIG_SUBDIRS([lib/gtkglext mozilla-plugin])
-
AC_CONFIG_TESTDIR([tests])
AC_OUTPUT
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-17 05:55:19 UTC (rev 3838)
+++ trunk/src/Makefile.am 2009-03-17 07:10:58 UTC (rev 3839)
@@ -731,9 +731,6 @@
endif
openvrml_xembed_openvrml_xembed_CPPFLAGS = \
-I$(top_builddir)/src/openvrml-xembed \
- -I$(top_srcdir)/lib/gtkglext \
- -I$(top_builddir)/lib/gtkglext \
- -I$(top_builddir)/lib/gtkglext/gdk \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
-I$(top_builddir)/src/libopenvrml-gl \
@@ -743,8 +740,7 @@
openvrml_xembed_openvrml_xembed_CXXFLAGS = \
$(PTHREAD_CFLAGS) \
$(DBUS_G_CFLAGS) \
- $(GTK_CFLAGS) \
- $(GL_CFLAGS)
+ $(GTKGL_CFLAGS)
openvrml_xembed_openvrml_xembed_SOURCES = \
openvrml-xembed/main.cpp \
openvrml-xembed/browserfactory.cpp \
@@ -756,12 +752,9 @@
openvrml-xembed/streamclient.h
openvrml_xembed_openvrml_xembed_LDFLAGS = \
$(DBUS_G_LIBS) \
- $(GTK_LIBS) \
- $(GL_LIBS)
+ $(GTKGL_LIBS)
openvrml_xembed_openvrml_xembed_LDADD = \
- libopenvrml-gl/libopenvrml-gl.la \
- $(top_builddir)/lib/gtkglext/gtk/libgtkglext-x11-1.0.la \
- $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la
+ libopenvrml-gl/libopenvrml-gl.la
openvrml_xembed_datadir = $(datadir)/openvrml-xembed
openvrml_xembed_dbusdir = $(openvrml_xembed_datadir)/dbus-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-17 05:55:40
|
Revision: 3838
http://openvrml.svn.sourceforge.net/openvrml/?rev=3838&view=rev
Author: braden
Date: 2009-03-17 05:55:19 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Updates for 0.17.12 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
trunk/src/Makefile.am
Property Changed:
----------------
trunk/
trunk/src/libopenvrml/openvrml/bad_url.cpp
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/libopenvrml/openvrml/script.cpp
Property changes on: trunk
___________________________________________________________________
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
/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
+ /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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-16 09:50:40 UTC (rev 3837)
+++ trunk/ChangeLog 2009-03-17 05:55:19 UTC (rev 3838)
@@ -1,6 +1,16 @@
+2009-03-17 Braden McDaniel <br...@en...>
+
+ Updates for 0.17.12 release.
+
+ * NEWS
+ * README
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * src/Makefile.am
+ (LIBOPENVRML_GL_LIBRARY_VERSION): Updated to 7:4:0.
+
2009-03-16 Braden McDaniel <br...@en...>
- * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
Updated to use FreeType 2.3.9.
2009-03-16 Braden McDaniel <br...@en...>
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-03-16 09:50:40 UTC (rev 3837)
+++ trunk/NEWS 2009-03-17 05:55:19 UTC (rev 3838)
@@ -1,3 +1,9 @@
+Changes new in version 0.17.12, 16 March, 2009
+========================================================================
+
+- Fixes to build against X11 on Mac OS X.
+
+
Changes new in version 0.17.11, 2 March, 2009
========================================================================
Modified: trunk/README
===================================================================
--- trunk/README 2009-03-16 09:50:40 UTC (rev 3837)
+++ trunk/README 2009-03-17 05:55:19 UTC (rev 3838)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.17.11
+OpenVRML library version 0.17.12
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Braden McDaniel <br...@en...>
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-16 09:50:40 UTC (rev 3837)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-17 05:55:19 UTC (rev 3838)
@@ -11,7 +11,7 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,3,0,0
+ FILEVERSION 7,4,0,0
PRODUCTVERSION 0,17,99,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
@@ -28,7 +28,7 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
- VALUE "FileVersion", "7, 3, 0, 0"
+ VALUE "FileVersion", "7, 4, 0, 0"
VALUE "InternalName", "openvrml-gl"
VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml-gl.dll"
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-16 09:50:40 UTC (rev 3837)
+++ trunk/src/Makefile.am 2009-03-17 05:55:19 UTC (rev 3838)
@@ -50,7 +50,7 @@
openvrml-player/filechooserdialog.h
LIBOPENVRML_LIBRARY_VERSION = 8:8:0
-LIBOPENVRML_GL_LIBRARY_VERSION = 7:3:0
+LIBOPENVRML_GL_LIBRARY_VERSION = 7:4:0
# | | |
# +------+ | +---+
# | | |
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
+ /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
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
+ /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
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
+ /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
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
+ /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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 09:50:51
|
Revision: 3837
http://openvrml.svn.sourceforge.net/openvrml/?rev=3837&view=rev
Author: braden
Date: 2009-03-16 09:50:40 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Tagged 0.17.12 release.
Added Paths:
-----------
tags/0.17.12/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 09:47:51
|
Revision: 3836
http://openvrml.svn.sourceforge.net/openvrml/?rev=3836&view=rev
Author: braden
Date: 2009-03-16 09:47:44 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Updates for 0.17.12 release.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/NEWS
branches/0.17/README
branches/0.17/configure.ac
branches/0.17/doc/Doxyfile
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
branches/0.17/mozilla-plugin/configure.ac
branches/0.17/src/Makefile.am
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/ChangeLog 2009-03-16 09:47:44 UTC (rev 3836)
@@ -1,5 +1,20 @@
2009-03-16 Braden McDaniel <br...@en...>
+ Updates for 0.17.12 release.
+
+ * NEWS
+ * README
+ * configure.ac
+ * doc/Doxyfile
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * mozilla-plugin/configure.ac
+ * src/Makefile.am
+ (LIBOPENVRML_GL_LIBRARY_VERSION): Updated to 7:4:0.
+
+2009-03-16 Braden McDaniel <br...@en...>
+
* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
Updated to use FreeType 2.3.9.
Modified: branches/0.17/NEWS
===================================================================
--- branches/0.17/NEWS 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/NEWS 2009-03-16 09:47:44 UTC (rev 3836)
@@ -1,3 +1,9 @@
+Changes new in version 0.17.12, 16 March, 2009
+========================================================================
+
+- Fixes to build against X11 on Mac OS X.
+
+
Changes new in version 0.17.11, 2 March, 2009
========================================================================
Modified: branches/0.17/README
===================================================================
--- branches/0.17/README 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/README 2009-03-16 09:47:44 UTC (rev 3836)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.17.11
+OpenVRML library version 0.17.12
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Braden McDaniel <br...@en...>
Modified: branches/0.17/configure.ac
===================================================================
--- branches/0.17/configure.ac 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/configure.ac 2009-03-16 09:47:44 UTC (rev 3836)
@@ -1,4 +1,4 @@
-AC_INIT([OpenVRML], [0.17.11], [ope...@li...])
+AC_INIT([OpenVRML], [0.17.12], [ope...@li...])
AC_PREREQ([2.53])
AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
Modified: branches/0.17/doc/Doxyfile
===================================================================
--- branches/0.17/doc/Doxyfile 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/doc/Doxyfile 2009-03-16 09:47:44 UTC (rev 3836)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenVRML
-PROJECT_NUMBER = 0.17.11
+PROJECT_NUMBER = 0.17.12
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-03-16 09:47:44 UTC (rev 3836)
@@ -12,7 +12,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,8,0,0
- PRODUCTVERSION 0,17,11,0
+ PRODUCTVERSION 0,17,12,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -33,7 +33,7 @@
VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.17.11"
+ VALUE "ProductVersion", "0.17.12"
END
END
BLOCK "VarFileInfo"
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-03-16 09:47:44 UTC (rev 3836)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;PACKAGE_VERSION=\"0.17.11\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const""
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;PACKAGE_VERSION=\"0.17.12\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const""
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -127,7 +127,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.17.11\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";NDEBUG"
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.17.12\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-16 09:47:44 UTC (rev 3836)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,3,0,0
- PRODUCTVERSION 0,17,11,0
+ FILEVERSION 7,4,0,0
+ PRODUCTVERSION 0,17,12,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
- VALUE "FileVersion", "7, 3, 0, 0"
+ VALUE "FileVersion", "7, 4, 0, 0"
VALUE "InternalName", "openvrml-gl"
VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml-gl.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.17.11"
+ VALUE "ProductVersion", "0.17.12"
END
END
BLOCK "VarFileInfo"
Modified: branches/0.17/mozilla-plugin/configure.ac
===================================================================
--- branches/0.17/mozilla-plugin/configure.ac 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/mozilla-plugin/configure.ac 2009-03-16 09:47:44 UTC (rev 3836)
@@ -1,5 +1,5 @@
AC_PREREQ([2.53])
-AC_INIT([OpenVRML Mozilla Plugin], [0.17.11],
+AC_INIT([OpenVRML Mozilla Plugin], [0.17.12],
[ope...@li...])
AC_COPYRIGHT([Portions copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
Modified: branches/0.17/src/Makefile.am
===================================================================
--- branches/0.17/src/Makefile.am 2009-03-16 07:20:10 UTC (rev 3835)
+++ branches/0.17/src/Makefile.am 2009-03-16 09:47:44 UTC (rev 3836)
@@ -64,7 +64,7 @@
openvrml-player/filechooserdialog.h
LIBOPENVRML_LIBRARY_VERSION = 8:8:0
-LIBOPENVRML_GL_LIBRARY_VERSION = 7:3:0
+LIBOPENVRML_GL_LIBRARY_VERSION = 7:4:0
# | | |
# +------+ | +---+
# | | |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 07:20:25
|
Revision: 3835
http://openvrml.svn.sourceforge.net/openvrml/?rev=3835&view=rev
Author: braden
Date: 2009-03-16 07:20:10 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Updated to use FreeType 2.3.9.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-16 07:16:16 UTC (rev 3834)
+++ trunk/ChangeLog 2009-03-16 07:20:10 UTC (rev 3835)
@@ -1,5 +1,10 @@
2009-03-16 Braden McDaniel <br...@en...>
+ * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
+ Updated to use FreeType 2.3.9.
+
+2009-03-16 Braden McDaniel <br...@en...>
+
* src/libopenvrml-gl/openvrml/gl/viewer.cpp
(openvrml::gl::viewer::do_set_frustum(float, float, float)):
Explicitly convert to float to quell a warning from the Microsoft
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2009-03-16 07:16:16 UTC (rev 3834)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2009-03-16 07:20:10 UTC (rev 3835)
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpngd.lib zlibd.lib freetype236MT_D.lib"
+ AdditionalDependencies="libpngd.lib zlibd.lib freetype239MT_D.lib"
OutputFile="$(SolutionDir)..\bin\node\$(ProjectName).dll"
IgnoreDefaultLibraryNames="libcmtd"
/>
@@ -135,7 +135,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpng.lib zlib.lib freetype236MT.lib"
+ AdditionalDependencies="libpng.lib zlib.lib freetype239MT.lib"
OutputFile="$(SolutionDir)..\bin\node\$(ProjectName).dll"
/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 07:16:22
|
Revision: 3834
http://openvrml.svn.sourceforge.net/openvrml/?rev=3834&view=rev
Author: braden
Date: 2009-03-16 07:16:16 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Updated to use FreeType 2.3.9.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-16 07:13:46 UTC (rev 3833)
+++ branches/0.17/ChangeLog 2009-03-16 07:16:16 UTC (rev 3834)
@@ -1,5 +1,10 @@
2009-03-16 Braden McDaniel <br...@en...>
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+ Updated to use FreeType 2.3.9.
+
+2009-03-16 Braden McDaniel <br...@en...>
+
* src/libopenvrml-gl/openvrml/gl/viewer.cpp
(openvrml::gl::viewer::do_set_frustum(float, float, float)):
Explicitly convert to float to quell a warning from the Microsoft
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-03-16 07:13:46 UTC (rev 3833)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-03-16 07:16:16 UTC (rev 3834)
@@ -67,7 +67,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gdi32.lib advapi32.lib shell32.lib libpngd.lib zlibd.lib freetype236MT_D.lib"
+ AdditionalDependencies="gdi32.lib advapi32.lib shell32.lib libpngd.lib zlibd.lib freetype239MT_D.lib"
OutputFile="$(SolutionDir)..\bin\$(ProjectName)d.dll"
IgnoreDefaultLibraryNames="libcmtd;msvcrt"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gdi32.lib advapi32.lib shell32.lib libpng.lib zlib.lib freetype236MT.lib"
+ AdditionalDependencies="gdi32.lib advapi32.lib shell32.lib libpng.lib zlib.lib freetype239MT.lib"
OutputFile="$(SolutionDir)..\bin\$(ProjectName).dll"
IgnoreDefaultLibraryNames="libcmt"
GenerateDebugInformation="true"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 07:14:06
|
Revision: 3833
http://openvrml.svn.sourceforge.net/openvrml/?rev=3833&view=rev
Author: braden
Date: 2009-03-16 07:13:46 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Explicitly convert to float to quell a warning from the Microsoft compiler.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-16 07:11:57 UTC (rev 3832)
+++ trunk/ChangeLog 2009-03-16 07:13:46 UTC (rev 3833)
@@ -1,5 +1,12 @@
2009-03-16 Braden McDaniel <br...@en...>
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp
+ (openvrml::gl::viewer::do_set_frustum(float, float, float)):
+ Explicitly convert to float to quell a warning from the Microsoft
+ compiler.
+
+2009-03-16 Braden McDaniel <br...@en...>
+
* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj:
Define HAVE_GL_GLU_H.
Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-16 07:11:57 UTC (rev 3832)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-16 07:13:46 UTC (rev 3833)
@@ -3812,7 +3812,7 @@
glMatrixMode(GL_PROJECTION);
if (!this->select_mode) { glLoadIdentity(); }
- (field_of_view *= 180.0) /= pi;
+ (field_of_view *= 180.0f) /= float(pi);
const float aspect = float(this->win_width) / this->win_height;
const float znear = (avatar_size > 0.0)
? float(0.5 * avatar_size)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 07:12:07
|
Revision: 3832
http://openvrml.svn.sourceforge.net/openvrml/?rev=3832&view=rev
Author: braden
Date: 2009-03-16 07:11:57 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Explicitly convert to float to quell a warning from the Microsoft compiler.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-16 07:06:12 UTC (rev 3831)
+++ branches/0.17/ChangeLog 2009-03-16 07:11:57 UTC (rev 3832)
@@ -1,5 +1,12 @@
2009-03-16 Braden McDaniel <br...@en...>
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp
+ (openvrml::gl::viewer::do_set_frustum(float, float, float)):
+ Explicitly convert to float to quell a warning from the Microsoft
+ compiler.
+
+2009-03-16 Braden McDaniel <br...@en...>
+
* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj:
Define HAVE_GL_GLU_H.
Modified: branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-16 07:06:12 UTC (rev 3831)
+++ branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-16 07:11:57 UTC (rev 3832)
@@ -3812,7 +3812,7 @@
glMatrixMode(GL_PROJECTION);
if (!this->select_mode) { glLoadIdentity(); }
- (field_of_view *= 180.0) /= pi;
+ (field_of_view *= 180.0f) /= float(pi);
const float aspect = float(this->win_width) / this->win_height;
const float znear = (avatar_size > 0.0)
? float(0.5 * avatar_size)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 07:06:17
|
Revision: 3831
http://openvrml.svn.sourceforge.net/openvrml/?rev=3831&view=rev
Author: braden
Date: 2009-03-16 07:06:12 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Define HAVE_GL_GLU_H.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-16 07:01:48 UTC (rev 3830)
+++ trunk/ChangeLog 2009-03-16 07:06:12 UTC (rev 3831)
@@ -1,3 +1,8 @@
+2009-03-16 Braden McDaniel <br...@en...>
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj:
+ Define HAVE_GL_GLU_H.
+
2009-03-15 Braden McDaniel <br...@en...>
* src/libopenvrml-gl/openvrml/gl/viewer.cpp: Use the conventional
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj 2009-03-16 07:01:48 UTC (rev 3830)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj 2009-03-16 07:06:12 UTC (rev 3831)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\openvrml;"..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL"
+ PreprocessorDefinitions="HAVE_GL_GLU_H;HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -124,7 +124,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\openvrml;"..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="_SECURE_SCL=0;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG"
+ PreprocessorDefinitions="_SECURE_SCL=0;HAVE_GL_GLU_H;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-16 07:02:06
|
Revision: 3830
http://openvrml.svn.sourceforge.net/openvrml/?rev=3830&view=rev
Author: braden
Date: 2009-03-16 07:01:48 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Define HAVE_GL_GLU_H.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-15 18:51:39 UTC (rev 3829)
+++ branches/0.17/ChangeLog 2009-03-16 07:01:48 UTC (rev 3830)
@@ -1,3 +1,8 @@
+2009-03-16 Braden McDaniel <br...@en...>
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj:
+ Define HAVE_GL_GLU_H.
+
2009-03-15 Braden McDaniel <br...@en...>
* src/libopenvrml-gl/openvrml/gl/viewer.cpp: Use the conventional
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj 2009-03-15 18:51:39 UTC (rev 3829)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj 2009-03-16 07:01:48 UTC (rev 3830)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\openvrml;"..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL"
+ PreprocessorDefinitions="HAVE_GL_GLU_H;HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -124,7 +124,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\openvrml;"..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG"
+ PreprocessorDefinitions="HAVE_GL_GLU_H;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-15 18:51:55
|
Revision: 3829
http://openvrml.svn.sourceforge.net/openvrml/?rev=3829&view=rev
Author: braden
Date: 2009-03-15 18:51:39 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
Use the conventional gl.h/glu.h header paths as a first choice. Make it up to users who don't want these to make them unavailable to the build environment. Most of the time, that will be done by configuring --without-x.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
Property Changed:
----------------
trunk/
trunk/src/libopenvrml/openvrml/bad_url.cpp
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/libopenvrml/openvrml/script.cpp
Property changes on: trunk
___________________________________________________________________
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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-15 18:33:14 UTC (rev 3828)
+++ trunk/ChangeLog 2009-03-15 18:51:39 UTC (rev 3829)
@@ -1,3 +1,11 @@
+2009-03-15 Braden McDaniel <br...@en...>
+
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp: Use the conventional
+ gl.h/glu.h header paths as a first choice. Make it up to users
+ who don't want these to make them unavailable to the build
+ environment. Most of the time, that will be done by configuring
+ --without-x.
+
2009-03-04 Braden McDaniel <br...@en...>
Moved the parser instances out of browser.cpp along with a lot of
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-15 18:33:14 UTC (rev 3828)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-15 18:51:39 UTC (rev 3829)
@@ -36,12 +36,14 @@
# undef interface
# endif
-# ifdef HAVE_OPENGL_GL_H
+# ifdef HAVE_GL_GLU_H
+# include <GL/gl.h>
+# include <GL/glu.h>
+# elif defined(HAVE_OPENGL_GLU_H)
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>
# else
-# include <GL/gl.h>
-# include <GL/glu.h>
+# error must define HAVE_GL_GLU_H or HAVE_OPENGL_GLU_H
# endif
# include <cmath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-15 18:33:39
|
Revision: 3828
http://openvrml.svn.sourceforge.net/openvrml/?rev=3828&view=rev
Author: braden
Date: 2009-03-15 18:33:14 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
Use the conventional gl.h/glu.h header paths as a first choice. Make it up to users who don't want these to make them unavailable to the build environment. Most of the time, that will be done by configuring --without-x.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-04 07:16:37 UTC (rev 3827)
+++ branches/0.17/ChangeLog 2009-03-15 18:33:14 UTC (rev 3828)
@@ -1,3 +1,11 @@
+2009-03-15 Braden McDaniel <br...@en...>
+
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp: Use the conventional
+ gl.h/glu.h header paths as a first choice. Make it up to users
+ who don't want these to make them unavailable to the build
+ environment. Most of the time, that will be done by configuring
+ --without-x.
+
2009-03-02 Braden McDaniel <br...@en...>
Updates for 0.17.11 release.
Modified: branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-04 07:16:37 UTC (rev 3827)
+++ branches/0.17/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-03-15 18:33:14 UTC (rev 3828)
@@ -36,12 +36,14 @@
# undef interface
# endif
-# ifdef HAVE_OPENGL_GL_H
+# ifdef HAVE_GL_GLU_H
+# include <GL/gl.h>
+# include <GL/glu.h>
+# elif defined(HAVE_OPENGL_GLU_H)
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>
# else
-# include <GL/gl.h>
-# include <GL/glu.h>
+# error must define HAVE_GL_GLU_H or HAVE_OPENGL_GLU_H
# endif
# include <cmath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-04 07:16:42
|
Revision: 3827
http://openvrml.svn.sourceforge.net/openvrml/?rev=3827&view=rev
Author: braden
Date: 2009-03-04 07:16:37 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
Moved the parser instances out of browser.cpp along with a lot of other code that implied.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/browser.h
trunk/src/libopenvrml/openvrml/node.h
trunk/src/libopenvrml/openvrml/scene.cpp
Added Paths:
-----------
trunk/src/libopenvrml/openvrml/local/component.cpp
trunk/src/libopenvrml/openvrml/local/component.h
trunk/src/libopenvrml/openvrml/local/externproto.cpp
trunk/src/libopenvrml/openvrml/local/externproto.h
trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp
trunk/src/libopenvrml/openvrml/local/parse_vrml.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-02 06:29:53 UTC (rev 3826)
+++ trunk/ChangeLog 2009-03-04 07:16:37 UTC (rev 3827)
@@ -1,3 +1,29 @@
+2009-03-04 Braden McDaniel <br...@en...>
+
+ Moved the parser instances out of browser.cpp along with a lot of
+ other code that implied.
+
+ * src/libopenvrml/openvrml/local/component.cpp: Added file.
+ * src/libopenvrml/openvrml/local/component.h: Added file.
+ component and profile class definitions.
+ * src/libopenvrml/openvrml/local/externproto.cpp: Added file.
+ * src/libopenvrml/openvrml/local/externproto.h: Added file.
+ Definitions of externproto_node, externproto_node_type, and
+ externproto_node_metatype.
+ * src/libopenvrml/openvrml/local/parse_vrml.cpp: Added file.
+ * src/libopenvrml/openvrml/local/parse_vrml.h: Added file.
+ Declaration of parse_vrml function and definitions of the parse
+ actions classes.
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/browser.h
+ * src/libopenvrml/openvrml/scene.cpp
+ * src/libopenvrml/openvrml/node.h
+ * src/Makefile.am
+ (libopenvrml_libopenvrml_la_SOURCES): Added files
+ libopenvrml/openvrml/local/parse_vrml.{cpp,h},
+ libopenvrml/openvrml/local/component.{cpp,h},
+ libopenvrml/openvrml/local/externproto.{cpp,h}.
+
2009-03-02 Braden McDaniel <br...@en...>
Updates for 0.17.11 release.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-02 06:29:53 UTC (rev 3826)
+++ trunk/src/Makefile.am 2009-03-04 07:16:37 UTC (rev 3827)
@@ -104,8 +104,14 @@
libopenvrml/openvrml/local/uri.h \
libopenvrml/openvrml/local/xml_reader.cpp \
libopenvrml/openvrml/local/xml_reader.h \
+ libopenvrml/openvrml/local/parse_vrml.cpp \
+ libopenvrml/openvrml/local/parse_vrml.h \
+ libopenvrml/openvrml/local/component.cpp \
+ libopenvrml/openvrml/local/component.h \
libopenvrml/openvrml/local/proto.cpp \
libopenvrml/openvrml/local/proto.h \
+ libopenvrml/openvrml/local/externproto.cpp \
+ libopenvrml/openvrml/local/externproto.h \
libopenvrml/openvrml/local/field_value_types.h \
libopenvrml/openvrml/local/float.h \
libopenvrml/openvrml/local/node_metatype_registry_impl.cpp \
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2009-03-02 06:29:53 UTC (rev 3826)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2009-03-04 07:16:37 UTC (rev 3827)
@@ -22,23 +22,15 @@
# include "browser.h"
# include "scene.h"
# include "scope.h"
-# include "x3d_vrml_grammar.h"
-# include <openvrml/local/dl.h>
# include <openvrml/local/uri.h>
-# include <openvrml/local/xml_reader.h>
-# include <openvrml/local/field_value_types.h>
-# include <openvrml/local/proto.h>
# include <openvrml/local/node_metatype_registry_impl.h>
+# include <openvrml/local/component.h>
+# include <openvrml/local/parse_vrml.h>
# include <private.h>
-# include <boost/algorithm/string/predicate.hpp>
# include <boost/bind.hpp>
-# include <boost/enable_shared_from_this.hpp>
-# include <boost/filesystem.hpp>
# include <boost/functional.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/mpl/for_each.hpp>
# include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/ptr_container/ptr_map.hpp>
# include <boost/thread/thread.hpp>
# include <algorithm>
# include <functional>
@@ -95,242 +87,6 @@
};
} // namespace openvrml
-
-/**
- * @brief @c node_metatype for @c EXTERNPROTO%s.
- */
-class OPENVRML_LOCAL openvrml::browser::externproto_node_metatype :
- public boost::enable_shared_from_this<externproto_node_metatype>,
- public openvrml::node_metatype {
-
- friend class externproto_node_type;
-
- struct load_proto;
-
- mutable boost::mutex mutex_;
- boost::weak_ptr<openvrml::local::proto_node_metatype> proto_node_metatype_;
-
- typedef std::vector<boost::weak_ptr<externproto_node_type> >
- externproto_node_types;
-
- mutable externproto_node_types externproto_node_types_;
- bool externproto_node_types_cleared_;
-
- boost::thread * const load_proto_thread_;
-
-public:
- externproto_node_metatype(
- const openvrml::node_metatype_id & id,
- const openvrml::scene & scene,
- const std::vector<std::string> & uris,
- boost::thread_group & load_proto_thread_group)
- OPENVRML_THROW2(boost::thread_resource_error, std::bad_alloc);
- virtual ~externproto_node_metatype() OPENVRML_NOTHROW;
-
-private:
- virtual const boost::shared_ptr<openvrml::node_type>
- do_create_type(const std::string & id,
- const openvrml::node_interface_set & interfaces) const
- OPENVRML_THROW2(openvrml::unsupported_interface, std::bad_alloc);
-
- virtual void do_shutdown(double time) OPENVRML_NOTHROW;
-
- void set_proto_node_metatype(
- const boost::weak_ptr<openvrml::local::proto_node_metatype> & proto_node_metatype = boost::weak_ptr<openvrml::local::proto_node_metatype>())
- OPENVRML_THROW1(std::bad_alloc);
-
- void clear_externproto_node_types() OPENVRML_NOTHROW;
-};
-
-
-class OPENVRML_LOCAL openvrml::browser::externproto_node_type :
- public openvrml::node_type {
-
- const boost::shared_ptr<const externproto_node_metatype> node_metatype_;
-
- openvrml::node_interface_set interfaces_;
-
- mutable boost::mutex mutex_;
- boost::shared_ptr<openvrml::node_type> proto_node_type_;
-
- typedef std::vector<boost::intrusive_ptr<externproto_node> >
- externproto_nodes;
-
- mutable externproto_nodes externproto_nodes_;
-
-public:
- externproto_node_type(
- const boost::shared_ptr<const externproto_node_metatype> & c,
- const std::string & id,
- const openvrml::node_interface_set & interfaces)
- OPENVRML_THROW1(std::bad_alloc);
-
- virtual ~externproto_node_type() OPENVRML_NOTHROW;
-
- void set_proto_node_type(openvrml::local::proto_node_metatype & proto_node_metatype)
- OPENVRML_THROW1(std::bad_alloc);
-
- void clear_externproto_nodes() OPENVRML_NOTHROW;
-
-private:
- virtual const openvrml::node_interface_set & do_interfaces() const
- OPENVRML_NOTHROW;
-
- virtual const boost::intrusive_ptr<openvrml::node>
- do_create_node(
- const boost::shared_ptr<openvrml::scope> & scope,
- const openvrml::initial_value_map & initial_values) const
- OPENVRML_THROW3(openvrml::unsupported_interface, std::bad_cast,
- std::bad_alloc);
-};
-
-
-class OPENVRML_LOCAL openvrml::externproto_node :
- public openvrml::local::abstract_proto_node {
-
- template <typename FieldValue>
- class externproto_exposedfield : public FieldValue,
- public proto_eventin<FieldValue>,
- public proto_eventout<FieldValue> {
- public:
- explicit externproto_exposedfield(
- externproto_node & node,
- const FieldValue & initial_value = FieldValue())
- OPENVRML_NOTHROW;
- virtual ~externproto_exposedfield() OPENVRML_NOTHROW;
-
- private:
- virtual std::auto_ptr<openvrml::field_value> do_clone() const
- OPENVRML_THROW1(std::bad_alloc);
- virtual void do_process_event(const FieldValue & value,
- double timestamp)
- OPENVRML_THROW1(std::bad_alloc);
- };
-
- struct externproto_exposedfield_creator {
- externproto_exposedfield_creator(
- externproto_node & node,
- const openvrml::field_value::type_id type,
- boost::shared_ptr<openvrml::field_value> & exposedfield):
- node_(&node),
- type_(type),
- exposedfield_(&exposedfield)
- {}
-
- template <typename T>
- void operator()(T) const
- {
- if (T::field_value_type_id == this->type_) {
- this->exposedfield_->reset(
- new externproto_exposedfield<T>(*this->node_));
- }
- }
-
- private:
- externproto_node * node_;
- openvrml::field_value::type_id type_;
- boost::shared_ptr<openvrml::field_value> * exposedfield_;
- };
-
- static const boost::shared_ptr<openvrml::field_value>
- create_exposedfield(externproto_node & node,
- openvrml::field_value::type_id type)
- OPENVRML_THROW1(std::bad_alloc);
-
- typedef std::map<std::string, boost::shared_ptr<openvrml::field_value> >
- field_map;
-
- struct externproto_field_equal_to :
- std::unary_function<field_map::value_type, bool> {
-
- explicit externproto_field_equal_to(
- const openvrml::field_value & field_value):
- field_value_(&field_value)
- {}
-
- bool operator()(const field_map::value_type & arg) const
- {
- return this->field_value_ == arg.second.get();
- }
-
- private:
- const openvrml::field_value * field_value_;
- };
-
- initial_value_map initial_values_;
- std::set<openvrml::field_value *> received_event_;
- field_map field_map_;
-
- boost::intrusive_ptr<openvrml::node> proto_node_;
-
-public:
- externproto_node(const browser::externproto_node_type & type,
- const boost::shared_ptr<openvrml::scope> & scope,
- const openvrml::initial_value_map & initial_values)
- OPENVRML_THROW1(std::bad_alloc);
-
- virtual ~externproto_node() OPENVRML_NOTHROW;
-
- virtual bool modified() const;
-
- void set_proto_node(node_type & type)
- OPENVRML_THROW1(std::bad_alloc);
-
-private:
- virtual
- const std::vector<boost::intrusive_ptr<node> > & do_impl_nodes() const
- OPENVRML_NOTHROW;
-
- virtual void do_initialize(double timestamp)
- OPENVRML_THROW1(std::bad_alloc);
-
- virtual const openvrml::field_value &
- do_field(const std::string & id) const
- OPENVRML_THROW1(openvrml::unsupported_interface);
-
- virtual openvrml::event_listener &
- do_event_listener(const std::string & id)
- OPENVRML_THROW1(openvrml::unsupported_interface);
-
- virtual openvrml::event_emitter &
- do_event_emitter(const std::string & id)
- OPENVRML_THROW1(openvrml::unsupported_interface);
-
- virtual void do_shutdown(double timestamp) OPENVRML_NOTHROW;
-
- virtual openvrml::script_node * to_script() OPENVRML_NOTHROW;
- virtual openvrml::appearance_node * to_appearance() OPENVRML_NOTHROW;
- virtual openvrml::bounded_volume_node * to_bounded_volume()
- OPENVRML_NOTHROW;
- virtual openvrml::child_node * to_child() OPENVRML_NOTHROW;
- virtual openvrml::color_node * to_color() OPENVRML_NOTHROW;
- virtual openvrml::color_rgba_node * to_color_rgba() OPENVRML_NOTHROW;
- virtual openvrml::coordinate_node * to_coordinate() OPENVRML_NOTHROW;
- virtual openvrml::font_style_node * to_font_style() OPENVRML_NOTHROW ;
- virtual openvrml::geometry_node * to_geometry() OPENVRML_NOTHROW;
- virtual openvrml::grouping_node * to_grouping() OPENVRML_NOTHROW;
- virtual openvrml::light_node * to_light() OPENVRML_NOTHROW;
- virtual openvrml::material_node * to_material() OPENVRML_NOTHROW;
- virtual openvrml::navigation_info_node * to_navigation_info()
- OPENVRML_NOTHROW;
- virtual openvrml::normal_node * to_normal() OPENVRML_NOTHROW;
- virtual openvrml::pointing_device_sensor_node *
- to_pointing_device_sensor() OPENVRML_NOTHROW;
- virtual openvrml::scoped_light_node * to_scoped_light()
- OPENVRML_NOTHROW;
- virtual openvrml::sound_source_node * to_sound_source()
- OPENVRML_NOTHROW;
- virtual openvrml::texture_node * to_texture() OPENVRML_NOTHROW;
- virtual openvrml::texture_coordinate_node * to_texture_coordinate()
- OPENVRML_NOTHROW;
- virtual openvrml::texture_transform_node * to_texture_transform()
- OPENVRML_NOTHROW;
- virtual openvrml::time_dependent_node * to_time_dependent()
- OPENVRML_NOTHROW;
- virtual openvrml::transform_node * to_transform() OPENVRML_NOTHROW;
- virtual openvrml::viewpoint_node * to_viewpoint() OPENVRML_NOTHROW;
-};
-
namespace {
class OPENVRML_LOCAL default_navigation_info :
@@ -656,231 +412,8 @@
throw openvrml::unsupported_interface(this->type(), id);
return *static_cast<openvrml::event_emitter *>(0);
}
-
-
- const std::string anonymous_stream_id_prefix_ =
- "urn:X-openvrml:stream:";
-
- OPENVRML_LOCAL bool anonymous_stream_id(const openvrml::local::uri & id)
- {
- const std::string str(id);
- return str.length() > anonymous_stream_id_prefix_.length()
- && std::equal(anonymous_stream_id_prefix_.begin(),
- anonymous_stream_id_prefix_.end(),
- str.begin());
- }
-
-
- class OPENVRML_LOCAL profile {
- typedef std::map<std::string, int> map_t;
- map_t components_;
-
- protected:
- void add_component(const std::string & name, int level)
- OPENVRML_THROW1(std::bad_alloc);
-
- public:
- std::auto_ptr<openvrml::scope>
- create_root_scope(const openvrml::browser & browser,
- const std::string & uri) const
- OPENVRML_THROW1(std::bad_alloc);
- std::auto_ptr<openvrml::node_type_decls>
- create_node_type_desc_map() const
- OPENVRML_THROW1(std::bad_alloc);
- };
-
-
- class OPENVRML_LOCAL vrml97_profile : public profile {
- public:
- static const char * const id;
-
- vrml97_profile();
- };
-
-
- class OPENVRML_LOCAL x3d_core_profile : public profile {
- public:
- static const char * const id;
-
- x3d_core_profile();
- };
-
-
- class OPENVRML_LOCAL x3d_interchange_profile : public profile {
- public:
- static const char * const id;
-
- x3d_interchange_profile();
- };
-
-
- class OPENVRML_LOCAL x3d_interactive_profile : public profile {
- public:
- static const char * const id;
-
- x3d_interactive_profile();
- };
-
-
- class OPENVRML_LOCAL x3d_mpeg4_profile : public profile {
- public:
- static const char * const id;
-
- x3d_mpeg4_profile();
- };
-
-
- class OPENVRML_LOCAL x3d_immersive_profile : public profile {
- public:
- static const char * const id;
-
- x3d_immersive_profile();
- };
-
-
- class OPENVRML_LOCAL x3d_full_profile : public profile {
- public:
- static const char * const id;
-
- x3d_full_profile();
- };
}
-namespace {
-
- class OPENVRML_LOCAL component {
- struct node_type_decl {
- openvrml::node_interface_set interfaces;
- std::string metatype_id;
- };
-
- class xml_reader;
-
- class level : std::map<std::string, node_type_decl> {
- friend class xml_reader;
-
- public:
- typedef std::map<std::string, size_t> dependencies_t;
-
- private:
- dependencies_t dependencies_;
-
- public:
- typedef std::map<std::string, node_type_decl> base_t;
- using base_t::value_type;
- using base_t::iterator;
- using base_t::const_iterator;
- using base_t::begin;
- using base_t::end;
- using base_t::find;
- using base_t::insert;
-
- const dependencies_t & requires() const;
- };
-
- class xml_reader : boost::noncopyable {
- enum parse_state {
- none,
- component,
- level,
- requires,
- node,
- field
- };
-
- ::component & component_;
- parse_state state_;
- std::vector<component::level>::value_type * current_level_;
- level::value_type * current_node_;
-
- public:
- explicit xml_reader(::component & c);
-
- void read(const std::string & filename)
- OPENVRML_THROW1(std::runtime_error);
-
- private:
- void process_node(openvrml::local::xml_reader & reader);
- void start_element(openvrml::local::xml_reader & reader);
- void end_element(openvrml::local::xml_reader & reader);
- };
-
- std::string id_;
- std::vector<level> levels_;
-
- public:
- explicit component(const std::string & filename)
- OPENVRML_THROW1(std::runtime_error);
-
- const std::string & id() const OPENVRML_NOTHROW;
- size_t support_level() const OPENVRML_NOTHROW;
- void add_to_scope(const openvrml::browser & b,
- openvrml::scope & scope,
- size_t level) const
- OPENVRML_THROW2(std::invalid_argument, std::bad_alloc);
- void add_to_node_type_desc_map(openvrml::node_type_decls & type_descs,
- size_t level) const
- OPENVRML_THROW2(std::invalid_argument, std::bad_alloc);
-
- private:
- static bool
- add_type_desc(openvrml::node_type_decls & type_descs,
- const std::string & node_type_id,
- const openvrml::node_interface_set & interfaces)
- OPENVRML_THROW1(std::bad_alloc);
-
- void add_scope_entry(
- const openvrml::browser & b,
- const char * node_name,
- const openvrml::node_interface_set & interface_set,
- const char * urn,
- openvrml::scope & scope) const
- OPENVRML_THROW2(openvrml::unsupported_interface, std::bad_alloc);
- };
-
- const class OPENVRML_LOCAL profile_registry : boost::ptr_map<std::string,
- profile> {
- public:
- profile_registry();
-
- using boost::ptr_map<std::string, profile>::at;
- } profile_registry_;
-
- profile_registry::profile_registry()
- {
- std::string key;
- bool succeeded;
-
- key = vrml97_profile::id;
- succeeded = this->insert(key, new vrml97_profile).second;
- assert(succeeded);
-
- key = x3d_core_profile::id;
- succeeded = this->insert(key, new x3d_core_profile).second;
- assert(succeeded);
-
- key = x3d_interchange_profile::id;
- succeeded = this->insert(key, new x3d_interchange_profile).second;
- assert(succeeded);
-
- key = x3d_interactive_profile::id;
- succeeded = this->insert(key, new x3d_interactive_profile).second;
- assert(succeeded);
-
- key = x3d_mpeg4_profile::id;
- succeeded = this->insert(key, new x3d_mpeg4_profile).second;
- assert(succeeded);
-
- key = x3d_immersive_profile::id;
- succeeded = this->insert(key, new x3d_immersive_profile).second;
- assert(succeeded);
-
- key = x3d_full_profile::id;
- succeeded = this->insert(key, new x3d_full_profile).second;
- assert(succeeded);
- }
-}
-
/**
* @brief Get a @c node_type_decls map corresponding to a particular profile.
*
@@ -897,26 +430,14 @@
OPENVRML_THROW2(std::invalid_argument, std::bad_alloc)
{
try {
- return ::profile_registry_.at(profile_id).create_node_type_desc_map();
+ return local::profile_registry_.at(profile_id)
+ .create_node_type_desc_map();
} catch (boost::bad_ptr_container_operation &) {
throw std::invalid_argument("unknown profile identifier \""
+ profile_id + '"');
}
}
-namespace {
-
- const class OPENVRML_LOCAL component_registry : boost::ptr_map<std::string,
- component> {
- public:
- component_registry()
- OPENVRML_THROW2(boost::filesystem::filesystem_error,
- std::bad_alloc);
-
- using boost::ptr_map<std::string, component>::at;
- } component_registry_;
-}
-
/**
* @brief Add the nodes corresponding to a component level to a
* @c node_type_decls map.
@@ -937,7 +458,8 @@
OPENVRML_THROW2(std::invalid_argument, std::bad_alloc)
{
try {
- const component & comp = ::component_registry_.at(component_id);
+ const local::component & comp =
+ local::component_registry_.at(component_id);
comp.add_to_node_type_desc_map(node_types, level);
} catch (boost::bad_ptr_container_operation &) {
throw std::invalid_argument("unknown component identifier \""
@@ -946,2392 +468,6 @@
}
-struct OPENVRML_LOCAL openvrml::browser::vrml97_parse_actions {
- vrml97_parse_actions(
- const std::string & uri,
- const openvrml::scene & scene,
- std::vector<boost::intrusive_ptr<openvrml::node> > & nodes):
- on_scene_start(*this),
- on_scene_finish(*this),
- on_externproto(*this),
- on_proto_start(*this),
- on_proto_interface(*this),
- on_proto_default_value_start(*this),
- on_proto_default_value_finish(*this),
- on_proto_body_start(*this),
- on_proto_finish(*this),
- on_node_start(*this),
- on_node_finish(*this),
- on_script_interface_decl(*this),
- on_route(*this),
- on_use(*this),
- on_is_mapping(*this),
- on_field_start(*this),
- on_sfnode(*this),
- on_mfnode(*this),
- on_sfbool(*this),
- on_sfcolor(*this),
- on_mfcolor(*this),
- on_sffloat(*this),
- on_mffloat(*this),
- on_sfimage(*this),
- on_sfint32(*this),
- on_mfint32(*this),
- on_sfrotation(*this),
- on_mfrotation(*this),
- on_sfstring(*this),
- on_mfstring(*this),
- on_sftime(*this),
- on_mftime(*this),
- on_sfvec2f(*this),
- on_mfvec2f(*this),
- on_sfvec3f(*this),
- on_mfvec3f(*this),
- uri_(uri),
- scene_(scene),
- nodes_(nodes)
- {}
-
- struct on_scene_start_t {
- explicit on_scene_start_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- using std::vector;
- using boost::intrusive_ptr;
-
- this->actions_.ps.push(parse_scope());
-
- const ::profile & p = ::profile_registry_.at(vrml97_profile::id);
- std::auto_ptr<scope>
- root_scope(p.create_root_scope(this->actions_.scene_.browser(),
- this->actions_.uri_));
- this->actions_.ps.top().scope = root_scope;
- this->actions_.ps.top().children.push(
- parse_scope::children_t());
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_scene_start;
-
- struct on_scene_finish_t {
- explicit on_scene_finish_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- using std::vector;
-
- assert(this->actions_.ps.top().children.size() == 1);
- this->actions_.nodes_ =
- this->actions_.ps.top().children.top();
- this->actions_.ps.top().children.pop();
-
- assert(this->actions_.ps.size() == 1);
-
- parse_scope & ps = this->actions_.ps.top();
-
- for (vector<route>::const_iterator r = ps.routes.begin();
- r != ps.routes.end();
- ++r) {
- node * const from = ps.scope->find_node(r->from);
- assert(from);
- node * const to = ps.scope->find_node(r->to);
- assert(to);
- //
- // Redundant routing is ignored (4.10.2), so we don't care if
- // add_route returns false.
- //
- add_route(*from, r->eventout, *to, r->eventin);
- }
- this->actions_.ps.pop();
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_scene_finish;
-
- struct on_externproto_t {
- explicit on_externproto_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & node_type_id,
- const node_interface_set & interfaces,
- const std::vector<std::string> & uri_list) const
- {
- using std::string;
- using std::vector;
- using boost::shared_ptr;
- using local::uri;
-
- //
- // If we are parsing an "anonymous" stream--that is, one passed to
- // browser::create_vrml_from_stream--we cannot use the URI
- // associated with the stream to resolve relative URIs. So in
- // this instance, we get the base URI from browser::world_url. If
- // browser::world_url is an empty string, we call create_file_url
- // with an empty (relative) uri.
- //
- const uri base_uri =
- anonymous_stream_id(uri(this->actions_.uri_))
- ? this->actions_.scene_.browser().world_url().empty()
- ? create_file_url(uri())
- : uri(this->actions_.scene_.browser().world_url())
- : uri(this->actions_.uri_);
-
- shared_ptr<node_type> node_type;
- for (vector<string>::const_iterator resource_id = uri_list.begin();
- resource_id != uri_list.end();
- ++resource_id) {
- const uri absolute_uri = relative(uri(*resource_id))
- ? resolve_against(uri(*resource_id), base_uri)
- : uri(*resource_id);
- const shared_ptr<openvrml::node_metatype> node_metatype =
- this->actions_.scene_.browser().node_metatype(
- node_metatype_id(absolute_uri));
- if (node_metatype) {
- node_type = node_metatype->create_type(node_type_id,
- interfaces);
- break;
- }
- }
-
- if (!node_type) {
- const std::string metatype_id =
- path(*this->actions_.ps.top().scope) + '#'
- + node_type_id;
- const shared_ptr<openvrml::node_metatype>
- externproto_class(
- new externproto_node_metatype(
- metatype_id,
- this->actions_.scene_,
- uri_list,
- this->actions_.scene_.browser()
- .load_proto_thread_group_));
-
- this->actions_.scene_.browser().add_node_metatype(
- externproto_class->id(),
- externproto_class);
- for (vector<string>::const_iterator resource_id =
- uri_list.begin();
- resource_id != uri_list.end();
- ++resource_id) {
- const uri absolute_uri = relative(uri(*resource_id))
- ? resolve_against(uri(*resource_id), base_uri)
- : uri(*resource_id);
- this->actions_.scene_.browser()
- .add_node_metatype(node_metatype_id(absolute_uri),
- externproto_class);
- }
-
- node_type = externproto_class->create_type(node_type_id,
- interfaces);
- }
-
- assert(node_type);
-
- const bool succeeded =
- this->actions_.ps.top().scope->add_type(node_type)
- .second;
- assert(succeeded);
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_externproto;
-
- struct on_proto_start_t {
- explicit on_proto_start_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & node_type_id) const
- {
- const boost::shared_ptr<scope> outer_scope =
- this->actions_.ps.top().scope;
- assert(outer_scope);
-
- this->actions_.ps.push(parse_scope());
-
- parse_scope & ps = this->actions_.ps.top();
-
- ps.proto_node_type_id = node_type_id;
-
- //
- // We don't want to create the new scope until we start the PROTO
- // body. So, for now we set the parse_scope::scope to the outer
- // scope.
- //
- ps.scope = outer_scope;
-
- //
- // We push a node_data onto the stack to hold any field default
- // values.
- //
- ps.node_data_.push(node_data());
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_proto_start;
-
- struct on_proto_interface_t {
- explicit on_proto_interface_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const node_interface & interface_) const
- {
- parse_scope & ps = this->actions_.ps.top();
-
- const bool succeeded =
- ps.proto_interfaces.insert(interface_).second;
- assert(succeeded);
-
- assert(!ps.node_data_.empty());
- node_data & nd = ps.node_data_.top();
-
- if (interface_.type == node_interface::field_id
- || interface_.type == node_interface::exposedfield_id) {
- using std::auto_ptr;
- using std::pair;
- auto_ptr<field_value> value =
- field_value::create(interface_.field_type);
- pair<initial_value_map::iterator, bool> insert_result =
- nd.initial_values.insert(
- make_pair(interface_.id,
- boost::shared_ptr<field_value>(value)));
- assert(insert_result.second);
- nd.current_field_value = &(*insert_result.first);
- }
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_proto_interface;
-
- struct on_proto_default_value_start_t {
- explicit on_proto_default_value_start_t(
- vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- parse_scope & ps = this->actions_.ps.top();
-
- boost::shared_ptr<scope> outer_scope = ps.scope;
- const std::string & proto_node_type_id = ps.proto_node_type_id;
- assert(!proto_node_type_id.empty());
- const std::string & field_id =
- ps.node_data_.top().current_field_value->first;
- const field_value::type_id field_type =
- ps.node_data_.top().current_field_value->second->type();
-
- if (field_type == field_value::sfnode_id
- || field_type == field_value::mfnode_id) {
- using std::vector;
- using boost::intrusive_ptr;
-
- const node_data old_nd = ps.node_data_.top();
-
- const std::string scope_id =
- proto_node_type_id + '.' + field_id;
- actions_.ps.push(parse_scope());
-
- parse_scope & new_ps = this->actions_.ps.top();
-
- new_ps.scope.reset(new scope(scope_id, outer_scope));
- new_ps.node_data_.push(old_nd);
- new_ps.children.push(parse_scope::children_t());
- }
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_proto_default_value_start;
-
- struct on_proto_default_value_finish_t {
- explicit on_proto_default_value_finish_t(
- vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- assert(!actions_.ps.empty());
-
- parse_scope & ps = this->actions_.ps.top();
-
- const field_value::type_id field_type =
- ps.node_data_.top().current_field_value->second->type();
-
- if (field_type == field_value::sfnode_id
- || field_type == field_value::mfnode_id) {
- using std::vector;
-
- assert(actions_.ps.size() > 1);
-
- for (vector<route>::const_iterator r = ps.routes.begin();
- r != ps.routes.end();
- ++r) {
- node * const from = ps.scope->find_node(r->from);
- assert(from);
- node * const to = ps.scope->find_node(r->to);
- assert(to);
- //
- // Redundant routing is ignored (4.10.2), so we don't care
- // if add_route returns false.
- //
- add_route(*from, r->eventout, *to, r->eventin);
- }
-
- parse_scope old_ps = ps;
- this->actions_.ps.pop();
- parse_scope & new_ps = this->actions_.ps.top();
- new_ps.node_data_.top().current_field_value->second->assign(
- *old_ps.node_data_.top().current_field_value->second);
- }
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_proto_default_value_finish;
-
- struct on_proto_body_start_t {
- explicit on_proto_body_start_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- assert(!actions_.ps.empty());
- const boost::shared_ptr<scope> parent =
- actions_.ps.top().scope;
- actions_.ps.top().scope
- .reset(new scope(actions_.ps.top().proto_node_type_id,
- parent));
- actions_.ps.top().proto_default_values =
- actions_.ps.top().node_data_.top().initial_values;
- actions_.ps.top().node_data_.pop();
- assert(actions_.ps.top().children.empty());
- actions_.ps.top().children.push(
- parse_scope::children_t());
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_proto_body_start;
-
- struct on_proto_finish_t {
- explicit on_proto_finish_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- using std::vector;
- using boost::shared_ptr;
- using boost::dynamic_pointer_cast;
- using local::proto_node_metatype;
- parse_scope & ps = this->actions_.ps.top();
- assert(ps.children.size() == 1);
- assert(ps.node_data_.empty());
- proto_node_metatype::routes_t proto_routes;
- for (vector<route>::const_iterator r = ps.routes.begin();
- r != ps.routes.end();
- ++r) {
- node * const from = ps.scope->find_node(r->from);
- assert(from);
- node * const to = ps.scope->find_node(r->to);
- assert(to);
- proto_routes.push_back(
- proto_node_metatype::route(*from, r->eventout,
- *to, r->eventin));
- }
- const shared_ptr<openvrml::node_metatype> node_metatype(
- new proto_node_metatype(
- path(*ps.scope),
- this->actions_.scene_.browser(),
- ps.proto_interfaces,
- ps.proto_default_values,
- ps.children.top(),
- ps.proto_is_map,
- proto_routes));
-
- //
- // Add the new node_metatype (prototype definition) to the
- // browser's node_metatype_registry.
- //
- this->actions_.scene_.browser()
- .add_node_metatype(node_metatype->id(), node_metatype);
-
- if (!dynamic_pointer_cast<proto_node_metatype>(
- this->actions_.scene_.browser().node_metatype(
- node_metatype_id(this->actions_.uri_)))) {
- this->actions_.scene_.browser()
- .add_node_metatype(node_metatype_id(this->actions_.uri_),
- node_metatype);
- }
-
- //
- // PROTOs implicitly introduce a new node type as well.
- //
- const shared_ptr<node_type> node_type =
- node_metatype->create_type(
- ps.proto_node_type_id,
- this->actions_.ps.top().proto_interfaces);
- assert(node_type);
-
- //
- // We want to add the type to the PROTO's enclosing scope, so pop
- // off the current scope.
- //
- assert(this->actions_.ps.size() > 1);
- this->actions_.ps.pop();
-
- const bool succeeded =
- this->actions_.ps.top().scope->add_type(node_type)
- .second;
- assert(succeeded);
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_proto_finish;
-
- struct on_node_start_t {
- explicit on_node_start_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & node_name_id,
- const std::string & node_type_id) const
- {
- parse_scope & ps = this->actions_.ps.top();
-
- ps.node_data_.push(node_data());
- ps.node_data_.top().node_name_id = node_name_id;
-
- assert(ps.scope);
- if (node_type_id != "Script") {
- ps.node_data_.top().type = ps.scope->find_type(node_type_id);
- assert(ps.node_data_.top().type);
- }
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_node_start;
-
- struct on_node_finish_t {
- explicit on_node_finish_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- using boost::intrusive_ptr;
-
- parse_scope & ps = this->actions_.ps.top();
-
- assert(!ps.children.empty());
- assert(!ps.node_data_.empty());
-
- const node_data & nd = ps.node_data_.top();
-
- const intrusive_ptr<node> n = nd.type
- ? nd.type->create_node(ps.scope, nd.initial_values)
- : intrusive_ptr<node>(
- new script_node(
- this->actions_.scene_.browser().script_node_metatype_,
- ps.scope,
- nd.script_interfaces,
- nd.initial_values));
-
- if (!nd.node_name_id.empty()) { n->id(nd.node_name_id); }
-
- for (node_data::is_map_t::const_iterator entry = nd.is_map.begin();
- entry != nd.is_map.end();
- ++entry) {
- ps.proto_is_map.insert(
- make_pair(entry->second,
- local::proto_node_metatype::is_target(
- *n, entry->first)));
- }
-
- ps.children.top().push_back(n);
- ps.node_data_.pop();
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_node_finish;
-
- struct on_script_interface_decl_t {
- explicit on_script_interface_decl_t(
- vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const node_interface & interface_) const
- {
- parse_scope & ps = this->actions_.ps.top();
-
- assert(!ps.node_data_.empty());
-
- node_data & nd = ps.node_data_.top();
-
- const bool succeeded =
- nd.script_interfaces.insert(interface_).second;
- assert(succeeded);
-
- this->actions_.on_field_start(interface_.id, interface_.field_type);
- if ((interface_.type == node_interface::eventin_id
- || interface_.type == node_interface::eventout_id)
- && (interface_.field_type == field_value::sfnode_id
- || interface_.field_type == field_value::mfnode_id)) {
- ps.children.pop();
- }
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_script_interface_decl;
-
- struct on_route_t {
- explicit on_route_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & from_node_name_id,
- const node_interface & from_node_interface,
- const std::string & to_node_name_id,
- const node_interface & to_node_interface) const
- {
- parse_scope & ps = this->actions_.ps.top();
- const route r(from_node_name_id, from_node_interface.id,
- to_node_name_id, to_node_interface.id);
- ps.routes.push_back(r);
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_route;
-
- struct on_use_t {
- explicit on_use_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & node_name_id) const
- {
- using boost::intrusive_ptr;
- parse_scope & ps = this->actions_.ps.top();
- node_data & nd = ps.node_data_.top();
-
- //
- // Check for self-reference. This is legitimate in Script nodes.
- //
- node * const n = (node_name_id == nd.node_name_id)
- ? node::self_tag.get()
- : ps.scope->find_node(node_name_id);
- assert(n);
- assert(!ps.children.empty());
- ps.children.top().push_back(intrusive_ptr<node>(n));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_use;
-
- struct on_is_mapping_t {
- explicit on_is_mapping_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & proto_interface_id) const
- {
- node_data & nd =
- this->actions_.ps.top().node_data_.top();
- assert(nd.current_field_value);
- nd.is_map.insert(make_pair(nd.current_field_value->first,
- proto_interface_id));
-
- const field_value::type_id field_type =
- nd.current_field_value->second->type();
- if (field_type == field_value::sfnode_id
- || field_type == field_value::mfnode_id) {
- this->actions_.ps.top().children.pop();
- }
-
- //
- // We need to leave this around for Script nodes.
- //
- if (nd.type) {
- const initial_value_map::size_type erased =
- nd.initial_values.erase(nd.current_field_value->first);
- assert(erased != 0);
- }
- nd.current_field_value = 0;
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_is_mapping;
-
- struct on_field_start_t {
- explicit on_field_start_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & field_name_id,
- const field_value::type_id field_type) const
- {
- parse_scope & ps = this->actions_.ps.top();
- node_data & nd = ps.node_data_.top();
-
- using boost::shared_ptr;
- using std::pair;
- std::auto_ptr<field_value> value = field_value::create(field_type);
- pair<initial_value_map::iterator, bool> insert_result =
- nd.initial_values.insert(
- make_pair(field_name_id, shared_ptr<field_value>(value)));
- assert(insert_result.second);
- nd.current_field_value = &(*insert_result.first);
-
- if (field_type == field_value::sfnode_id
- || field_type == field_value::mfnode_id) {
- ps.children.push(parse_scope::children_t());
- }
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_field_start;
-
- struct on_sfnode_t {
- explicit on_sfnode_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(bool null) const
- {
- assert(!actions_.ps.empty());
- parse_scope & ps = this->actions_.ps.top();
-
- if (!null) {
- assert(!ps.node_data_.empty());
- assert(!ps.children.top().empty());
- ps.node_data_.top()
- .current_field_value->second->assign(
- sfnode(ps.children.top().front()));
- }
- actions_.ps.top().children.pop();
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfnode;
-
- struct on_mfnode_t {
- explicit on_mfnode_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()() const
- {
- assert(!this->actions_.ps.empty());
- assert(!this->actions_.ps.top().node_data_.empty());
- assert(!this->actions_.ps.top().children.empty());
- this->actions_.ps.top().node_data_.top()
- .current_field_value->second
- ->assign(mfnode(this->actions_.ps.top().children.top()));
- this->actions_.ps.top().children.pop();
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfnode;
-
- struct on_sfbool_t {
- explicit on_sfbool_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const bool val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfbool(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfbool;
-
- struct on_sfcolor_t {
- explicit on_sfcolor_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const color & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfcolor(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfcolor;
-
- struct on_mfcolor_t {
- explicit on_mfcolor_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<color> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mfcolor(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfcolor;
-
- struct on_sffloat_t {
- explicit on_sffloat_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const float val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sffloat(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sffloat;
-
- struct on_mffloat_t {
- explicit on_mffloat_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<float> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mffloat(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mffloat;
-
- struct on_sfimage_t {
- explicit on_sfimage_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const image & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfimage(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfimage;
-
- struct on_sfint32_t {
- explicit on_sfint32_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const int32 val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfint32(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfint32;
-
- struct on_mfint32_t {
- explicit on_mfint32_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<int32> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mfint32(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfint32;
-
- struct on_sfrotation_t {
- explicit on_sfrotation_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const rotation & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfrotation(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfrotation;
-
- struct on_mfrotation_t {
- explicit on_mfrotation_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<rotation> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mfrotation(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfrotation;
-
- struct on_sfstring_t {
- explicit on_sfstring_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::string & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfstring(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfstring;
-
- struct on_mfstring_t {
- explicit on_mfstring_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<std::string> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mfstring(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfstring;
-
- struct on_sftime_t {
- explicit on_sftime_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const double val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sftime(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sftime;
-
- struct on_mftime_t {
- explicit on_mftime_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<double> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mftime(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mftime;
-
- struct on_sfvec2f_t {
- explicit on_sfvec2f_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const vec2f & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfvec2f(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfvec2f;
-
- struct on_mfvec2f_t {
- explicit on_mfvec2f_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<vec2f> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mfvec2f(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfvec2f;
-
- struct on_sfvec3f_t {
- explicit on_sfvec3f_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const vec3f & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(sfvec3f(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_sfvec3f;
-
- struct on_mfvec3f_t {
- explicit on_mfvec3f_t(vrml97_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(const std::vector<vec3f> & val) const
- {
- assert(!actions_.ps.empty());
- assert(!actions_.ps.top().node_data_.empty());
- actions_.ps.top().node_data_.top()
- .current_field_value->second->assign(mfvec3f(val));
- }
-
- private:
- vrml97_parse_actions & actions_;
- } on_mfvec3f;
-
- struct route {
- std::string from;
- std::string eventout;
- std::string to;
- std::string eventin;
-
- route(const std::string & from, const std::string & eventout,
- const std::string & to, const std::string & eventin):
- from(from),
- eventout(eventout),
- to(to),
- eventin(eventin)
- {}
- };
-
- struct node_data {
- //
- // This is a multimap because an exposedField might have multiple
- // entries (i.e., for the corresponding eventIn, field, and eventOut).
- //
- typedef std::multimap<std::string, std::string> is_map_t;
-
- boost::shared_ptr<node_type> type;
- std::string node_name_id;
- initial_value_map initial_values;
- initial_value_map::value_type * current_field_value;
- node_interface_set script_interfaces;
- is_map_t is_map;
-
- node_data():
- current_field_value(0)
- {}
-
- node_data(const node_data & nd):
- type(nd.type),
- node_name_id(nd.node_name_id),
- initial_values(nd.initial_values),
- current_field_value(0),
- script_interfaces(nd.script_interfaces),
- is_map(nd.is_map)
- {
- if (nd.current_field_value) {
- initial_value_map::iterator pos =
- this->initial_values.find(nd.current_field_value->first);
- assert(pos != this->initial_values.end());
- this->current_field_value = &(*pos);
- }
- }
-
- node_data & operator=(const node_data & nd)
- {
- node_data temp(nd);
- this->swap(temp);
- return *this;
- }
-
- void swap(node_data & nd) OPENVRML_NOTHROW
- {
- this->type.swap(nd.type);
- this->node_name_id.swap(nd.node_name_id);
- this->initial_values.swap(nd.initial_values);
- std::swap(this->current_field_value, nd.current_field_value);
- this->script_interfaces.swap(nd.script_interfaces);
- this->is_map.swap(nd.is_map);
- }
- };
-
- struct parse_scope {
- typedef std::vector<boost::intrusive_ptr<node> > children_t;
-
- std::string proto_node_type_id;
- boost::shared_ptr<openvrml::scope> scope;
- node_interface_set proto_interfaces;
- local::proto_node_metatype::default_value_map_t proto_default_values;
- local::proto_node_metatype::is_map_t proto_is_map;
- std::vector<route> routes;
- std::stack<children_t> children;
- std::stack<node_data> node_data_;
- };
-
- //
- // We push a parse_scope onto the stack
- // * at the scene root
- std::stack<parse_scope> ps;
-
-private:
- const std::string uri_;
- const openvrml::scene & scene_;
- std::vector<boost::intrusive_ptr<openvrml::node> > & nodes_;
-};
-
-struct OPENVRML_LOCAL openvrml::browser::x3d_vrml_parse_actions :
- openvrml::browser::vrml97_parse_actions {
-
- x3d_vrml_parse_actions(
- const std::string & uri,
- const openvrml::scene & scene,
- std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
- std::map<std::string, std::string> & meta):
- openvrml::browser::vrml97_parse_actions(uri, scene, nodes),
- on_profile_statement(*this),
- on_component_statement(*this),
- on_meta_statement(*this),
- on_sfcolorrgba(*this),
- on_sfdouble(*this),
- on_sfvec2d(*this),
- on_sfvec3d(*this),
- on_mfbool(*this),
- on_mfcolorrgba(*this),
- on_mfimage(*this),
- on_mfvec2d(*this),
- on_mfvec3d(*this),
- meta_(meta)
- {}
-
- struct on_profile_statement_t {
- explicit on_profile_statement_t(x3d_vrml_parse_actions & actions):
- actions_(actions)
- {}
-
- void operator()(cons...
[truncated message content] |
|
From: <br...@us...> - 2009-03-02 06:29:56
|
Revision: 3826
http://openvrml.svn.sourceforge.net/openvrml/?rev=3826&view=rev
Author: braden
Date: 2009-03-02 06:29:53 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Updates for 0.17.11 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
trunk/src/Makefile.am
Property Changed:
----------------
trunk/
trunk/src/libopenvrml/openvrml/bad_url.cpp
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/libopenvrml/openvrml/script.cpp
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-02 05:26:56 UTC (rev 3825)
+++ trunk/ChangeLog 2009-03-02 06:29:53 UTC (rev 3826)
@@ -1,3 +1,18 @@
+2009-03-02 Braden McDaniel <br...@en...>
+
+ Updates for 0.17.11 release.
+
+ * NEWS
+ * README
+ * configure.ac
+ * doc/Doxyfile
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * mozilla-plugin/configure.ac
+ * src/Makefile.am
+ (LIBOPENVRML_LIBRARY_VERSION): Updated to 8:8:0.
+
2009-03-01 Braden McDaniel <br...@en...>
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-03-02 05:26:56 UTC (rev 3825)
+++ trunk/NEWS 2009-03-02 06:29:53 UTC (rev 3826)
@@ -1,3 +1,16 @@
+Changes new in version 0.17.11, 2 March, 2009
+========================================================================
+
+- Moved D-Bus interaction in openvrml-xembed to a background thread,
+ preventing some deadlocks.
+
+- Fixed configure test for nonstandard GLU tesselator callback
+ function signature on Mac OS 10.4 and previous.
+
+- Changed the MIME media type for VRML-style X3D to "model/x3d-vrml"
+ in accordance with the pending registration.
+
+
Changes new in version 0.17.10, 26 October, 2008
========================================================================
Modified: trunk/README
===================================================================
--- trunk/README 2009-03-02 05:26:56 UTC (rev 3825)
+++ trunk/README 2009-03-02 06:29:53 UTC (rev 3826)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.17.10
+OpenVRML library version 0.17.11
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Braden McDaniel <br...@en...>
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-03-02 05:26:56 UTC (rev 3825)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-03-02 06:29:53 UTC (rev 3826)
@@ -11,7 +11,7 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,7,0,0
+ FILEVERSION 8,8,0,0
PRODUCTVERSION 0,17,99,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
@@ -28,9 +28,9 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML Library"
- VALUE "FileVersion", "8, 7, 0, 0"
+ VALUE "FileVersion", "8, 8, 0, 0"
VALUE "InternalName", "openvrml"
- VALUE "LegalCopyright", "Copyright (C) 2008"
+ VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml.dll"
VALUE "ProductName", "OpenVRML Library"
VALUE "ProductVersion", "0.17.99"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-02 05:26:56 UTC (rev 3825)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-02 06:29:53 UTC (rev 3826)
@@ -30,7 +30,7 @@
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
VALUE "FileVersion", "7, 3, 0, 0"
VALUE "InternalName", "openvrml-gl"
- VALUE "LegalCopyright", "Copyright (C) 2008"
+ VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml-gl.dll"
VALUE "ProductName", "OpenVRML Library"
VALUE "ProductVersion", "0.17.99"
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-02 05:26:56 UTC (rev 3825)
+++ trunk/src/Makefile.am 2009-03-02 06:29:53 UTC (rev 3826)
@@ -49,7 +49,7 @@
openvrml-xembed/plugin_streambuf.h \
openvrml-player/filechooserdialog.h
-LIBOPENVRML_LIBRARY_VERSION = 8:7:0
+LIBOPENVRML_LIBRARY_VERSION = 8:8:0
LIBOPENVRML_GL_LIBRARY_VERSION = 7:3:0
# | | |
# +------+ | +---+
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
Property changes on: trunk/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
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
+ /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
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 05:27:00
|
Revision: 3825
http://openvrml.svn.sourceforge.net/openvrml/?rev=3825&view=rev
Author: braden
Date: 2009-03-02 05:26:56 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Tagged 0.17.11 release.
Added Paths:
-----------
tags/0.17.11/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 05:25:21
|
Revision: 3824
http://openvrml.svn.sourceforge.net/openvrml/?rev=3824&view=rev
Author: braden
Date: 2009-03-02 05:25:15 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Updates for 0.17.11 release.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/NEWS
branches/0.17/README
branches/0.17/configure.ac
branches/0.17/doc/Doxyfile
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
branches/0.17/mozilla-plugin/configure.ac
branches/0.17/src/Makefile.am
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/ChangeLog 2009-03-02 05:25:15 UTC (rev 3824)
@@ -1,3 +1,18 @@
+2009-03-02 Braden McDaniel <br...@en...>
+
+ Updates for 0.17.11 release.
+
+ * NEWS
+ * README
+ * configure.ac
+ * doc/Doxyfile
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * mozilla-plugin/configure.ac
+ * src/Makefile.am
+ (LIBOPENVRML_LIBRARY_VERSION): Updated to 8:8:0.
+
2009-03-01 Braden McDaniel <br...@en...>
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with
Modified: branches/0.17/NEWS
===================================================================
--- branches/0.17/NEWS 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/NEWS 2009-03-02 05:25:15 UTC (rev 3824)
@@ -1,3 +1,16 @@
+Changes new in version 0.17.11, 2 March, 2009
+========================================================================
+
+- Moved D-Bus interaction in openvrml-xembed to a background thread,
+ preventing some deadlocks.
+
+- Fixed configure test for nonstandard GLU tesselator callback
+ function signature on Mac OS 10.4 and previous.
+
+- Changed the MIME media type for VRML-style X3D to "model/x3d-vrml"
+ in accordance with the pending registration.
+
+
Changes new in version 0.17.10, 26 October, 2008
========================================================================
Modified: branches/0.17/README
===================================================================
--- branches/0.17/README 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/README 2009-03-02 05:25:15 UTC (rev 3824)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.17.10
+OpenVRML library version 0.17.11
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Braden McDaniel <br...@en...>
Modified: branches/0.17/configure.ac
===================================================================
--- branches/0.17/configure.ac 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/configure.ac 2009-03-02 05:25:15 UTC (rev 3824)
@@ -1,4 +1,4 @@
-AC_INIT([OpenVRML], [0.17.10], [ope...@li...])
+AC_INIT([OpenVRML], [0.17.11], [ope...@li...])
AC_PREREQ([2.53])
AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
Modified: branches/0.17/doc/Doxyfile
===================================================================
--- branches/0.17/doc/Doxyfile 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/doc/Doxyfile 2009-03-02 05:25:15 UTC (rev 3824)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenVRML
-PROJECT_NUMBER = 0.17.10
+PROJECT_NUMBER = 0.17.11
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-03-02 05:25:15 UTC (rev 3824)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,7,0,0
- PRODUCTVERSION 0,17,10,0
+ FILEVERSION 8,8,0,0
+ PRODUCTVERSION 0,17,11,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML Library"
- VALUE "FileVersion", "8, 7, 0, 0"
+ VALUE "FileVersion", "8, 8, 0, 0"
VALUE "InternalName", "openvrml"
- VALUE "LegalCopyright", "Copyright (C) 2008"
+ VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.17.10"
+ VALUE "ProductVersion", "0.17.11"
END
END
BLOCK "VarFileInfo"
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-03-02 05:25:15 UTC (rev 3824)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;PACKAGE_VERSION=\"0.17.10\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const""
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;PACKAGE_VERSION=\"0.17.11\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const""
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -127,7 +127,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.17.10\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";NDEBUG"
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.17.11\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Modified: branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-03-02 05:25:15 UTC (rev 3824)
@@ -12,7 +12,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,3,0,0
- PRODUCTVERSION 0,17,10,0
+ PRODUCTVERSION 0,17,11,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -30,10 +30,10 @@
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
VALUE "FileVersion", "7, 3, 0, 0"
VALUE "InternalName", "openvrml-gl"
- VALUE "LegalCopyright", "Copyright (C) 2008"
+ VALUE "LegalCopyright", "Copyright (C) 2009"
VALUE "OriginalFilename", "openvrml-gl.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.17.10"
+ VALUE "ProductVersion", "0.17.11"
END
END
BLOCK "VarFileInfo"
Modified: branches/0.17/mozilla-plugin/configure.ac
===================================================================
--- branches/0.17/mozilla-plugin/configure.ac 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/mozilla-plugin/configure.ac 2009-03-02 05:25:15 UTC (rev 3824)
@@ -1,5 +1,5 @@
AC_PREREQ([2.53])
-AC_INIT([OpenVRML Mozilla Plugin], [0.17.10],
+AC_INIT([OpenVRML Mozilla Plugin], [0.17.11],
[ope...@li...])
AC_COPYRIGHT([Portions copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
Modified: branches/0.17/src/Makefile.am
===================================================================
--- branches/0.17/src/Makefile.am 2009-03-02 01:58:23 UTC (rev 3823)
+++ branches/0.17/src/Makefile.am 2009-03-02 05:25:15 UTC (rev 3824)
@@ -63,7 +63,7 @@
openvrml-xembed/plugin_streambuf.h \
openvrml-player/filechooserdialog.h
-LIBOPENVRML_LIBRARY_VERSION = 8:7:0
+LIBOPENVRML_LIBRARY_VERSION = 8:8:0
LIBOPENVRML_GL_LIBRARY_VERSION = 7:3:0
# | | |
# +------+ | +---+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 01:58:24
|
Revision: 3823
http://openvrml.svn.sourceforge.net/openvrml/?rev=3823&view=rev
Author: braden
Date: 2009-03-02 01:58:23 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
scene.cpp doesn't exist here.
Modified Paths:
--------------
branches/0.17/ChangeLog
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-02 01:20:27 UTC (rev 3822)
+++ branches/0.17/ChangeLog 2009-03-02 01:58:23 UTC (rev 3823)
@@ -5,7 +5,6 @@
* README
* src/libopenvrml/openvrml/browser.cpp
- * src/libopenvrml/openvrml/scene.cpp
* src/openvrml-player/filechooserdialog.cpp
2009-03-01 Braden McDaniel <br...@en...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 01:20:28
|
Revision: 3822
http://openvrml.svn.sourceforge.net/openvrml/?rev=3822&view=rev
Author: braden
Date: 2009-03-02 01:20:27 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with the pending media type registration.
Modified Paths:
--------------
branches/0.17/src/libopenvrml/openvrml/browser.cpp
Modified: branches/0.17/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- branches/0.17/src/libopenvrml/openvrml/browser.cpp 2009-03-02 01:19:28 UTC (rev 3821)
+++ branches/0.17/src/libopenvrml/openvrml/browser.cpp 2009-03-02 01:20:27 UTC (rev 3822)
@@ -8781,7 +8781,7 @@
* @exception bad_media_type if @p in.type() is not
* “model/vrml”,
* “x-world/x-vrml”, or
- * “model/x3d+vrml”.
+ * “model/x3d-vrml”.
* @exception invalid_vrml if @p in has invalid syntax.
*/
void openvrml::scene::load(resource_istream & in)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 01:19:36
|
Revision: 3821
http://openvrml.svn.sourceforge.net/openvrml/?rev=3821&view=rev
Author: braden
Date: 2009-03-02 01:19:28 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with the pending media type registration.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/README
branches/0.17/src/libopenvrml/openvrml/browser.cpp
branches/0.17/src/openvrml-player/filechooserdialog.cpp
Property Changed:
----------------
branches/0.17/
Property changes on: branches/0.17
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3596,3612,3625,3707,3710,3728,3815,3817
+ /trunk:3596,3612,3625,3707,3710,3728,3815,3817,3819-3820
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-02 01:17:23 UTC (rev 3820)
+++ branches/0.17/ChangeLog 2009-03-02 01:19:28 UTC (rev 3821)
@@ -1,5 +1,15 @@
2009-03-01 Braden McDaniel <br...@en...>
+ Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with
+ the pending media type registration.
+
+ * README
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/scene.cpp
+ * src/openvrml-player/filechooserdialog.cpp
+
+2009-03-01 Braden McDaniel <br...@en...>
+
* src/Makefile.am: Generate
openvrml-xembed/browser-host-client-glue.h.
Modified: branches/0.17/README
===================================================================
--- branches/0.17/README 2009-03-02 01:17:23 UTC (rev 3820)
+++ branches/0.17/README 2009-03-02 01:19:28 UTC (rev 3821)
@@ -275,10 +275,10 @@
If OpenVRML is configured to be installed to the same prefix as a
Mozilla-based browser is installed on the system, "make install" will
install the Mozilla plug-in to the browser's plug-in directory. This
-should be sufficient to enable support for the "model/vrml" media type
-in the browser. Entering "about:plugins" in the URL entry bar of a
-Mozilla-based browser will show a listing of successfully installed
-plug-ins.
+should be sufficient to enable support for the "model/vrml" and
+"model/x3d-vrml" media types in the browser. Entering "about:plugins"
+in the URL entry bar of a Mozilla-based browser will show a listing of
+successfully installed plug-ins.
To run openvrml-player or the Mozilla plug-in from the build
directories, you must first start an openvrml-xembed process. Once
Modified: branches/0.17/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- branches/0.17/src/libopenvrml/openvrml/browser.cpp 2009-03-02 01:17:23 UTC (rev 3820)
+++ branches/0.17/src/libopenvrml/openvrml/browser.cpp 2009-03-02 01:19:28 UTC (rev 3821)
@@ -6229,7 +6229,7 @@
/**
* @brief X3D VRML MIME media type.
*/
-const char openvrml::x3d_vrml_media_type[15] = "model/x3d+vrml";
+const char openvrml::x3d_vrml_media_type[15] = "model/x3d-vrml";
/**
* @class openvrml::resource_istream openvrml/browser.h
@@ -7839,7 +7839,7 @@
* @param[in,out] in an input stream.
*
* @exception bad_media_type if @p in.type() is not @c model/vrml,
- * @c x-world/x-vrml, or @c model/x3d+vrml.
+ * @c x-world/x-vrml, or @c model/x3d-vrml.
* @exception invalid_vrml if @p in has invalid syntax.
*/
void openvrml::browser::set_world(resource_istream & in)
Modified: branches/0.17/src/openvrml-player/filechooserdialog.cpp
===================================================================
--- branches/0.17/src/openvrml-player/filechooserdialog.cpp 2009-03-02 01:17:23 UTC (rev 3820)
+++ branches/0.17/src/openvrml-player/filechooserdialog.cpp 2009-03-02 01:19:28 UTC (rev 3821)
@@ -73,7 +73,7 @@
gtk_file_filter_set_name(world_filter, "VRML/X3D worlds");
gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml");
gtk_file_filter_add_mime_type(world_filter, "model/vrml");
- gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml");
+ gtk_file_filter_add_mime_type(world_filter, "model/x3d-vrml");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(obj), world_filter);
world_filter_guard.dismiss();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 01:17:24
|
Revision: 3820
http://openvrml.svn.sourceforge.net/openvrml/?rev=3820&view=rev
Author: braden
Date: 2009-03-02 01:17:23 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with the pending media type registration.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-02 01:16:04 UTC (rev 3819)
+++ trunk/ChangeLog 2009-03-02 01:17:23 UTC (rev 3820)
@@ -1,5 +1,15 @@
2009-03-01 Braden McDaniel <br...@en...>
+ Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with
+ the pending media type registration.
+
+ * README
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/scene.cpp
+ * src/openvrml-player/filechooserdialog.cpp
+
+2009-03-01 Braden McDaniel <br...@en...>
+
* src/Makefile.am: Generate
openvrml-xembed/browser-host-client-glue.h.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-02 01:16:07
|
Revision: 3819
http://openvrml.svn.sourceforge.net/openvrml/?rev=3819&view=rev
Author: braden
Date: 2009-03-02 01:16:04 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with the pending media type registration.
Modified Paths:
--------------
trunk/README
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/openvrml-player/filechooserdialog.cpp
Modified: trunk/README
===================================================================
--- trunk/README 2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/README 2009-03-02 01:16:04 UTC (rev 3819)
@@ -268,10 +268,10 @@
If OpenVRML is configured to be installed to the same prefix as a
Mozilla-based browser is installed on the system, "make install" will
install the Mozilla plug-in to the browser's plug-in directory. This
-should be sufficient to enable support for the "model/vrml" media type
-in the browser. Entering "about:plugins" in the URL entry bar of a
-Mozilla-based browser will show a listing of successfully installed
-plug-ins.
+should be sufficient to enable support for the "model/vrml" and
+"model/x3d-vrml" media types in the browser. Entering "about:plugins"
+in the URL entry bar of a Mozilla-based browser will show a listing of
+successfully installed plug-ins.
To run openvrml-player or the Mozilla plug-in from the build
directories, you must first start an openvrml-xembed process. Once
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2009-03-02 01:16:04 UTC (rev 3819)
@@ -3357,7 +3357,7 @@
/**
* @brief X3D VRML MIME media type.
*/
-const char openvrml::x3d_vrml_media_type[15] = "model/x3d+vrml";
+const char openvrml::x3d_vrml_media_type[15] = "model/x3d-vrml";
/**
* @class openvrml::resource_istream openvrml/browser.h
@@ -4725,7 +4725,7 @@
* @param[in,out] in an input stream.
*
* @exception bad_media_type if @p in.type() is not @c model/vrml,
- * @c x-world/x-vrml, or @c model/x3d+vrml.
+ * @c x-world/x-vrml, or @c model/x3d-vrml.
* @exception invalid_vrml if @p in has invalid syntax.
*/
void openvrml::browser::set_world(resource_istream & in)
Modified: trunk/src/libopenvrml/openvrml/scene.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/scene.cpp 2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/src/libopenvrml/openvrml/scene.cpp 2009-03-02 01:16:04 UTC (rev 3819)
@@ -164,7 +164,7 @@
* @exception bad_media_type if @p in.type() is not
* “model/vrml”,
* “x-world/x-vrml”, or
- * “model/x3d+vrml”.
+ * “model/x3d-vrml”.
* @exception invalid_vrml if @p in has invalid syntax.
*/
void openvrml::scene::load(resource_istream & in)
Modified: trunk/src/openvrml-player/filechooserdialog.cpp
===================================================================
--- trunk/src/openvrml-player/filechooserdialog.cpp 2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/src/openvrml-player/filechooserdialog.cpp 2009-03-02 01:16:04 UTC (rev 3819)
@@ -73,7 +73,7 @@
gtk_file_filter_set_name(world_filter, "VRML/X3D worlds");
gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml");
gtk_file_filter_add_mime_type(world_filter, "model/vrml");
- gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml");
+ gtk_file_filter_add_mime_type(world_filter, "model/x3d-vrml");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(obj), world_filter);
world_filter_guard.dismiss();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-01 20:19:20
|
Revision: 3818
http://openvrml.svn.sourceforge.net/openvrml/?rev=3818&view=rev
Author: braden
Date: 2009-03-01 20:19:15 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Generate openvrml-xembed/browser-host-client-glue.h.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/src/Makefile.am
Property Changed:
----------------
branches/0.17/
Property changes on: branches/0.17
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3596,3612,3625,3707,3710,3728,3815
+ /trunk:3596,3612,3625,3707,3710,3728,3815,3817
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2009-03-01 20:17:21 UTC (rev 3817)
+++ branches/0.17/ChangeLog 2009-03-01 20:19:15 UTC (rev 3818)
@@ -1,5 +1,10 @@
2009-03-01 Braden McDaniel <br...@en...>
+ * src/Makefile.am: Generate
+ openvrml-xembed/browser-host-client-glue.h.
+
+2009-03-01 Braden McDaniel <br...@en...>
+
Moved D-Bus interaction out of the main (GTK+) thread and into its
own background thread. This avoids a deadlock when a resource
fetch comes from the rendering thread and waits on feedback that
Modified: branches/0.17/src/Makefile.am
===================================================================
--- branches/0.17/src/Makefile.am 2009-03-01 20:17:21 UTC (rev 3817)
+++ branches/0.17/src/Makefile.am 2009-03-01 20:19:15 UTC (rev 3818)
@@ -163,7 +163,8 @@
session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
BUILT_SOURCES += \
openvrml-xembed/browser-server-glue.h \
- openvrml-xembed/browser-factory-server-glue.h
+ openvrml-xembed/browser-factory-server-glue.h \
+ openvrml-xembed/browser-host-client-glue.h
endif
openvrml_xembed_openvrml_xembed_CPPFLAGS = \
-I$(top_builddir)/src/openvrml-xembed \
@@ -221,6 +222,13 @@
--output=$@ \
$?
+openvrml-xembed/browser-host-client-glue.h: $(srcdir)/openvrml-xembed/browser-host.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+ --prefix=openvrml_xembed_browser_host \
+ --mode=glib-client \
+ --output=$@ \
+ $?
+
edit = sed -e 's|@libexecdir[@]|$(libexecdir)|g'
openvrml-xembed/org.openvrml.BrowserControl.service: Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-03-01 20:17:27
|
Revision: 3817
http://openvrml.svn.sourceforge.net/openvrml/?rev=3817&view=rev
Author: braden
Date: 2009-03-01 20:17:21 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Generate openvrml-xembed/browser-host-client-glue.h.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-01 05:15:08 UTC (rev 3816)
+++ trunk/ChangeLog 2009-03-01 20:17:21 UTC (rev 3817)
@@ -1,5 +1,10 @@
2009-03-01 Braden McDaniel <br...@en...>
+ * src/Makefile.am: Generate
+ openvrml-xembed/browser-host-client-glue.h.
+
+2009-03-01 Braden McDaniel <br...@en...>
+
Moved D-Bus interaction out of the main (GTK+) thread and into its
own background thread. This avoids a deadlock when a resource
fetch comes from the rendering thread and waits on feedback that
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-01 05:15:08 UTC (rev 3816)
+++ trunk/src/Makefile.am 2009-03-01 20:17:21 UTC (rev 3817)
@@ -720,7 +720,8 @@
session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
BUILT_SOURCES += \
openvrml-xembed/browser-server-glue.h \
- openvrml-xembed/browser-factory-server-glue.h
+ openvrml-xembed/browser-factory-server-glue.h \
+ openvrml-xembed/browser-host-client-glue.h
endif
openvrml_xembed_openvrml_xembed_CPPFLAGS = \
-I$(top_builddir)/src/openvrml-xembed \
@@ -777,6 +778,13 @@
--output=$@ \
$?
+openvrml-xembed/browser-host-client-glue.h: $(srcdir)/openvrml-xembed/browser-host.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+ --prefix=openvrml_xembed_browser_host \
+ --mode=glib-client \
+ --output=$@ \
+ $?
+
edit = sed -e 's|@libexecdir[@]|$(libexecdir)|g'
openvrml-xembed/org.openvrml.BrowserControl.service: Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
