diff --git a/Make/dependencies b/Make/dependencies index df993827b..27f44edd3 100644 --- a/Make/dependencies +++ b/Make/dependencies @@ -58,6 +58,8 @@ endif COIN_INSTALLED ?= no INVENTOR_INSTALLED ?= no +LIBVRML_INSTALLED ?= no + PERFORMER_INSTALLED ?= no GLUT_INSTALLED ?= no diff --git a/Make/makedirdefs b/Make/makedirdefs index 0ab9b9958..2ee95206b 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -156,6 +156,10 @@ else endif endif +ifeq ($(LIBVRML_INSTALLED),yes) + PLUGIN_DIRS += vrml +endif + ifeq ($(PERFORMER_INSTALLED),yes) PLUGIN_DIRS += pfb diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 6db3ff1d0..f58d2802b 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -205,7 +205,8 @@ Registry::Registry() //addFileExtensionAlias("geo", "lwo"); addFileExtensionAlias("lw", "lwo"); - addFileExtensionAlias("wrl", "iv"); + // addFileExtensionAlias("wrl", "iv"); + addFileExtensionAlias("wrl", "vrml"); // add alias for the text/freetype plugin. addFileExtensionAlias("ttf", "freetype"); // true type diff --git a/src/osgPlugins/vrml/GNUmakefile b/src/osgPlugins/vrml/GNUmakefile new file mode 100644 index 000000000..2b0da0de8 --- /dev/null +++ b/src/osgPlugins/vrml/GNUmakefile @@ -0,0 +1,21 @@ +# +# $Id$ +# + +TOPDIR = ../../.. +include $(TOPDIR)/Make/makedefs + +CXXFILES =\ + ReaderWriterVRML2.cpp\ + +OPENVRML_HOME ? = /usr/local + +LIBS += $(OSG_LIBS) $(OTHER_LIBS) -L$(OPENVRML_HOME)/lib -lopenvrml + +INC += -I$(OPENVRML_HOME)/include/openvrml + +TARGET_BASENAME = vrml +include $(TOPDIR)/Make/cygwin_plugin_def +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) + +include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/vrml/LICENSE.txt b/src/osgPlugins/vrml/LICENSE.txt new file mode 100755 index 000000000..b1e3f5a26 --- /dev/null +++ b/src/osgPlugins/vrml/LICENSE.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2.1 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/src/osgPlugins/vrml/README.txt b/src/osgPlugins/vrml/README.txt new file mode 100644 index 000000000..7e6481695 --- /dev/null +++ b/src/osgPlugins/vrml/README.txt @@ -0,0 +1,12 @@ +######################################################## +# Replacement VRML plugin for OpenSceneGraph. # +# (C) J.Ciger B.Herbelin T.Abaci 2003,2004 VRlab EPFL # +######################################################## + +- dependencies: + OpenVRML (http://openvrml.org/) + OpenSceneGraph (http://www.openscenegraph.org/) + +CAUTION! +This version of the plugin requires OpenVRML 0.14.3. Version 0.16.2 *WILL NOT* work! + diff --git a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp new file mode 100644 index 000000000..f6a1e6260 --- /dev/null +++ b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp @@ -0,0 +1,535 @@ +// -*-c++-*- + +/* + * + * VRML2 file converter for OpenSceneGraph. + * + * authors : Jan Ciger (jan.ciger@gmail.com), + * Tolga Abaci (tolga.abaci@gmail.com), + * Bruno Herbelin (bruno.herbelin@gmail.com) + * + * (c) VRlab EPFL, Switzerland, 2004-2006 + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + + +#include +#include +#include +#include + +#include +#include + + +/** + * OpenSceneGraph plugin wrapper/converter. + */ +class ReaderWriterVRML2 : public osgDB::ReaderWriter +{ + public: + ReaderWriterVRML2() { } + + virtual const char* className() + { + return "VRML2 Reader/Writer"; + } + + virtual bool acceptsExtension(const std::string& extension) + { + return osgDB::equalCaseInsensitive(extension, "wrl") ? true : false; + } + + virtual ReadResult readNode(const std::string&, const osgDB::ReaderWriter::Options *options = NULL) const; + private: + osg::Node* convertFromVRML(openvrml::node *obj) const; +}; + +// Register with Registry to instantiate the above reader/writer. +osgDB::RegisterReaderWriterProxy g_readerWriter_VRML_Proxy; + +osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string &fileName, const Options*) const +{ + std::fstream null; + openvrml::browser *browser = new openvrml::browser(null, null); + + std::vector parameter; + std::vector vuri; + vuri.push_back(fileName); + browser->load_url(vuri, parameter); + + std::vector< openvrml::node_ptr > mfn; + mfn = browser->root_nodes(); + + if (mfn.size() == 0) { + return ReadResult::FILE_NOT_HANDLED; + + } else { + osg::MatrixTransform *osg_root = new osg::MatrixTransform(osg::Matrix(1, 0, 0, 0, + 0, 0, 1, 0, + 0, -1, 0, 0, + 0, 0, 0, 1)); + + for (unsigned i = 0; i < mfn.size(); i++) { + openvrml::node *vrml_node = mfn[i].get(); + osg_root->addChild(convertFromVRML(vrml_node)); + } + + return osg_root; + } +} + +osg::Node* ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const +{ + std::string name = obj->id(); + static int osgLightNum = 0; //light + + //std::cout << obj->type.id << " Node " << " ["<< name <<']' << std::endl; + + if (obj->type.id == "Transform") // Handle transforms + { + openvrml::vrml97_node::transform_node *vrml_transform; + vrml_transform = dynamic_cast(obj); + + openvrml::mat4f vrml_m = vrml_transform->transform(); + osg::MatrixTransform *osg_m = new osg::MatrixTransform(osg::Matrix(vrml_m[0][0], vrml_m[0][1], vrml_m[0][2], vrml_m[0][3], vrml_m[1][0], vrml_m[1][1], vrml_m[1][2], vrml_m[1][3], vrml_m[2][0], vrml_m[2][1], vrml_m[2][2], vrml_m[2][3], vrml_m[3][0], vrml_m[3][1], vrml_m[3][2], vrml_m[3][3])); + + try + { + const openvrml::field_value &fv = obj->field("children"); + + if ( fv.type() == openvrml::field_value::mfnode_id ) { + const openvrml::mfnode &mfn = dynamic_cast(fv); + for (unsigned i = 0; i < mfn.value.size(); i++) { + openvrml::node *node = mfn.value[i].get(); + osg_m->addChild(convertFromVRML(node)); + } + } + } catch (openvrml::unsupported_interface &e) + { + // no children + } + + return osg_m; + + } else if (obj->type.id == "Shape") // Handle Shape node + { + osg::Geode *osg_geode = new osg::Geode(); + osg::Geometry *osg_geom = new osg::Geometry(); + osg_geode->addDrawable(osg_geom); + + osg_geom->addPrimitiveSet(new osg::DrawArrayLengths(osg::PrimitiveSet::POLYGON)); + + // parse the geometry + { + const openvrml::field_value &fv = obj->field("geometry"); + + if (fv.type() == openvrml::field_value::sfnode_id) + { + const openvrml::sfnode &sfn = dynamic_cast(fv); + // is it indexed_face_set_node ? + if (openvrml::vrml97_node::indexed_face_set_node *vrml_ifs = + dynamic_cast(sfn.value.get())) { + // get array of vertex coordinate_nodes + { + const openvrml::field_value & fv = vrml_ifs->field("coord"); + const openvrml::sfnode &sfn = dynamic_cast(fv); + openvrml::vrml97_node::coordinate_node *vrml_coord_node = + dynamic_cast(sfn.value.get()); + + const std::vector &vrml_coord = vrml_coord_node->point(); + osg::Vec3Array *osg_vertices = new osg::Vec3Array(); + + unsigned i; + for (i = 0; i < vrml_coord.size(); i++) + { + openvrml::vec3f vec = vrml_coord[i]; + osg_vertices->push_back(osg::Vec3(vec[0], vec[1], vec[2])); + } + + osg_geom->setVertexArray(osg_vertices); + + // get array of vertex indices + const openvrml::field_value &fv2 = vrml_ifs->field("coordIndex"); + const openvrml::mfint32 &vrml_coord_index = dynamic_cast(fv2); + + osg::IntArray *osg_vert_index = new osg::IntArray(); + + int num_vert = 0; + for (i = 0; i < vrml_coord_index.value.size(); i++) + { + int index = vrml_coord_index.value[i]; + if (index == -1) { + ((osg::DrawArrayLengths*) osg_geom->getPrimitiveSet(0))->push_back(num_vert); + num_vert = 0; + } else { + osg_vert_index->push_back(index); + num_vert ++; + } + } + + osg_geom->setVertexIndices(osg_vert_index); + } + + { + // get texture coordinate_nodes + const openvrml::field_value &fv = vrml_ifs->field("texCoord"); + const openvrml::sfnode &sfn = dynamic_cast(fv); + openvrml::vrml97_node::texture_coordinate_node *vrml_tex_coord_node = + dynamic_cast(sfn.value.get()); + + if (vrml_tex_coord_node != 0) // if no texture, node is NULL pointer + { + const std::vector &vrml_tex_coord = vrml_tex_coord_node->point(); + osg::Vec2Array *osg_texcoords = new osg::Vec2Array(); + + unsigned i; + for (i = 0; i < vrml_tex_coord.size(); i++) + { + openvrml::vec2f vec = vrml_tex_coord[i]; + osg_texcoords->push_back(osg::Vec2(vec[0], vec[1])); + } + + osg_geom->setTexCoordArray(0, osg_texcoords); + + // get array of texture indices + const openvrml::field_value &fv2 = vrml_ifs->field("texCoordIndex"); + const openvrml::mfint32 &vrml_tex_coord_index = dynamic_cast(fv2); + + osg::IntArray *osg_tex_coord_index = new osg::IntArray(); + + for (i = 0; i < vrml_tex_coord_index.value.size(); i++) + { + int index = vrml_tex_coord_index.value[i]; + if (index != -1) { + osg_tex_coord_index->push_back(index); + } + } + + osg_geom->setTexCoordIndices(0, osg_tex_coord_index); + } + + } + + // get array of normals per vertex (if specified) + { + const openvrml::field_value &fv = vrml_ifs->field("normal"); + const openvrml::sfnode &sfn = dynamic_cast(fv); + openvrml::vrml97_node::normal_node *vrml_normal_node = + dynamic_cast(sfn.value.get()); + + if (vrml_normal_node != 0) // if no normals, node is NULL pointer + { + const std::vector &vrml_normal_coord = vrml_normal_node->vector(); + + osg::Vec3Array *osg_normalcoords = new osg::Vec3Array(); + + unsigned i; + for (i = 0; i < vrml_normal_coord.size(); i++) + { + const openvrml::vec3f vec = vrml_normal_coord[i]; + osg_normalcoords->push_back(osg::Vec3(vec[0], vec[1], vec[2])); + } + + // get array of texture indices + const openvrml::field_value &fv2 = vrml_ifs->field("normalIndex"); + const openvrml::mfint32 &vrml_normal_index = dynamic_cast(fv2); + + osg::IntArray *osg_normal_index = new osg::IntArray(); + + for (i = 0; i < vrml_normal_index.value.size(); i++) + { + int index = vrml_normal_index.value[i]; + if (index != -1) { + osg_normal_index->push_back(index); + } + } + + // get normal binding + const openvrml::field_value &fv3 = vrml_ifs->field("normalPerVertex"); + const openvrml::sfbool &vrml_norm_per_vertex = dynamic_cast(fv3); + + osg_geom->setNormalArray(osg_normalcoords); + osg_geom->setNormalIndices(osg_normal_index); + + if (vrml_norm_per_vertex.value) + { + osg_geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX); + } else + { + osg_geom->setNormalBinding(osg::Geometry::BIND_PER_PRIMITIVE); + } + } + } + } else { + // other geometry types not handled yet + } + } + } + + // parse the appearance + { + const openvrml::field_value &fv = obj->field("appearance"); + + if (fv.type() == openvrml::field_value::sfnode_id) + { + osg::StateSet *osg_stateset = osg_geom->getOrCreateStateSet(); + + const openvrml::sfnode &sfn = dynamic_cast(fv); + // std::cerr << "FV->sfnode OK" << std::endl << std::flush; + + openvrml::vrml97_node::appearance_node *vrml_app = + dynamic_cast(sfn.value.get()); + // std::cerr << "sfnode->appearance_node OK" << std::endl << std::flush; + + const openvrml::node_ptr &vrml_material_node = vrml_app->material(); + const openvrml::node_ptr &vrml_texture_node = vrml_app->texture(); + + const openvrml::vrml97_node::material_node *vrml_material = + dynamic_cast(vrml_material_node.get()); + // std::cerr << "sfnode->Material OK" << std::endl << std::flush; + + if (vrml_material != NULL) { + osg::Material *osg_mat = new osg::Material(); + osg_mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4(vrml_material->ambient_intensity(), + vrml_material->ambient_intensity(), + vrml_material->ambient_intensity(), + 1.0)); + osg_mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4(vrml_material->diffuse_color().r(), + vrml_material->diffuse_color().g(), + vrml_material->diffuse_color().b(), + 1.0)); + osg_mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4(vrml_material->emissive_color().r(), + vrml_material->emissive_color().g(), + vrml_material->emissive_color().b(), + 1.0)); + osg_mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4(vrml_material->specular_color().r(), + vrml_material->specular_color().g(), + vrml_material->specular_color().b(), + 1.0)); + + osg_mat->setTransparency(osg::Material::FRONT_AND_BACK, vrml_material->transparency() ); + //osg_stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); + + osg_mat->setShininess(osg::Material::FRONT_AND_BACK, vrml_material->shininess() ); + + //osg_mat->setColorMode(osg::Material::OFF); + + osg_stateset->setAttributeAndModes(osg_mat); + osg_stateset->setMode(GL_BLEND, osg::StateAttribute::ON); //bhbn + + } + + const openvrml::vrml97_node::image_texture_node *vrml_texture = + dynamic_cast(vrml_texture_node.get()); + // std::cerr << "TextureNode -> ImageTexture OK" << std::endl << std::flush; + + // if texture is provided + if (vrml_texture != 0) { + const openvrml::field_value &texture_url_fv = vrml_texture->field("url"); + const openvrml::mfstring &mfs = dynamic_cast(texture_url_fv); + // std::cerr << "Texture URL FV -> mfstring OK" << std::endl << std::flush; + + const std::string &url = mfs.value[0]; + + osg::Image* image = 0; + image = osgDB::readImageFile(url); + + if (image != 0) { + osg::Texture2D *texture = new osg::Texture2D; + texture->setImage(image); + + // defaults + texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT); + texture->setWrap(osg::Texture::WRAP_R, osg::Texture::REPEAT); + texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT); + + // get the real texture wrapping parameters (if any) + + try { + const openvrml::field_value &wrap_fv = vrml_texture->field("repeatS"); + const openvrml::sfbool &sfb = dynamic_cast(wrap_fv); + + if (!sfb.value) { + texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP); + } + } catch (...) { + // nothing specified + } + + try { + const openvrml::field_value &wrap_fv = vrml_texture->field("repeatT"); + const openvrml::sfbool &sfb = dynamic_cast(wrap_fv); + + if (!sfb.value) { + texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP); + } + } catch (...) { + // nothing specified + } + + osg_stateset->setTextureAttributeAndModes(0, texture); + //osg_stateset->setMode(GL_BLEND,osg::StateAttribute::ON); //bhbn + + } else { + std::cerr << "texture file " << url << " not found !" << std::endl << std::flush; + } + } + } + } + + return osg_geode; + } else { + return 0; + } + + /* + } else if(obj->type.id == "DirectionalLight") // Handle lights + { + osg::Group* lightGroup = new osg::Group; + + openvrml::vrml97_node::directional_light_node *vrml_light; + vrml_light = dynamic_cast(obj); + + // create light with global params + osg::Light* myLight = new osg::Light; + myLight->setLightNum(osgLightNum); + myLight->setAmbient(osg::Vec4(vrml_light->ambient_intensity(),vrml_light->ambient_intensity(),vrml_light->ambient_intensity(),vrml_light->ambient_intensity())); + float osgR = vrml_light->color().r()*vrml_light->intensity(); + float osgG = vrml_light->color().g()*vrml_light->intensity(); + float osgB = vrml_light->color().b()*vrml_light->intensity(); + myLight->setDiffuse(osg::Vec4(osgR, osgG, osgB, 1.0f)); + myLight->setSpecular(osg::Vec4(osgR, osgG, osgB, 1.0f)); + + // configure light as DIRECTIONAL + openvrml::sfvec3f &dir = vrml_light->direction_; + myLight->setDirection(osg::Vec3(dir.value[0],dir.value[1],dir.value[2])); + myLight->setPosition(osg::Vec4(dir.value[0],dir.value[1],dir.value[2], 0.0f)); + + // add the light in the scenegraph + osg::LightSource* lightS = new osg::LightSource; + lightS->setLight(myLight); + if (vrml_light->on()) { + lightS->setLocalStateSetModes(osg::StateAttribute::ON); + //lightS->setStateSetModes(*rootStateSet,osg::StateAttribute::ON); + } + + lightGroup->addChild(lightS); + osgLightNum++; + + return lightGroup; + + } else if(obj->type.id == "PointLight") // Handle lights + { + osg::Group* lightGroup = new osg::Group; + + openvrml::vrml97_node::point_light_node *vrml_light; + vrml_light = dynamic_cast(obj); + + // create light with global params + osg::Light* myLight = new osg::Light; + myLight->setLightNum(osgLightNum); + //std::cout<<"lightnum = "<location_; + myLight->setPosition(osg::Vec4(pos.value[0], pos.value[1], pos.value[2], 1.0f)); + + myLight->setAmbient(osg::Vec4(vrml_light->ambient_intensity(),vrml_light->ambient_intensity(),vrml_light->ambient_intensity(),vrml_light->ambient_intensity())); + float osgR = vrml_light->color().r()*vrml_light->intensity(); + float osgG = vrml_light->color().g()*vrml_light->intensity(); + float osgB = vrml_light->color().b()*vrml_light->intensity(); + myLight->setDiffuse(osg::Vec4(osgR, osgG, osgB, 1.0f)); + myLight->setSpecular(osg::Vec4(osgR, osgG, osgB, 1.0f)); + + // configure light as POINT + myLight->setDirection(osg::Vec3(0.f,0.f,0.f)); + + // add the light in the scenegraph + osg::LightSource* lightS = new osg::LightSource; + lightS->setLight(myLight); + if (vrml_light->on()) { + lightS->setLocalStateSetModes(osg::StateAttribute::ON); + //lightS->setStateSetModes(*rootStateSet,osg::StateAttribute::ON); + } + + lightGroup->addChild(lightS); + osgLightNum++; + + return lightGroup; + + } else if(obj->type.id == "SpotLight") // Handle lights + { + osg::Group* lightGroup = new osg::Group; + + openvrml::vrml97_node::spot_light_node *vrml_light; + vrml_light = dynamic_cast(obj); + + // create light with global params + osg::Light* myLight = new osg::Light; + myLight->setLightNum(osgLightNum); + myLight->setPosition(osg::Vec4(0.0f, 0.0f, 0.0f, 1.0f)); + myLight->setAmbient(osg::Vec4(vrml_light->ambient_intensity(),vrml_light->ambient_intensity(),vrml_light->ambient_intensity(),vrml_light->ambient_intensity())); + float osgR = vrml_light->color().r()*vrml_light->intensity(); + float osgG = vrml_light->color().g()*vrml_light->intensity(); + float osgB = vrml_light->color().b()*vrml_light->intensity(); + myLight->setDiffuse(osg::Vec4(osgR, osgG, osgB, 1.0f)); + myLight->setSpecular(osg::Vec4(osgR, osgG, osgB, 1.0f)); + + // configure light as SPOT + openvrml::sfvec3f &dir = vrml_light->direction_; + myLight->setDirection(osg::Vec3(dir.value[0],dir.value[1],dir.value[2])); + + // The cutOff value in osg ranges from 0 to 90, we need + // to divide by 2 to avoid openGL error. + // myLight->setSpotCutoff(ls.fallsize/2.0f); + // The bigger the differens is between fallsize and hotsize + // the bigger the exponent should be. + // float diff = ls.fallsize - ls.hotsize; + // myLight->setSpotExponent(diff); + + // add the light in the scenegraph + osg::LightSource* lightS = new osg::LightSource; + lightS->setLight(myLight); + if (vrml_light->on()) { + lightS->setLocalStateSetModes(osg::StateAttribute::ON); + //lightS->setStateSetModes(*rootStateSet,osg::StateAttribute::ON); + } + + lightGroup->addChild(lightS); + osgLightNum++; + + return lightGroup; + + } else { + + return NULL; + } + */ +} + + + diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 166097219..8c4aae0ae 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -308,6 +308,7 @@ BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) I_PublicMemberProperty(unsigned int, level); I_PublicMemberProperty(unsigned int, face); I_PublicMemberProperty(unsigned int, mipMapGeneration); + I_PublicMemberProperty(bool, vsync); I_PublicMemberProperty(osg::GraphicsContext *, sharedContext); END_REFLECTOR diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index ce6ea0755..9a1b8e26e 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -75,8 +75,16 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) "Default value is Escape (osgGA::GUIEVentAdapter::KEY_Escape). Setting to 0 switches off the feature. "); I_Method0(int, getKeySetsDone, __int__getKeySetsDone, - "Set the key value that the viewer checks on each frame to see if the viewer's done flag. ", + "get the key value that the viewer checks on each frame to see if the viewer's done flag. ", ""); + I_Method1(void, setQuitEventSetsDone, IN, bool, flag, + __void__setQuitEventSetsDone__bool, + "if the flag is true, the viewer set its done flag when a QUIT_APPLICATION is received, false disables this feature ", + ""); + I_Method0(bool, getQuitEventSetsDone, + __bool__getQuitEventSetsDone, + "", + "true if the viewer respond to the QUIT_APPLICATION-event "); I_Method0(int, run, __int__run, "Execute a main frame loop. ", @@ -141,6 +149,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) I_SimpleProperty(int, KeySetsDone, __int__getKeySetsDone, __void__setKeySetsDone__int); + I_SimpleProperty(bool, QuitEventSetsDone, + __bool__getQuitEventSetsDone, + __void__setQuitEventSetsDone__bool); I_SimpleProperty(osgViewer::Viewer::ThreadingModel, ThreadingModel, __ThreadingModel__getThreadingModel, __void__setThreadingModel__ThreadingModel);