diff --git a/src/osgPlugins/directx/LICENSE b/src/osgPlugins/directx/LICENSE new file mode 100644 index 000000000..b1e3f5a26 --- /dev/null +++ b/src/osgPlugins/directx/LICENSE @@ -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/directx/ReaderWriterDirectX.cpp b/src/osgPlugins/directx/ReaderWriterDirectX.cpp index 34a8cc4d4..bfaebdc65 100644 --- a/src/osgPlugins/directx/ReaderWriterDirectX.cpp +++ b/src/osgPlugins/directx/ReaderWriterDirectX.cpp @@ -6,18 +6,18 @@ * DirectX file converter for OpenSceneGraph. * Copyright (c)2002 Ulrich Hertlein * - * 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 of the License, or - * (at your option) any later version. + * 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 General Public License - * along with this program; if not, write to the Free Software + * 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 */ @@ -60,7 +60,7 @@ public: const osgDB::ReaderWriter::Options* options); private: - osg::Geode* convertFromDX(DX::Object& obj, bool flipTexture); + osg::Geode* convertFromDX(DX::Object& obj, bool flipTexture, float creaseAngle); }; // Register with Registry to instantiate the above reader/writer. @@ -80,17 +80,21 @@ osgDB::ReaderWriter::ReadResult ReaderWriterDirectX::readNode(const std::string& // Load DirectX mesh DX::Object obj; if (obj.load(fileName.c_str())) { + // Options? bool flipTexture = true; + float creaseAngle = 80.0f; if (options) { const std::string option = options->getOptionString(); - cerr << option << endl; if (option.find("flipTexture") != string::npos) flipTexture = false; + if (option.find("creaseAngle") != string::npos) { + // TODO + } } // Convert to osg::Geode - osg::Geode* geode = convertFromDX(obj, flipTexture); + osg::Geode* geode = convertFromDX(obj, flipTexture, creaseAngle); if (!geode) return ReadResult::FILE_NOT_HANDLED; @@ -101,7 +105,8 @@ osgDB::ReaderWriter::ReadResult ReaderWriterDirectX::readNode(const std::string& } // Convert DirectX mesh to osg::Geode -osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Object& obj, bool flipTexture) +osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Object& obj, + bool flipTexture, float creaseAngle) { // Fetch mesh const DX::Mesh* mesh = obj.getMesh(); @@ -114,7 +119,7 @@ osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Object& obj, bool flipTexture const DX::MeshNormals* meshNormals = obj.getMeshNormals(); if (!meshNormals) { - obj.generateNormals(); + obj.generateNormals(creaseAngle); meshNormals = obj.getMeshNormals(); } if (!meshNormals) @@ -285,11 +290,5 @@ osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Object& obj, bool flipTexture cullFace->setMode(osg::CullFace::BACK); state->setAttributeAndModes(cullFace); - /* - * TODO: - * Smooth normals if we previously did a 'generateNormals'? - * (Would create a dependency on osgUtil.) - */ - return geode; } diff --git a/src/osgPlugins/directx/directx.cpp b/src/osgPlugins/directx/directx.cpp index dd1e7051c..181e7be37 100644 --- a/src/osgPlugins/directx/directx.cpp +++ b/src/osgPlugins/directx/directx.cpp @@ -6,18 +6,18 @@ * Loader for DirectX .x files. * Copyright (c)2002 Ulrich Hertlein * - * 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 of the License, or - * (at your option) any later version. + * 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 General Public License - * along with this program; if not, write to the Free Software + * 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 */ @@ -35,8 +35,8 @@ using namespace std; // Tokenize a string -void tokenize(const string& str, vector& tokens, - const string& delimiters = " \t\r\n;,") +static void tokenize(const string& str, vector& tokens, + const string& delimiters = " \t\r\n;,") { string::size_type lastPos = str.find_first_not_of(delimiters, 0); string::size_type pos = str.find_first_of(delimiters, lastPos); @@ -50,21 +50,12 @@ void tokenize(const string& str, vector& tokens, // Constructor -Object::Object(const char* filename) +Object::Object() { _textureCoords = NULL; _materialList = NULL; _normals = NULL; _mesh = NULL; - - load(filename); -} - - -// Destructor -Object::~Object() -{ - clear(); } @@ -120,7 +111,7 @@ bool Object::load(const char* filename) /* * Generate per-face normals */ -bool Object::generateNormals() +bool Object::generateNormals(float /*creaseAngle*/) { if (!_mesh) return false; @@ -131,22 +122,22 @@ bool Object::generateNormals() _normals = NULL; } - cerr << "*** GenerateNormals\n"; + cout << "*** generateNormals\n"; - // Create normals - _normals = new MeshNormals; + /* + * Calculate per-face normals from face vertices. + */ + vector faceNormals; + faceNormals.resize(_mesh->faces.size()); - // Loop over MeshFaces - unsigned int i, fi; - for (fi = 0; fi < _mesh->faces.size(); fi++) { + for (unsigned int fi = 0; fi < _mesh->faces.size(); fi++) { - // Collect polygon vertices vector poly; unsigned int n = _mesh->faces[fi].size(); if (n < 3) continue; - for (i = 0; i < n; i++) { + for (unsigned int i = 0; i < n; i++) { unsigned int idx = _mesh->faces[fi][i]; poly.push_back(_mesh->vertices[idx]); } @@ -167,25 +158,55 @@ bool Object::generateNormals() normal.x = e0.y * e1.z - e0.z * e1.y; normal.y = e0.z * e1.x - e0.x * e1.z; normal.z = e0.x * e1.y - e0.y * e1.x; + normal.normalize(); - // Normalize - float len = sqrt(normal.x * normal.x + normal.y * normal.y + normal.z * normal.z); - normal.x /= len; - normal.y /= len; - normal.z /= len; - - // Add normal index - unsigned int ni = _normals->normals.size(); - _normals->normals.push_back(normal); - - // All vertices of this face share this vertex - MeshFace mf; - mf.resize(n); - for (i = 0; i < n; i++) - mf[i] = ni; - _normals->faceNormals.push_back(mf); + // Add to per-face normals + faceNormals[fi] = normal; } + /* + * Calculate per-vertex normals as average of all per-face normals that + * share this vertex. The index of the vertex normal is identical to the + * vertex index for now. This means each vertex only has a single normal... + */ + _normals = new MeshNormals; + _normals->normals.resize(_mesh->vertices.size()); + + for (unsigned int vi = 0; vi < _mesh->vertices.size(); vi++) { + + Vector normal = { 0.0f, 0.0f, 0.0f }; + unsigned int polyCount = 0; + + // Collect normals of polygons that share this vertex + for (unsigned int fi = 0; fi < _mesh->faces.size(); fi++) + for (unsigned int i = 0; i < _mesh->faces[fi].size(); i++) { + unsigned int idx = _mesh->faces[fi][i]; + if (idx == vi) { + normal.x += faceNormals[fi].x; + normal.y += faceNormals[fi].y; + normal.z += faceNormals[fi].z; + polyCount++; + } + } + + //cerr << "vertex " << vi << " used by " << polyCount << " faces\n"; + if (polyCount > 1) { + float polyCountRecip = 1.0f / (float) polyCount; + normal.x *= polyCountRecip; + normal.y *= polyCountRecip; + normal.z *= polyCountRecip; + normal.normalize(); + } + + // Add vertex normal + _normals->normals[vi] = normal; + } + + // Copy face mesh to normals mesh + _normals->faceNormals.resize(_mesh->faces.size()); + for (unsigned int fi = 0; fi < _mesh->faces.size(); fi++) + _normals->faceNormals[fi] = _mesh->faces[fi]; + return true; } @@ -202,7 +223,7 @@ void Object::readTexFilename(ifstream& fin, TextureFilename& texture) char buf[256]; vector token; - cerr << "*** TexFilename\n"; + //cout << "*** TexFilename\n"; while (fin.getline(buf, sizeof(buf))) { // Tokenize @@ -236,7 +257,7 @@ void Object::parseMaterial(ifstream& fin, Material& material) unsigned int i = 0; - //cerr << "*** Material\n"; + //cout << "*** Material\n"; while (fin.getline(buf, sizeof(buf))) { // Tokenize @@ -250,9 +271,8 @@ void Object::parseMaterial(ifstream& fin, Material& material) if (token[0] == "TextureFilename") { TextureFilename tf; readTexFilename(fin, tf); - material.texture.push_back(tf); - //cerr << "num tex=" << material.texture.size() << endl; + //cerr << "* num tex=" << material.texture.size() << endl; } else switch (i) { @@ -296,7 +316,7 @@ void Object::readCoords2d(ifstream& fin, vector& v, unsigned int count unsigned int i = 0; - cerr << "*** Coords2d\n"; + //cout << "*** Coords2d\n"; while (i < count && fin.getline(buf, sizeof(buf))) { // Tokenize @@ -322,7 +342,7 @@ void Object::readMeshTexCoords(ifstream& fin) unsigned int nTextureCoords = 0; - cerr << "*** MeshTextureCoords\n"; + //cout << "*** MeshTextureCoords\n"; while (fin.getline(buf, sizeof(buf))) { // Tokenize @@ -342,8 +362,7 @@ void Object::readMeshTexCoords(ifstream& fin) nTextureCoords = atoi(token[0].c_str()); readCoords2d(fin, *_textureCoords, nTextureCoords); - cerr << "nTextureCoords=" << nTextureCoords << "/" << _textureCoords->size() << endl; - + cerr << "* nTextureCoords=" << _textureCoords->size() << endl; assert(nTextureCoords == _textureCoords->size()); } } @@ -357,7 +376,7 @@ void Object::readIndexList(ifstream& fin, vector& v, unsigned int unsigned int i = 0; - cerr << "*** IndexList\n"; + //cout << "*** IndexList\n"; while (i < count && fin.getline(buf, sizeof(buf))) { // Tokenize @@ -381,7 +400,7 @@ void Object::parseMeshMaterialList(ifstream& fin) unsigned int nMaterials = 0, nFaceIndices = 0; - cerr << "*** MeshMaterialList\n"; + //cout << "*** MeshMaterialList\n"; while (fin.getline(buf, sizeof(buf))) { // Tokenize @@ -398,7 +417,7 @@ void Object::parseMeshMaterialList(ifstream& fin) parseMaterial(fin, mm); _materialList->material.push_back(mm); - //cerr << "num mat=" << _materialList->material.size() << endl; + //cerr << "* num mat=" << _materialList->material.size() << endl; } else { cerr << "!!! MeshMaterialList: Section " << token[0] << endl; @@ -412,15 +431,14 @@ void Object::parseMeshMaterialList(ifstream& fin) // Materials nMaterials = atoi(token[0].c_str()); - //cerr << "nMaterials=" << nMaterials << endl; + //cerr << "* nMaterials=" << nMaterials << endl; } else if (nFaceIndices == 0) { // Face indices nFaceIndices = atoi(token[0].c_str()); readIndexList(fin, _materialList->faceIndices, nFaceIndices); - cerr << "nFaceIndices=" << nFaceIndices << "/" << _materialList->faceIndices.size() << endl; - + cerr << "* nFaceIndices=" << _materialList->faceIndices.size() << endl; assert(nFaceIndices == _materialList->faceIndices.size()); } } @@ -437,7 +455,7 @@ void Object::readVector(ifstream& fin, vector& v, unsigned int count) unsigned int i = 0; - cerr << "*** Vector\n"; + //cout << "*** Vector\n"; while (i < count && fin.getline(buf, sizeof(buf))) { // Tokenize @@ -464,7 +482,7 @@ void Object::readMeshFace(ifstream& fin, vector& v, unsigned int count unsigned int i = 0; - cerr << "*** MeshFace\n"; + //cout << "*** MeshFace\n"; while (i < count && fin.getline(buf, sizeof(buf))) { // Tokenize @@ -494,7 +512,7 @@ void Object::parseMeshNormals(ifstream& fin) unsigned int nNormals = 0, nFaceNormals = 0; - cerr << "*** MeshNormals\n"; + //cout << "*** MeshNormals\n"; while (fin.getline(buf, sizeof(buf))) { // Tokenize @@ -514,7 +532,9 @@ void Object::parseMeshNormals(ifstream& fin) nNormals = atoi(token[0].c_str()); readVector(fin, _normals->normals, nNormals); - cerr << "nNormals=" << nNormals << "/" << _normals->normals.size() << endl; + cerr << "* nNormals=" << _normals->normals.size() << endl; + assert(nNormals == _normals->normals.size()); + #ifdef NORMALIZE_NORMALS for (unsigned int i = 0; i < _normals->normals.size(); i++) { DX::Vector vec = _normals->normals[i]; @@ -528,16 +548,13 @@ void Object::parseMeshNormals(ifstream& fin) _normals->normals[i] = vec; } #endif - - assert(nNormals == _normals->normals.size()); } else if (nFaceNormals == 0) { // Face normals nFaceNormals = atoi(token[0].c_str()); readMeshFace(fin, _normals->faceNormals, nFaceNormals); - cerr << "nFaceNormals=" << nFaceNormals << "/" << _normals->faceNormals.size() << endl; - + cerr << "* nFaceNormals=" << _normals->faceNormals.size() << endl; assert(nFaceNormals == _normals->faceNormals.size()); } } @@ -552,7 +569,7 @@ void Object::parseMesh(ifstream& fin) unsigned int nVertices = 0, nFaces = 0; - cerr << "*** Mesh\n"; + //cout << "*** Mesh\n"; while (fin.getline(buf, sizeof(buf))) { // Tokenize @@ -585,8 +602,7 @@ void Object::parseMesh(ifstream& fin) nVertices = atoi(token[0].c_str()); readVector(fin, _mesh->vertices, nVertices); - cerr << "nVertices=" << nVertices << "/" << _mesh->vertices.size() << endl; - + cerr << "* nVertices=" << _mesh->vertices.size() << endl; assert(nVertices == _mesh->vertices.size()); } else if (nFaces == 0) { @@ -594,8 +610,7 @@ void Object::parseMesh(ifstream& fin) nFaces = atoi(token[0].c_str()); readMeshFace(fin, _mesh->faces, nFaces); - cerr << "nFaces=" << nFaces << "/" << _mesh->faces.size() << endl; - + cerr << "* nFaces=" << _mesh->faces.size() << endl; assert(nFaces == _mesh->faces.size()); } else diff --git a/src/osgPlugins/directx/directx.h b/src/osgPlugins/directx/directx.h index 87497a2bb..a65cdb183 100644 --- a/src/osgPlugins/directx/directx.h +++ b/src/osgPlugins/directx/directx.h @@ -6,18 +6,18 @@ * Loader for DirectX .x files. * Copyright (c)2002 Ulrich Hertlein * - * 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 of the License, or - * (at your option) any later version. + * 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 General Public License - * along with this program; if not, write to the Free Software + * 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 */ @@ -38,6 +38,13 @@ namespace DX { // Vector typedef struct { float x,y,z; + + inline void normalize() { + float lenRecip = 1.0f / sqrt(x * x + y * y + z * z); + x *= lenRecip; + y *= lenRecip; + z *= lenRecip; + } } Vector; // Coords2d @@ -105,21 +112,30 @@ namespace DX { */ class Object { public: - /// Constructor; loads filename if non-NULL. - Object(const char* filename = NULL); + /// Constructor. + Object(); /// Destructor. - virtual ~Object(); + virtual ~Object() { + clear(); + } - /// Load from file; discards old data. + /** + * Load model from file + * Discards old data. + * @param filename Filename. + * @return false if the model could not be loaded, else true. + */ bool load(const char* filename); /** - * Generate normals. - * This function generates face normals and binds them to - * every vertex of this face. + * Generate per-vertex normals for the entire model. + * Discards any previously loaded or generated normals. + * @param creaseAngle TODO: The angle above which two adjacent faces are no + * longer considered to belong to a common surface. + * @return false if an error occurred, else true. */ - bool generateNormals(); + bool generateNormals(float creaseAngle = 80.0f); /// Get MeshTextureCoords. inline const MeshTextureCoords* getMeshTextureCoords() const { @@ -170,16 +186,16 @@ namespace DX { void readMeshTexCoords(std::ifstream& fin); /// Read index list. - void readIndexList(ifstream& fin, std::vector& v, unsigned int count); + void readIndexList(std::ifstream& fin, std::vector& v, unsigned int count); /// Parse 'MeshMaterialList'. void parseMeshMaterialList(std::ifstream& fin); /// Read 'Vector'. - void readVector(ifstream& fin, std::vector& v, unsigned int count); + void readVector(std::ifstream& fin, std::vector& v, unsigned int count); /// Read 'MeshFace'. - void readMeshFace(ifstream& fin, std::vector& v, unsigned int count); + void readMeshFace(std::ifstream& fin, std::vector& v, unsigned int count); /// Parse 'MeshNormals'. void parseMeshNormals(std::ifstream& fin);