Menu
▾
▴
openvrml-commit
|
From: <br...@us...> - 2008-10-14 01:34:16
|
Revision: 3736
http://openvrml.svn.sourceforge.net/openvrml/?rev=3736&view=rev
Author: braden
Date: 2008-10-14 01:34:12 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Don't need --enable-gecko-rpath anymore.
Modified Paths:
--------------
trunk/configure-gcc-dbg
trunk/configure-gcc-opt
Modified: trunk/configure-gcc-dbg
===================================================================
--- trunk/configure-gcc-dbg 2008-10-10 07:55:02 UTC (rev 3735)
+++ trunk/configure-gcc-dbg 2008-10-14 01:34:12 UTC (rev 3736)
@@ -1,3 +1,3 @@
#!/bin/bash
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static --enable-gecko-rpath --enable-gtk-doc CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" BOOST_LIB_SUFFIX='-mt' JAVA_HOME=/usr/lib/jvm/jre "$*"
+./$(dirname $0)/configure -C --prefix=$HOME --disable-static --enable-gtk-doc CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" BOOST_LIB_SUFFIX='-mt' JAVA_HOME=/usr/lib/jvm/jre "$*"
Modified: trunk/configure-gcc-opt
===================================================================
--- trunk/configure-gcc-opt 2008-10-10 07:55:02 UTC (rev 3735)
+++ trunk/configure-gcc-opt 2008-10-14 01:34:12 UTC (rev 3736)
@@ -1,3 +1,3 @@
#!/bin/bash
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static --disable-exception-specs --enable-gecko-rpath --enable-gtk-doc CXX='g++ -pipe' CPPFLAGS='-I$HOME/include -DNDEBUG' CXXFLAGS='-Os -Wall -Wextra -Wno-missing-braces -Wno-unused-variable -fvisibility=hidden -fvisibility-inlines-hidden' LDFLAGS='-L$HOME/lib64 -L$HOME/lib' BOOST_LIB_SUFFIX=-mt JAVA_HOME=/usr/lib/jvm/jre "$*"
+./$(dirname $0)/configure -C --prefix=$HOME --disable-static --disable-exception-specs --enable-gtk-doc CXX='g++ -pipe' CPPFLAGS='-I$HOME/include -DNDEBUG' CXXFLAGS='-Os -Wall -Wextra -Wno-missing-braces -Wno-unused-variable -fvisibility=hidden -fvisibility-inlines-hidden' LDFLAGS='-L$HOME/lib64 -L$HOME/lib' BOOST_LIB_SUFFIX=-mt JAVA_HOME=/usr/lib/jvm/jre "$*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-14 03:00:43
|
Revision: 3737
http://openvrml.svn.sourceforge.net/openvrml/?rev=3737&view=rev
Author: braden
Date: 2008-10-14 03:00:33 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Use the implementation of ScopeGuard buried in Boost.MultiIndex instead of providing our own. (Yes, it's in a "detail" namespace; but since Boost doesn't guarantee any API stability from one release to the next, that has little practical meaning.)
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/libopenvrml/private.h
trunk/src/script/javascript.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-14 01:34:12 UTC (rev 3736)
+++ trunk/ChangeLog 2008-10-14 03:00:33 UTC (rev 3737)
@@ -1,3 +1,24 @@
+2008-10-13 Braden McDaniel <br...@en...>
+
+ Use the implementation of ScopeGuard buried in Boost.MultiIndex
+ instead of providing our own. (Yes, it's in a "detail" namespace;
+ but since Boost doesn't guarantee any API stability from one
+ release to the next, that has little practical meaning.)
+
+ * src/libopenvrml/private.h: Removed ScopeGuard implementation.
+ * src/libopenvrml/openvrml/browser.cpp
+ (openvrml::browser::externproto_node_metatype::load_proto::operator()()
+ const): Use boost::multi_index::detail::scope_guard.
+ * src/libopenvrml/openvrml/script.cpp
+ (openvrml::script_node::script_node(script_node_metatype &, const
+ boost::shared_ptr<openvrml::scope> &, const node_interface_set &,
+ const initial_value_map &)): Use
+ boost::multi_index::detail::scope_guard.
+ * src/script/javascript.cpp
+ (script::activate(double, const std::string &, size_t, const
+ openvrml::field_value * const[])): Use
+ boost::multi_index::detail::scope_guard.
+
2008-10-09 Braden McDaniel <br...@en...>
Updates for 0.17.9 release.
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2008-10-14 01:34:12 UTC (rev 3736)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2008-10-14 03:00:33 UTC (rev 3737)
@@ -2471,8 +2471,6 @@
using std::vector;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
- using openvrml_::scope_guard;
- using openvrml_::make_obj_guard;
using local::uri;
scope_guard guard =
Modified: trunk/src/libopenvrml/openvrml/script.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/script.cpp 2008-10-14 01:34:12 UTC (rev 3736)
+++ trunk/src/libopenvrml/openvrml/script.cpp 2008-10-14 03:00:33 UTC (rev 3737)
@@ -1934,8 +1934,7 @@
// nodes.
//
this->add_ref();
- openvrml_::scope_guard guard =
- openvrml_::make_obj_guard(*this, &script_node::remove_ref);
+ scope_guard guard = make_obj_guard(*this, &script_node::remove_ref);
boost::ignore_unused_variable_warning(guard);
for (node_interface_set::const_iterator interface_ = interfaces.begin();
Modified: trunk/src/libopenvrml/private.h
===================================================================
--- trunk/src/libopenvrml/private.h 2008-10-14 01:34:12 UTC (rev 3736)
+++ trunk/src/libopenvrml/private.h 2008-10-14 03:00:33 UTC (rev 3737)
@@ -149,207 +149,6 @@
const fgreater_equal_t fgreater_equal = fgreater_equal_t();
- class OPENVRML_LOCAL scope_guard_impl_base {
- protected:
- mutable bool dismissed;
-
- public:
- void dismiss() const throw ();
-
- protected:
- scope_guard_impl_base() throw ();
- scope_guard_impl_base(const scope_guard_impl_base &) throw ();
-
- private:
- // Disable assignment.
- scope_guard_impl_base & operator=(const scope_guard_impl_base &);
- };
-
- typedef const scope_guard_impl_base & scope_guard;
-
- inline scope_guard_impl_base::scope_guard_impl_base() throw ():
- dismissed(false)
- {}
-
- inline scope_guard_impl_base::scope_guard_impl_base(
- const scope_guard_impl_base & scope_guard) throw ():
- dismissed(scope_guard.dismissed)
- {
- scope_guard.dismiss();
- }
-
- inline void scope_guard_impl_base::dismiss() const throw ()
- {
- this->dismissed = true;
- }
-
- template <typename Function, typename Param>
- class OPENVRML_LOCAL scope_guard_impl1 : public scope_guard_impl_base {
- Function function;
- const Param param;
-
- public:
- scope_guard_impl1(const Function & function, const Param & param);
- ~scope_guard_impl1();
- };
-
- template <typename Function, typename Param>
- scope_guard_impl1<Function, Param>::
- scope_guard_impl1(const Function & function, const Param & param):
- function(function),
- param(param)
- {}
-
- template <typename Function, typename Param>
- scope_guard_impl1<Function, Param>::~scope_guard_impl1()
- {
- if (!this->dismissed) { this->function(this->param); }
- }
-
- template <typename Function, typename Param>
- OPENVRML_LOCAL scope_guard_impl1<Function, Param>
- make_guard(const Function & function, const Param & param)
- {
- return scope_guard_impl1<Function, Param>(function, param);
- }
-
- template <typename Function,
- typename Param1,
- typename Param2,
- typename Param3>
- class OPENVRML_LOCAL scope_guard_impl3 : public scope_guard_impl_base {
- Function function;
- const Param1 param1;
- const Param2 param2;
- const Param3 param3;
-
- public:
- scope_guard_impl3(const Function & function,
- const Param1 & param1,
- const Param2 & param2,
- const Param3 & param3);
- ~scope_guard_impl3();
- };
-
- template <typename Function,
- typename Param1,
- typename Param2,
- typename Param3>
- scope_guard_impl3<Function, Param1, Param2, Param3>::
- scope_guard_impl3(const Function & function,
- const Param1 & param1,
- const Param2 & param2,
- const Param3 & param3):
- function(function),
- param1(param1),
- param2(param2),
- param3(param3)
- {}
-
- template <typename Function,
- typename Param1,
- typename Param2,
- typename Param3>
- scope_guard_impl3<Function, Param1, Param2, Param3>::
- ~scope_guard_impl3()
- {
- if (!this->dismissed) {
- this->function(this->param1, this->param2, this->param3);
- }
- }
-
- template <typename Function,
- typename Param1,
- typename Param2,
- typename Param3>
- OPENVRML_LOCAL scope_guard_impl3<Function, Param1, Param2, Param3>
- make_guard(const Function & function,
- const Param1 & param1,
- const Param2 & param2,
- const Param3 & param3)
- {
- return scope_guard_impl3<Function, Param1, Param2, Param3>(
- function, param1, param2, param3);
- }
-
- template <typename Object, typename MemberFunction>
- class OPENVRML_LOCAL obj_scope_guard_impl0 :
- public scope_guard_impl_base {
- Object & obj;
- MemberFunction mem_fun;
-
- public:
- obj_scope_guard_impl0(Object & obj, MemberFunction mem_fun);
- ~obj_scope_guard_impl0();
- };
-
- template <typename Object, typename MemberFunction>
- inline
- obj_scope_guard_impl0<Object, MemberFunction>::
- obj_scope_guard_impl0(Object & obj, MemberFunction mem_fun):
- obj(obj),
- mem_fun(mem_fun)
- {}
-
- template <typename Object, typename MemberFunction>
- inline
- obj_scope_guard_impl0<Object, MemberFunction>::~obj_scope_guard_impl0()
- {
- if (!this->dismissed) { (this->obj.*this->mem_fun)(); }
- }
-
- template <typename Object, typename MemberFunction>
- OPENVRML_LOCAL obj_scope_guard_impl0<Object, MemberFunction>
- make_obj_guard(Object & obj, MemberFunction mem_fun)
- {
- return obj_scope_guard_impl0<Object, MemberFunction>(obj, mem_fun);
- }
-
- template <typename Object, typename MemberFunction, typename Param>
- class OPENVRML_LOCAL obj_scope_guard_impl1 :
- public scope_guard_impl_base {
- Object & obj;
- MemberFunction mem_fun;
- const Param param;
-
- public:
- obj_scope_guard_impl1(Object & obj,
- MemberFunction mem_fun,
- const Param & param) throw ();
- ~obj_scope_guard_impl1() throw ();
- };
-
- template <typename Object, typename MemberFunction, typename Param>
- inline
- obj_scope_guard_impl1<Object, MemberFunction, Param>::
- obj_scope_guard_impl1(Object & obj,
- MemberFunction mem_fun,
- const Param & param)
- throw ():
- obj(obj),
- mem_fun(mem_fun),
- param(param)
- {}
-
- template <typename Object, typename MemberFunction, typename Param>
- inline
- obj_scope_guard_impl1<Object, MemberFunction, Param>::
- ~obj_scope_guard_impl1() throw ()
- {
- if (!this->dismissed) { (this->obj.*this->mem_fun)(this->param); }
- }
-
- template <typename Object, typename MemberFunction, typename Param>
- OPENVRML_LOCAL obj_scope_guard_impl1<Object, MemberFunction, Param>
- make_obj_guard(Object & obj,
- MemberFunction mem_fun,
- const Param & param)
- {
- return obj_scope_guard_impl1<Object, MemberFunction, Param>(
- obj, mem_fun, param);
- }
-
-
typedef boost::mpl::vector<openvrml::sfbool,
openvrml::sfcolor,
openvrml::sfcolorrgba,
Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp 2008-10-14 01:34:12 UTC (rev 3736)
+++ trunk/src/script/javascript.cpp 2008-10-14 03:00:33 UTC (rev 3737)
@@ -24,6 +24,7 @@
# include <private.h>
# include <jsapi.h>
# include <boost/array.hpp>
+# include <boost/multi_index/detail/scope_guard.hpp>
# include <algorithm>
# include <iostream>
# include <memory>
@@ -34,6 +35,8 @@
# include <config.h>
# endif
+using namespace boost::multi_index::detail; // for scope_guard
+
namespace {
class SFNode;
@@ -1191,8 +1194,8 @@
# ifdef JS_THREADSAFE
JS_SetContextThread(this->cx);
- openvrml_::scope_guard context_thread_guard =
- openvrml_::make_guard(&JS_ClearContextThread, this->cx);
+ scope_guard context_thread_guard =
+ make_guard(&JS_ClearContextThread, this->cx);
boost::ignore_unused_variable_warning(context_thread_guard);
# endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-14 05:30:19
|
Revision: 3738
http://openvrml.svn.sourceforge.net/openvrml/?rev=3738&view=rev
Author: braden
Date: 2008-10-14 05:30:14 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Moved the boost::mpl::vector of field value types to the openvrml::local namespace.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/field_value.cpp
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/libopenvrml/private.h
Added Paths:
-----------
trunk/src/libopenvrml/openvrml/local/field_value_types.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/ChangeLog 2008-10-14 05:30:14 UTC (rev 3738)
@@ -1,3 +1,26 @@
+2008-10-14 Braden McDaniel <br...@en...>
+
+ Moved the boost::mpl::vector of field value types to the
+ openvrml::local namespace.
+
+ * src/libopenvrml/private.h: Moved field_value_types to the
+ openvrml::local namespace;
+ * src/libopenvrml/openvrml/local/proto.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/local/field_value_types.h: Added file;
+ contains the declaration of openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/node.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/browser.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/script.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/field_value.cpp: Use
+ openvrml::local::field_value_types.
+ * src/Makefile.am
+ (libopenvrml_libopenvrml_la_SOURCES): Added
+ libopenvrml/openvrml/local/field_value_types.h.
+
2008-10-13 Braden McDaniel <br...@en...>
Use the implementation of ScopeGuard buried in Boost.MultiIndex
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/Makefile.am 2008-10-14 05:30:14 UTC (rev 3738)
@@ -157,7 +157,8 @@
libopenvrml/openvrml/local/xml_reader.cpp \
libopenvrml/openvrml/local/xml_reader.h \
libopenvrml/openvrml/local/proto.cpp \
- libopenvrml/openvrml/local/proto.h
+ libopenvrml/openvrml/local/proto.h \
+ libopenvrml/openvrml/local/field_value_types.h
libopenvrml_libopenvrml_la_LDFLAGS = \
-version-info $(LIBOPENVRML_LIBRARY_VERSION) \
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -42,6 +42,7 @@
# include "x3d_cad_geometry.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 <private.h>
# include <boost/algorithm/string/predicate.hpp>
@@ -2807,7 +2808,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<field_value> result;
for_each<field_value_types>(externproto_exposedfield_creator(node,
@@ -2949,7 +2950,7 @@
map_entry != this->eventin_map.end();
++map_entry) {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_listener & eventin =
this->proto_node_->event_listener(map_entry->first);
@@ -2963,7 +2964,7 @@
map_entry != this->eventout_map.end();
++map_entry) {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_emitter & eventout =
this->proto_node_->event_emitter(map_entry->first);
Modified: trunk/src/libopenvrml/openvrml/field_value.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/field_value.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/field_value.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -19,18 +19,18 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "field_value.h"
+# include "node.h"
+# include <openvrml/local/field_value_types.h>
+# include <boost/array.hpp>
+# include <boost/mpl/for_each.hpp>
+# include <algorithm>
+# include <numeric>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <algorithm>
-# include <numeric>
-# include <boost/array.hpp>
-# include <private.h>
-# include <boost/mpl/for_each.hpp>
-# include "field_value.h"
-# include "node.h"
-
/**
* @file openvrml/field_value.h
*
@@ -442,7 +442,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
std::auto_ptr<field_value> result;
for_each<field_value_types>(create_field_value(type, result));
Added: trunk/src/libopenvrml/openvrml/local/field_value_types.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/field_value_types.h (rev 0)
+++ trunk/src/libopenvrml/openvrml/local/field_value_types.h 2008-10-14 05:30:14 UTC (rev 3738)
@@ -0,0 +1,96 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2008 Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# ifndef OPENVRML_LOCAL_FIELD_VALUE_TYPES_H
+# define OPENVRML_LOCAL_FIELD_VALUE_TYPES_H
+
+# include <openvrml-common.h>
+# include <boost/mpl/vector.hpp>
+
+namespace openvrml {
+
+ class sfbool;
+ class sfcolor;
+ class sfcolorrgba;
+ class sfdouble;
+ class sffloat;
+ class sfimage;
+ class sfint32;
+ class sfnode;
+ class sfrotation;
+ class sfstring;
+ class sftime;
+ class sfvec2d;
+ class sfvec2f;
+ class sfvec3d;
+ class sfvec3f;
+ class mfbool;
+ class mfcolor;
+ class mfcolorrgba;
+ class mfdouble;
+ class mffloat;
+ class mfimage;
+ class mfint32;
+ class mfnode;
+ class mfrotation;
+ class mfstring;
+ class mftime;
+ class mfvec2d;
+ class mfvec2f;
+ class mfvec3d;
+ class mfvec3f;
+
+ namespace local {
+
+ typedef boost::mpl::vector<openvrml::sfbool,
+ openvrml::sfcolor,
+ openvrml::sfcolorrgba,
+ openvrml::sfdouble,
+ openvrml::sffloat,
+ openvrml::sfimage,
+ openvrml::sfint32,
+ openvrml::sfnode,
+ openvrml::sfrotation,
+ openvrml::sfstring,
+ openvrml::sftime,
+ openvrml::sfvec2d,
+ openvrml::sfvec2f,
+ openvrml::sfvec3d,
+ openvrml::sfvec3f,
+ openvrml::mfbool,
+ openvrml::mfcolor,
+ openvrml::mfcolorrgba,
+ openvrml::mfdouble,
+ openvrml::mffloat,
+ openvrml::mfimage,
+ openvrml::mfint32,
+ openvrml::mfnode,
+ openvrml::mfrotation,
+ openvrml::mfstring,
+ openvrml::mftime,
+ openvrml::mfvec2d,
+ openvrml::mfvec2f,
+ openvrml::mfvec3d,
+ openvrml::mfvec3f>
+ field_value_types;
+ }
+}
+
+# endif // ifndef OPENVRML_LOCAL_FIELD_VALUE_TYPES_H
Property changes on: trunk/src/libopenvrml/openvrml/local/field_value_types.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -20,6 +20,7 @@
//
# include "proto.h"
+# include "field_value_types.h"
# include <private.h>
# include <openvrml/scope.h>
# include <boost/mpl/for_each.hpp>
@@ -912,7 +913,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_listener> result;
for_each<field_value_types>(proto_eventin_creator(type, node, result));
@@ -936,7 +937,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_emitter> result;
for_each<field_value_types>(proto_eventout_creator(type, node, result));
@@ -1027,7 +1028,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_listener> result;
for_each<field_value_types>(proto_exposedfield_creator(initial_value,
@@ -1135,7 +1136,7 @@
is_mapping->second.impl_node_interface;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_listener & impl_eventin =
impl_node->event_listener(impl_node_interface);
@@ -1171,7 +1172,7 @@
is_mapping->second.impl_node_interface;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_emitter & impl_eventout =
impl_node->event_emitter(impl_node_interface);
@@ -1217,7 +1218,7 @@
is_mapping->second.impl_node_interface;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_listener & impl_eventin =
impl_node->event_listener(impl_node_interface);
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -22,7 +22,7 @@
# include "browser.h"
# include "scope.h"
# include <openvrml/local/uri.h>
-# include <private.h>
+# include <openvrml/local/field_value_types.h>
# include <boost/array.hpp>
# include <boost/lexical_cast.hpp>
# include <boost/mpl/for_each.hpp>
@@ -2633,7 +2633,7 @@
{
using namespace openvrml;
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
if (interface_.type == node_interface::exposedfield_id
|| interface_.type == node_interface::field_id) {
this->out << std::string(this->indent + indent_increment_, ' ')
@@ -2812,7 +2812,7 @@
bool added_route = false;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
for_each<field_value_types>(add_listener(emitter,
listener,
added_route));
@@ -2878,7 +2878,7 @@
bool deleted_route = false;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
for_each<field_value_types>(remove_listener(emitter,
listener,
deleted_route));
Modified: trunk/src/libopenvrml/openvrml/script.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/script.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/script.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -24,6 +24,7 @@
# include "scene.h"
# include <openvrml/local/dl.h>
# include <openvrml/local/uri.h>
+# include <openvrml/local/field_value_types.h>
# include <private.h>
# include <boost/array.hpp>
# include <boost/functional.hpp>
@@ -300,7 +301,7 @@
output != this->direct_output_map_.end();
++output) {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
for_each<field_value_types>(direct_output_processor(*output->first,
*output->second,
timestamp));
@@ -1385,7 +1386,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_listener> listener;
for_each<field_value_types>(
script_event_listener_creator(type, id, node, listener));
@@ -1530,7 +1531,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
std::auto_ptr<openvrml::event_emitter> emitter;
for_each<field_value_types>(
script_event_emitter_creator(node, value, emitter));
Modified: trunk/src/libopenvrml/private.h
===================================================================
--- trunk/src/libopenvrml/private.h 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/private.h 2008-10-14 05:30:14 UTC (rev 3738)
@@ -63,41 +63,7 @@
# include <functional>
# include <limits>
# include <boost/concept_check.hpp>
-# include <boost/mpl/vector.hpp>
-namespace openvrml {
- class sfbool;
- class sfcolor;
- class sfcolorrgba;
- class sfdouble;
- class sffloat;
- class sfimage;
- class sfint32;
- class sfnode;
- class sfrotation;
- class sfstring;
- class sftime;
- class sfvec2d;
- class sfvec2f;
- class sfvec3d;
- class sfvec3f;
- class mfbool;
- class mfcolor;
- class mfcolorrgba;
- class mfdouble;
- class mffloat;
- class mfimage;
- class mfint32;
- class mfnode;
- class mfrotation;
- class mfstring;
- class mftime;
- class mfvec2d;
- class mfvec2f;
- class mfvec3d;
- class mfvec3f;
-}
-
namespace {
namespace openvrml_ {
@@ -147,41 +113,6 @@
};
const fgreater_equal_t fgreater_equal = fgreater_equal_t();
-
-
- typedef boost::mpl::vector<openvrml::sfbool,
- openvrml::sfcolor,
- openvrml::sfcolorrgba,
- openvrml::sfdouble,
- openvrml::sffloat,
- openvrml::sfimage,
- openvrml::sfint32,
- openvrml::sfnode,
- openvrml::sfrotation,
- openvrml::sfstring,
- openvrml::sftime,
- openvrml::sfvec2d,
- openvrml::sfvec2f,
- openvrml::sfvec3d,
- openvrml::sfvec3f,
- openvrml::mfbool,
- openvrml::mfcolor,
- openvrml::mfcolorrgba,
- openvrml::mfdouble,
- openvrml::mffloat,
- openvrml::mfimage,
- openvrml::mfint32,
- openvrml::mfnode,
- openvrml::mfrotation,
- openvrml::mfstring,
- openvrml::mftime,
- openvrml::mfvec2d,
- openvrml::mfvec2f,
- openvrml::mfvec3d,
- openvrml::mfvec3f>
- field_value_types;
-
-
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-15 01:32:21
|
Revision: 3739
http://openvrml.svn.sourceforge.net/openvrml/?rev=3739&view=rev
Author: braden
Date: 2008-10-15 01:32:15 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Define _SECURE_SCL=0 for Release configurations.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ChangeLog 2008-10-15 01:32:15 UTC (rev 3739)
@@ -1,5 +1,34 @@
2008-10-14 Braden McDaniel <br...@en...>
+ Define _SECURE_SCL=0 for Release configurations.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
+
+2008-10-14 Braden McDaniel <br...@en...>
+
Moved the boost::mpl::vector of field value types to the
openvrml::local namespace.
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -119,7 +119,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL="
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL="
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -102,7 +102,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="2"
+ CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
@@ -127,7 +127,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.17.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
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 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -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="_SECURE_SCL=0;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -119,7 +119,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -119,7 +119,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -118,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -125,7 +125,7 @@
Optimization="3"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=""..\openvrml-gl";..\openvrml;"..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG"
+ PreprocessorDefinitions="_SECURE_SCL=0;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -84,7 +84,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_FT_CONST="const";OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_FT_CONST="const";OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -108,7 +108,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj 2008-10-14 05:30:14 UTC (rev 3738)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj 2008-10-15 01:32:15 UTC (rev 3739)
@@ -107,7 +107,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_BUILD_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;OPENVRML_BUILD_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-15 07:50:26
|
Revision: 3740
http://openvrml.svn.sourceforge.net/openvrml/?rev=3740&view=rev
Author: braden
Date: 2008-10-15 07:50:14 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Add project files for node component libraries to the distribution.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-15 01:32:15 UTC (rev 3739)
+++ trunk/ChangeLog 2008-10-15 07:50:14 UTC (rev 3740)
@@ -1,3 +1,9 @@
+2008-10-15 Braden McDaniel <br...@en...>
+
+ * ide-projects/Makefile.am
+ (VISUALC9_0_FILES): Add project files for node component libraries
+ to the distribution.
+
2008-10-14 Braden McDaniel <br...@en...>
Define _SECURE_SCL=0 for Release configurations.
Modified: trunk/ide-projects/Makefile.am
===================================================================
--- trunk/ide-projects/Makefile.am 2008-10-15 01:32:15 UTC (rev 3739)
+++ trunk/ide-projects/Makefile.am 2008-10-15 07:50:14 UTC (rev 3740)
@@ -1,5 +1,6 @@
VISUALC9_0_FILES = \
Windows/VisualC9_0/OpenVRML/OpenVRML.sln \
+ Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj \
Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj \
Windows/VisualC9_0/OpenVRML/openvrml/openvrml-config.h \
Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc \
@@ -9,6 +10,23 @@
Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj \
Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj \
Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj \
- Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj
+ Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj \
+ Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj \
+ Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
EXTRA_DIST = $(VISUALC9_0_FILES)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-16 21:40:03
|
Revision: 3741
http://openvrml.svn.sourceforge.net/openvrml/?rev=3741&view=rev
Author: braden
Date: 2008-10-16 21:39:58 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
Removed redundant AC_ARG_VAR for JAVA_HOME.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-15 07:50:14 UTC (rev 3740)
+++ trunk/ChangeLog 2008-10-16 21:39:58 UTC (rev 3741)
@@ -1,3 +1,7 @@
+2008-10-16 Braden McDaniel <br...@en...>
+
+ * configure.ac: Removed redundant AC_ARG_VAR for JAVA_HOME.
+
2008-10-15 Braden McDaniel <br...@en...>
* ide-projects/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-10-15 07:50:14 UTC (rev 3740)
+++ trunk/configure.ac 2008-10-16 21:39:58 UTC (rev 3741)
@@ -322,7 +322,6 @@
#
# Script node Java support
#
-AC_ARG_VAR([JAVA_HOME], [Java Runtime Environment (JRE) location])
AC_ARG_ENABLE([script-node-java],
[AC_HELP_STRING([--disable-script-node-java],
[disable Script node Java support])])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-16 21:50:08
|
Revision: 3742
http://openvrml.svn.sourceforge.net/openvrml/?rev=3742&view=rev
Author: braden
Date: 2008-10-16 21:49:59 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
Moved floating point comparison functions from private.h to openvrml/local/float.h.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/basetypes.cpp
trunk/src/libopenvrml/openvrml/bounding_volume.cpp
trunk/src/libopenvrml/openvrml/frustum.cpp
trunk/src/libopenvrml/private.h
trunk/src/node/vrml97/cylinder_sensor.cpp
trunk/src/node/vrml97/normal_interpolator.cpp
trunk/src/node/vrml97/orientation_interpolator.cpp
trunk/src/node/vrml97/proximity_sensor.cpp
trunk/src/node/vrml97/texture_transform.cpp
trunk/src/node/vrml97/time_sensor.cpp
trunk/src/node/vrml97/visibility_sensor.cpp
trunk/src/script/javascript.cpp
Added Paths:
-----------
trunk/src/libopenvrml/openvrml/local/float.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/ChangeLog 2008-10-16 21:49:59 UTC (rev 3742)
@@ -1,5 +1,29 @@
2008-10-16 Braden McDaniel <br...@en...>
+ Moved floating point comparison functions from private.h to
+ openvrml/local/float.h.
+
+ * src/Makefile.am
+ (libopenvrml_libopenvrml_la_SOURCES): Added
+ libopenvrml/openvrml/local/float.h.
+ * src/libopenvrml/private.h: Moved floating point comparison
+ functions to openvrml/local/float.h.
+ * src/libopenvrml/openvrml/basetypes.cpp
+ * src/libopenvrml/openvrml/bounding_volume.cpp
+ * src/libopenvrml/openvrml/frustum.cpp
+ * src/libopenvrml/openvrml/local/float.h: Added file; moved
+ floating point comparison functions here.
+ * src/node/vrml97/cylinder_sensor.cpp
+ * src/node/vrml97/normal_interpolator.cpp
+ * src/node/vrml97/orientation_interpolator.cpp
+ * src/node/vrml97/proximity_sensor.cpp
+ * src/node/vrml97/texture_transform.cpp
+ * src/node/vrml97/time_sensor.cpp
+ * src/node/vrml97/visibility_sensor.cpp
+ * src/script/javascript.cpp
+
+2008-10-16 Braden McDaniel <br...@en...>
+
* configure.ac: Removed redundant AC_ARG_VAR for JAVA_HOME.
2008-10-15 Braden McDaniel <br...@en...>
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/Makefile.am 2008-10-16 21:49:59 UTC (rev 3742)
@@ -158,7 +158,8 @@
libopenvrml/openvrml/local/xml_reader.h \
libopenvrml/openvrml/local/proto.cpp \
libopenvrml/openvrml/local/proto.h \
- libopenvrml/openvrml/local/field_value_types.h
+ libopenvrml/openvrml/local/field_value_types.h \
+ libopenvrml/openvrml/local/float.h
libopenvrml_libopenvrml_la_LDFLAGS = \
-version-info $(LIBOPENVRML_LIBRARY_VERSION) \
Modified: trunk/src/libopenvrml/openvrml/basetypes.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/basetypes.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/libopenvrml/openvrml/basetypes.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -19,12 +19,13 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "basetypes.h"
+# include "x3d_vrml_grammar.h"
+# include <openvrml/local/float.h>
+# include <private.h>
# include <cmath>
# include <numeric>
# include <ostream>
-# include <private.h>
-# include "basetypes.h"
-# include "x3d_vrml_grammar.h"
/**
* @file openvrml/basetypes.h
@@ -283,7 +284,7 @@
bool openvrml::operator==(const color & lhs, const color & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 3, &rhs[0], fequal);
}
@@ -578,7 +579,7 @@
bool openvrml::operator==(const color_rgba & lhs, const color_rgba & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 4, &rhs[0], fequal);
}
@@ -977,7 +978,7 @@
*/
const openvrml::vec2f openvrml::vec2f::normalize() const OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
const float len = this->length();
vec2f result(*this);
if (!fequal(len, 0.0f)) { result /= len; }
@@ -998,7 +999,7 @@
bool openvrml::operator==(const vec2f & lhs, const vec2f & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 2, &rhs[0], fequal);
}
@@ -1392,7 +1393,7 @@
*/
const openvrml::vec2d openvrml::vec2d::normalize() const OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
const double len = this->length();
vec2d result(*this);
if (!fequal(len, 0.0)) { result /= len; }
@@ -1413,7 +1414,7 @@
bool openvrml::operator==(const vec2d & lhs, const vec2d & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 2, &rhs[0], fequal);
}
@@ -1936,7 +1937,7 @@
*/
const openvrml::vec3f openvrml::vec3f::normalize() const OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
const float len = this->length();
vec3f result(*this);
if (!fequal(len, 0.0f)) { result /= len; }
@@ -1957,7 +1958,7 @@
bool openvrml::operator==(const vec3f & lhs, const vec3f & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 3, &rhs[0], fequal);
}
@@ -2479,7 +2480,7 @@
*/
const openvrml::vec3d openvrml::vec3d::normalize() const OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
const double len = this->length();
vec3d result(*this);
if (!fequal(len, 0.0)) { result /= len; }
@@ -2500,7 +2501,7 @@
bool openvrml::operator==(const vec3d & lhs, const vec3d & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 3, &rhs[0], fequal);
}
@@ -2637,8 +2638,9 @@
assert(rot[2] == rot[2]);
assert(rot[3] == rot[3]);
- assert(openvrml_::fequal(1.0f,
- make_vec3f(rot[0], rot[1], rot[2]).length()));
+ assert(
+ openvrml::local::fequal(1.0f,
+ make_vec3f(rot[0], rot[1], rot[2]).length()));
const rotation r = { { rot[0], rot[1], rot[2], rot[3] } };
return r;
}
@@ -2673,7 +2675,7 @@
assert(z == z);
assert(angle == angle);
- assert(openvrml_::fequal(1.0f, make_vec3f(x, y, z).length()));
+ assert(openvrml::local::fequal(1.0f, make_vec3f(x, y, z).length()));
const rotation r = { { x, y, z, angle } };
return r;
}
@@ -2701,7 +2703,7 @@
//
assert(angle == angle);
- assert(openvrml_::fequal(1.0f, axis.length()));
+ assert(openvrml::local::fequal(1.0f, axis.length()));
const rotation r = { { axis.x(), axis.y(), axis.z(), angle } };
return r;
}
@@ -2745,7 +2747,7 @@
const openvrml::rotation openvrml::make_rotation(const quatf & quat)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
rotation r = make_rotation();
const float val = float(acos(quat.w()));
@@ -2850,7 +2852,7 @@
OPENVRML_LOCAL inline void normalize_(float vec[3])
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
const float len = float(length_(vec));
if (!fequal(len, 0.0f)) {
vec[0] /= len;
@@ -2861,7 +2863,7 @@
OPENVRML_LOCAL void normalize_axis_(float axis[3]) OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
const float axis_length = float(length_(axis));
if (fequal(axis_length, 0.0f)) {
axis[2] = 1.0;
@@ -2911,7 +2913,7 @@
*/
void openvrml::rotation::axis(const vec3f & axis) OPENVRML_NOTHROW
{
- assert(openvrml_::fequal(1.0f, axis.length()));
+ assert(openvrml::local::fequal(1.0f, axis.length()));
this->rot[0] = axis.x();
this->rot[1] = axis.y();
this->rot[2] = axis.z();
@@ -2951,7 +2953,7 @@
const float t) const
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
quatf from_quat = make_quatf(*this), to_quat = make_quatf(dest_rot);
@@ -3011,7 +3013,7 @@
bool openvrml::operator==(const rotation & lhs, const rotation & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 4, &rhs[0], fequal);
}
@@ -3042,7 +3044,7 @@
bool operator()() const
{
using openvrml::make_vec3f;
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return fequal(make_vec3f(this->x_, this->y_, this->z_).length(),
1.0f);
}
@@ -3302,7 +3304,7 @@
const vec3f & c)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
mat4f mat = make_mat4f();
if (t != make_vec3f(0.0, 0.0, 0.0)) {
@@ -3592,7 +3594,7 @@
//
// Some portions are taken from Graphics Gems 2.
//
- using openvrml_::fequal;
+ using openvrml::local::fequal;
//
// Check if it is singular.
@@ -3694,7 +3696,7 @@
//
// Some portions are taken from Graphics Gems 2.
//
- using openvrml_::fequal;
+ using openvrml::local::fequal;
//
// Check if it is singular.
@@ -4071,7 +4073,7 @@
bool openvrml::operator==(const mat4f & lhs, const mat4f & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0][0], &lhs[0][0] + 16, &rhs[0][0], fequal);
}
@@ -4181,7 +4183,7 @@
q.quat[1] = (mat[2][0] - mat[0][2]) * s;
q.quat[2] = (mat[0][1] - mat[1][0]) * s;
} else {
- using openvrml_::fequal;
+ using openvrml::local::fequal;
std::size_t i, j, k;
static const std::size_t next[3] = { 1, 2, 0 };
// diagonal is negative
@@ -4213,7 +4215,7 @@
const openvrml::quatf openvrml::make_quatf(const rotation & rot)
OPENVRML_NOTHROW
{
- assert(openvrml_::fequal(rot.axis().length(), 1.0f));
+ assert(openvrml::local::fequal(rot.axis().length(), 1.0f));
const float sin_angle = float(sin(rot.angle() / 2.0));
const quatf q = { rot.x() * sin_angle,
@@ -4637,7 +4639,7 @@
bool openvrml::operator==(const quatf & lhs, const quatf & rhs)
OPENVRML_NOTHROW
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
return std::equal(&lhs[0], &lhs[0] + 4, &rhs[0], fequal);
}
Modified: trunk/src/libopenvrml/openvrml/bounding_volume.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/bounding_volume.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/libopenvrml/openvrml/bounding_volume.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -19,7 +19,7 @@
//
# include <limits>
-# include <private.h>
+# include <openvrml/local/float.h>
# include "bounding_volume.h"
# include "field_value.h"
# include "frustum.h"
@@ -441,7 +441,7 @@
*/
void openvrml::bounding_sphere::do_extend(const vec3f & p)
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
if (this->maximized()) { return; }
@@ -509,7 +509,7 @@
*/
void openvrml::bounding_sphere::do_extend(const bounding_sphere & b)
{
- using openvrml_::fequal;
+ using openvrml::local::fequal;
if (this->maximized()) { return; }
Modified: trunk/src/libopenvrml/openvrml/frustum.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/frustum.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/libopenvrml/openvrml/frustum.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -18,14 +18,15 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "basetypes.h"
+# include "frustum.h"
+# include <openvrml/local/float.h>
+# include <cmath>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <private.h>
-# include "basetypes.h"
-# include "frustum.h"
-
/**
* @file openvrml/frustum.h
*
@@ -132,7 +133,7 @@
float aspect,
double z_near,
double z_far):
- fovy(float((fovy / 360.0) * 2.0 * openvrml_::pi)),
+ fovy(float((fovy / 360.0) * 2.0 * openvrml::local::pi)),
fovx(float(2.0 * atan(float(tan(this->fovy / 2.0)) * aspect))),
z_near(z_near),
z_far(z_far)
Copied: trunk/src/libopenvrml/openvrml/local/float.h (from rev 3740, trunk/src/libopenvrml/private.h)
===================================================================
--- trunk/src/libopenvrml/openvrml/local/float.h (rev 0)
+++ trunk/src/libopenvrml/openvrml/local/float.h 2008-10-16 21:49:59 UTC (rev 3742)
@@ -0,0 +1,81 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# ifndef OPENVRML_LOCAL_FLOAT_H
+# define OPENVRML_LOCAL_FLOAT_H
+
+# include <openvrml-common.h>
+# include <limits>
+# include <boost/concept_check.hpp>
+
+namespace openvrml {
+
+ namespace local {
+
+ const double pi = 3.14159265358979323846;
+ const double pi_2 = 1.57079632679489661923;
+ const double pi_4 = 0.78539816339744830962;
+ const double inv_pi = 0.31830988618379067154;
+
+ template <typename Float>
+ OPENVRML_LOCAL inline Float fabs(const Float f)
+ {
+ return f < 0.0 ? -f : f;
+ }
+
+ struct OPENVRML_LOCAL fequal_t {
+ template <typename Float>
+ bool operator()(Float a, Float b) const
+ {
+ const Float diff = fabs(a - b);
+ if (diff == 0.0) { return true; }
+ static const int rounding_errors = 10;
+ static const Float e = std::numeric_limits<Float>::epsilon();
+ static const Float tolerance = e * rounding_errors / 2;
+ return diff / fabs(a) <= tolerance
+ && diff / fabs(b) <= tolerance;
+ }
+ };
+
+ const fequal_t fequal = fequal_t();
+
+ struct OPENVRML_LOCAL fless_equal_t {
+ template <typename Float>
+ bool operator()(Float a, Float b) const
+ {
+ return a < b || fequal(a, b);
+ }
+ };
+
+ const fless_equal_t fless_equal = fless_equal_t();
+
+ struct OPENVRML_LOCAL fgreater_equal_t {
+ template <typename Float>
+ bool operator()(Float a, Float b) const
+ {
+ return a > b || fequal(a, b);
+ }
+ };
+
+ const fgreater_equal_t fgreater_equal = fgreater_equal_t();
+ }
+}
+
+# endif // ifndef OPENVRML_LOCAL_FLOAT_H
Modified: trunk/src/libopenvrml/private.h
===================================================================
--- trunk/src/libopenvrml/private.h 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/libopenvrml/private.h 2008-10-16 21:49:59 UTC (rev 3742)
@@ -57,63 +57,4 @@
<< message_ << std::endl
# endif
-# include <cassert>
-# include <cmath>
-# include <cstddef>
-# include <functional>
-# include <limits>
-# include <boost/concept_check.hpp>
-
-namespace {
- namespace openvrml_ {
-
- const double pi = 3.14159265358979323846;
- const double pi_2 = 1.57079632679489661923;
- const double pi_4 = 0.78539816339744830962;
- const double inv_pi = 0.31830988618379067154;
-
- template <typename Float>
- OPENVRML_LOCAL inline Float fabs(const Float f)
- {
- return f < 0.0 ? -f : f;
- }
-
- struct OPENVRML_LOCAL fequal_t {
- template <typename Float>
- bool operator()(Float a, Float b) const
- {
- const Float diff = fabs(a - b);
- if (diff == 0.0) { return true; }
- static const int rounding_errors = 10;
- static const Float e = std::numeric_limits<Float>::epsilon();
- static const Float tolerance = e * rounding_errors / 2;
- return diff / fabs(a) <= tolerance
- && diff / fabs(b) <= tolerance;
- }
- };
-
- const fequal_t fequal = fequal_t();
-
- struct OPENVRML_LOCAL fless_equal_t {
- template <typename Float>
- bool operator()(Float a, Float b) const
- {
- return a < b || fequal(a, b);
- }
- };
-
- const fless_equal_t fless_equal = fless_equal_t();
-
- struct OPENVRML_LOCAL fgreater_equal_t {
- template <typename Float>
- bool operator()(Float a, Float b) const
- {
- return a > b || fequal(a, b);
- }
- };
-
- const fgreater_equal_t fgreater_equal = fgreater_equal_t();
- }
-}
-
# endif
Modified: trunk/src/node/vrml97/cylinder_sensor.cpp
===================================================================
--- trunk/src/node/vrml97/cylinder_sensor.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/cylinder_sensor.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -20,15 +20,15 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "cylinder_sensor.h"
+# include <openvrml/node_impl_util.h>
+# include <openvrml/local/float.h>
+# include <boost/array.hpp>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <openvrml/node_impl_util.h>
-# include <private.h>
-# include "cylinder_sensor.h"
-
namespace {
class OPENVRML_LOCAL cylinder_sensor_node :
@@ -249,8 +249,8 @@
bool active,
const double (&p)[3])
{
- using openvrml_::pi;
- using openvrml_::pi_2;
+ using openvrml::local::pi;
+ using openvrml::local::pi_2;
using openvrml::vec3f;
using openvrml::make_vec3f;
@@ -293,7 +293,7 @@
// Tracking
else if (active) {
- using openvrml_::fequal;
+ using openvrml::local::fequal;
// get local coord for touch point
vec3f Vec = make_vec3f(static_cast<float>(p[0]),
Modified: trunk/src/node/vrml97/normal_interpolator.cpp
===================================================================
--- trunk/src/node/vrml97/normal_interpolator.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/normal_interpolator.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -19,15 +19,16 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "normal_interpolator.h"
+# include <openvrml/node_impl_util.h>
+# include <openvrml/local/float.h>
+# include <private.h>
+# include <boost/array.hpp>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <openvrml/node_impl_util.h>
-# include <private.h>
-# include "normal_interpolator.h"
-
namespace {
class OPENVRML_LOCAL normal_interpolator_node :
@@ -152,7 +153,7 @@
// Interpolate on the surface of unit sphere.
for (size_t j = 0; j < nNormals; ++j) {
- using openvrml_::fequal;
+ using openvrml::local::fequal;
float alpha, beta;
const float dot_product = v1->dot(*v2);
Modified: trunk/src/node/vrml97/orientation_interpolator.cpp
===================================================================
--- trunk/src/node/vrml97/orientation_interpolator.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/orientation_interpolator.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -20,15 +20,16 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "orientation_interpolator.h"
+# include <openvrml/node_impl_util.h>
+# include <openvrml/local/float.h>
+# include <private.h>
+# include <boost/array.hpp>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <openvrml/node_impl_util.h>
-# include <private.h>
-# include "orientation_interpolator.h"
-
namespace {
class OPENVRML_LOCAL orientation_interpolator_node :
@@ -137,7 +138,7 @@
for (size_t i = 0; i < n; ++i) {
if (key[i] <= fraction.value()
&& fraction.value() <= key[i + 1]) {
- using openvrml_::pi;
+ using openvrml::local::pi;
const rotation & v1 = key_value[i];
const rotation & v2 = key_value[i + 1];
Modified: trunk/src/node/vrml97/proximity_sensor.cpp
===================================================================
--- trunk/src/node/vrml97/proximity_sensor.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/proximity_sensor.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -20,16 +20,16 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "proximity_sensor.h"
+# include <openvrml/local/float.h>
+# include <openvrml/node_impl_util.h>
+# include <openvrml/browser.h>
+# include <boost/array.hpp>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <openvrml/node_impl_util.h>
-# include <openvrml/browser.h>
-# include <private.h>
-# include "proximity_sensor.h"
-
namespace {
class OPENVRML_LOCAL proximity_sensor_node :
@@ -223,8 +223,8 @@
&& this->size_.sfvec3f::value().y() > 0.0
&& this->size_.sfvec3f::value().z() > 0.0
&& viewer.mode() == viewer::draw_mode) {
- using openvrml_::fabs;
- using openvrml_::fless_equal;
+ using openvrml::local::fabs;
+ using openvrml::local::fless_equal;
sftime timeNow(browser::current_time());
float x, y, z;
Modified: trunk/src/node/vrml97/texture_transform.cpp
===================================================================
--- trunk/src/node/vrml97/texture_transform.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/texture_transform.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -31,8 +31,6 @@
namespace {
- using namespace openvrml_;
-
class OPENVRML_LOCAL texture_transform_node :
public openvrml::node_impl_util::abstract_node<texture_transform_node>,
public openvrml::texture_transform_node {
Modified: trunk/src/node/vrml97/time_sensor.cpp
===================================================================
--- trunk/src/node/vrml97/time_sensor.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/time_sensor.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -19,17 +19,18 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
-# ifdef HAVE_CONFIG_H
-# include <config.h>
-# endif
-
# include "time_sensor.h"
+# include <openvrml/local/float.h>
+# include <private.h>
# include <openvrml/browser.h>
# include <openvrml/node_impl_util.h>
# include <openvrml/scene.h>
-# include <private.h>
# include <boost/array.hpp>
+# ifdef HAVE_CONFIG_H
+# include <config.h>
+# endif
+
namespace {
class OPENVRML_LOCAL time_sensor_node :
@@ -264,7 +265,7 @@
if (enabled.value() != node.is_active_.value()) {
if (node.is_active_.value()) {
- using openvrml_::fequal;
+ using openvrml::local::fequal;
//
// Was active; shutdown.
@@ -545,8 +546,8 @@
// Running (active and enabled)
else if (this->is_active_.value()) {
- using openvrml_::fequal;
- using openvrml_::fless_equal;
+ using openvrml::local::fequal;
+ using openvrml::local::fless_equal;
double f, cycleInt = this->cycle_interval_.value();
bool deactivate = false;
Modified: trunk/src/node/vrml97/visibility_sensor.cpp
===================================================================
--- trunk/src/node/vrml97/visibility_sensor.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/node/vrml97/visibility_sensor.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -19,16 +19,16 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "visibility_sensor.h"
+# include <openvrml/local/float.h>
+# include <openvrml/node_impl_util.h>
+# include <openvrml/browser.h>
+# include <boost/array.hpp>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <boost/array.hpp>
-# include <openvrml/node_impl_util.h>
-# include <openvrml/browser.h>
-# include <private.h>
-# include "visibility_sensor.h"
-
namespace {
class OPENVRML_LOCAL visibility_sensor_node :
@@ -190,7 +190,7 @@
// Is the sphere visible? ...
bool inside = xyz[0].z() < 0.0; // && z > - scene->visLimit()
if (inside) {
- using openvrml_::fequal;
+ using openvrml::local::fequal;
openvrml::navigation_info_node & nav_info =
this->type().metatype().browser()
Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp 2008-10-16 21:39:58 UTC (rev 3741)
+++ trunk/src/script/javascript.cpp 2008-10-16 21:49:59 UTC (rev 3742)
@@ -19,6 +19,7 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include <openvrml/local/float.h>
# include <openvrml/browser.h>
# include <openvrml/scene.h>
# include <private.h>
@@ -3628,7 +3629,7 @@
OPENVRML_JAVASCRIPT_LOCAL bool normalized(const openvrml::vec3f & v)
{
- return openvrml_::fequal(v.length(), 1.0f);
+ return openvrml::local::fequal(v.length(), 1.0f);
}
JSBool SFRotation::initObject(JSContext * const cx,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-23 06:12:19
|
Revision: 3744
http://openvrml.svn.sourceforge.net/openvrml/?rev=3744&view=rev
Author: braden
Date: 2008-10-23 06:12:01 +0000 (Thu, 23 Oct 2008)
Log Message:
-----------
Require Automake 1.10.1.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
trunk/src/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-23 06:09:07 UTC (rev 3743)
+++ trunk/ChangeLog 2008-10-23 06:12:01 UTC (rev 3744)
@@ -1,3 +1,11 @@
+2008-10-23 Braden McDaniel <br...@en...>
+
+ Require Automake 1.10.1.
+
+ * configure.ac: Require Automake 1.10.1.
+ * src/Makefile.am: Removed hack to make distcheck work with
+ Automake 1.10.
+
2008-10-16 Braden McDaniel <br...@en...>
Moved floating point comparison functions from private.h to
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-10-23 06:09:07 UTC (rev 3743)
+++ trunk/configure.ac 2008-10-23 06:12:01 UTC (rev 3744)
@@ -24,7 +24,7 @@
[openvrml.pc])
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([1.9 foreign subdir-objects check-news tar-pax])
+AM_INIT_AUTOMAKE([1.10.1 foreign subdir-objects check-news tar-pax])
AM_CONFIG_HEADER([config.h])
#
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-23 06:09:07 UTC (rev 3743)
+++ trunk/src/Makefile.am 2008-10-23 06:12:01 UTC (rev 3744)
@@ -756,12 +756,7 @@
libopenvrml-gl/openvrml-gl-config.h.in \
openvrml-xembed/org.openvrml.BrowserControl.service.in
-#
-# Automake 1.10 seems to need this for distcheck to work.
-#
-CLEANFILES = \
- $(BUILT_SOURCES) \
- openvrml-xembed/.libs/openvrml-xembed
+CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = \
libopenvrml/openvrml-config.h \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-23 06:34:55
|
Revision: 3745
http://openvrml.svn.sourceforge.net/openvrml/?rev=3745&view=rev
Author: braden
Date: 2008-10-23 06:34:43 +0000 (Thu, 23 Oct 2008)
Log Message:
-----------
Removed redundant registration of the OpenvrmlXembedBrowserFactory instance.
Modified Paths:
--------------
trunk/ChangeLog
trunk/mozilla-plugin/src/openvrml.cpp
trunk/src/openvrml-player/curlbrowserhost.cpp
trunk/src/openvrml-xembed/main.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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/ChangeLog 2008-10-23 06:34:43 UTC (rev 3745)
@@ -1,5 +1,22 @@
2008-10-23 Braden McDaniel <br...@en...>
+ Removed redundant registration of the OpenvrmlXembedBrowserFactory
+ instance.
+
+ * src/openvrml-xembed/main.cpp
+ (main(int, char *[])): Removed redundant registration of the
+ OpenvrmlXembedBrowserFactory instance.
+ * src/openvrml-player/curlbrowserhost.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Proper factory object path is
+ "org/openvrml/BrowserFactory".
+ * mozilla-plugin/src/openvrml.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Proper factory object path is
+ "org/openvrml/BrowserFactory".
+
+2008-10-23 Braden McDaniel <br...@en...>
+
Require Automake 1.10.1.
* configure.ac: Require Automake 1.10.1.
Modified: trunk/mozilla-plugin/src/openvrml.cpp
===================================================================
--- trunk/mozilla-plugin/src/openvrml.cpp 2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/mozilla-plugin/src/openvrml.cpp 2008-10-23 06:34:43 UTC (rev 3745)
@@ -1162,7 +1162,7 @@
DBusGProxy * browser_factory =
dbus_g_proxy_new_for_name(connection,
"org.openvrml.BrowserControl",
- "/BrowserFactory",
+ "/org/openvrml/BrowserFactory",
"org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
scope_guard browser_factory_guard =
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743
Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp 2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp 2008-10-23 06:34:43 UTC (rev 3745)
@@ -855,7 +855,7 @@
DBusGProxy * browser_factory =
dbus_g_proxy_new_for_name(connection,
"org.openvrml.BrowserControl",
- "/BrowserFactory",
+ "/org/openvrml/BrowserFactory",
"org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
scope_guard browser_factory_guard =
Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp 2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/src/openvrml-xembed/main.cpp 2008-10-23 06:34:43 UTC (rev 3745)
@@ -102,10 +102,6 @@
// make_guard(g_object_unref, G_OBJECT(browser_factory));
// boost::ignore_unused_variable_warning(browser_factory_guard);
- dbus_g_connection_register_g_object(bus,
- "/BrowserFactory",
- G_OBJECT(browser_factory));
-
gdk_threads_enter();
gtk_main();
gdk_threads_leave();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-25 04:32:36
|
Revision: 3747
http://openvrml.svn.sourceforge.net/openvrml/?rev=3747&view=rev
Author: braden
Date: 2008-10-25 04:32:33 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Fixed signature of openvrml_xembed_browser_factory_create_control to use guint64 for the host_id.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/browserfactory.cpp
trunk/src/openvrml-xembed/browserfactory.h
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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-25 04:29:02 UTC (rev 3746)
+++ trunk/ChangeLog 2008-10-25 04:32:33 UTC (rev 3747)
@@ -1,3 +1,11 @@
+2008-10-25 Braden McDaniel <br...@en...>
+
+ Fixed signature of openvrml_xembed_browser_factory_create_control
+ to use guint64 for the host_id.
+
+ * src/openvrml-xembed/browserfactory.cpp
+ * src/openvrml-xembed/browserfactory.h
+
2008-10-23 Braden McDaniel <br...@en...>
Removed redundant registration of the OpenvrmlXembedBrowserFactory
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746
Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp 2008-10-25 04:29:02 UTC (rev 3746)
+++ trunk/src/openvrml-xembed/browserfactory.cpp 2008-10-25 04:32:33 UTC (rev 3747)
@@ -244,7 +244,7 @@
OpenvrmlXembedBrowserFactory * const control_factory,
const char * const host_name,
const char * const host_obj_path,
- const guint host_id,
+ const guint64 host_id,
const gboolean expect_initial_stream,
DBusGMethodInvocation * const context)
{
Modified: trunk/src/openvrml-xembed/browserfactory.h
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.h 2008-10-25 04:29:02 UTC (rev 3746)
+++ trunk/src/openvrml-xembed/browserfactory.h 2008-10-25 04:32:33 UTC (rev 3747)
@@ -53,7 +53,7 @@
OpenvrmlXembedBrowserFactory * factory,
const char * host_name,
const char * host_obj_path,
- guint host_id,
+ guint64 host_id,
gboolean expect_initial_stream,
DBusGMethodInvocation * context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-25 07:06:43
|
Revision: 3749
http://openvrml.svn.sourceforge.net/openvrml/?rev=3749&view=rev
Author: braden
Date: 2008-10-25 07:06:37 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Ensure the XEmbed control host identifier is consistently treated as a 64-bit type.
Modified Paths:
--------------
trunk/ChangeLog
trunk/mozilla-plugin/src/Makefile.am
trunk/mozilla-plugin/src/openvrml.cpp
trunk/src/Makefile.am
trunk/src/openvrml-player/curlbrowserhost.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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-25 06:59:43 UTC (rev 3748)
+++ trunk/ChangeLog 2008-10-25 07:06:37 UTC (rev 3749)
@@ -1,5 +1,37 @@
2008-10-25 Braden McDaniel <br...@en...>
+ Ensure the XEmbed control host identifier is consistently treated
+ as a 64-bit type.
+
+ * mozilla-plugin/src/Makefile.am: Generate client code for
+ org.openvrml.Browser and org.openvrml.BrowserFactory.
+ * mozilla-plugin/src/openvrml.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Use the generated function
+ org_openvrml_BrowserFactory_create_control.
+ (plugin_instance::new_stream(NPMIMEType, NPStream *)): Use the
+ generated function org_openvrml_Browser_new_stream.
+ (plugin_instance::destroy_stream(NPStream *)): Cast the stream
+ identifier to guint64.
+ (plugin_instance::write(NPStream *, int32, void *)): Cast the
+ stream identifier to guint64.
+ * src/Makefile.am: Generate client code for org.openvrml.Browser
+ and org.openvrml.BrowserFactory.
+ * src/openvrml-player/curlbrowserhost.cpp
+ (openvrml_player_curl_browser_host_realize(GtkWidget *)): Use the
+ generated function org_openvrml_Browser_get_id.
+ (openvrml_player_curl_browser_host_curl_source_callback(gpointer)):
+ Cast the stream identifier to guint64.
+ (openvrml_player_curl_browser_host_curl_write(void *, size_t,
+ size_t, void *)): Use the generated function
+ org_openvrml_Browser_new_stream; cast the stream identifier to
+ guint64.
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Use the generated function
+ org_openvrml_BrowserFactory_create_control.
+
+2008-10-25 Braden McDaniel <br...@en...>
+
Fixed signature of openvrml_xembed_browser_factory_create_control
to use guint64 for the host_id.
Modified: trunk/mozilla-plugin/src/Makefile.am
===================================================================
--- trunk/mozilla-plugin/src/Makefile.am 2008-10-25 06:59:43 UTC (rev 3748)
+++ trunk/mozilla-plugin/src/Makefile.am 2008-10-25 07:06:37 UTC (rev 3749)
@@ -7,7 +7,10 @@
if ENABLE_MOZILLA_PLUGIN
mozplugins_LTLIBRARIES = openvrml.la
-BUILT_SOURCES = browser-host-server-glue.h
+BUILT_SOURCES = \
+ browser-host-server-glue.h \
+ browser-factory-client-glue.h \
+ browser-client-glue.h
endif
openvrml_la_SOURCES = openvrml.cpp
@@ -23,6 +26,18 @@
--output=$@ \
$?
+browser-factory-client-glue.h: $(top_srcdir)/../src/openvrml-xembed/browser-factory.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+ --mode=glib-client \
+ --output=$@ \
+ $?
+
+browser-client-glue.h: $(top_srcdir)/../src/openvrml-xembed/browser.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+ --mode=glib-client \
+ --output=$@ \
+ $?
+
EXTRA_DIST = $(openvrml_la_SOURCES)
CLEANFILES = $(BUILT_SOURCES)
Modified: trunk/mozilla-plugin/src/openvrml.cpp
===================================================================
--- trunk/mozilla-plugin/src/openvrml.cpp 2008-10-25 06:59:43 UTC (rev 3748)
+++ trunk/mozilla-plugin/src/openvrml.cpp 2008-10-25 07:06:37 UTC (rev 3749)
@@ -70,6 +70,8 @@
G_END_DECLS
# include "browser-host-server-glue.h"
+# include "browser-factory-client-glue.h"
+# include "browser-client-glue.h"
using namespace boost::multi_index::detail; // for scope_guard
@@ -135,7 +137,7 @@
void openvrml_np_browser_host_init(OpenvrmlNpBrowserHost * const host)
{
- static size_t count = 0;
+ static unsigned long count = 0;
host->path = g_strdup_printf("/org/openvrml/BrowserHost/%u/%lu",
getpid(), count++);
dbus_g_connection_register_g_object(
@@ -1170,16 +1172,13 @@
boost::ignore_unused_variable_warning(browser_factory_guard);
char * browser_path = 0;
- if (!dbus_g_proxy_call(browser_factory,
- "CreateControl",
- error,
- G_TYPE_STRING, host_name,
- DBUS_TYPE_G_OBJECT_PATH, host_path,
- G_TYPE_UINT64, host_id,
- G_TYPE_BOOLEAN, true,
- G_TYPE_INVALID,
- DBUS_TYPE_G_OBJECT_PATH, &browser_path,
- G_TYPE_INVALID)) {
+ if (!org_openvrml_BrowserFactory_create_control(browser_factory,
+ host_name,
+ host_path,
+ host_id,
+ true,
+ &browser_path,
+ error)) {
return 0;
}
@@ -1235,14 +1234,11 @@
GError * error = 0;
scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
- gboolean result = dbus_g_proxy_call(this->browser,
- "NewStream",
- &error,
- G_TYPE_UINT64, stream,
- G_TYPE_STRING, type,
- G_TYPE_STRING, stream->url,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
+ gboolean result = org_openvrml_Browser_new_stream(this->browser,
+ guint64(stream),
+ type,
+ stream->url,
+ &error);
if (!result) {
g_critical("Call to org.openvrml.Browser.NewStream failed: %s",
error->message);
@@ -1258,7 +1254,7 @@
dbus_g_proxy_call_no_reply(this->browser,
"DestroyStream",
- G_TYPE_UINT64, stream,
+ G_TYPE_UINT64, guint64(stream),
G_TYPE_INVALID);
return NPERR_NO_ERROR;
}
@@ -1275,7 +1271,7 @@
dbus_g_proxy_call_no_reply(this->browser,
"Write",
- G_TYPE_UINT64, stream,
+ G_TYPE_UINT64, guint64(stream),
DBUS_TYPE_G_UCHAR_ARRAY, &array,
G_TYPE_INVALID);
return len;
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-25 06:59:43 UTC (rev 3748)
+++ trunk/src/Makefile.am 2008-10-25 07:06:37 UTC (rev 3749)
@@ -713,7 +713,9 @@
if ENABLE_PLAYER
bin_PROGRAMS = openvrml-player/openvrml-player
BUILT_SOURCES += \
- openvrml-player/browser-host-server-glue.h
+ openvrml-player/browser-host-server-glue.h \
+ openvrml-player/browser-factory-client-glue.h \
+ openvrml-player/browser-client-glue.h
endif
openvrml_player_openvrml_player_CPPFLAGS = \
@@ -751,6 +753,18 @@
--output=$@ \
$?
+openvrml-player/browser-factory-client-glue.h: $(srcdir)/openvrml-xembed/browser-factory.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+ --mode=glib-client \
+ --output=$@ \
+ $?
+
+openvrml-player/browser-client-glue.h: $(srcdir)/openvrml-xembed/browser.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+ --mode=glib-client \
+ --output=$@ \
+ $?
+
EXTRA_DIST = \
libopenvrml/openvrml-config.h.in \
libopenvrml-gl/openvrml-gl-config.h.in \
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748
Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp 2008-10-25 06:59:43 UTC (rev 3748)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp 2008-10-25 07:06:37 UTC (rev 3749)
@@ -21,6 +21,8 @@
# include <curl/curl.h>
# include <libgnomevfs/gnome-vfs.h>
# include <browser-host-server-glue.h>
+# include <browser-factory-client-glue.h>
+# include <browser-client-glue.h>
# include <dbus/dbus-glib-bindings.h>
# include <dbus/dbus-protocol.h>
# include <boost/concept_check.hpp>
@@ -90,7 +92,7 @@
browser_host->priv =
OPENVRML_PLAYER_CURL_BROWSER_HOST_GET_PRIVATE(browser_host);
- static size_t count = 0;
+ static unsigned long count = 0;
browser_host->priv->path =
g_strdup_printf("/org/openvrml/BrowserHost/%u/%lu",
getpid(), count++);
@@ -255,12 +257,8 @@
}
guint64 plug_id = 0;
- if (!dbus_g_proxy_call(browser_host->priv->browser,
- "GetId",
- &error,
- G_TYPE_INVALID,
- G_TYPE_UINT64, &plug_id,
- G_TYPE_INVALID)) {
+ if (!org_openvrml_Browser_get_id(browser_host->priv->browser, &plug_id,
+ &error)) {
g_critical("Call to org.openvrml.Browser.GetId failed: %s",
error->message);
return;
@@ -726,7 +724,7 @@
dbus_g_proxy_call_no_reply(
browser_host->priv->browser,
"DestroyStream",
- G_TYPE_UINT64, msg->easy_handle,
+ G_TYPE_UINT64, guint64(msg->easy_handle),
G_TYPE_INVALID);
}
@@ -795,15 +793,12 @@
GError * error = 0;
scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
gboolean new_stream_result =
- dbus_g_proxy_call(
+ org_openvrml_Browser_new_stream(
stream_data.browser(),
- "NewStream",
- &error,
- G_TYPE_UINT64, stream_data.handle(),
- G_TYPE_STRING, (type ? type : "application/octet-stream"),
- G_TYPE_STRING, stream_data.url(),
- G_TYPE_INVALID,
- G_TYPE_INVALID);
+ guint64(stream_data.handle()),
+ (type ? type : "application/octet-stream"),
+ stream_data.url(),
+ &error);
if (!new_stream_result) {
g_critical("Call to org.openvrml.Browser.NewStream failed: %s",
error->message);
@@ -832,7 +827,7 @@
dbus_g_proxy_call_no_reply(stream_data.browser(),
"Write",
- G_TYPE_UINT64, stream_data.handle(),
+ G_TYPE_UINT64, guint64(stream_data.handle()),
DBUS_TYPE_G_UCHAR_ARRAY, &array,
G_TYPE_INVALID);
g_assert(size == 1);
@@ -863,16 +858,14 @@
boost::ignore_unused_variable_warning(browser_factory_guard);
char * browser_path = 0;
- if (!dbus_g_proxy_call(browser_factory,
- "CreateControl",
- error,
- G_TYPE_STRING, host_name,
- DBUS_TYPE_G_OBJECT_PATH, host_path,
- G_TYPE_UINT64, host_id,
- G_TYPE_BOOLEAN, false,
- G_TYPE_INVALID,
- DBUS_TYPE_G_OBJECT_PATH, &browser_path,
- G_TYPE_INVALID)) {
+ if (!org_openvrml_BrowserFactory_create_control(
+ browser_factory,
+ host_name,
+ host_path,
+ host_id,
+ false,
+ &browser_path,
+ error)) {
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-26 07:36:54
|
Revision: 3751
http://openvrml.svn.sourceforge.net/openvrml/?rev=3751&view=rev
Author: braden
Date: 2008-10-26 07:36:50 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Set GErrors on failure of the XEmbed browser control's stream handling functions.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/browser.cpp
trunk/src/openvrml-xembed/browser.h
trunk/src/openvrml-xembed/browserfactory.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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-26 07:30:36 UTC (rev 3750)
+++ trunk/ChangeLog 2008-10-26 07:36:50 UTC (rev 3751)
@@ -1,3 +1,28 @@
+2008-10-26 Braden McDaniel <br...@en...>
+
+ Set GErrors on failure of the XEmbed browser control's stream
+ handling functions.
+
+ * src/openvrml-xembed/browser.cpp
+ (openvrml_xembed_error_quark()): Moved from browserfactory.cpp.
+ (openvrml_xembed_browser_new_stream(OpenvrmlXembedStreamClient *,
+ guint64, const char *, const char *, GError **)): Set an
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM GError if the new stream URI
+ is not recognized.
+ (openvrml_xembed_browser_destroy_stream(OpenvrmlXembedStreamClient *,
+ guint64, GError **)): Set an OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM
+ GError if the stream id is not recognized.
+ (openvrml_xembed_browser_write(OpenvrmlXembedStreamClient *,
+ guint64, const GArray *, GError **)): Set an
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM GError if the stream id is
+ not recognized.
+ * src/openvrml-xembed/browser.h
+ (OpenvrmlXembedError): Moved from browserfactory.cpp; added
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM.
+ * src/openvrml-xembed/browserfactory.cpp
+ (openvrml_xembed_error_quark()): Moved to browser.cpp.
+ (OpenvrmlXembedError): Moved to browser.h.
+
2008-10-25 Braden McDaniel <br...@en...>
Ensure the XEmbed control host identifier is consistently treated
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp 2008-10-26 07:30:36 UTC (rev 3750)
+++ trunk/src/openvrml-xembed/browser.cpp 2008-10-26 07:36:50 UTC (rev 3751)
@@ -37,6 +37,11 @@
using namespace boost::multi_index::detail; // for scope_guard
+GQuark openvrml_xembed_error_quark()
+{
+ return g_quark_from_static_string("openvrml-xembed-error-quark");
+}
+
extern "C" {
//
// GObject overrides
@@ -558,16 +563,13 @@
return browser;
}
-/**
- * @todo We need to do something with the GError here.
- */
gboolean
openvrml_xembed_browser_new_stream(
OpenvrmlXembedStreamClient * const stream_client,
const guint64 stream_id,
- const char * type,
+ const char * const type,
const char * const url,
- GError ** /* error */)
+ GError ** const error)
{
using namespace openvrml_xembed;
using boost::shared_ptr;
@@ -587,7 +589,12 @@
browser->priv->uninitialized_streambuf_map->front();
got_initial_stream = true;
} else {
- g_warning("Attempt to create an unrequested stream");
+ g_set_error(
+ error,
+ OPENVRML_XEMBED_ERROR,
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM,
+ "Attempt to create a stream that has not been requested: %s",
+ url);
return false;
}
}
@@ -596,14 +603,11 @@
return true;
}
-/**
- * @todo We need to do something with the GError here.
- */
gboolean
openvrml_xembed_browser_destroy_stream(
OpenvrmlXembedStreamClient * const stream_client,
const guint64 stream_id,
- GError ** /* error */)
+ GError ** const error)
{
using namespace openvrml_xembed;
using boost::shared_ptr;
@@ -614,8 +618,12 @@
const shared_ptr<plugin_streambuf> streambuf =
browser->priv->streambuf_map->find(stream_id);
if (!streambuf) {
- g_warning("Attempt to destroy a nonexistent stream (with stream ID "
- "%lu)", stream_id);
+ g_set_error(
+ error,
+ OPENVRML_XEMBED_ERROR,
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM,
+ "Attempt to destroy a nonexistent stream: %lu",
+ stream_id);
return false;
}
streambuf->buf_.set_eof();
@@ -623,14 +631,11 @@
return true;
}
-/**
- * @todo We need to do something with the GError here.
- */
gboolean
openvrml_xembed_browser_write(OpenvrmlXembedStreamClient * const stream_client,
const guint64 stream_id,
const GArray * const data,
- GError ** /* error */)
+ GError ** const error)
{
using namespace openvrml_xembed;
using boost::shared_ptr;
@@ -641,7 +646,12 @@
const shared_ptr<plugin_streambuf> streambuf =
browser->priv->streambuf_map->find(stream_id);
if (!streambuf) {
- g_warning("Attempt to write to a nonexistent stream");
+ g_set_error(
+ error,
+ OPENVRML_XEMBED_ERROR,
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM,
+ "Attempt to write to a nonexistent stream: %lu",
+ stream_id);
return false;
}
for (size_t i = 0; i < data->len; ++i) {
Modified: trunk/src/openvrml-xembed/browser.h
===================================================================
--- trunk/src/openvrml-xembed/browser.h 2008-10-26 07:30:36 UTC (rev 3750)
+++ trunk/src/openvrml-xembed/browser.h 2008-10-26 07:36:50 UTC (rev 3751)
@@ -27,6 +27,16 @@
G_BEGIN_DECLS
+# define OPENVRML_XEMBED_ERROR openvrml_xembed_error_quark()
+
+GQuark openvrml_xembed_error_quark(void);
+
+typedef enum {
+ OPENVRML_XEMBED_ERROR_FAILED,
+ OPENVRML_XEMBED_ERROR_NO_MEMORY,
+ OPENVRML_XEMBED_ERROR_UNKNOWN_STREAM
+} OpenvrmlXembedError;
+
# define OPENVRML_XEMBED_TYPE_BROWSER (openvrml_xembed_browser_get_type ())
# define OPENVRML_XEMBED_BROWSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), OPENVRML_XEMBED_TYPE_BROWSER, OpenvrmlXembedBrowser))
# define OPENVRML_XEMBED_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), OPENVRML_XEMBED_TYPE_BROWSER, OpenvrmlXembedBrowserClass))
Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp 2008-10-26 07:30:36 UTC (rev 3750)
+++ trunk/src/openvrml-xembed/browserfactory.cpp 2008-10-26 07:36:50 UTC (rev 3751)
@@ -36,17 +36,6 @@
using namespace boost::multi_index::detail; // for scope_guard
-# define OPENVRML_XEMBED_ERROR openvrml_xembed_error_quark()
-GQuark openvrml_xembed_error_quark()
-{
- return g_quark_from_static_string("openvrml-xembed-error-quark");
-}
-
-enum OpenvrmlXembedError {
- OPENVRML_XEMBED_ERROR_FAILED,
- OPENVRML_XEMBED_ERROR_NO_MEMORY
-};
-
G_DEFINE_TYPE(OpenvrmlXembedBrowserFactory,
openvrml_xembed_browser_factory,
G_TYPE_OBJECT);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-26 07:50:48
|
Revision: 3753
http://openvrml.svn.sourceforge.net/openvrml/?rev=3753&view=rev
Author: braden
Date: 2008-10-26 07:50:46 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
"got_initial_stream" flag needs to be per-XEmbed browser instance.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/browser.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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-26 07:48:14 UTC (rev 3752)
+++ trunk/ChangeLog 2008-10-26 07:50:46 UTC (rev 3753)
@@ -1,5 +1,15 @@
2008-10-26 Braden McDaniel <br...@en...>
+ "got_initial_stream" flag needs to be per-XEmbed browser instance.
+
+ * src/openvrml-xembed/browser.cpp
+ (OpenvrmlXembedBrowserPrivate_): Added member got_initial_stream.
+ (openvrml_xembed_browser_new_stream(OpenvrmlXembedStreamClient *,
+ guint64, const char *, const char *, GError **)): Use the
+ got_initial_stream private member instead of a static variable.
+
+2008-10-26 Braden McDaniel <br...@en...>
+
Set GErrors on failure of the XEmbed browser control's stream
handling functions.
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752
Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp 2008-10-26 07:48:14 UTC (rev 3752)
+++ trunk/src/openvrml-xembed/browser.cpp 2008-10-26 07:50:46 UTC (rev 3753)
@@ -209,6 +209,7 @@
openvrml_xembed::plugin_streambuf_map * streambuf_map;
boost::thread * initial_stream_reader_thread;
bool expect_initial_stream;
+ bool got_initial_stream;
};
# define OPENVRML_XEMBED_BROWSER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OPENVRML_XEMBED_TYPE_BROWSER, OpenvrmlXembedBrowserPrivate))
@@ -216,7 +217,6 @@
void openvrml_xembed_browser_init(OpenvrmlXembedBrowser * const vrml_browser)
{
vrml_browser->priv = OPENVRML_XEMBED_BROWSER_GET_PRIVATE(vrml_browser);
-
}
namespace {
@@ -580,14 +580,13 @@
shared_ptr<plugin_streambuf> streambuf =
browser->priv->uninitialized_streambuf_map->find(url);
- static bool got_initial_stream = false;
if (!streambuf) {
- if (!got_initial_stream) {
+ if (!browser->priv->got_initial_stream) {
g_assert(
browser->priv->uninitialized_streambuf_map->size() == 1);
streambuf =
browser->priv->uninitialized_streambuf_map->front();
- got_initial_stream = true;
+ browser->priv->got_initial_stream = true;
} else {
g_set_error(
error,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-10-26 17:06:25
|
Revision: 3755
http://openvrml.svn.sourceforge.net/openvrml/?rev=3755&view=rev
Author: braden
Date: 2008-10-26 17:06:22 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Updates for 0.17.10 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-26 16:55:51 UTC (rev 3754)
+++ trunk/ChangeLog 2008-10-26 17:06:22 UTC (rev 3755)
@@ -1,5 +1,12 @@
2008-10-26 Braden McDaniel <br...@en...>
+ Updates for 0.17.10 release.
+
+ * NEWS
+ * README
+
+2008-10-26 Braden McDaniel <br...@en...>
+
"got_initial_stream" flag needs to be per-XEmbed browser instance.
* src/openvrml-xembed/browser.cpp
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-26 16:55:51 UTC (rev 3754)
+++ trunk/NEWS 2008-10-26 17:06:22 UTC (rev 3755)
@@ -1,3 +1,9 @@
+Changes new in version 0.17.10, 26 October, 2008
+========================================================================
+
+- Fixed 32-/64-bit parity and stream handling bugs in openvrml-xembed.
+
+
Changes new in version 0.17.9, 9 October, 2008
========================================================================
Modified: trunk/README
===================================================================
--- trunk/README 2008-10-26 16:55:51 UTC (rev 3754)
+++ trunk/README 2008-10-26 17:06:22 UTC (rev 3755)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.17.9
+OpenVRML library version 0.17.10
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Braden McDaniel <br...@en...>
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-03 07:55:58
|
Revision: 3758
http://openvrml.svn.sourceforge.net/openvrml/?rev=3758&view=rev
Author: braden
Date: 2008-11-03 07:55:53 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Doc-comment fix.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/local/proto.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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-03 07:49:36 UTC (rev 3757)
+++ trunk/ChangeLog 2008-11-03 07:55:53 UTC (rev 3758)
@@ -1,3 +1,8 @@
+2008-11-03 Braden McDaniel <br...@en...>
+
+ * src/libopenvrml/openvrml/local/proto.cpp
+ (proto_node::do_shutdown(double)): Doc-comment fix.
+
2008-10-26 Braden McDaniel <br...@en...>
Updates for 0.17.10 release.
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
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-03 07:49:36 UTC (rev 3757)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-03 07:55:53 UTC (rev 3758)
@@ -1403,7 +1403,7 @@
}
/**
- * @brief Initialize.
+ * @brief Shutdown.
*
* @param[in] timestamp the current time.
*/
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-03 08:16:37
|
Revision: 3761
http://openvrml.svn.sourceforge.net/openvrml/?rev=3761&view=rev
Author: braden
Date: 2008-11-03 08:16:32 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Only render a node if the scene pointer is nonnull (i.e., the node has been initialized).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/node/vrml97/image_texture.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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-03 08:12:19 UTC (rev 3760)
+++ trunk/ChangeLog 2008-11-03 08:16:32 UTC (rev 3761)
@@ -1,5 +1,27 @@
2008-11-03 Braden McDaniel <br...@en...>
+ Only render a node if the scene pointer is nonnull (i.e., the node
+ has been initialized).
+
+ * src/libopenvrml/openvrml/node.cpp
+ (openvrml::appearance_node::render_appearance(viewer &,
+ rendering_context)): Check that the scene pointer is nonnull.
+ (openvrml::child_node::render_child(viewer &, rendering_context)):
+ Check that the scene pointer is nonnull.
+ (openvrml::geometry_node::render_geometry(viewer &,
+ rendering_context)): Check that the scene pointer is nonnull.
+ (openvrml::scoped_light_node::render_scoped_light(viewer &)):
+ Check that the scene pointer is nonnull.
+ (openvrml::texture_node::render_texture(viewer &)): Check that the
+ scene pointer is nonnull.
+ (openvrml::texture_transform_node::render_texture_transform(viewer&)):
+ Check that the scene pointer is nonnull.
+ * src/node/vrml97/image_texture.cpp
+ (image_texture_node::update_texture()): Assert that the scene
+ pointer is nonnull (i.e., the node has been initialized).
+
+2008-11-03 Braden McDaniel <br...@en...>
+
* src/libopenvrml/openvrml/local/proto.cpp
(proto_node::do_shutdown(double)): Doc-comment fix.
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
+ /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
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2008-11-03 08:12:19 UTC (rev 3760)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2008-11-03 08:16:32 UTC (rev 3761)
@@ -3113,8 +3113,10 @@
void openvrml::appearance_node::render_appearance(viewer & v,
rendering_context context)
{
- this->do_render_appearance(v, context);
- this->modified(false);
+ if (this->scene()) {
+ this->do_render_appearance(v, context);
+ this->modified(false);
+ }
}
/**
@@ -3378,8 +3380,10 @@
void openvrml::child_node::render_child(viewer & v,
const rendering_context context)
{
- this->do_render_child(v, context);
- this->modified(false);
+ if (this->scene()) {
+ this->do_render_child(v, context);
+ this->modified(false);
+ }
}
/**
@@ -3738,20 +3742,23 @@
openvrml::geometry_node::render_geometry(viewer & v,
rendering_context context)
{
- boost::mutex::scoped_lock lock(this->geometry_reference_mutex_);
+ if (this->scene()) {
+ boost::mutex::scoped_lock lock(this->geometry_reference_mutex_);
- if (this->geometry_reference != 0 && this->modified()) {
- v.remove_object(this->geometry_reference);
- this->geometry_reference = 0;
- }
+ if (this->geometry_reference != 0 && this->modified()) {
+ v.remove_object(this->geometry_reference);
+ this->geometry_reference = 0;
+ }
- if (this->geometry_reference != 0) {
- v.insert_reference(this->geometry_reference);
- } else {
- this->geometry_reference = this->do_render_geometry(v, context);
- this->modified(false);
+ if (this->geometry_reference != 0) {
+ v.insert_reference(this->geometry_reference);
+ } else {
+ this->geometry_reference = this->do_render_geometry(v, context);
+ this->modified(false);
+ }
+ return this->geometry_reference;
}
- return this->geometry_reference;
+ return 0;
}
/**
@@ -4345,7 +4352,9 @@
*/
void openvrml::scoped_light_node::render_scoped_light(viewer & v)
{
- this->do_render_scoped_light(v);
+ if (this->scene()) {
+ this->do_render_scoped_light(v);
+ }
}
/**
@@ -4461,21 +4470,24 @@
openvrml::viewer::texture_object_t
openvrml::texture_node::render_texture(viewer & v)
{
- boost::mutex::scoped_lock lock(this->texture_reference_mutex_);
+ if (this->scene()) {
+ boost::mutex::scoped_lock lock(this->texture_reference_mutex_);
- if (this->texture_reference != 0 && this->modified()) {
- v.remove_texture_object(this->texture_reference);
- this->texture_reference = 0;
- }
+ if (this->texture_reference != 0 && this->modified()) {
+ v.remove_texture_object(this->texture_reference);
+ this->texture_reference = 0;
+ }
- if (this->texture_reference != 0) {
- v.insert_texture_reference(this->texture_reference,
- this->image().comp());
- } else {
- this->texture_reference = this->do_render_texture(v);
- this->modified(false);
+ if (this->texture_reference != 0) {
+ v.insert_texture_reference(this->texture_reference,
+ this->image().comp());
+ } else {
+ this->texture_reference = this->do_render_texture(v);
+ this->modified(false);
+ }
+ return this->texture_reference;
}
- return this->texture_reference;
+ return 0;
}
/**
@@ -4608,8 +4620,10 @@
*/
void openvrml::texture_transform_node::render_texture_transform(viewer & v)
{
- this->do_render_texture_transform(v);
- this->modified(false);
+ if (this->scene()) {
+ this->do_render_texture_transform(v);
+ this->modified(false);
+ }
}
/**
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760
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
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760
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
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760
Modified: trunk/src/node/vrml97/image_texture.cpp
===================================================================
--- trunk/src/node/vrml97/image_texture.cpp 2008-11-03 08:12:19 UTC (rev 3760)
+++ trunk/src/node/vrml97/image_texture.cpp 2008-11-03 08:16:32 UTC (rev 3761)
@@ -243,10 +243,7 @@
*/
void image_texture_node::update_texture()
{
- //
- // If the node hasn't been initialized yet, bail.
- //
- if (!this->scene()) { return; }
+ assert(this->scene());
if (this->texture_needs_update) {
using openvrml_node_vrml97::image_stream_listener;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-09 05:24:58
|
Revision: 3763
http://openvrml.svn.sourceforge.net/openvrml/?rev=3763&view=rev
Author: braden
Date: 2008-11-09 05:24:53 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Acquire a read lock on the scene pointer mutex when rendering a node.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/node.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-06 07:55:28 UTC (rev 3762)
+++ trunk/ChangeLog 2008-11-09 05:24:53 UTC (rev 3763)
@@ -1,3 +1,27 @@
+2008-11-09 Braden McDaniel <br...@en...>
+
+ Acquire a read lock on the scene pointer mutex when rendering a
+ node.
+
+ * src/libopenvrml/openvrml/node.cpp
+ (openvrml::node::scene_mutex()): Get the scene pointer mutex.
+ (openvrml::appearance_node::render_appearance(viewer &,
+ rendering_context)): Acquire a read lock on the scene pointer
+ mutex.
+ (openvrml::child_node::render_child(viewer &, rendering_context)):
+ Acquire a read lock on the scene pointer mutex.
+ (openvrml::geometry_node::render_geometry(viewer &,
+ rendering_context)): Acquire a read lock on the scene pointer
+ mutex.
+ (openvrml::scoped_light_node::render_scoped_light(viewer &)):
+ Acquire a read lock on the scene pointer mutex.
+ (openvrml::texture_node::render_texture(viewer &)): Acquire a read
+ lock on the scene pointer mutex.
+ (openvrml::texture_transform_node::render_texture_transform(viewer&)):
+ Acquire a read lock on the scene pointer mutex.
+ * src/libopenvrml/openvrml/node.h
+ (openvrml::node): Added protected accessor for the scene mutex.
+
2008-11-03 Braden McDaniel <br...@en...>
Only render a node if the scene pointer is nonnull (i.e., the node
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2008-11-06 07:55:28 UTC (rev 3762)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2008-11-09 05:24:53 UTC (rev 3763)
@@ -2589,6 +2589,16 @@
emitter.emit_event(timestamp);
}
+/**
+ * @brief The @c scene mutex.
+ *
+ * @return the @c scene mutex.
+ */
+openvrml::read_write_mutex & openvrml::node::scene_mutex()
+{
+ return this->scene_mutex_;
+}
+
namespace {
struct OPENVRML_LOCAL field_printer_ {
field_printer_(const openvrml::node & node,
@@ -3113,6 +3123,7 @@
void openvrml::appearance_node::render_appearance(viewer & v,
rendering_context context)
{
+ read_write_mutex::scoped_read_lock lock(this->scene_mutex());
if (this->scene()) {
this->do_render_appearance(v, context);
this->modified(false);
@@ -3380,6 +3391,7 @@
void openvrml::child_node::render_child(viewer & v,
const rendering_context context)
{
+ read_write_mutex::scoped_read_lock lock(this->scene_mutex());
if (this->scene()) {
this->do_render_child(v, context);
this->modified(false);
@@ -3742,6 +3754,7 @@
openvrml::geometry_node::render_geometry(viewer & v,
rendering_context context)
{
+ read_write_mutex::scoped_read_lock lock(this->scene_mutex());
if (this->scene()) {
boost::mutex::scoped_lock lock(this->geometry_reference_mutex_);
@@ -4352,6 +4365,7 @@
*/
void openvrml::scoped_light_node::render_scoped_light(viewer & v)
{
+ read_write_mutex::scoped_read_lock lock(this->scene_mutex());
if (this->scene()) {
this->do_render_scoped_light(v);
}
@@ -4470,6 +4484,7 @@
openvrml::viewer::texture_object_t
openvrml::texture_node::render_texture(viewer & v)
{
+ read_write_mutex::scoped_read_lock lock(this->scene_mutex());
if (this->scene()) {
boost::mutex::scoped_lock lock(this->texture_reference_mutex_);
@@ -4620,6 +4635,7 @@
*/
void openvrml::texture_transform_node::render_texture_transform(viewer & v)
{
+ read_write_mutex::scoped_read_lock lock(this->scene_mutex());
if (this->scene()) {
this->do_render_texture_transform(v);
this->modified(false);
Modified: trunk/src/libopenvrml/openvrml/node.h
===================================================================
--- trunk/src/libopenvrml/openvrml/node.h 2008-11-06 07:55:28 UTC (rev 3762)
+++ trunk/src/libopenvrml/openvrml/node.h 2008-11-09 05:24:53 UTC (rev 3763)
@@ -552,6 +552,8 @@
const boost::shared_ptr<openvrml::scope> & scope)
OPENVRML_NOTHROW;
+ read_write_mutex & scene_mutex();
+
private:
virtual void do_initialize(double timestamp)
OPENVRML_THROW1(std::bad_alloc);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-09 05:31:53
|
Revision: 3765
http://openvrml.svn.sourceforge.net/openvrml/?rev=3765&view=rev
Author: braden
Date: 2008-11-09 05:31:48 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Updated to 20081109 release of Autoconf GL Macros. This addresses issues with the test for the varargs GLU tesselator callback signature on Mac OS X 10.4.
Modified Paths:
--------------
trunk/ChangeLog
trunk/m4/ax_check_gl.m4
trunk/m4/ax_check_glu.m4
trunk/m4/ax_lang_compiler_ms.m4
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
/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
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-09 05:27:20 UTC (rev 3764)
+++ trunk/ChangeLog 2008-11-09 05:31:48 UTC (rev 3765)
@@ -1,5 +1,15 @@
2008-11-09 Braden McDaniel <br...@en...>
+ Updated to 20081109 release of Autoconf GL Macros. This addresses
+ issues with the test for the varargs GLU tesselator callback
+ signature on Mac OS X 10.4.
+
+ * m4/ax_check_gl.m4
+ * m4/ax_check_glu.m4
+ * m4/ax_lang_compiler_ms.m4
+
+2008-11-09 Braden McDaniel <br...@en...>
+
Acquire a read lock on the scene pointer mutex when rendering a
node.
Modified: trunk/m4/ax_check_gl.m4
===================================================================
--- trunk/m4/ax_check_gl.m4 2008-11-09 05:27:20 UTC (rev 3764)
+++ trunk/m4/ax_check_gl.m4 2008-11-09 05:31:48 UTC (rev 3765)
@@ -1,41 +1,43 @@
-dnl
-dnl AX_CHECK_GL
-dnl
-dnl Check for an OpenGL implementation. If GL is found, the required compiler
-dnl and linker flags are included in the output variables "GL_CFLAGS" and
-dnl "GL_LIBS", respectively. If no usable GL implementation is found, "no_gl"
-dnl is set to "yes".
-dnl
-dnl If the header "GL/gl.h" is found, "HAVE_GL_GL_H" is defined. If the header
-dnl "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
-dnl definitions may not be mutually exclusive.
-dnl
-dnl version: 2.2
-dnl author: Braden McDaniel <br...@en...>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-dnl 02110-1301, USA.
-dnl
-dnl As a special exception, the you may copy, distribute and modify the
-dnl configure scripts that are the output of Autoconf when processing
-dnl the Macro. You need not follow the terms of the GNU General Public
-dnl License when using or distributing such scripts.
-dnl
+# -*- mode: autoconf -*-
+#
+# AX_CHECK_GL
+#
+# Check for an OpenGL implementation. If GL is found, the required compiler
+# and linker flags are included in the output variables "GL_CFLAGS" and
+# "GL_LIBS", respectively. If no usable GL implementation is found, "no_gl"
+# is set to "yes".
+#
+# If the header "GL/gl.h" is found, "HAVE_GL_GL_H" is defined. If the header
+# "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
+# definitions may not be mutually exclusive.
+#
+# version: 2.3
+# author: Braden McDaniel <br...@en...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception, the you may copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts.
+#
AC_DEFUN([AX_CHECK_GL],
-[AC_REQUIRE([AC_CANONICAL_HOST])
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PATH_X])dnl
+AC_REQUIRE([AC_PROG_SED])dnl
AC_REQUIRE([ACX_PTHREAD])dnl
AC_LANG_PUSH([C])
@@ -47,16 +49,16 @@
# Use x_includes and x_libraries if they have been set (presumably by
# AC_PATH_X).
#
-AS_IF([test "X$no_x" != "Xyes"],
- [AS_IF([test -n "$x_includes"],
- [GL_CFLAGS="-I${x_includes} ${GL_CFLAGS}"])]
- AS_IF([test -n "$x_libraries"],
- [GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"]))
+AS_IF([test X$no_x != Xyes],
+ [AS_IF([test -n $x_includes],
+ [GL_CFLAGS="-I$x_includes $GL_CFLAGS"])]
+ AS_IF([test -n $x_libraries],
+ [GL_LIBS="-L$x_libraries -lX11 $GL_LIBS"]))
-ax_save_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}"
+ax_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h])
-CPPFLAGS="${ax_save_CPPFLAGS}"
+CPPFLAGS=$ax_save_CPPFLAGS
AC_CHECK_HEADERS([windows.h])
@@ -75,42 +77,42 @@
[[glBegin(0)]])])
AC_CACHE_CHECK([for OpenGL library], [ax_cv_check_gl_libgl],
-[ax_cv_check_gl_libgl="no"
+[ax_cv_check_gl_libgl=no
case $host_cpu in
x86_64) ax_check_gl_libdir=lib64 ;;
*) ax_check_gl_libdir=lib ;;
esac
-ax_save_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}"
-ax_save_LIBS="${LIBS}"
+ax_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
+ax_save_LIBS=$LIBS
LIBS=""
ax_check_libs="-lopengl32 -lGL"
for ax_lib in ${ax_check_libs}; do
AS_IF([test X$ax_compiler_ms = Xyes],
- [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
- [ax_try_lib="${ax_lib}"])
- LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+ [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
+ [ax_try_lib=$ax_lib])
+ LIBS="$ax_try_lib $GL_LIBS $ax_save_LIBS"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib}"; break],
- [ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}"
-AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_nvidia_flags}"; break],
- [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}"
-AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break])])])
+ [ax_cv_check_gl_libgl=$ax_try_lib; break],
+ [ax_check_gl_nvidia_flags="-L/usr/$ax_check_gl_libdir/nvidia" LIBS="$ax_try_lib $ax_check_gl_nvidia_flags $GL_LIBS $ax_save_LIBS"
+ AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl="$ax_try_lib $ax_check_gl_nvidia_flags"; break],
+ [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="$ax_try_lib $ax_check_gl_dylib_flag $GL_LIBS $ax_save_LIBS"
+ AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl="$ax_try_lib $ax_check_gl_dylib_flag"; break])])])
done
-AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes],
-[LIBS='-framework OpenGL'
-AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="$LIBS"])])
+AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a X$no_x = Xyes],
+ [LIBS='-framework OpenGL'
+ AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl=$LIBS])])
-LIBS=${ax_save_LIBS}
-CPPFLAGS=${ax_save_CPPFLAGS}])
+LIBS=$ax_save_LIBS
+CPPFLAGS=$ax_save_CPPFLAGS])
AS_IF([test "X$ax_cv_check_gl_libgl" = Xno],
[no_gl=yes; GL_CFLAGS=""; GL_LIBS=""],
- [GL_LIBS="${ax_cv_check_gl_libgl} ${GL_LIBS}"])
+ [GL_LIBS="$ax_cv_check_gl_libgl $GL_LIBS"])
AC_LANG_POP([C])
AC_SUBST([GL_CFLAGS])
Modified: trunk/m4/ax_check_glu.m4
===================================================================
--- trunk/m4/ax_check_glu.m4 2008-11-09 05:27:20 UTC (rev 3764)
+++ trunk/m4/ax_check_glu.m4 2008-11-09 05:31:48 UTC (rev 3765)
@@ -1,51 +1,52 @@
-dnl
-dnl AX_CHECK_GLU
-dnl
-dnl Check for GLU. If GLU is found, the required preprocessor and linker flags
-dnl are included in the output variables "GLU_CFLAGS" and "GLU_LIBS",
-dnl respectively. If no GLU implementation is found, "no_glu" is set to "yes".
-dnl
-dnl If the header "GL/glu.h" is found, "HAVE_GL_GLU_H" is defined. If the
-dnl header "OpenGL/glu.h" is found, HAVE_OPENGL_GLU_H is defined. These
-dnl preprocessor definitions may not be mutually exclusive.
-dnl
-dnl Some implementations (in particular, some versions of Mac OS X) are known
-dnl to treat the GLU tesselator callback function type as "GLvoid (*)(...)"
-dnl rather than the standard "GLvoid (*)()". If the former condition is
-dnl detected, this macro defines "HAVE_VARARGS_GLU_TESSCB".
-dnl
-dnl version: 2.1
-dnl author: Braden McDaniel <br...@en...>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-dnl 02110-1301, USA.
-dnl
-dnl As a special exception, the you may copy, distribute and modify the
-dnl configure scripts that are the output of Autoconf when processing
-dnl the Macro. You need not follow the terms of the GNU General Public
-dnl License when using or distributing such scripts.
-dnl
+# -*- mode: autoconf -*-
+#
+# AX_CHECK_GLU
+#
+# Check for GLU. If GLU is found, the required preprocessor and linker flags
+# are included in the output variables "GLU_CFLAGS" and "GLU_LIBS",
+# respectively. If no GLU implementation is found, "no_glu" is set to "yes".
+#
+# If the header "GL/glu.h" is found, "HAVE_GL_GLU_H" is defined. If the
+# header "OpenGL/glu.h" is found, HAVE_OPENGL_GLU_H is defined. These
+# preprocessor definitions may not be mutually exclusive.
+#
+# Some implementations (in particular, some versions of Mac OS X) are known
+# to treat the GLU tesselator callback function type as "GLvoid (*)(...)"
+# rather than the standard "GLvoid (*)()". If the former condition is
+# detected, this macro defines "HAVE_VARARGS_GLU_TESSCB".
+#
+# version: 2.2
+# author: Braden McDaniel <br...@en...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception, the you may copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts.
+#
AC_DEFUN([AX_CHECK_GLU],
[AC_REQUIRE([AX_CHECK_GL])dnl
AC_REQUIRE([AC_PROG_CXX])dnl
-GLU_CFLAGS="${GL_CFLAGS}"
+GLU_CFLAGS=$GL_CFLAGS
-ax_save_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}"
+ax_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h])
-CPPFLAGS="${ax_save_CPPFLAGS}"
+CPPFLAGS=$ax_save_CPPFLAGS
m4_define([AX_CHECK_GLU_PROGRAM],
[AC_LANG_PROGRAM([[
@@ -62,16 +63,16 @@
[[gluBeginCurve(0)]])])
AC_CACHE_CHECK([for OpenGL Utility library], [ax_cv_check_glu_libglu],
-[ax_cv_check_glu_libglu="no"
-ax_save_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}"
-ax_save_LIBS="${LIBS}"
+[ax_cv_check_glu_libglu=no
+ax_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
+ax_save_LIBS=$LIBS
#
# First, check for the possibility that everything we need is already in
# GL_LIBS.
#
-LIBS="${GL_LIBS} ${ax_save_LIBS}"
+LIBS="$GL_LIBS $ax_save_LIBS"
#
# libGLU typically links with libstdc++ on POSIX platforms.
# However, setting the language to C++ means that test program
@@ -81,55 +82,54 @@
AC_LANG_PUSH([C++])
AS_IF([test X$ax_compiler_ms = Xyes],
[AC_LANG_PUSH([C])])
-AC_LINK_IFELSE(
-[AX_CHECK_GLU_PROGRAM],
-[ax_cv_check_glu_libglu=yes],
-[LIBS=""
-ax_check_libs="-lglu32 -lGLU"
-for ax_lib in ${ax_check_libs}; do
- AS_IF([test X$ax_compiler_ms = Xyes],
- [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
- [ax_try_lib="${ax_lib}"])
- LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
- AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
- [ax_cv_check_glu_libglu="${ax_try_lib}"; break])
-done
-])
+AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
+ [ax_cv_check_glu_libglu=yes],
+ [LIBS=""
+ ax_check_libs="-lglu32 -lGLU"
+ for ax_lib in ${ax_check_libs}; do
+ AS_IF([test X$ax_compiler_ms = Xyes],
+ [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
+ [ax_try_lib=$ax_lib])
+ LIBS="$ax_try_lib $GL_LIBS $ax_save_LIBS"
+ AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
+ [ax_cv_check_glu_libglu=$ax_try_lib; break])
+ done])
AS_IF([test X$ax_compiler_ms = Xyes],
[AC_LANG_POP([C])])
AC_LANG_POP([C++])
-LIBS=${ax_save_LIBS}
-CPPFLAGS=${ax_save_CPPFLAGS}])
+LIBS=$ax_save_LIBS
+CPPFLAGS=$ax_save_CPPFLAGS])
AS_IF([test "X$ax_cv_check_glu_libglu" = Xno],
[no_glu=yes; GLU_CFLAGS=""; GLU_LIBS=""],
[AS_IF([test "X$ax_cv_check_glu_libglu" = Xyes],
- [GLU_LIBS="$GL_LIBS"],
- [GLU_LIBS="${ax_cv_check_glu_libglu} ${GL_LIBS}"])])
+ [GLU_LIBS=$GL_LIBS],
+ [GLU_LIBS="$ax_cv_check_glu_libglu $GL_LIBS"])])
AC_SUBST([GLU_CFLAGS])
AC_SUBST([GLU_LIBS])
#
# Some versions of Mac OS X include a broken interpretation of the GLU
-# tesselation callback function signature.
+# tesselation callback function signature when using the C++ compiler.
#
AS_IF([test "X$ax_cv_check_glu_libglu" != Xno],
-[AC_CACHE_CHECK([for varargs GLU tesselator callback function type],
- [ax_cv_varargs_glu_tesscb],
-[ax_cv_varargs_glu_tesscb=no
-ax_save_CFLAGS="$CFLAGS"
-CFLAGS="$GL_CFLAGS $CFLAGS"
-AC_COMPILE_IFELSE(
-[AC_LANG_PROGRAM([[
+ [AC_CACHE_CHECK([for varargs GLU tesselator callback function type],
+ [ax_cv_varargs_glu_tesscb],
+ [AC_LANG_PUSH([C++])
+ ax_cv_varargs_glu_tesscb=no
+ ax_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$GL_CFLAGS $CXXFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
# ifdef HAVE_GL_GLU_H
# include <GL/glu.h>
# else
# include <OpenGL/glu.h>
# endif]],
- [[GLvoid (*func)(...); gluTessCallback(0, 0, func)]])],
-[ax_cv_varargs_glu_tesscb=yes])
-CFLAGS="$ax_save_CFLAGS"])
-AS_IF([test X$ax_cv_varargs_glu_tesscb = Xyes],
- [AC_DEFINE([HAVE_VARARGS_GLU_TESSCB], [1],
- [Use nonstandard varargs form for the GLU tesselator callback])])])
+ [[GLvoid (*func)(...); gluTessCallback(0, 0, func)]])],
+ [ax_cv_varargs_glu_tesscb=yes])
+ CXXFLAGS=$ax_save_CXXFLAGS
+ AC_LANG_POP([C++])])
+ AS_IF([test X$ax_cv_varargs_glu_tesscb = Xyes],
+ [AC_DEFINE([HAVE_VARARGS_GLU_TESSCB], [1],
+ [Use nonstandard varargs form for the GLU tesselator callback])])])
])
Modified: trunk/m4/ax_lang_compiler_ms.m4
===================================================================
--- trunk/m4/ax_lang_compiler_ms.m4 2008-11-09 05:27:20 UTC (rev 3764)
+++ trunk/m4/ax_lang_compiler_ms.m4 2008-11-09 05:31:48 UTC (rev 3765)
@@ -1,32 +1,33 @@
-dnl
-dnl Check whether the compiler for the current language is Microsoft.
-dnl
-dnl This macro is modeled after _AC_LANG_COMPILER_GNU in the GNU Autoconf
-dnl implementation.
-dnl
-dnl version: 1.0
-dnl author: Braden McDaniel <br...@en...>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-dnl 02110-1301, USA.
-dnl
-dnl As a special exception, the you may copy, distribute and modify the
-dnl configure scripts that are the output of Autoconf when processing
-dnl the Macro. You need not follow the terms of the GNU General Public
-dnl License when using or distributing such scripts.
-dnl
+# -*- mode: autoconf -*-
+#
+# Check whether the compiler for the current language is Microsoft.
+#
+# This macro is modeled after _AC_LANG_COMPILER_GNU in the GNU Autoconf
+# implementation.
+#
+# version: 1.0
+# author: Braden McDaniel <br...@en...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception, the you may copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts.
+#
AC_DEFUN([AX_LANG_COMPILER_MS],
[AC_CACHE_CHECK([whether we are using the Microsoft _AC_LANG compiler],
[ax_cv_[]_AC_LANG_ABBREV[]_compiler_ms],
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
+ /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
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
+ /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
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
+ /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
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
+ /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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-10 05:27:36
|
Revision: 3767
http://openvrml.svn.sourceforge.net/openvrml/?rev=3767&view=rev
Author: braden
Date: 2008-11-10 05:27:27 +0000 (Mon, 10 Nov 2008)
Log Message:
-----------
Updated to 20081110 release of Autoconf GL Macros. This addresses some quoting issues in the AX_CHECK_GL macro.
Modified Paths:
--------------
trunk/ChangeLog
trunk/m4/ax_check_gl.m4
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
/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
+ /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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-10 05:21:20 UTC (rev 3766)
+++ trunk/ChangeLog 2008-11-10 05:27:27 UTC (rev 3767)
@@ -1,3 +1,10 @@
+2008-11-10 Braden McDaniel <br...@en...>
+
+ Updated to 20081110 release of Autoconf GL Macros. This addresses
+ some quoting issues in the AX_CHECK_GL macro.
+
+ * m4/ax_check_gl.m4
+
2008-11-09 Braden McDaniel <br...@en...>
Updated to 20081109 release of Autoconf GL Macros. This addresses
Modified: trunk/m4/ax_check_gl.m4
===================================================================
--- trunk/m4/ax_check_gl.m4 2008-11-10 05:21:20 UTC (rev 3766)
+++ trunk/m4/ax_check_gl.m4 2008-11-10 05:27:27 UTC (rev 3767)
@@ -11,7 +11,7 @@
# "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
# definitions may not be mutually exclusive.
#
-# version: 2.3
+# version: 2.4
# author: Braden McDaniel <br...@en...>
#
# This program is free software; you can redistribute it and/or modify
@@ -50,9 +50,9 @@
# AC_PATH_X).
#
AS_IF([test X$no_x != Xyes],
- [AS_IF([test -n $x_includes],
+ [AS_IF([test -n "$x_includes"],
[GL_CFLAGS="-I$x_includes $GL_CFLAGS"])]
- AS_IF([test -n $x_libraries],
+ AS_IF([test -n "$x_libraries"],
[GL_LIBS="-L$x_libraries -lX11 $GL_LIBS"]))
ax_save_CPPFLAGS=$CPPFLAGS
@@ -87,7 +87,7 @@
ax_save_LIBS=$LIBS
LIBS=""
ax_check_libs="-lopengl32 -lGL"
-for ax_lib in ${ax_check_libs}; do
+for ax_lib in $ax_check_libs; do
AS_IF([test X$ax_compiler_ms = Xyes],
[ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
[ax_try_lib=$ax_lib])
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
+ /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
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
+ /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
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
+ /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
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
+ /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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-22 04:37:10
|
Revision: 3802
http://openvrml.svn.sourceforge.net/openvrml/?rev=3802&view=rev
Author: braden
Date: 2008-11-22 04:37:00 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Moved node implementations to dynamically loaded libraries.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/browser.h
trunk/src/libopenvrml/openvrml/exposedfield.h
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/read_write_mutex.h
Added Paths:
-----------
trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
trunk/src/node/vrml97/register_node_metatypes.cpp
trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
trunk/src/node/x3d-core/register_node_metatypes.cpp
trunk/src/node/x3d-dis/register_node_metatypes.cpp
trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp
trunk/src/node/x3d-geospatial/register_node_metatypes.cpp
trunk/src/node/x3d-grouping/register_node_metatypes.cpp
trunk/src/node/x3d-h-anim/register_node_metatypes.cpp
trunk/src/node/x3d-interpolation/register_node_metatypes.cpp
trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
trunk/src/node/x3d-networking/register_node_metatypes.cpp
trunk/src/node/x3d-nurbs/register_node_metatypes.cpp
trunk/src/node/x3d-rendering/register_node_metatypes.cpp
trunk/src/node/x3d-shape/register_node_metatypes.cpp
trunk/src/node/x3d-texturing/register_node_metatypes.cpp
Removed Paths:
-------------
trunk/src/libopenvrml/openvrml/vrml97node.cpp
trunk/src/libopenvrml/openvrml/vrml97node.h
trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp
trunk/src/libopenvrml/openvrml/x3d_cad_geometry.h
trunk/src/libopenvrml/openvrml/x3d_core.cpp
trunk/src/libopenvrml/openvrml/x3d_core.h
trunk/src/libopenvrml/openvrml/x3d_dis.cpp
trunk/src/libopenvrml/openvrml/x3d_dis.h
trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp
trunk/src/libopenvrml/openvrml/x3d_environmental_effects.h
trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp
trunk/src/libopenvrml/openvrml/x3d_event_utilities.h
trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp
trunk/src/libopenvrml/openvrml/x3d_geometry2d.h
trunk/src/libopenvrml/openvrml/x3d_geospatial.cpp
trunk/src/libopenvrml/openvrml/x3d_geospatial.h
trunk/src/libopenvrml/openvrml/x3d_grouping.cpp
trunk/src/libopenvrml/openvrml/x3d_grouping.h
trunk/src/libopenvrml/openvrml/x3d_hanim.cpp
trunk/src/libopenvrml/openvrml/x3d_hanim.h
trunk/src/libopenvrml/openvrml/x3d_interpolation.cpp
trunk/src/libopenvrml/openvrml/x3d_interpolation.h
trunk/src/libopenvrml/openvrml/x3d_key_device_sensor.cpp
trunk/src/libopenvrml/openvrml/x3d_key_device_sensor.h
trunk/src/libopenvrml/openvrml/x3d_networking.cpp
trunk/src/libopenvrml/openvrml/x3d_networking.h
trunk/src/libopenvrml/openvrml/x3d_nurbs.cpp
trunk/src/libopenvrml/openvrml/x3d_nurbs.h
trunk/src/libopenvrml/openvrml/x3d_rendering.cpp
trunk/src/libopenvrml/openvrml/x3d_rendering.h
trunk/src/libopenvrml/openvrml/x3d_shape.cpp
trunk/src/libopenvrml/openvrml/x3d_shape.h
trunk/src/libopenvrml/openvrml/x3d_texturing.cpp
trunk/src/libopenvrml/openvrml/x3d_texturing.h
Property Changed:
----------------
trunk/
trunk/src/libopenvrml/openvrml/bad_url.cpp
trunk/src/libopenvrml/openvrml/bad_url.h
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/local/proto.h
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/node/x3d-cad-geometry/cad_face.cpp
trunk/src/node/x3d-cad-geometry/cad_face.h
trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
trunk/src/node/x3d-core/metadata_double.cpp
trunk/src/node/x3d-core/metadata_double.h
trunk/src/node/x3d-core/metadata_float.cpp
trunk/src/node/x3d-core/metadata_float.h
trunk/src/node/x3d-core/metadata_integer.cpp
trunk/src/node/x3d-core/metadata_integer.h
trunk/src/node/x3d-core/metadata_set.cpp
trunk/src/node/x3d-core/metadata_set.h
trunk/src/node/x3d-core/metadata_string.cpp
trunk/src/node/x3d-core/metadata_string.h
trunk/src/node/x3d-dis/espdu_transform.cpp
trunk/src/node/x3d-dis/espdu_transform.h
trunk/src/node/x3d-dis/receiver_pdu.cpp
trunk/src/node/x3d-dis/receiver_pdu.h
trunk/src/node/x3d-dis/signal_pdu.cpp
trunk/src/node/x3d-dis/signal_pdu.h
trunk/src/node/x3d-dis/transmitter_pdu.cpp
trunk/src/node/x3d-dis/transmitter_pdu.h
trunk/src/node/x3d-environmental-effects/texture_background.cpp
trunk/src/node/x3d-environmental-effects/texture_background.h
trunk/src/node/x3d-event-utilities/boolean_filter.cpp
trunk/src/node/x3d-event-utilities/boolean_filter.h
trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
trunk/src/node/x3d-event-utilities/boolean_sequencer.h
trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
trunk/src/node/x3d-event-utilities/boolean_toggle.h
trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
trunk/src/node/x3d-event-utilities/boolean_trigger.h
trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
trunk/src/node/x3d-event-utilities/integer_sequencer.h
trunk/src/node/x3d-event-utilities/integer_trigger.cpp
trunk/src/node/x3d-event-utilities/integer_trigger.h
trunk/src/node/x3d-event-utilities/time_trigger.cpp
trunk/src/node/x3d-event-utilities/time_trigger.h
trunk/src/node/x3d-geometry2d/arc2d.cpp
trunk/src/node/x3d-geometry2d/arc2d.h
trunk/src/node/x3d-geometry2d/arc_close2d.cpp
trunk/src/node/x3d-geometry2d/arc_close2d.h
trunk/src/node/x3d-geometry2d/circle2d.cpp
trunk/src/node/x3d-geometry2d/circle2d.h
trunk/src/node/x3d-geometry2d/disk2d.cpp
trunk/src/node/x3d-geometry2d/disk2d.h
trunk/src/node/x3d-geometry2d/polyline2d.cpp
trunk/src/node/x3d-geometry2d/polyline2d.h
trunk/src/node/x3d-geometry2d/polypoint2d.cpp
trunk/src/node/x3d-geometry2d/polypoint2d.h
trunk/src/node/x3d-geometry2d/rectangle2d.cpp
trunk/src/node/x3d-geometry2d/rectangle2d.h
trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
trunk/src/node/x3d-geometry2d/triangle_set2d.h
trunk/src/node/x3d-geospatial/geo_coordinate.cpp
trunk/src/node/x3d-geospatial/geo_coordinate.h
trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp
trunk/src/node/x3d-geospatial/geo_elevation_grid.h
trunk/src/node/x3d-geospatial/geo_location.cpp
trunk/src/node/x3d-geospatial/geo_location.h
trunk/src/node/x3d-geospatial/geo_lod.cpp
trunk/src/node/x3d-geospatial/geo_lod.h
trunk/src/node/x3d-geospatial/geo_metadata.cpp
trunk/src/node/x3d-geospatial/geo_metadata.h
trunk/src/node/x3d-geospatial/geo_origin.cpp
trunk/src/node/x3d-geospatial/geo_origin.h
trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp
trunk/src/node/x3d-geospatial/geo_position_interpolator.h
trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp
trunk/src/node/x3d-geospatial/geo_touch_sensor.h
trunk/src/node/x3d-geospatial/geo_viewpoint.cpp
trunk/src/node/x3d-geospatial/geo_viewpoint.h
trunk/src/node/x3d-grouping/static_group.cpp
trunk/src/node/x3d-grouping/static_group.h
trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
trunk/src/node/x3d-h-anim/h_anim_displacer.h
trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
trunk/src/node/x3d-h-anim/h_anim_humanoid.h
trunk/src/node/x3d-h-anim/h_anim_joint.cpp
trunk/src/node/x3d-h-anim/h_anim_joint.h
trunk/src/node/x3d-h-anim/h_anim_segment.cpp
trunk/src/node/x3d-h-anim/h_anim_segment.h
trunk/src/node/x3d-h-anim/h_anim_site.cpp
trunk/src/node/x3d-h-anim/h_anim_site.h
trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
trunk/src/node/x3d-interpolation/position_interpolator2d.h
trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
trunk/src/node/x3d-key-device-sensor/key_sensor.h
trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
trunk/src/node/x3d-key-device-sensor/string_sensor.h
trunk/src/node/x3d-networking/load_sensor.cpp
trunk/src/node/x3d-networking/load_sensor.h
trunk/src/node/x3d-nurbs/contour2d.cpp
trunk/src/node/x3d-nurbs/contour2d.h
trunk/src/node/x3d-nurbs/contour_polyline2d.cpp
trunk/src/node/x3d-nurbs/contour_polyline2d.h
trunk/src/node/x3d-nurbs/coordinate_double.cpp
trunk/src/node/x3d-nurbs/coordinate_double.h
trunk/src/node/x3d-nurbs/nurbs_curve.cpp
trunk/src/node/x3d-nurbs/nurbs_curve.h
trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp
trunk/src/node/x3d-nurbs/nurbs_curve2d.h
trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_patch_surface.h
trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h
trunk/src/node/x3d-nurbs/nurbs_set.cpp
trunk/src/node/x3d-nurbs/nurbs_set.h
trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h
trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_swept_surface.h
trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_swung_surface.h
trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h
trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h
trunk/src/node/x3d-rendering/color_rgba.cpp
trunk/src/node/x3d-rendering/color_rgba.h
trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_set.h
trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
trunk/src/node/x3d-rendering/triangle_fan_set.cpp
trunk/src/node/x3d-rendering/triangle_fan_set.h
trunk/src/node/x3d-rendering/triangle_set.cpp
trunk/src/node/x3d-rendering/triangle_set.h
trunk/src/node/x3d-rendering/triangle_strip_set.cpp
trunk/src/node/x3d-rendering/triangle_strip_set.h
trunk/src/node/x3d-shape/fill_properties.cpp
trunk/src/node/x3d-shape/fill_properties.h
trunk/src/node/x3d-shape/line_properties.cpp
trunk/src/node/x3d-shape/line_properties.h
trunk/src/node/x3d-texturing/multi_texture.cpp
trunk/src/node/x3d-texturing/multi_texture.h
trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp
trunk/src/node/x3d-texturing/multi_texture_coordinate.h
trunk/src/node/x3d-texturing/multi_texture_transform.cpp
trunk/src/node/x3d-texturing/multi_texture_transform.h
trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp
trunk/src/node/x3d-texturing/texture_coordinate_generator.h
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/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
+ /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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-18 09:52:55 UTC (rev 3801)
+++ trunk/ChangeLog 2008-11-22 04:37:00 UTC (rev 3802)
@@ -1,3 +1,400 @@
+2008-11-20 Braden McDaniel <br...@en...>
+
+ Moved node implementations to dynamically loaded libraries.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+ Removed dependencies libpng, zlib, and FreeType; added
+ libopenvrml/openvrml/local/node_metatype_registry_impl.{cpp,h};
+ removed libopenvrml/openvrml/vrml97node.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_cad_geometry.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_core.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_dis.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_environmental_effects.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_event_utilities.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_geometry2d.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_geospatial.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_grouping.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_hanim.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_interpolation.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_key_device_sensor.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_networking.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_nurbs.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_rendering.{cpp,h}, removed
+ libopenvrml/openvrml/x3d_shape.{cpp,h} removed
+ libopenvrml/openvrml/x3d_texturing.{cpp,h}.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
+ Build as a DLL; added dependencies libpng, zlib, and FreeType;
+ added node/vrml97/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj:
+ Build as a DLL; added
+ node/x3d-cad-geometry/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj:
+ Build as a DLL; added node/x3d-core/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj:
+ Build as a DLL; added node/x3d-dis/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj:
+ Build as a DLL; added
+ node/x3d-environmental-effects/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj:
+ Build as a DLL; added
+ node/x3d-event-utilities/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj:
+ Build as a DLL; added
+ node/x3d-geometry2d/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj:
+ Build as a DLL; added
+ node/x3d-geospatial/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj:
+ Build as a DLL; added
+ node/x3d-grouping/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj:
+ Build as a DLL; added node/x3d-h-anim/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj:
+ Build as a DLL; added
+ node/x3d-interpolation/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj:
+ Build as a DLL; added
+ node/x3d-key-device-sensor/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj:
+ Build as a DLL; added
+ node/x3d-networking/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj:
+ Build as a DLL; added node/x3d-nurbs/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj:
+ Build as a DLL; added
+ node/x3d-rendering/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj:
+ Build as a DLL; added node/x3d-shape/register_node_metatypes.cpp.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj:
+ Build as a DLL; added
+ node/x3d-texturing/register_node_metatypes.cpp.
+ * src/Makefile.am
+ (noinst_LTLIBRARIES): Removed.
+ (openvrml_include_HEADERS): Removed
+ libopenvrml/openvrml/vrml97node.h,
+ libopenvrml/openvrml/x3d_core.h,
+ libopenvrml/openvrml/x3d_networking.h,
+ libopenvrml/openvrml/x3d_grouping.h,
+ libopenvrml/openvrml/x3d_rendering.h,
+ libopenvrml/openvrml/x3d_shape.h,
+ libopenvrml/openvrml/x3d_geometry2d.h,
+ libopenvrml/openvrml/x3d_texturing.h,
+ libopenvrml/openvrml/x3d_interpolation.h,
+ libopenvrml/openvrml/x3d_key_device_sensor.h,
+ libopenvrml/openvrml/x3d_event_utilities.h,
+ libopenvrml/openvrml/x3d_dis.h,
+ libopenvrml/openvrml/x3d_environmental_effects.h,
+ libopenvrml/openvrml/x3d_geospatial.h,
+ libopenvrml/openvrml/x3d_hanim.h,
+ libopenvrml/openvrml/x3d_nurbs.h,
+ libopenvrml/openvrml/x3d_cad_geometry.h
+ (libopenvrml_libopenvrml_la_SOURCES): Removed
+ libopenvrml/openvrml/vrml97node.cpp,
+ libopenvrml/openvrml/x3d_core.cpp,
+ libopenvrml/openvrml/x3d_networking.cpp,
+ libopenvrml/openvrml/x3d_grouping.cpp,
+ libopenvrml/openvrml/x3d_rendering.cpp,
+ libopenvrml/openvrml/x3d_shape.cpp,
+ libopenvrml/openvrml/x3d_geometry2d.cpp,
+ libopenvrml/openvrml/x3d_texturing.cpp,
+ libopenvrml/openvrml/x3d_interpolation.cpp,
+ libopenvrml/openvrml/x3d_key_device_sensor.cpp,
+ libopenvrml/openvrml/x3d_event_utilities.cpp,
+ libopenvrml/openvrml/x3d_dis.cpp,
+ libopenvrml/openvrml/x3d_environmental_effects.cpp,
+ libopenvrml/openvrml/x3d_geospatial.cpp,
+ libopenvrml/openvrml/x3d_hanim.cpp,
+ libopenvrml/openvrml/x3d_nurbs.cpp,
+ libopenvrml/openvrml/x3d_cad_geometry.cpp; added
+ libopenvrml/openvrml/local/node_metatype_registry_impl.{cpp,h}.
+ (libopenvrml_libopenvrml_la_LIBADD): Removed
+ node/vrml97/libvrml97.la, node/x3d-core/libx3d-core.la,
+ node/x3d-networking/libx3d-networking.la,
+ node/x3d-grouping/libx3d-grouping.la,
+ node/x3d-rendering/libx3d-rendering.la,
+ node/x3d-shape/libx3d-shape.la,
+ node/x3d-geometry2d/libx3d-geometry2d.la,
+ node/x3d-texturing/libx3d-texturing.la,
+ node/x3d-interpolation/libx3d-interpolation.la,
+ node/x3d-key-device-sensor/libx3d-key-device-sensor.la,
+ node/x3d-event-utilities/libx3d-event-utilities.la,
+ node/x3d-dis/libx3d-dis.la,
+ node/x3d-environmental-effects/libx3d-environmental-effects.la,
+ node/x3d-geospatial/libx3d-geospatial.la,
+ node/x3d-h-anim/libx3d-h-anim.la, node/x3d-nurbs/libx3d-nurbs.la,
+ node/x3d-cad-geometry/libx3d-cad-geometry.la.
+ (openvrmlnode_LTLIBRARIES): Added node/vrml97.la,
+ node/x3d-core.la, node/x3d-networking.la, node/x3d-grouping.la,
+ node/x3d-rendering.la, node/x3d-shape.la, node/x3d-geometry2d.la,
+ node/x3d-texturing.la, node/x3d-interpolation.la,
+ node/x3d-key-device-sensor.la, node/x3d-event-utilities.la,
+ node/x3d-dis.la, node/x3d-environmental-effects.la,
+ node/x3d-geospatial.la, node/x3d-h-anim.la, node/x3d-nurbs.la,
+ node/x3d-cad-geometry.la.
+ (node_vrml97_la_CPPFLAGS): Replaced
+ node_vrml97_libvrml97_la_CPPFLAGS.
+ (node_vrml97_la_CXXFLAGS): Replaced
+ node_vrml97_libvrml97_la_CXXFLAGS.
+ (node_vrml97_la_SOURCES): Replaced
+ node_vrml97_libvrml97_la_SOURCES; added
+ node/vrml97/register_node_metatypes.cpp.
+ (node_vrml97_la_LDFLAGS): Replaced
+ node_vrml97_libvrml97_la_LDFLAGS; added -module.
+ (node_x3d_core_la_CPPFLAGS): Replaced
+ node_x3d_core_libx3d_core_la_CPPFLAGS.
+ (node_x3d_core_la_CXXFLAGS): Replaced
+ node_x3d_core_libx3d_core_la_CXXFLAGS.
+ (node_x3d_core_la_SOURCES): Replaced
+ node_x3d_core_libx3d_core_la_SOURCES; added
+ node/x3d-core/register_node_metatypes.cpp.
+ (node_x3d_core_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_networking_la_CPPFLAGS): Replaced
+ node_x3d_networking_libx3d_networking_la_CPPFLAGS.
+ (node_x3d_networking_la_CXXFLAGS): Replaced
+ node_x3d_networking_libx3d_networking_la_CXXFLAGS.
+ (node_x3d_networking_la_SOURCES): Replaced
+ node_x3d_networking_libx3d_networking_la_SOURCES; added
+ node/x3d-networking/register_node_metatypes.cpp.
+ (node_x3d_networking_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_grouping_la_CPPFLAGS): Replaced
+ node_x3d_grouping_libx3d_grouping_la_CPPFLAGS.
+ (node_x3d_grouping_la_CXXFLAGS): Replaced
+ node_x3d_grouping_libx3d_grouping_la_CXXFLAGS.
+ (node_x3d_grouping_la_SOURCES): Replaced
+ node_x3d_grouping_libx3d_grouping_la_SOURCES; added
+ node/x3d-grouping/register_node_metatypes.cpp.
+ (node_x3d_grouping_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_rendering_la_CPPFLAGS): Replaced
+ node_x3d_rendering_libx3d_rendering_la_CPPFLAGS.
+ (node_x3d_rendering_la_CXXFLAGS): Replaced
+ node_x3d_rendering_libx3d_rendering_la_CXXFLAGS.
+ (node_x3d_rendering_la_SOURCES): Replaced
+ node_x3d_rendering_libx3d_rendering_la_SOURCES; added
+ node/x3d-rendering/register_node_metatypes.cpp.
+ (node_x3d_rendering_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_shape_la_CPPFLAGS): Replaced
+ node_x3d_shape_libx3d_shape_la_CPPFLAGS.
+ (node_x3d_shape_la_CXXFLAGS): Replaced
+ node_x3d_shape_libx3d_shape_la_CXXFLAGS.
+ (node_x3d_shape_la_SOURCES): Replaced
+ node_x3d_shape_libx3d_shape_la_SOURCES; added
+ node/x3d-shape/register_node_metatypes.cpp.
+ (node_x3d_shape_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_geometry2d_la_CPPFLAGS): Replaced
+ node_x3d_geometry2d_libx3d_geometry2d_la_CPPFLAGS.
+ (node_x3d_geometry2d_la_CXXFLAGS): Replaced
+ node_x3d_geometry2d_libx3d_geometry2d_la_CXXFLAGS.
+ (node_x3d_geometry2d_la_SOURCES): Replaced
+ node_x3d_geometry2d_libx3d_geometry2d_la_SOURCES; added
+ node/x3d-geometry2d/register_node_metatypes.cpp.
+ (node_x3d_geometry2d_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_texturing_la_CPPFLAGS): Replaced
+ node_x3d_texturing_libx3d_texturing_la_CPPFLAGS.
+ (node_x3d_texturing_la_CXXFLAGS): Replaced
+ node_x3d_texturing_libx3d_texturing_la_CXXFLAGS.
+ (node_x3d_texturing_la_SOURCES): Replaced
+ node_x3d_texturing_libx3d_texturing_la_SOURCES; added
+ node/x3d-texturing/register_node_metatypes.cpp.
+ (node_x3d_texturing_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_interpolation_la_CPPFLAGS): Replaced
+ node_x3d_interpolation_libx3d_interpolation_la_CPPFLAGS.
+ (node_x3d_interpolation_la_CXXFLAGS): Replaced
+ node_x3d_interpolation_libx3d_interpolation_la_CXXFLAGS.
+ (node_x3d_interpolation_la_SOURCES): Replaced
+ node_x3d_interpolation_libx3d_interpolation_la_SOURCES; added
+ node/x3d-interpolation/register_node_metatypes.cpp.
+ (node_x3d_interpolation_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_key_device_sensor_la_CPPFLAGS): Replaced
+ node_x3d_key_device_sensor_libx3d_key_device_sensor_la_CPPFLAGS.
+ (node_x3d_key_device_sensor_la_CXXFLAGS): Replaced
+ node_x3d_key_device_sensor_libx3d_key_device_sensor_la_CXXFLAGS.
+ (node_x3d_key_device_sensor_la_SOURCES): Replaced
+ node_x3d_key_device_sensor_libx3d_key_device_sensor_la_SOURCES;
+ added node/x3d-key-device-sensor/register_node_metatypes.cpp.
+ (node_x3d_key_device_sensor_la_LDFLAGS): Added -module
+ -avoid-version.
+ (node_x3d_event_utilities_la_CPPFLAGS): Replaced
+ node_x3d_event_utilities_libx3d_event_utilities_la_CPPFLAGS.
+ (node_x3d_event_utilities_la_CXXFLAGS): Replaced
+ node_x3d_event_utilities_libx3d_event_utilities_la_CXXFLAGS.
+ (node_x3d_event_utilities_la_SOURCES): Replaced
+ node_x3d_event_utilities_libx3d_event_utilities_la_SOURCES; added
+ node/x3d-event-utilities/register_node_metatypes.cpp.
+ (node_x3d_event_utilities_la_LDFLAGS): Added -module
+ -avoid-version.
+ (node_x3d_dis_la_CPPFLAGS): Replaced
+ node_x3d_dis_libx3d_dis_la_CPPFLAGS.
+ (node_x3d_dis_la_CXXFLAGS): Replaced
+ node_x3d_dis_libx3d_dis_la_CXXFLAGS.
+ (node_x3d_dis_la_SOURCES): Replaced
+ node_x3d_dis_libx3d_dis_la_SOURCES; added
+ node/x3d-dis/register_node_metatypes.cpp.
+ (node_x3d_dis_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_environmental_effects_la_CPPFLAGS): Replaced
+ node_x3d_environmental_effects_libx3d_environmental_effects_la_CPPFLAGS.
+ (node_x3d_environmental_effects_la_CXXFLAGS): Replaced
+ node_x3d_environmental_effects_libx3d_environmental_effects_la_CXXFLAGS.
+ (node_x3d_environmental_effects_la_SOURCES): Replaced
+ node_x3d_environmental_effects_libx3d_environmental_effects_la_SOURCES;
+ added node/x3d-environmental-effects/register_node_metatypes.cpp.
+ (node_x3d_environmental_effects_la_LDFLAGS): Added -module
+ -avoid-version.
+ (node_x3d_geospatial_la_CPPFLAGS): Replaced
+ node_x3d_geospatial_libx3d_geospatial_la_CPPFLAGS.
+ (node_x3d_geospatial_la_CXXFLAGS): Replaced
+ node_x3d_geospatial_libx3d_geospatial_la_CXXFLAGS.
+ (node_x3d_geospatial_la_SOURCES): Replaced
+ node_x3d_geospatial_libx3d_geospatial_la_SOURCES; added
+ node/x3d-geospatial/register_node_metatypes.cpp.
+ (node_x3d_geospatial_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_h_anim_la_CPPFLAGS): Replaced
+ node_x3d_h_anim_libx3d_h_anim_la_CPPFLAGS.
+ (node_x3d_h_anim_la_CXXFLAGS): Replaced
+ node_x3d_h_anim_libx3d_h_anim_la_CXXFLAGS.
+ (node_x3d_h_anim_la_SOURCES): Replaced
+ node_x3d_h_anim_libx3d_h_anim_la_SOURCES; added
+ node/x3d-h-anim/register_node_metatypes.cpp.
+ (node_x3d_h_anim_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_nurbs_la_CPPFLAGS): Replaced
+ node_x3d_nurbs_libx3d_nurbs_la_CPPFLAGS.
+ (node_x3d_nurbs_la_CXXFLAGS): Replaced
+ node_x3d_nurbs_libx3d_nurbs_la_CXXFLAGS.
+ (node_x3d_nurbs_la_SOURCES): Replaced
+ node_x3d_nurbs_libx3d_nurbs_la_SOURCES; added
+ node/x3d-nurbs/register_node_metatypes.cpp.
+ (node_x3d_nurbs_la_LDFLAGS): Added -module -avoid-version.
+ (node_x3d_cad_geometry_la_CPPFLAGS): Replaced
+ node_x3d_cad_geometry_libx3d_cad_geometry_la_CPPFLAGS.
+ (node_x3d_cad_geometry_la_CXXFLAGS): Replaced
+ node_x3d_cad_geometry_libx3d_cad_geometry_la_CXXFLAGS.
+ (node_x3d_cad_geometry_la_SOURCES): Replaced
+ node_x3d_cad_geometry_libx3d_cad_geometry_la_SOURCES; added
+ node/x3d-cad-geometry/register_node_metatypes.cpp.
+ (node_x3d_cad_geometry_la_LDFLAGS): Added -module -avoid-version.
+ * src/node/vrml97/register_node_metatypes.cpp: Moved from
+ libopenvrml/openvrml/vrml97node.cpp.
+ (openvrml_register_node_metatypes(openvrml::node_metatype_registry&)):
+ Replaced register_vrml97_node_metatypes.
+
+A + src/node/x3d-cad-geometry/register_node_metatypes.cpp
+A + src/node/x3d-core/register_node_metatypes.cpp
+A + src/node/x3d-dis/register_node_metatypes.cpp
+A + src/node/x3d-environmental-effects/register_node_metatypes.cpp
+A + src/node/x3d-event-utilities/register_node_metatypes.cpp
+A + src/node/x3d-geometry2d/register_node_metatypes.cpp
+A + src/node/x3d-geospatial/register_node_metatypes.cpp
+A + src/node/x3d-grouping/register_node_metatypes.cpp
+A + src/node/x3d-h-anim/register_node_metatypes.cpp
+A + src/node/x3d-interpolation/register_node_metatypes.cpp
+A + src/node/x3d-key-device-sensor/register_node_metatypes.cpp
+A + src/node/x3d-networking/register_node_metatypes.cpp
+A + src/node/x3d-nurbs/register_node_metatypes.cpp
+A + src/node/x3d-rendering/register_node_metatypes.cpp
+A + src/node/x3d-shape/register_node_metatypes.cpp
+A + src/node/x3d-texturing/register_node_metatypes.cpp
+
+ * src/libopenvrml/openvrml/browser.cpp
+ (openvrml::browser::node_metatype_map::node_metatype_map()):
+ Removed.
+ (openvrml::browser::node_metatype_map::~node_metatype_map()):
+ Removed.
+ (openvrml::browser::node_metatype_map::operator=(const
+ node_metatype_map &)): Removed.
+ (openvrml::browser::node_metatype_map::init(viewpoint_node *,
+ double)): Removed; logic moved to
+ openvrml::local::node_metatype_registry_impl::init.
+ (openvrml::browser::node_metatype_map::insert(const std::string &,
+ const boost::shared_ptr<openvrml::node_metatype> &)): Removed;
+ replaced with
+ openvrml::node_metatype_registry::register_node_metatype.
+ (openvrml::browser::node_metatype_map::remove(const
+ std::string&)): Removed.
+ (openvrml::browser::node_metatype_map::find(const std::string &)):
+ Removed; logic moved to
+ openvrml::local::node_metatype_registry_impl::find.
+ (openvrml::browser::node_metatype_map::node_metatype_ids(const
+ node_metatype &)): Removed; logic moved to
+ openvrml::local::node_metatype_registry_impl::node_metatype_ids.
+ (openvrm...
[truncated message content] |
|
From: <br...@us...> - 2008-11-22 09:22:22
|
Revision: 3807
http://openvrml.svn.sourceforge.net/openvrml/?rev=3807&view=rev
Author: braden
Date: 2008-11-22 09:22:18 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Made openvrml::node_traverser::halted and openvrml::node_traverser::traversed const.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/node.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-22 09:21:59 UTC (rev 3806)
+++ trunk/ChangeLog 2008-11-22 09:22:18 UTC (rev 3807)
@@ -1,3 +1,15 @@
+2008-11-22 Braden McDaniel <br...@en...>
+
+ Made openvrml::node_traverser::halted and
+ openvrml::node_traverser::traversed const.
+
+ * src/libopenvrml/openvrml/node.cpp
+ (openvrml::node_traverser::halted() const): Made const.
+ (openvrml::node_traverser::traversed(node &) const): Made const.
+ * src/libopenvrml/openvrml/node.h
+ (openvrml::node_traverser): Made the halted and traversed member
+ functions const.
+
2008-11-21 Braden McDaniel <br...@en...>
Moved node implementations to dynamically loaded libraries.
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2008-11-22 09:21:59 UTC (rev 3806)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2008-11-22 09:22:18 UTC (rev 3807)
@@ -5019,7 +5019,7 @@
*
* @return @c true if the traversal has been halted; @c false otherwise.
*/
-bool openvrml::node_traverser::halted() OPENVRML_NOTHROW
+bool openvrml::node_traverser::halted() const OPENVRML_NOTHROW
{
return this->halt;
}
@@ -5031,7 +5031,7 @@
*
* @return @c true if @p n has been traversed; @c false otherwise.
*/
-bool openvrml::node_traverser::traversed(node & n) OPENVRML_NOTHROW
+bool openvrml::node_traverser::traversed(node & n) const OPENVRML_NOTHROW
{
return this->traversed_nodes.find(&n) != this->traversed_nodes.end();
}
Modified: trunk/src/libopenvrml/openvrml/node.h
===================================================================
--- trunk/src/libopenvrml/openvrml/node.h 2008-11-22 09:21:59 UTC (rev 3806)
+++ trunk/src/libopenvrml/openvrml/node.h 2008-11-22 09:22:18 UTC (rev 3807)
@@ -1330,8 +1330,8 @@
protected:
void halt_traversal() OPENVRML_NOTHROW;
- bool halted() OPENVRML_NOTHROW;
- bool traversed(node & n) OPENVRML_NOTHROW;
+ bool halted() const OPENVRML_NOTHROW;
+ bool traversed(node & n) const OPENVRML_NOTHROW;
private:
virtual void on_entering(node & n);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-23 05:19:21
|
Revision: 3808
http://openvrml.svn.sourceforge.net/openvrml/?rev=3808&view=rev
Author: braden
Date: 2008-11-23 05:19:15 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Use trailing underscore convention for private variables in openvrml::local::proto_node_metatype.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/local/proto.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-22 09:22:18 UTC (rev 3807)
+++ trunk/ChangeLog 2008-11-23 05:19:15 UTC (rev 3808)
@@ -1,3 +1,11 @@
+2008-11-23 Braden McDaniel <br...@en...>
+
+ Use trailing underscore convention for private variables in
+ openvrml::local::proto_node_metatype.
+
+ * src/libopenvrml/openvrml/local/proto.cpp
+ * src/libopenvrml/openvrml/local/proto.h
+
2008-11-22 Braden McDaniel <br...@en...>
Made openvrml::node_traverser::halted and
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-22 09:22:18 UTC (rev 3807)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-23 05:19:15 UTC (rev 3808)
@@ -563,12 +563,12 @@
using openvrml::node;
vector<boost::intrusive_ptr<node> > result(
- this->node_metatype.impl_nodes.size());
+ this->node_metatype.impl_nodes_.size());
for (vector<boost::intrusive_ptr<node> >::size_type i = 0;
- i < this->node_metatype.impl_nodes.size();
+ i < this->node_metatype.impl_nodes_.size();
++i) {
- result[i] = this->clone_node(this->node_metatype.impl_nodes[i]);
+ result[i] = this->clone_node(this->node_metatype.impl_nodes_[i]);
assert(result[i]);
}
return result;
@@ -653,11 +653,11 @@
default_value_map;
is_map::const_iterator is_mapping =
- find_if(this->node_metatype.is_map.begin(),
- this->node_metatype.is_map.end(),
+ find_if(this->node_metatype.is_map_.begin(),
+ this->node_metatype.is_map_.end(),
matches_is_target(
is_target(*n, interface_->id)));
- if (is_mapping != this->node_metatype.is_map.end()) {
+ if (is_mapping != this->node_metatype.is_map_.end()) {
using boost::bind;
using std::logical_or;
//
@@ -670,8 +670,8 @@
//
node_interface_set::const_iterator
proto_interface =
- find_if(this->node_metatype.interfaces.begin(),
- this->node_metatype.interfaces.end(),
+ find_if(this->node_metatype.interfaces_.begin(),
+ this->node_metatype.interfaces_.end(),
bind(logical_or<bool>(),
bind(node_interface_matches_exposedfield(),
_1,
@@ -681,7 +681,7 @@
is_mapping->first)));
if (proto_interface
- != this->node_metatype.interfaces.end()) {
+ != this->node_metatype.interfaces_.end()) {
initial_value_map::const_iterator
initial_value =
this->initial_values_.find(
@@ -692,11 +692,11 @@
} else {
default_value_map::const_iterator
default_value =
- this->node_metatype.default_value_map
+ this->node_metatype.default_value_map_
.find(is_mapping->first);
assert(default_value
!= this->node_metatype
- .default_value_map.end());
+ .default_value_map_.end());
src_val = default_value->second->clone();
}
} else {
@@ -784,10 +784,10 @@
interface_ != interfaces.end();
++interface_) {
node_interface_set::const_iterator pos =
- find(node_metatype.interfaces.begin(),
- node_metatype.interfaces.end(),
+ find(node_metatype.interfaces_.begin(),
+ node_metatype.interfaces_.end(),
*interface_);
- if (pos == node_metatype.interfaces.end()) {
+ if (pos == node_metatype.interfaces_.end()) {
throw openvrml::unsupported_interface(*interface_);
}
const bool succeeded = this->interfaces_.insert(*interface_).second;
@@ -875,11 +875,11 @@
const is_map_t & is_map,
const routes_t & routes):
node_metatype(id, browser),
- interfaces(interfaces),
- default_value_map(default_value_map),
- impl_nodes(impl_nodes),
- routes(routes),
- is_map(is_map)
+ interfaces_(interfaces),
+ default_value_map_(default_value_map),
+ impl_nodes_(impl_nodes),
+ routes_(routes),
+ is_map_(is_map)
{}
openvrml::local::proto_node_metatype::~proto_node_metatype() OPENVRML_NOTHROW
@@ -1066,8 +1066,8 @@
// Establish routes.
//
typedef proto_node_metatype::routes_t routes_t;
- for (routes_t::const_iterator route = node_metatype.routes.begin();
- route != node_metatype.routes.end();
+ for (routes_t::const_iterator route = node_metatype.routes_.begin();
+ route != node_metatype.routes_.end();
++route) {
// XXX
// XXX It would be better to store the node_paths along with the
@@ -1075,9 +1075,9 @@
// XXX the PROTO.
// XXX
node_path_t path_to_from;
- assert(!node_metatype.impl_nodes.empty());
+ assert(!node_metatype.impl_nodes_.empty());
path_getter(*route->from, path_to_from)
- .get_path_from(node_metatype.impl_nodes);
+ .get_path_from(node_metatype.impl_nodes_);
assert(!path_to_from.empty());
node * const from_node = resolve_node_path(path_to_from,
this->impl_nodes);
@@ -1085,7 +1085,7 @@
node_path_t path_to_to;
path_getter(*route->to, path_to_to)
- .get_path_from(node_metatype.impl_nodes);
+ .get_path_from(node_metatype.impl_nodes_);
node * const to_node = resolve_node_path(path_to_to,
this->impl_nodes);
assert(to_node);
@@ -1104,8 +1104,8 @@
// Add eventIns, eventOuts, exposedFields.
//
for (node_interface_set::const_iterator interface_ =
- node_metatype.interfaces.begin();
- interface_ != node_metatype.interfaces.end();
+ node_metatype.interfaces_.begin();
+ interface_ != node_metatype.interfaces_.end();
++interface_) {
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
@@ -1120,7 +1120,7 @@
case node_interface::eventin_id:
interface_eventin = create_eventin(interface_->field_type,
*this);
- is_range = node_metatype.is_map.equal_range(interface_->id);
+ is_range = node_metatype.is_map_.equal_range(interface_->id);
for (is_map_t::const_iterator is_mapping = is_range.first;
is_mapping != is_range.second;
++is_mapping) {
@@ -1128,7 +1128,7 @@
node_path_t path_to_impl_node;
path_getter(*is_mapping->second.impl_node,
path_to_impl_node)
- .get_path_from(node_metatype.impl_nodes);
+ .get_path_from(node_metatype.impl_nodes_);
node * impl_node = resolve_node_path(path_to_impl_node,
this->impl_nodes);
assert(impl_node);
@@ -1156,7 +1156,7 @@
case node_interface::eventout_id:
interface_eventout = create_eventout(interface_->field_type,
*this);
- is_range = node_metatype.is_map.equal_range(interface_->id);
+ is_range = node_metatype.is_map_.equal_range(interface_->id);
for (is_map_t::const_iterator is_mapping = is_range.first;
is_mapping != is_range.second;
++is_mapping) {
@@ -1164,7 +1164,7 @@
node_path_t path_to_impl_node;
path_getter(*is_mapping->second.impl_node,
path_to_impl_node)
- .get_path_from(node_metatype.impl_nodes);
+ .get_path_from(node_metatype.impl_nodes_);
node * impl_node = resolve_node_path(path_to_impl_node,
this->impl_nodes);
assert(impl_node);
@@ -1193,16 +1193,15 @@
initial_value = initial_values.find(interface_->id);
if (initial_value == initial_values.end()) {
initial_value =
- node_metatype.default_value_map.find(interface_->id);
- assert(initial_value
- != node_metatype.default_value_map.end());
+ node_metatype.default_value_map_.find(interface_->id);
+ assert(initial_value != node_metatype.default_value_map_.end());
}
interface_eventin = create_exposedfield(*initial_value->second,
*this);
interface_eventout =
dynamic_pointer_cast<openvrml::event_emitter>(
interface_eventin);
- is_range = node_metatype.is_map.equal_range(interface_->id);
+ is_range = node_metatype.is_map_.equal_range(interface_->id);
for (is_map_t::const_iterator is_mapping = is_range.first;
is_mapping != is_range.second;
++is_mapping) {
@@ -1210,7 +1209,7 @@
node_path_t path_to_impl_node;
path_getter(*is_mapping->second.impl_node,
path_to_impl_node)
- .get_path_from(node_metatype.impl_nodes);
+ .get_path_from(node_metatype.impl_nodes_);
node * impl_node = resolve_node_path(path_to_impl_node,
this->impl_nodes);
assert(impl_node);
@@ -1316,8 +1315,8 @@
const proto_node_metatype & node_metatype =
static_cast<const proto_node_metatype &>(this->type().metatype());
proto_node_metatype::is_map_t::const_iterator is_mapping =
- node_metatype.is_map.find(id);
- if (is_mapping != node_metatype.is_map.end()) {
+ node_metatype.is_map_.find(id);
+ if (is_mapping != node_metatype.is_map_.end()) {
//
// Get the path to the implementation node.
//
@@ -1325,7 +1324,7 @@
assert(!is_mapping->second.impl_node_interface.empty());
node_path_t path;
path_getter(*is_mapping->second.impl_node, path)
- .get_path_from(node_metatype.impl_nodes);
+ .get_path_from(node_metatype.impl_nodes_);
//
// Resolve the path against this instance's implementation nodes.
@@ -1342,8 +1341,8 @@
// default value.
//
proto_node_metatype::default_value_map_t::const_iterator
- default_value = node_metatype.default_value_map.find(id);
- if (default_value == node_metatype.default_value_map.end()) {
+ default_value = node_metatype.default_value_map_.find(id);
+ if (default_value == node_metatype.default_value_map_.end()) {
throw unsupported_interface(this->type(), id);
}
return *default_value->second;
Modified: trunk/src/libopenvrml/openvrml/local/proto.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.h 2008-11-22 09:22:18 UTC (rev 3807)
+++ trunk/src/libopenvrml/openvrml/local/proto.h 2008-11-23 05:19:15 UTC (rev 3808)
@@ -76,11 +76,11 @@
default_value_map_t;
private:
- openvrml::node_interface_set interfaces;
- default_value_map_t default_value_map;
- std::vector<boost::intrusive_ptr<openvrml::node> > impl_nodes;
- routes_t routes;
- is_map_t is_map;
+ openvrml::node_interface_set interfaces_;
+ default_value_map_t default_value_map_;
+ std::vector<boost::intrusive_ptr<openvrml::node> > impl_nodes_;
+ routes_t routes_;
+ is_map_t is_map_;
public:
proto_node_metatype(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-23 05:39:16
|
Revision: 3810
http://openvrml.svn.sourceforge.net/openvrml/?rev=3810&view=rev
Author: braden
Date: 2008-11-23 05:39:09 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Use trailing underscore convention for private variables in openvrml::local::proto_node.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/local/proto.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-23 05:23:50 UTC (rev 3809)
+++ trunk/ChangeLog 2008-11-23 05:39:09 UTC (rev 3810)
@@ -1,6 +1,13 @@
2008-11-23 Braden McDaniel <br...@en...>
Use trailing underscore convention for private variables in
+ openvrml::local::proto_node.
+
+ * src/libopenvrml/openvrml/local/proto.cpp
+
+2008-11-23 Braden McDaniel <br...@en...>
+
+ Use trailing underscore convention for private variables in
openvrml::local::proto_node_metatype.
* src/libopenvrml/openvrml/local/proto.cpp
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-23 05:23:50 UTC (rev 3809)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-23 05:39:09 UTC (rev 3810)
@@ -142,8 +142,8 @@
proto_node & node)
OPENVRML_THROW1(std::bad_alloc);
- boost::shared_ptr<openvrml::scope> proto_scope;
- std::vector<boost::intrusive_ptr<node> > impl_nodes;
+ boost::shared_ptr<openvrml::scope> proto_scope_;
+ std::vector<boost::intrusive_ptr<node> > impl_nodes_;
public:
proto_node(const openvrml::node_type & type,
@@ -1052,15 +1052,15 @@
const openvrml::initial_value_map & initial_values)
OPENVRML_THROW1(std::bad_alloc):
abstract_proto_node(type, scope),
- proto_scope(scope)
+ proto_scope_(scope)
{
const proto_node_metatype & node_metatype =
static_cast<const proto_node_metatype &>(type.metatype());
- this->impl_nodes =
+ this->impl_nodes_ =
proto_node_metatype::proto_impl_cloner(node_metatype,
initial_values,
- this->proto_scope).clone();
+ this->proto_scope_).clone();
//
// Establish routes.
@@ -1080,14 +1080,14 @@
.get_path_from(node_metatype.impl_nodes_);
assert(!path_to_from.empty());
node * const from_node = resolve_node_path(path_to_from,
- this->impl_nodes);
+ this->impl_nodes_);
assert(from_node);
node_path_t path_to_to;
path_getter(*route->to, path_to_to)
.get_path_from(node_metatype.impl_nodes_);
node * const to_node = resolve_node_path(path_to_to,
- this->impl_nodes);
+ this->impl_nodes_);
assert(to_node);
try {
@@ -1130,7 +1130,7 @@
path_to_impl_node)
.get_path_from(node_metatype.impl_nodes_);
node * impl_node = resolve_node_path(path_to_impl_node,
- this->impl_nodes);
+ this->impl_nodes_);
assert(impl_node);
const std::string & impl_node_interface =
is_mapping->second.impl_node_interface;
@@ -1166,7 +1166,7 @@
path_to_impl_node)
.get_path_from(node_metatype.impl_nodes_);
node * impl_node = resolve_node_path(path_to_impl_node,
- this->impl_nodes);
+ this->impl_nodes_);
assert(impl_node);
const std::string & impl_node_interface =
is_mapping->second.impl_node_interface;
@@ -1211,7 +1211,7 @@
path_to_impl_node)
.get_path_from(node_metatype.impl_nodes_);
node * impl_node = resolve_node_path(path_to_impl_node,
- this->impl_nodes);
+ this->impl_nodes_);
assert(impl_node);
const std::string & impl_node_interface =
is_mapping->second.impl_node_interface;
@@ -1266,8 +1266,8 @@
*/
bool openvrml::local::proto_node::modified() const
{
- return !this->impl_nodes.empty()
- ? this->impl_nodes.front()->modified()
+ return !this->impl_nodes_.empty()
+ ? this->impl_nodes_.front()->modified()
: false;
}
@@ -1284,13 +1284,13 @@
{
using std::vector;
for (vector<boost::intrusive_ptr<node> >::const_iterator node =
- this->impl_nodes.begin();
- node != impl_nodes.end();
+ this->impl_nodes_.begin();
+ node != impl_nodes_.end();
++node) {
(*node)->initialize(*this->scene(), timestamp);
}
- if (!this->impl_nodes.empty()) {
- this->impl_nodes.front()->modified(true);
+ if (!this->impl_nodes_.empty()) {
+ this->impl_nodes_.front()->modified(true);
}
}
@@ -1329,7 +1329,7 @@
//
// Resolve the path against this instance's implementation nodes.
//
- node * const impl_node = resolve_node_path(path, this->impl_nodes);
+ node * const impl_node = resolve_node_path(path, this->impl_nodes_);
//
// Get the field value for the implementation node.
@@ -1413,8 +1413,8 @@
{
using std::vector;
for (vector<boost::intrusive_ptr<node> >::const_iterator node =
- this->impl_nodes.begin();
- node != impl_nodes.end();
+ this->impl_nodes_.begin();
+ node != impl_nodes_.end();
++node) {
(*node)->shutdown(timestamp);
}
@@ -1429,9 +1429,9 @@
openvrml::script_node *
openvrml::local::proto_node::to_script() OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<script_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<script_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1444,9 +1444,9 @@
openvrml::local::proto_node::to_appearance()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<appearance_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<appearance_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1459,9 +1459,9 @@
openvrml::local::proto_node::to_bounded_volume()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<bounded_volume_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<bounded_volume_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1474,9 +1474,9 @@
openvrml::local::proto_node::to_child()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<child_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<child_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1489,9 +1489,9 @@
openvrml::local::proto_node::to_color()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<color_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<color_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1504,9 +1504,9 @@
openvrml::local::proto_node::to_color_rgba()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<color_rgba_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<color_rgba_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1519,9 +1519,9 @@
openvrml::local::proto_node::to_coordinate()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<coordinate_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<coordinate_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1534,9 +1534,9 @@
openvrml::local::proto_node::to_font_style()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<font_style_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<font_style_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1549,9 +1549,9 @@
openvrml::local::proto_node::to_geometry()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<geometry_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<geometry_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1564,9 +1564,9 @@
openvrml::local::proto_node::to_grouping()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<grouping_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<grouping_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1579,9 +1579,9 @@
openvrml::local::proto_node::to_light()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<light_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<light_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1594,9 +1594,9 @@
openvrml::local::proto_node::to_material()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<material_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<material_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1609,9 +1609,9 @@
openvrml::local::proto_node::to_navigation_info()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<navigation_info_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<navigation_info_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1624,9 +1624,9 @@
openvrml::local::proto_node::to_normal()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<normal_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<normal_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1639,10 +1639,10 @@
openvrml::local::proto_node::to_pointing_device_sensor()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
return node_cast<pointing_device_sensor_node *>(
- this->impl_nodes[0].get());
+ this->impl_nodes_[0].get());
}
/**
@@ -1655,9 +1655,9 @@
openvrml::local::proto_node::to_scoped_light()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<scoped_light_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<scoped_light_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1670,9 +1670,9 @@
openvrml::local::proto_node::to_sound_source()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<sound_source_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<sound_source_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1685,9 +1685,9 @@
openvrml::local::proto_node::to_texture()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<texture_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<texture_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1700,9 +1700,9 @@
openvrml::local::proto_node::to_texture_coordinate()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<texture_coordinate_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<texture_coordinate_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1715,9 +1715,9 @@
openvrml::local::proto_node::to_texture_transform()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<texture_transform_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<texture_transform_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1730,9 +1730,9 @@
openvrml::local::proto_node::to_time_dependent()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<time_dependent_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<time_dependent_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1745,9 +1745,9 @@
openvrml::local::proto_node::to_transform()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<transform_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<transform_node *>(this->impl_nodes_[0].get());
}
/**
@@ -1760,7 +1760,7 @@
openvrml::local::proto_node::to_viewpoint()
OPENVRML_NOTHROW
{
- assert(!this->impl_nodes.empty());
- assert(this->impl_nodes[0]);
- return node_cast<viewpoint_node *>(this->impl_nodes[0].get());
+ assert(!this->impl_nodes_.empty());
+ assert(this->impl_nodes_[0]);
+ return node_cast<viewpoint_node *>(this->impl_nodes_[0].get());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-11-24 06:57:01
|
Revision: 3811
http://openvrml.svn.sourceforge.net/openvrml/?rev=3811&view=rev
Author: braden
Date: 2008-11-24 06:56:51 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
Provide access to a PROTO instance's implementation nodes.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/node.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-23 05:39:09 UTC (rev 3810)
+++ trunk/ChangeLog 2008-11-24 06:56:51 UTC (rev 3811)
@@ -1,3 +1,30 @@
+2008-11-24 Braden McDaniel <br...@en...>
+
+ Provide access to a PROTO instance's implementation nodes.
+
+ * src/libopenvrml/openvrml/browser.cpp
+ (openvrml::externproto_node): Override
+ openvrml::node::do_impl_nodes.
+ (openvrml::externproto_node::do_impl_nodes() const): If there is
+ an implementation, return the implementation's nodes.
+ * src/libopenvrml/openvrml/local/proto.cpp
+ (openvrml::local::proto_node): Override
+ openvrml::node::do_impl_nodes.
+ (openvrml::local::proto_node::do_impl_nodes() const): Return the
+ implementation nodes.
+ * src/libopenvrml/openvrml/node.cpp
+ (openvrml::node::impl_nodes() const): Delegate to
+ node::do_impl_nodes.
+ (openvrml::node::do_impl_nodes() const): Default implementation
+ returns an empty vector.
+ (openvrml::is_proto_instance(const node &)): Return true if a node
+ is a PROTO instance; false otherwise.
+ * src/libopenvrml/openvrml/node.h
+ (openvrml::node): Added member functions impl_nodes and
+ do_impl_nodes.
+ (openvrml::is_proto_instance(const node &)): Added; detects if a
+ node instance is a PROTO instance.
+
2008-11-23 Braden McDaniel <br...@en...>
Use trailing underscore convention for private variables in
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2008-11-23 05:39:09 UTC (rev 3810)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2008-11-24 06:56:51 UTC (rev 3811)
@@ -277,6 +277,10 @@
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);
@@ -2965,6 +2969,15 @@
}
}
+const std::vector<boost::intrusive_ptr<openvrml::node> > &
+openvrml::externproto_node::do_impl_nodes() const OPENVRML_NOTHROW
+{
+ static const std::vector<boost::intrusive_ptr<node> > empty_vec;
+ return this->proto_node_
+ ? this->proto_node_->impl_nodes()
+ : empty_vec;
+}
+
void openvrml::externproto_node::do_initialize(const double timestamp)
OPENVRML_THROW1(std::bad_alloc)
{
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-23 05:39:09 UTC (rev 3810)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-11-24 06:56:51 UTC (rev 3811)
@@ -155,6 +155,10 @@
virtual bool modified() const;
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);
@@ -1272,6 +1276,17 @@
}
/**
+ * @brief Get the implementation nodes.
+ *
+ * @return the implementation nodes.
+ */
+const std::vector<boost::intrusive_ptr<openvrml::node> > &
+openvrml::local::proto_node::do_impl_nodes() const OPENVRML_NOTHROW
+{
+ return this->impl_nodes_;
+}
+
+/**
* @brief Initialize.
*
* @param[in] timestamp the current time.
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2008-11-23 05:39:09 UTC (rev 3810)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2008-11-24 06:56:51 UTC (rev 3811)
@@ -2019,8 +2019,36 @@
return this->scene_;
}
+/**
+ * @brief Get the implementation nodes of a @c PROTO instance.
+ *
+ * If the @c node is not a @c PROTO instance, the returned @c vector is empty.
+ *
+ * This function delegates to @c #do_impl_nodes.
+ *
+ * @return the implementation nodes.
+ */
+const std::vector<boost::intrusive_ptr<openvrml::node> > &
+openvrml::node::impl_nodes() const OPENVRML_NOTHROW
+{
+ return this->do_impl_nodes();
+}
/**
+ * @brief Get the implementation nodes of a @c PROTO instance.
+ *
+ * This default implementation returns an empty @c vector.
+ *
+ * @return an empty @c vector.
+ */
+const std::vector<boost::intrusive_ptr<openvrml::node> > &
+openvrml::node::do_impl_nodes() const OPENVRML_NOTHROW
+{
+ static const std::vector<boost::intrusive_ptr<openvrml::node> > empty_vec;
+ return empty_vec;
+}
+
+/**
* @brief Initialize the node.
*
* This method works recursively, initializing any child nodes to the same
@@ -2758,6 +2786,20 @@
void openvrml::node::do_shutdown(double) OPENVRML_NOTHROW
{}
+/**
+ * @relatesalso openvrml::node
+ *
+ * @brief Check whether a @c node is a @c PROTO instance.
+ *
+ * @param[in] n a @c node.
+ *
+ * @return @c true if @p n is a @c PROTO instance; @c false otherwise.
+ */
+bool openvrml::is_proto_instance(const node & n)
+{
+ return !n.impl_nodes().empty();
+}
+
namespace {
struct OPENVRML_LOCAL add_listener {
add_listener(openvrml::event_emitter & emitter,
Modified: trunk/src/libopenvrml/openvrml/node.h
===================================================================
--- trunk/src/libopenvrml/openvrml/node.h 2008-11-23 05:39:09 UTC (rev 3810)
+++ trunk/src/libopenvrml/openvrml/node.h 2008-11-24 06:56:51 UTC (rev 3811)
@@ -513,6 +513,9 @@
openvrml::scene * scene() const OPENVRML_NOTHROW;
+ const std::vector<boost::intrusive_ptr<node> > & impl_nodes() const
+ OPENVRML_NOTHROW;
+
std::ostream & print(std::ostream & out, size_t indent) const;
void initialize(openvrml::scene & scene, double timestamp)
@@ -556,6 +559,10 @@
read_write_mutex & scene_mutex();
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 field_value & do_field(const std::string & id) const
@@ -657,6 +664,8 @@
this->do_event_emitter(id));
}
+ OPENVRML_API bool is_proto_instance(const node & n);
+
OPENVRML_API bool add_route(node & from, const std::string & eventout,
node & to, const std::string & eventin)
OPENVRML_THROW3(std::bad_alloc, unsupported_interface,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2008-12-03 07:18:23
|
Revision: 3812
http://openvrml.svn.sourceforge.net/openvrml/?rev=3812&view=rev
Author: braden
Date: 2008-12-03 07:18:15 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Ignore files added by libtool 2.2 libtoolize.
Property Changed:
----------------
trunk/lib/gtkglext/m4macros/
trunk/m4/
Property changes on: trunk/lib/gtkglext/m4macros
___________________________________________________________________
Modified: svn:ignore
- Makefile.in
+ Makefile
Makefile.in
ltsugar.m4
libtool.m4
ltversion.m4
lt~obsolete.m4
ltoptions.m4
Property changes on: trunk/m4
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
ltsugar.m4
libtool.m4
ltversion.m4
lt~obsolete.m4
ltoptions.m4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X