Fix windows build: warnings management

Also removes the use of 'this' to initialize base classes, which led to
a compiler warning on vs2010.

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -11,6 +11,7 @@
 /bin-release
 /indra/viewer-*
 /indra/newview/vivox-runtime/
+/indra/newview/dbghelp.dll
 /libraries/
 /lib/
 *.pyc
@@ -22,3 +23,4 @@
 /LICENSES/
 /edited-files.txt
 qtcreator-build/
+/.pc

LICENSES/FLOSS-exception.txt

@@ -0,0 +1,114 @@
+Linden Research, Inc. ("Linden Lab") Viewer FLOSS License Exception v0.5
+
+The Linden Lab Exception for Free/Libre and Open Source Software-only
+Applications Using Linden Lab Viewer Software (the "FLOSS Exception").
+
+Exception Intent
+
+Linden Lab is releasing the source code for certain software that
+enables users to view or otherwise access the Second Life virtual
+world environment (the "Viewer Software"), under version 2 of the GNU
+General Public License (the "GPL").  The creation or distribution of
+works based on the Program (as defined under the GPL) of the Viewer
+Software may require the use of certain Free/Libre and Open Source
+Software ("FLOSS") works that are subject to license agreements not
+compatible with re-licensing under the GPL.  Because we want to allow
+the Viewer Software to be distributed with these FLOSS works, this
+FLOSS Exception following exception applies subject to the terms and
+conditions below.
+
+Legal Terms and Conditions
+
+As a special exception to the terms and conditions of version 2.0 of
+the GPL:
+
+You are free to distribute a work based on the Program that is formed
+entirely from the Viewer Software (and any modifications thereof) and
+one or more works that are independent and separate works not derived
+from the Viewer Software, and are licensed under one or more of the
+licenses listed below in section 1 (each, a "FLOSS Work") , as long
+as:
+
+   A. You obey the GPL in all respects for the Viewer Software and any
+      work based on the Program, except for the FLOSS Works, for which
+      you must comply with B below,
+
+   B. all FLOSS Works,
+
+         i.  are distributed subject to one of the FLOSS licenses
+             listed below, and
+
+         ii. the object code or executable form of the FLOSS Works are
+             accompanied by the complete corresponding
+             machine-readable source code for those FLOSS Works on the
+             same medium and under the same FLOSS license as the
+             corresponding object code or executable forms thereof,
+             and
+
+   C. any works that are aggregated with the Viewer Software or a work
+      based on the Program on a volume of a storage or distribution
+      medium in accordance with the GPL, and are not licensed under
+      the FLOSS licenses listed below, are independent and separate
+      works in themselves which are not derivatives of either the
+      Viewer Software, a work based on the Program or a FLOSS Work.
+
+If the above conditions are not met, then the Viewer Software may only
+be copied, modified, distributed or used under the terms and
+conditions of the GPL or another valid licensing option from Linden
+Lab.
+
+1. FLOSS License List
+
+License name                                Version(s)/Copyright Date
+Academic Free License                                             2.0
+Apache Software License                                   1.0/1.1/2.0
+Apple Public Source License                                       2.0
+Artistic license                                      From Perl 5.8.0
+BSD license                                            "July 22 1999"
+Common Development and 
+    Distribution License (CDDL)                                   1.0
+Common Public License                                             1.0
+GNU Library or "Lesser" General 
+    Public License (LGPL)                                     2.0/2.1
+Jabber Open Source License                                        1.0
+MIT License (As listed in file MIT-License.txt)                     -
+Mozilla Public License (MPL)                                  1.0/1.1
+Open Software License                                             2.0
+OpenSSL license (with 
+    original SSLeay license)                          "2003" ("1998")
+PHP License                                                       3.0
+Python license (CNRI Python License)                                -
+Python Software Foundation License                              2.1.1
+Sleepycat License                                              "1999"
+W3C License                                                    "2001"
+X11 License                                                    "2001"
+Zlib/libpng License                                                 -
+Zope Public License                                               2.0
+
+Due to the many variants of some of the above licenses, we require
+that any variant of the above licenses be identical in substance to
+the form approved by the Open Source Initiative and follow the 2003
+version of the Free Software Foundation's Free Software Definition
+(http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of the
+Open Source Definition by the Open Source Initiative
+(http://www.opensource.org/docs/definition.php).
+
+2. Definitions
+
+Terms used, but not defined, herein shall have the meaning provided in
+the GPL.
+
+3. Applicability
+
+This FLOSS Exception applies to all Viewer Software files that contain
+a notice placed by Linden Lab saying that the Viewer Software may be
+distributed under the terms of this FLOSS Exception. If you create or
+distribute a work which is a work based on the Program for the Viewer
+Software and any other work licensed under the GPL, then this FLOSS
+Exception is not available for that work; thus, you must remove the
+FLOSS Exception notice from that work and comply with the GPL in all
+respects, including by retaining all GPL notices. You may choose to
+redistribute a copy of the Viewer Software exclusively under the terms
+of the GPL by removing the FLOSS Exception notice from that copy of
+the Viewer Software, provided that the copy has never been modified by
+you or any third party.

LICENSES/GPL-license.txt

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, 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 or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+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 give any other recipients of the Program a copy of this License
+along with the Program.
+
+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 Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) 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; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, 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 executable.  However, as a
+special exception, the source code 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.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. 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 Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program 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 to
+this License.
+
+  7. 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 Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 Program
+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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), 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 Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

LICENSES/LLQTWEBKIT_LICENSE.txt

@@ -0,0 +1,36 @@
+Source code
+========
+The license for the source code in this distribution should be clearly
+marked on each source file.  Unless otherwise specified, the source
+code in this distribution ("Source Code") is provided by Linden Lab to
+you under the terms of the GNU General Public License, version 2.0
+("GPL"), unless you have obtained a separate licensing agreement
+("Other License"), formally executed by you and Linden Lab.  Terms of
+the GPL can be found in GPL-license.txt in this distribution, or
+online at http://secondlifegrid.net/technology-programs/license-virtual-world/viewerlicensing/gplv2
+
+There are special exceptions to the terms and conditions of the GPL as
+it is applied to this Source Code. View the full text of the exception
+in the file FLOSS-exception.txt in this software distribution, or
+online at http://secondlifegrid.net/technology-programs/license-virtual-world/viewerlicensing/flossexception
+
+By copying, modifying or distributing this software, you acknowledge
+that you have read and understood your obligations described above,
+and agree to abide by those obligations.
+
+ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+COMPLETENESS OR PERFORMANCE.
+
+Logos and trademarks
+==============
+
+"Second Life" and "Linden Lab" are registered trademarks of Linden
+Research, Inc.  Other trademarks include (but are not limited to): the
+names Linden and Linden Research, as well as the Linden Lab Hexagon
+Design and the Second Life Hand Design logos.
+
+Use of logos and trademarks are subject to the Linden Lab trademark
+policy, available at:
+
+http://secondlife.com/corporate/trademark/

README

@@ -9,15 +9,30 @@
 Sin-gu-la-ri-ty (noun) - a distinctive feature, a uniqueness; a point at which
 continuity breaks up; a point in history at which machine becomes smarter than 
 humanity and/or fuses with it indivisively; or simply a cool sounding word with 
-my initials in it :)
+the initials S.G. in it :)
 	
-Singularity Viewer is a Second Life protocol compatible client application. It
-can be used to access Second LIfe service as well as a number of other such as
-those based upon OpenSim plattform. It is directly based upon source code of 
-Ascent Viewer by Balseraph Software Group, which is in turn based upon source 
-code released by Linden Lab, with contributions from various sources.
+Singularity Viewer is a SecondLife(tm) protocol compatible client application.
+It can be used to access SecondLife services as well as a number of others such
+as those based upon the OpenSim platform.
+
+Singulariy is maintained by a small group of volunteers who can be contacted
+both, in-world (SingularityViewer group) as well on IRC (#SingularityViewer
+@ FreeNode). Bug requests and features requests can be submitted through our
+Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from
+the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...)
+
 
 As this Readme grows out of date, please refer to 
 
 	http://www.singularityviewer.org/about
 
+
+00000000011111111112222222222333333333344444444445555555555666666666677777777778
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+
+History
+
+The Singularity viewer was started by Siana Gearz in November 2010 by forking it
+from the Ascent Viewer, by Balseraph Software Group, which in turn was based upon
+source code modified from the snowglobe source code released by Linden Lab.
+

doc/contributions.txt

@@ -248,6 +248,7 @@ Celierra Darling
 	VWR-6975
 Cron Stardust
 	VWR-10579
+	STORM-1919
 Cypren Christenson
 	SNOW-129
 	SNOW-140

etc/message.xml

@@ -50,7 +50,7 @@
 				<key>OpenCircuit</key>
 				<map>
 					<key>flavor</key>
-					<string>template</string>
+					<string>llsd</string>
 					<key>trusted-sender</key>
 					<boolean>false</boolean>
 				</map>
@@ -370,6 +370,22 @@
 				</map>
 
 				<!-- Server to client -->
+				<key>DisplayNameUpdate</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+                
+				<key>WindLightRefresh</key>
+					<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+
 				<key>ParcelVoiceInfo</key>
 				<map>
 					<key>flavor</key>
@@ -378,7 +394,6 @@
 					<boolean>true</boolean>
 				</map>
 
-
 				<key>ParcelNavigateMedia</key>
 				<map>
 					<key>flavor</key>
@@ -419,6 +434,22 @@
           <boolean>true</boolean>
         </map>
 
+        <key>SetDisplayNameReply</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <key>SimConsoleResponse</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
         <key>DirLandReply</key>
         <map>
           <key>flavor</key>
@@ -515,8 +546,24 @@
 					<key>trusted-sender</key>
 					<boolean>true</boolean>
 				</map>
-				
-				<!-- UDPDeprecated Messages -->
+
+        <key>NavMeshStatusUpdate</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <key>AgentStateUpdate</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <!-- UDPDeprecated Messages -->
 				<key>ScriptRunningReply</key>
 				<map>
 					<key>flavor</key>
@@ -569,26 +616,9 @@
 				<map>
 					<key>flavor</key>
 					<string>llsd</string>
-					<key>trusted-sender</key>
-					<boolean>true</boolean>
-				</map>
-
-                <!-- Server to client -->
-                <key>DisplayNameUpdate</key>
-                <map>
-                  <key>flavor</key>
-                  <string>llsd</string>
-                  <key>trusted-sender</key>
-                  <boolean>true</boolean>
-                </map>
- 
-                <key>SetDisplayNameReply</key>
-                <map>
-                  <key>flavor</key>
-                  <string>llsd</string>
-                  <key>trusted-sender</key>
-                  <boolean>true</boolean>
-                </map>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
 
 		  </map>
   	  	<key>capBans</key>
@@ -633,7 +663,7 @@
 			<boolean>false</boolean>
 
 			<key>RequestTextureDownload</key>
-			<boolean>false</boolean>
+			<boolean>true</boolean>
 
 			<key>EventQueueGet</key>
 			<boolean>false</boolean>
@@ -685,6 +715,9 @@
 		
 			<key>FetchLib2</key>
 			<boolean>true</boolean>
+
+			<key>UploadBakedTexture</key>
+			<boolean>true</boolean>
 		</map>
 
 		<key>messageBans</key>

indra/CMakeLists.txt

@@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
 cmake_policy(SET CMP0003 OLD)
 
 set(ROOT_PROJECT_NAME "Singularity" CACHE STRING
-    "The root project/makefile/solution name. Defaults to SecondLife.")
+    "The root project/makefile/solution name. Defaults to Singularity.")
 project(${ROOT_PROJECT_NAME})
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -30,7 +30,7 @@ include(BuildVersion)
 
 include(UnixInstall)
 
-set (DISABLE_FATAL_WARNINGS TRUE)
+set (DISABLE_FATAL_WARNINGS CACHE BOOL TRUE)
 
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING
@@ -46,12 +46,16 @@ endif(NOT STANDALONE)
 add_custom_target(prepare DEPENDS ${prepare_depends})
 
 add_subdirectory(cmake)
-add_subdirectory(${LIBS_OPEN_PREFIX}cwdebug)
+add_subdirectory(${LIBS_OPEN_PREFIX}aistatemachine)
 add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
+add_subdirectory(${LIBS_OPEN_PREFIX}llappearance)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
 add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
 add_subdirectory(${LIBS_OPEN_PREFIX}libopenjpeg)
+add_subdirectory(${LIBS_OPEN_PREFIX}libhacd)
+add_subdirectory(${LIBS_OPEN_PREFIX}libndhacd)
+add_subdirectory(${LIBS_OPEN_PREFIX}libpathing)
 add_subdirectory(${LIBS_OPEN_PREFIX}llimagej2coj)
 add_subdirectory(${LIBS_OPEN_PREFIX}llinventory)
 add_subdirectory(${LIBS_OPEN_PREFIX}llmath)
@@ -62,11 +66,15 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
+if(STANDALONE)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llqtwebkit)
+endif(STANDALONE)
+
 if (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE)
   add_subdirectory(${LIBS_CLOSED_PREFIX}llkdu)
 endif (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE)
 
-add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
+#add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
 
 if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
   add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts)
@@ -77,7 +85,6 @@ if (VIEWER)
   add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
   add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
   add_subdirectory(${LIBS_OPEN_PREFIX}llui)
-  add_subdirectory(${LIBS_OPEN_PREFIX}llxuixml)
 
   # viewer plugins directory
   add_subdirectory(${LIBS_OPEN_PREFIX}plugins)

indra/aistatemachine/CMakeLists.txt

@@ -0,0 +1,41 @@
+# -*- cmake -*-
+
+project(aistatemachine)
+
+include(00-Common)
+include(LLCommon)
+include(LLMessage)
+include(LLMath)
+include(LLXML)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(aistatemachine_SOURCE_FILES
+    aistatemachine.cpp
+    aistatemachinethread.cpp
+    aitimer.cpp
+    )
+
+set(aistatemachine_HEADER_FILES
+    CMakeLists.txt
+
+    aistatemachine.h
+    aistatemachinethread.h
+    aitimer.h
+    )
+
+set_source_files_properties(${aistatemachine_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND aistatemachine_SOURCE_FILES ${aistatemachine_HEADER_FILES})
+
+add_library (aistatemachine ${aistatemachine_SOURCE_FILES})
+add_dependencies(aistatemachine prepare)
+

indra/aistatemachine/aistatemachine.cpp

@@ -0,0 +1,628 @@
+/**
+ * @file aistatemachine.cpp
+ * @brief Implementation of AIStateMachine
+ *
+ * Copyright (c) 2010, Aleric Inglewood.
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   01/03/2010
+ *   Initial version, written by Aleric Inglewood @ SL
+ */
+
+#include "linden_common.h"
+
+#include <algorithm>
+
+#include "llcontrol.h"
+#include "llfasttimer.h"
+#include "aithreadsafe.h"
+#include "aistatemachine.h"
+
+// Local variables.
+namespace {
+  struct QueueElementComp;
+
+  class QueueElement {
+	private:
+	  AIStateMachine* mStateMachine;
+	  U64 mRuntime;
+
+	public:
+	  QueueElement(AIStateMachine* statemachine) : mStateMachine(statemachine), mRuntime(0) { }
+	  friend bool operator==(QueueElement const& e1, QueueElement const& e2) { return e1.mStateMachine == e2.mStateMachine; }
+	  friend struct QueueElementComp;
+
+	  AIStateMachine& statemachine(void) const { return *mStateMachine; }
+	  void add(U64 count) { mRuntime += count; }
+  };
+
+  struct QueueElementComp {
+	bool operator()(QueueElement const& e1, QueueElement const& e2) const { return e1.mRuntime < e2.mRuntime; }
+  };
+
+  typedef std::vector<QueueElement> active_statemachines_type;
+  active_statemachines_type active_statemachines;
+}
+
+// static
+U64 AIStateMachine::sMaxCount;
+AIThreadSafeDC<AIStateMachine::csme_type> AIStateMachine::sContinuedStateMachinesAndMainloopEnabled;
+
+// static
+void AIStateMachine::setMaxCount(F32 StateMachineMaxTime)
+{
+  llassert(is_main_thread());
+  Dout(dc::statemachine, "(Re)calculating AIStateMachine::sMaxCount");
+  sMaxCount = calc_clock_frequency() * StateMachineMaxTime / 1000;
+}
+
+//----------------------------------------------------------------------------
+//
+// Public methods
+//
+
+void AIStateMachine::run(AIStateMachine* parent, state_type new_parent_state, bool abort_parent, bool on_abort_signal_parent)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::run(" << (void*)parent << ", " << (parent ? parent->state_str(new_parent_state) : "NA") << ", " << abort_parent << ") [" << (void*)this << "]");
+  // Must be the first time we're being run, or we must be called from a callback function.
+  llassert(!mParent || mState == bs_callback);
+  llassert(!mCallback || mState == bs_callback);
+  // Can only be run when in this state.
+  llassert(mState == bs_initialize || mState == bs_callback);
+
+  // Allow NULL to be passed as parent to signal that we want to reuse the old one.
+  if (parent)
+  {
+	mParent = parent;
+	// In that case remove any old callback!
+	if (mCallback)
+	{
+	  delete mCallback;
+	  mCallback = NULL;
+	}
+
+	mNewParentState = new_parent_state;
+	mAbortParent = abort_parent;
+	mOnAbortSignalParent = on_abort_signal_parent;
+  }
+
+  // If abort_parent is requested then a parent must be provided.
+  llassert(!abort_parent || mParent);
+  // If a parent is provided, it must be running.
+  llassert(!mParent || mParent->mState == bs_run);
+
+  // Mark that run() has been called, in case we're being called from a callback function.
+  mState = bs_initialize;
+
+  // Set mIdle to false and add statemachine to continued_statemachines.
+  mSetStateLock.lock();
+  locked_cont();
+}
+
+void AIStateMachine::run(callback_type::signal_type::slot_type const& slot)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::run(<slot>) [" << (void*)this << "]");
+  // Must be the first time we're being run, or we must be called from a callback function.
+  llassert(!mParent || mState == bs_callback);
+  llassert(!mCallback || mState == bs_callback);
+  // Can only be run when in this state.
+  llassert(mState == bs_initialize || mState == bs_callback);
+
+  // Clean up any old callbacks.
+  mParent = NULL;
+  if (mCallback)
+  {
+	delete mCallback;
+	mCallback = NULL;
+  }
+
+  mCallback = new callback_type(slot);
+
+  // Mark that run() has been called, in case we're being called from a callback function.
+  mState = bs_initialize;
+
+  // Set mIdle to false and add statemachine to continued_statemachines.
+  mSetStateLock.lock();
+  locked_cont();
+}
+
+void AIStateMachine::idle(void)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::idle() [" << (void*)this << "]");
+  llassert(is_main_thread());
+  llassert(!mIdle);
+  mIdle = true;
+  mSleep = 0;
+#ifdef SHOW_ASSERT
+  mCalledThreadUnsafeIdle = true;
+#endif
+}
+
+void AIStateMachine::idle(state_type current_run_state)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::idle(" << state_str(current_run_state) << ") [" << (void*)this << "]");
+  llassert(is_main_thread());
+  llassert(!mIdle);
+  mSetStateLock.lock();
+  // Only go idle if the run state is (still) what we expect it to be.
+  // Otherwise assume that another thread called set_state() and continue running.
+  if (current_run_state == mRunState)
+  {
+	mIdle = true;
+	mSleep = 0;
+  }
+  mSetStateLock.unlock();
+}
+
+// About thread safeness:
+//
+// The main thread initializes a statemachine and calls run, so a statemachine
+// runs in the main thread. However, it is allowed that a state calls idle(current_state)
+// and then allows one or more other threads to call cont() upon some
+// event (only once, of course, as idle() has to be called before cont()
+// can be called again-- and a non-main thread is not allowed to call idle()).
+// Instead of cont() one may also call set_state().
+// Of course, this may give rise to a race condition; if that happens then
+// the thread that calls cont() (set_state()) first is serviced, and the other
+// thread(s) are ignored, as if they never called cont().
+void AIStateMachine::locked_cont(void)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::locked_cont() [" << (void*)this << "]");
+  llassert(mIdle);
+  // Atomic test mActive and change mIdle.
+  mIdleActive.lock();
+#ifdef SHOW_ASSERT
+  mContThread.reset();
+#endif
+  mIdle = false;
+  bool not_active = mActive == as_idle;
+  mIdleActive.unlock();
+  // mActive is only changed in AIStateMachine::mainloop, by the main-thread, and
+  // here, possibly by any thread. However, after setting mIdle to false above, it
+  // is impossible for any thread to come here, until after the main-thread called
+  // idle(). So, if this is the main thread then that certainly isn't going to
+  // happen until we left this function, while if this is another thread  and the
+  // state machine is already running in the main thread then not_active is false
+  // and we're already at the end of this function.
+  // If not_active is true then main-thread is not running this statemachine.
+  // It might call cont() (or set_state()) but never locked_cont(), and will never
+  // start actually running until we are done here and release the lock on
+  // sContinuedStateMachinesAndMainloopEnabled again. It is therefore safe
+  // to release mSetStateLock here, with as advantage that if we're not the main-
+  // thread and not_active is true, then the main-thread won't block when it has
+  // a timer running that times out and calls set_state().
+  mSetStateLock.unlock();
+  if (not_active)
+  {
+	AIWriteAccess<csme_type> csme_w(sContinuedStateMachinesAndMainloopEnabled);
+	// See above: it is not possible that mActive was changed since not_active
+	// was set to true above.
+	llassert_always(mActive == as_idle);
+	Dout(dc::statemachine, "Adding " << (void*)this << " to continued_statemachines");
+	csme_w->continued_statemachines.push_back(this);
+	if (!csme_w->mainloop_enabled)
+	{
+	  Dout(dc::statemachine, "Activating AIStateMachine::mainloop.");
+	  csme_w->mainloop_enabled = true;
+	}
+	mActive = as_queued;
+	llassert_always(!mIdle);	// It should never happen that the main thread calls idle(), while another thread calls cont() concurrently.
+  }
+}
+
+void AIStateMachine::set_state(state_type state)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::set_state(" << state_str(state) << ") [" << (void*)this << "]");
+
+  // Stop race condition of multiple threads calling cont() or set_state() here.
+  mSetStateLock.lock();
+
+  // Do not call set_state() unless running.
+  llassert(mState == bs_run || !is_main_thread());
+
+  // If this function is called from another thread than the main thread, then we have to ignore
+  // it if we're not idle and the state is less than the current state. The main thread must
+  // be able to change the state to anything (also smaller values). Note that that only can work
+  // if the main thread itself at all times cancels thread callbacks that call set_state()
+  // before calling idle() again!
+  //
+  // Thus: main thead calls idle(), and tells one or more threads to do callbacks on events,
+  // which (might) call set_state(). If the main thread calls set_state first (currently only
+  // possible as a result of the use of a timer) it will set mIdle to false (here) then cancel
+  // the call backs from the other threads and only then call idle() again.
+  // Thus if you want other threads get here while mIdle is false to be ignored then the
+  // main thread should use a large value for the new run state.
+  //
+  // If a non-main thread calls set_state first, then the state is changed but the main thread
+  // can still override it if it calls set_state before handling the new state; in the latter
+  // case it would still be as if the call from the non-main thread was ignored.
+  //
+  // Concurrent calls from non-main threads however, always result in the largest state
+  // to prevail.
+
+  // If the state machine is already running, and we are not the main-thread and the new
+  // state is less than the current state, ignore it.
+  // Also, if abort() or finish() was called, then we should just ignore it.
+  if (mState != bs_run ||
+	  (!mIdle && state <= mRunState && !AIThreadID::in_main_thread()))
+  {
+#ifdef SHOW_ASSERT
+	// It's a bit weird if the same thread does two calls on a row where the second call
+	// has a smaller value: warn about that.
+	if (mState == bs_run && mContThread.equals_current_thread())
+	{
+	  llwarns << "Ignoring call to set_state(" << state_str(state) <<
+		  ") by non-main thread before main-thread could react on previous call, "
+		  "because new state is smaller than old state (" << state_str(mRunState) << ")." << llendl;
+	}
+#endif
+	mSetStateLock.unlock();
+	return;		// Ignore.
+  }
+
+  // Do not call idle() when set_state is called from another thread; use idle(state_type) instead.
+  llassert(!mCalledThreadUnsafeIdle || is_main_thread());
+
+  // Change mRunState to the requested value.
+  if (mRunState != state)
+  {
+	mRunState = state;
+	Dout(dc::statemachine, "mRunState set to " << state_str(mRunState));
+  }
+
+  // Continue the state machine if appropriate.
+  if (mIdle)
+	locked_cont();				// This unlocks mSetStateLock.
+  else
+	mSetStateLock.unlock();
+
+  // If we get here then mIdle is false, so only mRunState can still be changed but we won't
+  // call locked_cont() anymore. When the main thread finally picks up on the state change,
+  // it will cancel any possible callbacks from other threads and process the largest state
+  // that this function was called with in the meantime.
+}
+
+void AIStateMachine::abort(void)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::abort() [" << (void*)this << "]");
+  // It's possible that abort() is called before calling AIStateMachine::multiplex.
+  // In that case the statemachine wasn't initialized yet and we should just kill() it.
+  if (LL_UNLIKELY(mState == bs_initialize))
+  {
+	// It's ok to use the thread-unsafe idle() here, because if the statemachine
+	// wasn't started yet, then other threads won't call set_state() on it.
+	if (!mIdle)
+	  idle();
+	// run() calls locked_cont() after which the top of the mainloop adds this
+	// state machine to active_statemachines. Therefore, if the following fails
+	// then either the same statemachine called run() immediately followed by abort(),
+	// which is not allowed; or there were two active statemachines running,
+	// the first created a new statemachine and called run() on it, and then
+	// the other (before reaching the top of the mainloop) called abort() on
+	// that freshly created statemachine. Obviously, this is highly unlikely,
+	// but if that is the case then here we bump the statemachine into
+	// continued_statemachines to prevent kill() to delete this statemachine:
+	// the caller of abort() does not expect that.
+	if (LL_UNLIKELY(mActive == as_idle))
+	{
+	  mSetStateLock.lock();
+	  locked_cont();
+	  idle();
+	}
+	kill();
+  }
+  else
+  {
+	llassert(mState == bs_run);
+	mSetStateLock.lock();
+	mState = bs_abort;		// Causes additional calls to set_state to be ignored.
+	mSetStateLock.unlock();
+	abort_impl();
+	mAborted = true;
+	finish();
+  }
+}
+
+void AIStateMachine::finish(void)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::finish() [" << (void*)this << "]");
+  mSetStateLock.lock();
+  llassert(mState == bs_run || mState == bs_abort);
+  // It is possible that mIdle is true when abort or finish was called from
+  // outside multiplex_impl. However, that only may be done by the main thread.
+  llassert(!mIdle || is_main_thread());
+  if (!mIdle)
+	idle();					// After calling this, we don't want other threads to call set_state() anymore.
+  mState = bs_finish;		// Causes additional calls to set_state to be ignored.
+  mSetStateLock.unlock();
+  finish_impl();
+  // Did finish_impl call kill()? Then that is only the default. Remember it.
+  bool default_delete = (mState == bs_killed);
+  mState = bs_finish;
+  if (mParent)
+  {
+	// It is possible that the parent is not running when the parent is in fact aborting and called
+	// abort on this object from it's abort_impl function. It that case we don't want to recursively
+	// call abort again (or change it's state).
+	if (mParent->running())
+	{
+	  if (mAborted && mAbortParent)
+	  {
+		mParent->abort();
+		mParent = NULL;
+	  }
+	  else if (!mAborted || mOnAbortSignalParent)
+	  {
+		mParent->set_state(mNewParentState);
+	  }
+	}
+  }
+  // After this (bool)*this evaluates to true and we can call the callback, which then is allowed to call run().
+  mState = bs_callback;
+  if (mCallback)
+  {
+	// This can/may call kill() that sets mState to bs_kill and in which case the whole AIStateMachine
+	// will be deleted from the mainloop, or it may call run() that sets mState is set to bs_initialize
+	// and might change or reuse mCallback or mParent.
+	mCallback->callback(!mAborted);
+	if (mState != bs_initialize)
+	{
+	  delete mCallback;
+	  mCallback = NULL;
+	  mParent = NULL;
+	}
+  }
+  else
+  {
+	// Not restarted by callback. Allow run() to be called later on.
+	mParent = NULL;
+  }
+  // Fix the final state.
+  if (mState == bs_callback)
+	mState = default_delete ? bs_killed : bs_initialize;
+  if (mState == bs_killed && mActive == as_idle)
+  {
+	// Bump the statemachine onto the active statemachine list, or else it won't be deleted.
+	mSetStateLock.lock();
+	locked_cont();
+	idle();
+  }
+}
+
+void AIStateMachine::kill(void)
+{
+  DoutEntering(dc::statemachine, "AIStateMachine::kill() [" << (void*)this << "]");
+  // Should only be called from finish() (or when not running (bs_initialize)).
+  // However, also allow multiple calls to kill() on a row (bs_killed) (which effectively don't do anything).
+  llassert(mIdle && (mState == bs_callback || mState == bs_finish || mState == bs_initialize || mState == bs_killed));
+  base_state_type prev_state = mState;
+  mState = bs_killed;
+  if (prev_state == bs_initialize && mActive == as_idle)
+  {
+	// We're not running (ie being deleted by a parent statemachine), delete it immediately.
+	delete this;
+  }
+}
+
+// Return stringified 'state'.
+char const* AIStateMachine::state_str(state_type state)
+{
+  if (state >= min_state && state < max_state)
+  {
+	switch (state)
+	{
+	  AI_CASE_RETURN(bs_initialize);
+	  AI_CASE_RETURN(bs_run);
+	  AI_CASE_RETURN(bs_abort);
+	  AI_CASE_RETURN(bs_finish);
+	  AI_CASE_RETURN(bs_callback);
+	  AI_CASE_RETURN(bs_killed);
+	}
+  }
+  return state_str_impl(state);
+}
+
+//----------------------------------------------------------------------------
+//
+// Private methods
+//
+
+void AIStateMachine::multiplex(U64 current_time)
+{
+  // Return immediately when this state machine is sleeping.
+  // A negative value of mSleep means we're counting frames,
+  // a positive value means we're waiting till a certain
+  // amount of time has passed.
+  if (mSleep != 0)
+  {
+	if (mSleep < 0)
+	{
+	  if (++mSleep)
+		return;
+	}
+	else
+	{
+	  if (current_time < (U64)mSleep)
+		return;
+	  mSleep = 0;
+	}
+  }
+
+  DoutEntering(dc::statemachine, "AIStateMachine::multiplex() [" << (void*)this << "] [with state: " << state_str(mState == bs_run ? mRunState : mState) << "]");
+  llassert(mState == bs_initialize || mState == bs_run);
+
+  // Real state machine starts here.
+  if (mState == bs_initialize)
+  {
+	mAborted = false;
+	mState = bs_run;
+	initialize_impl();
+	if (mAborted || mState != bs_run)
+	  return;
+  }
+  multiplex_impl();
+}
+
+//static
+void AIStateMachine::add_continued_statemachines(AIReadAccess<csme_type>& csme_r)
+{
+  bool nonempty = false;
+  for (continued_statemachines_type::const_iterator iter = csme_r->continued_statemachines.begin(); iter != csme_r->continued_statemachines.end(); ++iter)
+  {
+	nonempty = true;
+	active_statemachines.push_back(QueueElement(*iter));
+	Dout(dc::statemachine, "Adding " << (void*)*iter << " to active_statemachines");
+	(*iter)->mActive = as_active;
+  }
+  if (nonempty)
+	AIWriteAccess<csme_type>(csme_r)->continued_statemachines.clear();
+}
+
+// static
+void AIStateMachine::dowork(void)
+{
+  llassert(!active_statemachines.empty());
+  // Run one or more state machines.
+  U64 total_clocks = 0;
+  for (active_statemachines_type::iterator iter = active_statemachines.begin(); iter != active_statemachines.end(); ++iter)
+  {
+	AIStateMachine& statemachine(iter->statemachine());
+	if (!statemachine.mIdle)
+	{
+	  U64 start = get_clock_count();
+	  // This might call idle() and then pass the statemachine to another thread who then may call cont().
+	  // Hence, after this isn't not sure what mIdle is, and it can change from true to false at any moment,
+	  // if it is true after this function returns.
+	  statemachine.multiplex(start);
+	  U64 delta = get_clock_count() - start;
+	  iter->add(delta);
+	  total_clocks += delta;
+	  if (total_clocks >= sMaxCount)
+	  {
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+		llwarns << "AIStateMachine::mainloop did run for " << (total_clocks * 1000 / calc_clock_frequency()) << " ms." << llendl;
+#endif
+		std::sort(active_statemachines.begin(), active_statemachines.end(), QueueElementComp());
+		break;
+	  }
+	}
+  }
+  // Remove idle state machines from the loop.
+  active_statemachines_type::iterator iter = active_statemachines.begin();
+  while (iter != active_statemachines.end())
+  {
+	AIStateMachine& statemachine(iter->statemachine());
+	// Atomic test mIdle and change mActive.
+	bool locked = statemachine.mIdleActive.tryLock();
+	// If the lock failed, then another thread is in the middle of calling cont(),
+	// thus mIdle will end up false. So, there is no reason to block here; just
+	// treat mIdle as false already.
+	if (locked && statemachine.mIdle)
+	{
+	  // Without the lock, it would be possible that another thread called cont() right here,
+	  // changing mIdle to false again but NOT adding the statemachine to continued_statemachines,
+	  // thinking it is in active_statemachines (and it is), while immediately below it is
+	  // erased from active_statemachines.
+	  statemachine.mActive = as_idle;
+	  // Now, calling cont() is ok -- as that will cause the statemachine to be added to
+	  // continued_statemachines, so it's fine in that case-- even necessary-- to remove it from
+	  // active_statemachines regardless, and we can release the lock here.
+	  statemachine.mIdleActive.unlock();
+	  Dout(dc::statemachine, "Erasing " << (void*)&statemachine << " from active_statemachines");
+	  iter = active_statemachines.erase(iter);
+	  if (statemachine.mState == bs_killed)
+	  {
+	  	Dout(dc::statemachine, "Deleting " << (void*)&statemachine);
+		delete &statemachine;
+	  }
+	}
+	else
+	{
+	  if (locked)
+	  {
+		statemachine.mIdleActive.unlock();
+	  }
+	  llassert(statemachine.mActive == as_active);	// It should not be possible that another thread called cont() and changed this when we are we are not idle.
+	  llassert(statemachine.mState == bs_run || statemachine.mState == bs_initialize);
+	  ++iter;
+	}
+  }
+  if (active_statemachines.empty())
+  {
+	// If this was the last state machine, remove mainloop from the IdleCallbacks.
+	AIReadAccess<csme_type> csme_r(sContinuedStateMachinesAndMainloopEnabled, true);
+	if (csme_r->continued_statemachines.empty() && csme_r->mainloop_enabled)
+	{
+	  Dout(dc::statemachine, "Deactivating AIStateMachine::mainloop: no active state machines left.");
+	  AIWriteAccess<csme_type>(csme_r)->mainloop_enabled = false;
+	}
+  }
+}
+
+// static
+void AIStateMachine::flush(void)
+{
+  DoutEntering(dc::curl, "AIStateMachine::flush(void)");
+  {
+	AIReadAccess<csme_type> csme_r(sContinuedStateMachinesAndMainloopEnabled);
+	add_continued_statemachines(csme_r);
+  }
+  // Abort all state machines.
+  for (active_statemachines_type::iterator iter = active_statemachines.begin(); iter != active_statemachines.end(); ++iter)
+  {
+	AIStateMachine& statemachine(iter->statemachine());
+	if (statemachine.abortable())
+	{
+	  // We can't safely call abort() here for non-running (run() was called, but they weren't initialized yet) statemachines,
+	  // because that might call kill() which in some cases is undesirable (ie, when it is owned by a partent that will
+	  // also call abort() on it when it is aborted itself).
+	  if (statemachine.running())
+		statemachine.abort();
+	  else
+		statemachine.idle();		// Stop the statemachine from starting, in the next loop with batch == 0.
+	}
+  }
+  for (int batch = 0;; ++batch)
+  {
+	// Run mainloop until all state machines are idle (batch == 0) or deleted (batch == 1).
+	for(;;)
+	{
+	  {
+		AIReadAccess<csme_type> csme_r(sContinuedStateMachinesAndMainloopEnabled);
+		if (!csme_r->mainloop_enabled)
+		  break;
+	  }
+	  mainloop();
+	}
+	if (batch == 1)
+	  break;
+	{
+	  AIReadAccess<csme_type> csme_r(sContinuedStateMachinesAndMainloopEnabled);
+	  add_continued_statemachines(csme_r);
+	}
+  }
+  // At this point all statemachines should be idle.
+  AIReadAccess<csme_type> csme_r(sContinuedStateMachinesAndMainloopEnabled);
+  llinfos << "Current number of continued statemachines: " << csme_r->continued_statemachines.size() << llendl;
+  llinfos << "Current number of active statemachines: " << active_statemachines.size() << llendl;
+  llassert(csme_r->continued_statemachines.empty() && active_statemachines.empty());
+}

indra/aistatemachine/aistatemachine.h

@@ -32,7 +32,7 @@
 #define AISTATEMACHINE_H
 
 #include "aithreadsafe.h"
-#include "llfasttimer.h"
+#include "lltimer.h"
 #include <boost/signals2.hpp>
 
 //!
@@ -192,6 +192,15 @@ class AIStateMachine {
 	  as_active					// State machine is on active_statemachines list.
 	};
 
+	//! Type of continued_statemachines.
+	typedef std::vector<AIStateMachine*> continued_statemachines_type;
+	//! Type of sContinuedStateMachinesAndMainloopEnabled.
+	struct csme_type
+	{
+	  continued_statemachines_type continued_statemachines;
+	  bool mainloop_enabled;
+	};
+
   public:
 	typedef U32 state_type;		//!< The type of mRunState
 
@@ -207,12 +216,17 @@ class AIStateMachine {
 	active_type mActive;						//!< Whether statemachine is idle, queued to be added to the active list, or already on the active list.
 	S64 mSleep;									//!< Non-zero while the state machine is sleeping.
 	LLMutex mIdleActive;						//!< Used for atomic operations on the pair mIdle / mActive.
+#ifdef SHOW_ASSERT
+	AIThreadID mContThread;						//!< Thread that last called locked_cont().
+	bool mCalledThreadUnsafeIdle;				//!< Set to true when idle() is called.
+#endif
 
 	// Callback facilities.
 	// From within an other state machine:
 	AIStateMachine* mParent;					//!< The parent object that started this state machine, or NULL if there isn't any.
 	state_type mNewParentState;					//!< The state at which the parent should continue upon a successful finish.
 	bool mAbortParent;							//!< If true, abort parent on abort(). Otherwise continue as normal.
+	bool mOnAbortSignalParent;					//!< If true and mAbortParent is false, change state of parent even on abort.
 	// From outside a state machine:
 	struct callback_type {
 	  typedef boost::signals2::signal<void (bool)> signal_type;
@@ -225,40 +239,60 @@ class AIStateMachine {
 	};
 	callback_type* mCallback;					//!< Pointer to signal/connection, or NULL when not connected.
 
-	static AIThreadSafeSimpleDC<U64> sMaxCount;	//!< Number of cpu clocks below which we start a new state machine within the same frame.
+	static U64 sMaxCount;						//!< Number of cpu clocks below which we start a new state machine within the same frame.
+	static AIThreadSafeDC<csme_type> sContinuedStateMachinesAndMainloopEnabled;	//!< Read/write locked variable pair.
 
   protected:
+	LLMutex mSetStateLock;						//!< For critical areas in set_state() and locked_cont().
+
 	//! State of the derived class. Only valid if mState == bs_run. Call set_state to change.
-	state_type mRunState;
+	volatile state_type mRunState;
 
   public:
 	//! Create a non-running state machine.
-	AIStateMachine(void) : mState(bs_initialize), mIdle(true), mAborted(true), mActive(as_idle), mSleep(0), mParent(NULL), mCallback(NULL) { updateSettings(); }
+	AIStateMachine(void) : mState(bs_initialize), mIdle(true), mAborted(true), mActive(as_idle), mSleep(0), mParent(NULL), mCallback(NULL)
+#ifdef SHOW_ASSERT
+		, mContThread(AIThreadID::none), mCalledThreadUnsafeIdle(false)
+#endif
+		{ }
 
   protected:
 	//! The user should call 'kill()', not delete a AIStateMachine (derived) directly.
-	virtual ~AIStateMachine() { llassert(mState == bs_killed && mActive == as_idle); }
+	virtual ~AIStateMachine() { llassert((mState == bs_killed && mActive == as_idle) || mState == bs_initialize); }
 
   public:
-	//! Halt the state machine until cont() is called.
+	//! Halt the state machine until cont() is called (not thread-safe).
 	void idle(void);
 
+	//! Halt the state machine until cont() is called, provided it is still in 'current_run_state'.
+	void idle(state_type current_run_state);
+
 	//! Temporarily halt the state machine.
 	void yield_frame(unsigned int frames) { mSleep = -(S64)frames; }
 
 	//! Temporarily halt the state machine.
-	void yield_ms(unsigned int ms) { mSleep = LLFastTimer::getCPUClockCount64() + LLFastTimer::countsPerSecond() * ms / 1000; }
+	void yield_ms(unsigned int ms) { mSleep = get_clock_count() + calc_clock_frequency() * ms / 1000; }
 
 	//! Continue running after calling idle.
-	void cont(void);
+	void cont(void)
+	{
+		mSetStateLock.lock();
+		// Ignore calls to cont() if the statemachine isn't idle. See comments in set_state().
+		// Calling cont() twice or after calling set_state(), without first calling idle(), is an error.
+		if (mState != bs_run || !mIdle) { llassert(mState != bs_run || !mContThread.equals_current_thread()); mSetStateLock.unlock(); return; }
+		locked_cont();
+	}
+  private:
+	void locked_cont(void);
 
+  public:
 	//---------------------------------------
 	// Changing the state.
 
 	//! Change state to <code>bs_run</code>. May only be called after creation or after returning from finish().
 	// If <code>parent</code> is non-NULL, change the parent state machine's state to <code>new_parent_state</code>
 	// upon finish, or in the case of an abort and when <code>abort_parent</code> is true, call parent->abort() instead.
-	void run(AIStateMachine* parent, state_type new_parent_state, bool abort_parent = true);
+	void run(AIStateMachine* parent, state_type new_parent_state, bool abort_parent = true, bool on_abort_signal_parent = true);
 
 	//! Change state to 'bs_run'. May only be called after creation or after returning from finish().
 	// Does not cause a callback.
@@ -315,7 +349,7 @@ class AIStateMachine {
 	// Other.
 
 	//! Called whenever the StateMachineMaxTime setting is changed.
-	static void updateSettings(void);
+	static void setMaxCount(F32 StateMachineMaxTime);
 
 	//---------------------------------------
 	// Accessors.
@@ -326,11 +360,14 @@ class AIStateMachine {
 	//! Return true if the derived class is running (also when we are idle).
 	bool running(void) const { return mState == bs_run; }
 
+	//! Return true if it's safe to call abort.
+	bool abortable(void) const { return mState == bs_run || mState == bs_initialize; }
+
 	//! Return true if the derived class is running but idle.
 	bool waiting(void) const { return mState == bs_run && mIdle; }
 
 	// Use some safebool idiom (http://www.artima.com/cppsource/safebool.html) rather than operator bool.
-	typedef state_type AIStateMachine::* const bool_type;
+	typedef volatile state_type AIStateMachine::* const bool_type;
 	//! Return true if state machine successfully finished.
 	operator bool_type() const { return ((mState == bs_initialize || mState == bs_callback) && !mAborted) ? &AIStateMachine::mRunState : 0; }
 
@@ -338,9 +375,27 @@ class AIStateMachine {
 	char const* state_str(state_type state);
 
   private:
-	static void mainloop(void*);
+	static void add_continued_statemachines(AIReadAccess<csme_type>& csme_r);
+	static void dowork(void);
 	void multiplex(U64 current_time);
 
+  public:
+	//! Call this once per frame to give the statemachines CPU cycles.
+	static void mainloop(void)
+	{
+	  {
+		AIReadAccess<csme_type> csme_r(sContinuedStateMachinesAndMainloopEnabled, true);
+		if (!csme_r->mainloop_enabled)
+		  return;
+		if (!csme_r->continued_statemachines.empty())
+		  add_continued_statemachines(csme_r);
+	  }
+	  dowork();
+	}
+
+	//! Abort all running state machines and then run mainloop until all state machines are idle (called when application is exiting).
+	static void flush(void);
+
   protected:
 	//---------------------------------------
 	// Derived class implementations.

indra/aistatemachine/aistatemachinethread.cpp

@@ -0,0 +1,197 @@
+/**
+ * @file aistatemachinethread.cpp
+ * @brief Implementation of AIStateMachineThread
+ *
+ * Copyright (c) 2013, Aleric Inglewood.
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   23/01/2013
+ *   Initial version, written by Aleric Inglewood @ SL
+ */
+
+#include "linden_common.h"
+#include "aistatemachinethread.h"
+
+class AIStateMachineThreadBase::Thread : public LLThread {
+  private:
+	LLPointer<AIThreadImpl> mImpl;
+	bool mNeedCleanup;
+  public:
+	Thread(AIThreadImpl* impl) :
+#ifdef LL_DEBUG
+	  LLThread(impl->getName()),
+#else
+	  LLThread("AIStateMachineThreadBase::Thread"),
+#endif
+	  mImpl(impl) { }
+  protected:
+	/*virtual*/ void run(void)
+	{
+	  mNeedCleanup = mImpl->thread_done(mImpl->run());
+	}
+	/*virtual*/ void terminated(void)
+	{
+	  mStatus = STOPPED;
+	  if (mNeedCleanup)
+	  {
+		// The state machine that started us has disappeared! Clean up ourselves.
+
+		// This is OK now because in our case nobody is watching us and having set
+		// the status to STOPPED didn't change anything really, although it will
+		// prevent LLThread::shutdown from blocking a whole minute and then calling
+		// apr_thread_exit to never return! Normally, the LLThread might be deleted
+		// immediately (by the main thread) after setting mStatus to STOPPED.
+		Thread::completed(this);
+	  }
+	}
+  public:
+	// TODO: Implement a thread pool. For now, just create a new one every time.
+	static Thread* allocate(AIThreadImpl* impl) { return new Thread(impl); }
+	static void completed(Thread* threadp) { delete threadp; }
+};
+
+// MAIN THREAD
+
+char const* AIStateMachineThreadBase::state_str_impl(state_type run_state) const
+{
+  switch(run_state)
+  {
+	AI_CASE_RETURN(start_thread);
+	AI_CASE_RETURN(wait_stopped);
+  }
+  return "UNKNOWN STATE";
+}
+
+void AIStateMachineThreadBase::initialize_impl(void)
+{
+  mThread = NULL;
+  mAbort = false;
+  set_state(start_thread);
+}
+
+void AIStateMachineThreadBase::multiplex_impl(void)
+{
+  switch(mRunState)
+  {
+	case start_thread:
+	  mThread = Thread::allocate(mImpl);
+	  // Set next state.
+	  set_state(wait_stopped);
+	  idle(wait_stopped);		// Wait till the thread returns.
+	  mThread->start();
+	  break;
+	case wait_stopped:
+	  if (!mThread->isStopped())
+		break;
+	  // We're done!
+	  //
+	  // We can only get here when AIThreadImpl::done called cont(), (very
+	  // shortly after which it will be STOPPED), which means we need to do
+	  // the clean up of the thread.
+	  // Also, the thread has really stopped now, so it's safe to delete it.
+	  //
+	  // Clean up the thread.
+	  Thread::completed(mThread);
+	  mThread = NULL;			// Stop abort_impl() from doing anything.
+	  if (mAbort)
+		abort();
+	  else
+		finish();
+	  break;
+  }
+}
+
+void AIStateMachineThreadBase::abort_impl(void)
+{
+  if (mThread)
+  {
+	// If this AIStateMachineThreadBase still exists then the first base class of
+	// AIStateMachineThread<THREAD_IMPL>, LLPointer<THREAD_IMPL>, also still exists
+	// and therefore mImpl is valid.
+	bool need_cleanup = mImpl->state_machine_done(mThread);		// Signal the fact that we aborted.
+	if (need_cleanup)
+	{
+	  // This is an unlikely race condition. We have been aborted by our parent,
+	  // but at the same time the thread finished!
+	  // We can only get here when AIThreadImpl::thread_done already returned
+	  // (VERY shortly after the thread will stop (if not already)).
+	  // Just go into a tight loop while waiting for that, when it is safe
+	  // to clean up the thread.
+	  while (!mThread->isStopped())
+	  {
+		mThread->yield();
+	  }
+	  Thread::completed(mThread);
+	}
+	else
+	{
+	  // The thread is still happily running (and will clean up itself).
+	  // Lets make sure we're not flooded with this situation.
+	  llwarns << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << llendl;
+	}
+  }
+}
+
+bool AIThreadImpl::state_machine_done(LLThread* threadp)
+{
+  StateMachineThread_wat state_machine_thread_w(mStateMachineThread);
+  AIStateMachineThreadBase* state_machine_thread = *state_machine_thread_w;
+  bool need_cleanup = !state_machine_thread;
+  if (!need_cleanup)
+  {
+	// If state_machine_thread is non-NULL, then AIThreadImpl::thread_done wasnt called yet
+	// (or at least didn't return yet) which means the thread is still running.
+	// Try telling the thread that it can stop.
+	threadp->setQuitting();
+	// Finally, mark that we are NOT going to do the cleanup by setting mStateMachineThread to NULL.
+	*state_machine_thread_w = NULL;
+  }
+  return need_cleanup;
+}
+
+// AIStateMachineThread THREAD
+
+bool AIThreadImpl::thread_done(bool result)
+{
+  StateMachineThread_wat state_machine_thread_w(mStateMachineThread);
+  AIStateMachineThreadBase* state_machine_thread = *state_machine_thread_w;
+  bool need_cleanup = !state_machine_thread;
+  if (!need_cleanup)
+  {
+	// If state_machine_thread is non-NULL then AIThreadImpl::abort_impl wasn't called,
+	// which means the state machine still exists. In fact, it should be in the waiting() state.
+	// It can also happen that the state machine is being aborted right now (but it will still exist).
+	// (Note that waiting() and running() aren't strictly thread-safe (we should really lock
+	// mSetStateLock here) but by first calling waiting() and then running(), and assuming that
+	// changing an int from the value 1 to the value 2 is atomic, this will work since the
+	// only possible transition is from waiting to not running).
+	llassert(state_machine_thread->waiting() || !state_machine_thread->running());
+	state_machine_thread->schedule_abort(!result);
+	// Note that if the state machine is not running (being aborted, ie - hanging in abort_impl
+	// waiting for the lock on mStateMachineThread) then this is simply ignored.
+	state_machine_thread->cont();
+	// Finally, mark that we are NOT going to do the cleanup by setting mStateMachineThread to NULL.
+	*state_machine_thread_w = NULL;
+  }
+  return need_cleanup;
+}
+

indra/aistatemachine/aistatemachinethread.h

@@ -0,0 +1,229 @@
+/**
+ * @file aistatemachinethread.h
+ * @brief Run code in a thread.
+ *
+ * Copyright (c) 2013, Aleric Inglewood.
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   23/01/2013
+ *   Initial version, written by Aleric Inglewood @ SL
+ */
+
+#ifndef AISTATEMACHINETHREAD_H
+#define AISTATEMACHINETHREAD_H
+
+#include "aistatemachine.h"
+#include "llthread.h"
+#include "aithreadsafe.h"
+
+#ifdef EXAMPLE_CODE	// undefined
+
+class HelloWorldThread : public AIThreadImpl {
+  private:
+	bool mStdErr;		// input
+	bool mSuccess;		// output
+
+  public:
+	// Constructor.
+	HelloWorldThread(void) : AIThreadImpl("HelloWorldThread"),						// MAIN THREAD
+		mStdErr(false), mSuccess(false) { }
+
+	// Some initialization function (if needed).
+	void init(bool err)	{ mStdErr = err; }											// MAIN THREAD
+	// Read back output.
+	bool successful(void) const { return mSuccess; }
+
+	// Mandatory signature.
+	/*virtual*/ bool run(void)														// NEW THREAD
+	{
+	  if (mStdErr)
+		std::cerr << "Hello world" << std::endl;
+	  else
+		std::cout << "Hello world" << std::endl;
+	  mSuccess = true;
+	  return true;			// true = finish, false = abort.
+	}
+};
+
+// The states of this state machine.
+enum hello_world_state_type {
+  HelloWorld_start = AIStateMachine::max_state,
+  HelloWorld_done
+};
+
+// The statemachine class (this is almost a template).
+class HelloWorld : public AIStateMachine {
+  private:
+	AIStateMachineThread<HelloWorldThread> mHelloWorld;
+	bool mErr;
+
+  public:
+	HelloWorld() : mErr(false) { }
+
+	// Print to stderr or stdout?
+	void init(bool err) { mErr = err; }
+
+  protected:
+	// Call finish() (or abort()), not delete.
+	/*virtual*/ ~HelloWorld() { }
+
+	// Handle initializing the object.
+	/*virtual*/ void initialize_impl(void);
+
+	// Handle mRunState.
+	/*virtual*/ void multiplex_impl(void);
+
+	// Handle aborting from current bs_run state.
+	/*virtual*/ void abort_impl(void) { }
+
+	// Handle cleaning up from initialization (or post abort) state.
+	/*virtual*/ void finish_impl(void)
+	{
+	  // Kill object by default.
+	  // This can be overridden by calling run() from the callback function.
+	  kill();
+	}
+
+	// Implemenation of state_str for run states.
+	/*virtual*/ char const* state_str_impl(state_type run_state) const
+	{
+	  switch(run_state)
+	  {
+		AI_CASE_RETURN(HelloWorld_start);
+		AI_CASE_RETURN(HelloWorld_done);
+	  }
+	  return "UNKNOWN STATE";
+	}
+};
+
+// The actual implementation of this statemachine starts here!
+
+void HelloWorld::initialize_impl(void)
+{
+  mHelloWorld->init(mErr);							// Initialize the thread object.
+  set_state(HelloWorld_start);
+}
+
+void HelloWorld::multiplex_impl(void)
+{
+  switch (mRunState)
+  {
+	case HelloWorld_start:
+	{
+	  mHelloWorld.run(this, HelloWorld_done);		// Run HelloWorldThread and set the state of 'this' to HelloWorld_done when finished.
+	  idle(HelloWorld_start);						// Always go idle after starting a thread!
+	  break;
+	}
+	case HelloWorld_done:
+	{
+	  // We're done. Lets also abort when the thread reported no success.
+	  if (mHelloWorld->successful())				// Read output/result of thread object.
+		finish();
+	  else
+		abort();
+	  break;
+	}
+  }
+}
+
+#endif	// EXAMPLE CODE
+
+class AIStateMachineThreadBase;
+
+// Derive from this to implement the code that must run in another thread.
+class AIThreadImpl : public LLThreadSafeRefCount {
+  private:
+    template<typename THREAD_IMPL> friend struct AIStateMachineThread;
+	typedef AIAccess<AIStateMachineThreadBase*> StateMachineThread_wat;
+	AIThreadSafeSimpleDC<AIStateMachineThreadBase*> mStateMachineThread;
+
+  public:
+	virtual bool run(void) = 0;
+	bool thread_done(bool result);
+	bool state_machine_done(LLThread* threadp);
+
+#ifdef LL_DEBUG
+  private:
+	char const* mName;
+  protected:
+	AIThreadImpl(char const* name = "AIStateMachineThreadBase::Thread") : mName(name) { }
+  public:
+	char const* getName(void) const { return mName; }
+#endif
+};
+
+// The base class for statemachine threads.
+class AIStateMachineThreadBase : public AIStateMachine {
+  private:
+	// The actual thread (derived from LLThread).
+	class Thread;
+
+	// The states of this state machine.
+	enum thread_state_type {
+	  start_thread = AIStateMachine::max_state,		// Start the thread (if necessary create it first).
+	  wait_stopped									// Wait till the thread is stopped.
+	};
+
+  protected:
+	AIStateMachineThreadBase(AIThreadImpl* impl) : mImpl(impl) { }
+
+  private:
+	// Handle initializing the object.
+	/*virtual*/ void initialize_impl(void);
+
+	// Handle mRunState.
+	/*virtual*/ void multiplex_impl(void);
+
+	// Handle aborting from current bs_run state.
+	/*virtual*/ void abort_impl(void);
+
+	// Handle cleaning up from initialization (or post abort) state.
+	/*virtual*/ void finish_impl(void) { }
+
+	// Implemenation of state_str for run states.
+	/*virtual*/ char const* state_str_impl(state_type run_state) const;
+
+  private:
+	Thread* mThread;		// The thread that the code is run in.
+	AIThreadImpl* mImpl;	// Pointer to the implementation code that needs to be run in the thread.
+	bool mAbort;			// (Inverse of) return value of AIThreadImpl::run(). Only valid in state wait_stopped.
+
+  public:
+	void schedule_abort(bool do_abort) { mAbort = do_abort; }
+
+};
+
+// The state machine that runs T::run() in a thread.
+// THREAD_IMPL Must be derived from AIThreadImpl.
+template<typename THREAD_IMPL>
+struct AIStateMachineThread : public LLPointer<THREAD_IMPL>, public AIStateMachineThreadBase {
+  // Constructor.
+  AIStateMachineThread(void) :
+	  LLPointer<THREAD_IMPL>(new THREAD_IMPL),
+	  AIStateMachineThreadBase(LLPointer<THREAD_IMPL>::get())
+  {
+	*AIThreadImpl::StateMachineThread_wat(static_cast<AIThreadImpl*>(LLPointer<THREAD_IMPL>::get())->mStateMachineThread) = this;
+  }
+};
+
+#endif
+

indra/aistatemachine/aitimer.h

@@ -70,7 +70,6 @@ class AITimer : public AIStateMachine {
 	 * @brief Set the interval after which the timer should expire.
 	 *
 	 * @param interval Amount of time in seconds before the timer will expire.
-	 * @param True if the timer should be deleted after it expires; false means it will keep firing at regular intervals.
 	 *
 	 * Call abort() at any time to stop the timer (and delete the AITimer object).
 	 */

indra/cmake/00-Common.cmake

@@ -23,26 +23,32 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
 # Platform-specific compilation flags.
 
 if (WINDOWS)
+  # Various libs are compiler specific, generate some variables here we can just use
+  # when we require them instead of reimplementing the test each time.
+  if (MSVC10)
+    set(MSVC_DIR 10.0)
+    set(MSVC_SUFFIX 100)
+  endif (MSVC10)
+
   # Remove default /Zm1000 flag that cmake inserts
   string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /arch:SSE2"
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /arch:SSE2"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /fp:fast -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
   set(CMAKE_C_FLAGS_RELEASE
-      "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
+      "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /fp:fast"
       CACHE STRING "C compiler release options" FORCE)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
 
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LARGEADDRESSAWARE")
-           
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
   set(CMAKE_C_STANDARD_LIBRARIES "")
 
@@ -55,55 +61,25 @@ if (WINDOWS)
       /W3
       /c
       /Zc:forScope
+	  /Zc:wchar_t-
       /nologo
       /Oy-
+	  /arch:SSE2
       )
-     
+
   # configure win32 API for windows XP+ compatibility
   set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
   add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
 
-  if(MSVC80 OR MSVC90 OR MSVC10)
-    set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
-      CACHE STRING "C++ compiler release options" FORCE)
-    set(CMAKE_C_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
-      CACHE STRING "C compiler release options" FORCE)
-    add_definitions(
-      /Zc:wchar_t-
-      )
-  endif (MSVC80 OR MSVC90 OR MSVC10)
-  
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT DISABLE_FATAL_WARNINGS)
     add_definitions(/WX)
   endif (NOT DISABLE_FATAL_WARNINGS)
-  
-  # Various libs are compiler specific, generate some variables here we can just use
-  # when we require them instead of reimplementing the test each time.
-  
-  if (MSVC71)
-    set(MSVC_DIR 7.1)
-    set(MSVC_SUFFIX 71)
-  elseif (MSVC80)
-    set(MSVC_DIR 8.0)
-    set(MSVC_SUFFIX 80)
-  elseif (MSVC90)
-    set(MSVC_DIR 9.0)
-    set(MSVC_SUFFIX 90)
-  elseif (MSVC10)
-    set(MSVC_DIR 10.0)
-    set(MSVC_SUFFIX 100)
-  endif (MSVC71)
 
-  if (MSVC10)
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
-    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
-  endif(MSVC10)
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
 
-    
 endif (WINDOWS)
 
 set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")
@@ -130,7 +106,6 @@ if (LINUX)
     add_definitions(-DLL_IGNORE_SIGCHLD)
 
   if(${CMAKE_C_COMPILER} MATCHES "gcc*")
-
     find_program(GXX g++)
     mark_as_advanced(GXX)
 
@@ -183,9 +158,6 @@ if (LINUX)
 
     # End of hacks.
 
-    #GCC Specific
-    add_definitions(-DCC_GCC)
-
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
     if (NOT STANDALONE)
@@ -194,10 +166,10 @@ if (LINUX)
     endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
       add_definitions(-DLINUX64=1 -pipe)
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
-      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
-      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
+      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math")
+      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math")
     else (${ARCH} STREQUAL "x86_64")
       if (NOT STANDALONE)
         set(MARCH_FLAG " -march=pentium4")
@@ -217,7 +189,6 @@ if (LINUX)
     mark_as_advanced(CLANGXX)
 
     add_definitions(
-        -DCC_CLANG
         -D_FORTIFY_SOURCE=2
         )
 
@@ -237,12 +208,10 @@ if (LINUX)
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
   elseif(${CMAKE_C_COMPILER} MATCHES "icc*" AND ${CMAKE_CXX_COMPILER} MATCHES "icpc*")
- 
     find_program(ICC icc)
     mark_as_advanced(ICC)
 
     add_definitions(
-        -DCC_ICC
         -D_FORTIFY_SOURCE=2
         )
 
@@ -276,14 +245,23 @@ if (DARWIN)
   add_definitions(-DLL_DARWIN=1 -D_XOPEN_SOURCE)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
-  # NOTE: it's critical that the optimization flag is put in front.
-  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+  if(${CMAKE_C_COMPILER} MATCHES "gcc*")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+    # NOTE: it's critical that the optimization flag is put in front.
+    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+  elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
+    # NOTE: it's critical that the optimization flag is put in front.
+    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3")
+  endif()
 endif (DARWIN)
 
 
@@ -325,7 +303,7 @@ else (STANDALONE)
       glib-2.0
       gstreamer-0.10
       gtk-2.0
-      llfreetype2
+      freetype2
       pango-1.0
       )
 endif (STANDALONE)

indra/cmake/AIStateMachine.cmake

@@ -1,4 +1,4 @@
 # -*- cmake -*-
 
-set(AISTATEMACHINE_INCLUDE_DIRS statemachine)
-set(AISTATEMACHINE_LIBRARIES statemachine)
+set(AISTATEMACHINE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/aistatemachine)
+set(AISTATEMACHINE_LIBRARIES aistatemachine)

indra/cmake/APR.cmake

@@ -33,8 +33,8 @@ else (STANDALONE)
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)

indra/cmake/Audio.cmake

@@ -40,3 +40,11 @@ link_directories(
     ${VORBISFILE_LIBRARY_DIRS}
     ${OGG_LIBRARY_DIRS}
     )
+
+set(LLAUDIO_VORBIS_LIBRARIES
+    ${VORBISENC_LIBRARIES}
+    ${VORBISFILE_LIBRARIES}
+    ${VORBIS_LIBRARIES}
+    ${OGG_LIBRARIES}
+    )
+

indra/cmake/Boost.cmake

@@ -7,10 +7,8 @@ set(Boost_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindBoost)
 
-  set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
-  set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-  set(BOOST_REGEX_LIBRARY boost_regex-mt)
-  set(BOOST_SYSTEM_LIBRARY boost_system-mt)
+  set(Boost_USE_MULTITHREADED ON)
+  find_package(Boost 1.40.0 COMPONENTS date_time filesystem program_options regex system thread wave)
 else (STANDALONE)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
@@ -18,36 +16,36 @@ else (STANDALONE)
   if (WINDOWS)
     set(BOOST_VERSION 1_45)
 
-	# SNOW-788
-	# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc
-	# The precompiled boost libs for VC71 use a different suffix to VS80 and VS90
-	# This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate
-	# boost libs are avaiable - RC.
-	
-	if (MSVC71)
-		set(BOOST_OPTIM_SUFFIX mt-s)
-	    set(BOOST_DEBUG_SUFFIX mt-sgd)
-	else (MSVC71)
-	    set(BOOST_OPTIM_SUFFIX mt)
-	    set(BOOST_DEBUG_SUFFIX mt-gd)
-	endif (MSVC71)
-		
-	set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+    # SNOW-788
+    # 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc
+    # The precompiled boost libs for VC71 use a different suffix to VS80 and VS90
+    # This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate
+    # boost libs are avaiable - RC.
+
+    if (MSVC71)
+      set(BOOST_OPTIM_SUFFIX mt-s)
+      set(BOOST_DEBUG_SUFFIX mt-sgd)
+    else (MSVC71)
+      set(BOOST_OPTIM_SUFFIX mt)
+      set(BOOST_DEBUG_SUFFIX mt-gd)
+    endif (MSVC71)
+
+    set(Boost_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
           debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
-    set(BOOST_REGEX_LIBRARY
+    set(Boost_REGEX_LIBRARY
           optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
           debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
-	
+
   elseif (DARWIN)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
+    set(Boost_FILESYSTEM_LIBRARY boost_filesystem)
+    set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+    set(Boost_REGEX_LIBRARY boost_regex)
+    set(Boost_SYSTEM_LIBRARY boost_system)  
   elseif (LINUX)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
+    set(Boost_FILESYSTEM_LIBRARY boost_filesystem-mt)
+    set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+    set(Boost_REGEX_LIBRARY boost_regex-mt)
+    set(Boost_SYSTEM_LIBRARY boost_system-mt)  
   endif (WINDOWS)
 endif (STANDALONE)

indra/cmake/CMakeLists.txt

@@ -36,11 +36,13 @@ set(cmake_SOURCE_FILES
     FMOD.cmake
     FMODEX.cmake
     FreeType.cmake
+    GLOD.cmake
     GStreamer010Plugin.cmake
     GooglePerfTools.cmake
     Hunspell.cmake
     JPEG.cmake
     LLAddBuildTest.cmake
+    LLAppearance.cmake
     LLAudio.cmake
     LLCharacter.cmake
     LLCommon.cmake
@@ -54,13 +56,15 @@ set(cmake_SOURCE_FILES
     LLMessage.cmake
     LLPlugin.cmake
     LLPrimitive.cmake
+    LLPhysicsExtensions.cmake
+    LLQtWebkit.cmake
     LLRender.cmake
     LLScene.cmake
     LLUI.cmake
     LLVFS.cmake
     LLWindow.cmake
     LLXML.cmake
-    LScript.cmake
+#    LScript.cmake
     Linking.cmake
     NDOF.cmake
     OPENAL.cmake
@@ -70,6 +74,7 @@ set(cmake_SOURCE_FILES
     PNG.cmake
     Python.cmake
     Prebuilt.cmake
+    Qt4.cmake
     RunBuildTest.cmake
     TemplateCheck.cmake
     Tut.cmake

indra/cmake/CURL.cmake

@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-set(CURL_FIND_QUIETLY ON)
+set(CURL_FIND_QUIETLY OFF)
 set(CURL_FIND_REQUIRED ON)
 
 if (STANDALONE)
@@ -14,6 +14,9 @@ else (STANDALONE)
     optimized libcurl)
   else (WINDOWS)
     set(CURL_LIBRARIES curl)
+    if(LINUX AND WORD_SIZE EQUAL 64)
+      list(APPEND CURL_LIBRARIES idn)
+    endif(LINUX AND WORD_SIZE EQUAL 64)
   endif (WINDOWS)
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)

indra/cmake/Colladadom.cmake

@@ -0,0 +1,46 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+set(COLLADADOM_FIND_QUIETLY OFF)
+set(COLLADADOM_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include (FindColladadom)
+else (STANDALONE)
+  use_prebuilt_binary(colladadom)
+
+  if (NOT WINDOWS)
+	use_prebuilt_binary(pcre)
+  endif (NOT WINDOWS)
+
+  if (NOT DARWIN AND NOT WINDOWS)
+	use_prebuilt_binary(libxml)
+  endif (NOT DARWIN AND NOT WINDOWS)
+
+  set(COLLADADOM_INCLUDE_DIRS
+	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada
+	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada/1.4
+	  )
+
+  if (WINDOWS)
+	  add_definitions(-DDOM_DYNAMIC)
+	  set(COLLADADOM_LIBRARIES 
+		  debug libcollada14dom22-d
+		  optimized libcollada14dom22
+		  debug libboost_filesystem-vc100-mt-gd-1_45.lib
+		  optimized libboost_filesystem-vc100-mt-1_45.lib
+		  debug libboost_system-vc100-mt-gd-1_45.lib
+		  optimized libboost_system-vc100-mt-1_45.lib
+		  )
+  else (WINDOWS)
+	  set(COLLADADOM_LIBRARIES 
+		  collada14dom
+		  minizip
+		  xml2
+		  pcrecpp
+		  pcre
+		  )
+  endif (WINDOWS)
+endif (STANDALONE)
+

indra/cmake/CopyWinLibs.cmake

@@ -31,6 +31,8 @@ set(debug_files
     libapriconv-1.dll
     libeay32.dll
     ssleay32.dll
+    libcollada14dom22-d.dll
+    glod.dll
     )
 
 copy_if_different(
@@ -210,6 +212,8 @@ set(release_files
     libapriconv-1.dll
     libeay32.dll
     ssleay32.dll
+    libcollada14dom22.dll
+    glod.dll
     )
 
 if(FMODEX)

indra/cmake/Cwdebug.cmake

@@ -1 +1,18 @@
-set(CWDEBUG_LIBRARIES cwdebug)
+include_directories (${CMAKE_SOURCE_DIR}/cwdebug)
+
+set(cwdebug_SOURCE_FILES
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug.cc
+    )
+
+set(cwdebug_HEADER_FILES
+    ${CMAKE_SOURCE_DIR}/cwdebug/cwdebug.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/sys.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug_ostream_operators.h
+    )
+
+set_source_files_properties(${cwdebug_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
+

indra/cmake/FMODEX.cmake

@@ -2,57 +2,59 @@
 
 include(Linking)
 
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(fmodex)
-endif(INSTALL_PROPRIETARY)
-
-find_library(FMODEX_LIBRARY
-             NAMES fmodex fmodex_vc fmodexL_vc
-             PATHS
-             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
-             debug ${ARCH_PREBUILT_DIRS_DEBUG}
-             )
-
 if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)
-    find_library(FMODEX_LIBRARY
-                 fmodex fmodex_vc fmodexL_vc
-                 PATHS
-                 ${FMODEX_SDK_DIR}/api/lib
-                 ${FMODEX_SDK_DIR}/api
-                 ${FMODEX_SDK_DIR}/lib
-                 ${FMODEX_SDK_DIR}
-                 )
-
-				 
+    if(WORD_SIZE EQUAL 32)
+      find_library(FMODEX_LIBRARY
+                   fmodex_vc fmodexL_vc fmodex fmodexL
+                   PATHS
+                   "${FMODEX_SDK_DIR}/api/lib"
+                   "${FMODEX_SDK_DIR}/api"
+                   "${FMODEX_SDK_DIR}/lib"
+                   "${FMODEX_SDK_DIR}"
+                   )
+    elseif(WORD_SIZE EQUAL 64)
+      find_library(FMODEX_LIBRARY
+                   fmodex64 fmodexL64
+                   PATHS
+                   "${FMODEX_SDK_DIR}/api/lib"
+                   "${FMODEX_SDK_DIR}/api"
+                   "${FMODEX_SDK_DIR}/lib"
+                   "${FMODEX_SDK_DIR}"
+                   )
+    endif(WORD_SIZE EQUAL 32)
   endif(FMODEX_SDK_DIR)
   if(WINDOWS AND NOT FMODEX_LIBRARY)
-	set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")
-	find_library(FMODEX_LIBRARY
-                 fmodex_vc fmodexL_vc 
+    set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")
+    find_library(FMODEX_LIBRARY
+                 fmodex_vc fmodexL_vc
                  PATHS
-                 ${FMODEX_PROG_DIR}/api/lib
-				 ${FMODEX_PROG_DIR}/api
-				 ${FMODEX_PROG_DIR}
+                 "${FMODEX_PROG_DIR}/api/lib"
+                 "${FMODEX_PROG_DIR}/api"
+                 "${FMODEX_PROG_DIR}"
                  )
-	if(FMODEX_LIBRARY)
-		message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
-		set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR})
-		set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE)
-	endif(FMODEX_LIBRARY)
+    if(FMODEX_LIBRARY)
+      message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
+      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}")
+      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}" CACHE PATH "Path to the FMOD Ex SDK." FORCE)
+    endif(FMODEX_LIBRARY)
   endif(WINDOWS AND NOT FMODEX_LIBRARY)
 endif (NOT FMODEX_LIBRARY)
 
-find_path(FMODEX_INCLUDE_DIR fmod.h
-          ${LIBS_PREBUILT_DIR}/include/fmodex
-          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex
-          ${FMODEX_SDK_DIR}/api/inc
-          ${FMODEX_SDK_DIR}/inc
-          ${FMODEX_SDK_DIR}
+find_path(FMODEX_INCLUDE_DIR fmod.hpp
+          "${LIBS_PREBUILT_DIR}/include/fmodex"
+          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex"
+          "${FMODEX_SDK_DIR}/api/inc"
+          "${FMODEX_SDK_DIR}/inc"
+          "${FMODEX_SDK_DIR}"
           )
 
+if(DARWIN)
+  set(FMODEX_ORIG_LIBRARY "${FMODEX_LIBRARY}")
+  set(FMODEX_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/libfmodex.dylib")
+endif(DARWIN)
+
 if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
   set(FMODEX ON CACHE BOOL "Use closed source FMOD Ex sound library.")
 else (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)

indra/cmake/FindColladadom.cmake

@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+# - Find collada14dom
+# Find the colladadom version 1.4 includes and library
+# This module defines
+#  COLLADADOM_FOUND, System has libcollada14dom.so.
+#  COLLADADOM_INCLUDE_DIRS - The collada include directories.
+#  COLLADADOM_LIBRARIES - The libraries needed to use libcollada14dom.
+#  COLLADADOM_DEFINITIONS - Compiler switches required for using libcollada14dom.
+
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_COLLADADOM collada)
+SET(COLLADADOM_DEFINITIONS ${PC_COLLADADOM_CFLAGS_OTHER})
+
+FIND_PATH(COLLADADOM_INCLUDE_DIR dae.h
+  HINTS ${PC_COLLADADOM_INCLUDE_DIR} ${PC_COLLADADOM_INCLUDE_DIRS}
+  PATH_SUFFIXES collada)
+
+FIND_LIBRARY(COLLADADOM_LIBRARY
+  NAMES libcollada14dom.so
+  HINTS ${PC_COLLADADOM_LIBDIR} ${PC_COLLADADOM_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib)
+
+SET(COLLADADOM_LIBRARIES ${COLLADADOM_LIBRARY})
+SET(COLLADADOM_INCLUDE_DIRS ${COLLADADOM_INCLUDE_DIR} ${COLLADADOM_INCLUDE_DIR}/1.4)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(COLLADADOM DEFAULT_MSG
+  COLLADADOM_LIBRARY COLLADADOM_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(COLLADADOM_LIBRARY COLLADADOM_INCLUDE_DIR)

indra/cmake/FindGLOD.cmake

@@ -0,0 +1,32 @@
+# -*- cmake -*-
+
+# - Find GLOD
+# Find the GLOD includes and library
+# This module defines
+#  GLOD_FOUND, System has libglod.so.
+#  GLOD_INCLUDE_DIRS - The GLOD include directories.
+#  GLOD_LIBRARIES - The libraries needed to use libglod.
+#  GLOD_DEFINITIONS - Compiler switches required for using libglod.
+
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_GLOD glod)
+SET(GLOD_DEFINITIONS ${PC_GLOD_CFLAGS_OTHER})
+
+FIND_PATH(GLOD_INCLUDE_DIR glod/glod.h
+  HINTS ${PC_GLOD_INCLUDE_DIR} ${PC_GLOD_INCLUDE_DIRS}
+  )
+
+FIND_LIBRARY(GLOD_LIBRARY
+  NAMES libGLOD.so
+  HINTS ${PC_GLOD_LIBDIR} ${PC_GLOD_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib)
+
+SET(GLOD_LIBRARIES ${GLOD_LIBRARY})
+SET(GLOD_INCLUDE_DIRS ${GLOD_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLOD DEFAULT_MSG
+  GLOD_LIBRARY GLOD_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(GLOD_LIBRARY GLOD_INCLUDE_DIR)
+

indra/cmake/FindHunSpell.cmake

@@ -5,7 +5,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx
   /usr/include
   )
 
-SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2)
+SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2 hunspell-1.3)
 FIND_LIBRARY(HUNSPELL_LIBRARY
   NAMES ${HUNSPELL_NAMES}
   PATHS /usr/lib /usr/local/lib

indra/cmake/FindJsonCpp.cmake

@@ -3,16 +3,18 @@
 # - Find JSONCpp
 # Find the JSONCpp includes and library
 # This module defines
-#  JSONCPP_INCLUDE_DIR, where to find json.h, etc.
-#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
-#  JSONCPP_FOUND, If false, do not try to use jsoncpp.
-#  also defined, but not for general use are
-#  JSONCPP_LIBRARY, where to find the jsoncpp library.
+#  JSONCPP_FOUND, System has libjsoncpp.
+#  JSONCPP_INCLUDE_DIRS - The libjsoncpp include directories.
+#  JSONCPP_LIBRARIES - The libraries needed to use libjsoncpp.
+#  JSONCPP_DEFINITIONS - Compiler switches required for using libjsoncpp.
 
-FIND_PATH(JSONCPP_INCLUDE_DIR json/json.h
-/usr/local/include
-/usr/include
-)
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_JSONCPP jsoncpp)
+SET(JSONCPP_DEFINITIONS ${PC_JSONCPP_CFLAGS_OTHER})
+
+FIND_PATH(JSONCPP_INCLUDE_DIR json/reader.h
+  HINTS ${PC_JSONCPP_INCLUDE_DIR} ${PC_JSONCPP_INCLUDE_DIRS}
+  PATH_SUFFIXES jsoncpp)
 
 # Get the GCC compiler version
 EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
@@ -22,39 +24,16 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
             )
 
 # Try to find a library that was compiled with the same compiler version as we currently use.
-SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
-IF (STANDALONE)
-    # On standalone, assume that the system installed library was compiled with the used compiler.
-    SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
-ENDIF (STANDALONE)
 FIND_LIBRARY(JSONCPP_LIBRARY
-  NAMES ${JSONCPP_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
+  NAMES libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so libjsoncpp.so
+  HINTS ${PC_JSONCPP_LIBDIR} ${PC_JSONCPP_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib)
 
-IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
-    SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-    SET(JSONCPP_FOUND "YES")
-ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
-  SET(JSONCPP_FOUND "NO")
-ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+SET(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
 
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP DEFAULT_MSG
+  JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
 
-IF (JSONCPP_FOUND)
-   IF (NOT JSONCPP_FIND_QUIETLY)
-      MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
-   ENDIF (NOT JSONCPP_FIND_QUIETLY)
-ELSE (JSONCPP_FOUND)
-   IF (JSONCPP_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find JSONCpp library")
-   ENDIF (JSONCPP_FIND_REQUIRED)
-ENDIF (JSONCPP_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  JSONCPP_LIBRARY
-  JSONCPP_INCLUDE_DIR
-  )
+MARK_AS_ADVANCED(JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)

indra/cmake/GLOD.cmake

@@ -0,0 +1,13 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(GLOD_FIND_QUIETLY OFF)
+set(GLOD_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindGLOD)
+else (STANDALONE)
+  use_prebuilt_binary(GLOD)
+  set(GLOD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLOD_LIBRARIES glod)
+endif (STANDALONE)

indra/cmake/GooglePerfTools.cmake

@@ -1,16 +1,20 @@
 # -*- cmake -*-
 include(Prebuilt)
 
+if(WORD_SIZE EQUAL 64)
+  set(DISABLE_TCMALLOC TRUE)
+endif(WORD_SIZE EQUAL 64)
+
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  if (LINUX OR WINDOWS)
+  if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
     use_prebuilt_binary(gperftools)
-  endif (LINUX OR WINDOWS)
-  if (WINDOWS)
+  endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
+  if (WINDOWS AND NOT DISABLE_TCMALLOC)
     set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
     set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
-  endif (WINDOWS)
+  endif (WINDOWS AND NOT DISABLE_TCMALLOC)
   if (LINUX)
     if(USE_GOOGLE_PERFTOOLS)
       set(TCMALLOC_LIBRARIES tcmalloc)

indra/cmake/Hunspell.cmake

@@ -6,7 +6,7 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(hunspell)
 	
-	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell)
 
 	if (LINUX OR DARWIN)
 	    set(HUNSPELL_LIBRARY hunspell-1.3)

indra/cmake/JPEG.cmake

@@ -13,8 +13,8 @@ else (STANDALONE)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
     set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libjpeg.a
       )
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)

indra/cmake/JsonCpp.cmake

@@ -2,7 +2,7 @@
 
 include(Prebuilt)
 
-set(JSONCPP_FIND_QUIETLY ON)
+set(JSONCPP_FIND_QUIETLY OFF)
 set(JSONCPP_FIND_REQUIRED ON)
 
 if (STANDALONE)
@@ -14,7 +14,7 @@ else (STANDALONE)
       debug json_vc${MSVC_SUFFIX}d
       optimized json_vc${MSVC_SUFFIX})
   elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+    set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES jsoncpp)
   endif (WINDOWS)

indra/cmake/LLAppearance.cmake

@@ -0,0 +1,11 @@
+# -*- cmake -*-
+
+include(Variables)
+
+set(LLAPPEARANCE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llappearance
+    )
+
+set(LLAPPEARANCE_LIBRARIES llappearance)
+
+

indra/cmake/LLMessage.cmake

@@ -4,12 +4,14 @@ include(CARes)
 include(CURL)
 include(OpenSSL)
 include(XmlRpcEpi)
+include(AIStateMachine)
 
 set(LLMESSAGE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmessage
     ${CARES_INCLUDE_DIRS}
     ${CURL_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIRS}
+    ${AISTATEMACHINE_INCLUDE_DIRS}
     )
 
-set(LLMESSAGE_LIBRARIES llmessage)
+set(LLMESSAGE_LIBRARIES llmessage aistatemachine)

indra/cmake/LLPhysicsExtensions.cmake

@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLPHYSICSEXTENSIONS_LIBRARIES nd_hacdConvexDecomposition hacd nd_Pathing )
+set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_OPEN_DIR}/libndhacd )
+
+
+

indra/cmake/LLPrimitive.cmake

@@ -1,7 +1,22 @@
 # -*- cmake -*-
 
-set(LLPRIMITIVE_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llprimitive
-    )
+include(Colladadom)
+
+set(LLPRIMITIVE_INCLUDE_DIRS
+  ${LIBS_OPEN_DIR}/llprimitive
+  ${COLLADADOM_INCLUDE_DIRS}
+  )
+
+if (WINDOWS)
+  set(LLPRIMITIVE_LIBRARIES 
+	  debug llprimitive
+	  optimized llprimitive
+	  ${COLLADADOM_LIBRARIES}
+	  )
+else (WINDOWS)
+  set(LLPRIMITIVE_LIBRARIES 
+	  llprimitive
+	  ${COLLADADOM_LIBRARIES}
+	  )
+endif (WINDOWS)
 
-set(LLPRIMITIVE_LIBRARIES llprimitive)

indra/cmake/LLQtWebkit.cmake

@@ -0,0 +1,11 @@
+# -*- cmake -*-
+
+if (STANDALONE)
+  set(LLQTWEBKIT_INCLUDE_DIR
+      ${LIBS_OPEN_DIR}/llqtwebkit
+      )
+
+  set(LLQTWEBKIT_LIBRARY
+      llqtwebkit
+      )
+endif (STANDALONE)

indra/cmake/LLVFS.cmake

@@ -8,5 +8,5 @@ set(LLVFS_INCLUDE_DIRS
 
 set(LLVFS_LIBRARIES
     llvfs
-    ${BOOST_REGEX_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
     )

indra/cmake/LLWindow.cmake

@@ -18,7 +18,11 @@ else (STANDALONE)
     use_prebuilt_binary(SDL)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
-    set (SDL_LIBRARY SDL directfb fusion direct)
+    if(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL)
+    else(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL directfb fusion direct)
+    endif(WORD_SIZE EQUAL 64)
   endif (LINUX)
 endif (STANDALONE)
 

indra/cmake/LLXUIXML.cmake

@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLXUIXML_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llxuixml
-    )
-
-set(LLXUIXML_LIBRARIES llxuixml)

indra/cmake/Linking.cmake

@@ -10,9 +10,9 @@ if (NOT STANDALONE)
     set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
     set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
   elseif (DARWIN)
-    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
-    set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
-    set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
+    set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
+    set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
   endif (WINDOWS)
 endif (NOT STANDALONE)
 

indra/cmake/OpenSSL.cmake

@@ -4,9 +4,9 @@ include(Prebuilt)
 set(OpenSSL_FIND_QUIETLY ON)
 set(OpenSSL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (STANDALONE OR USE_SYSTEM_OPENSSL)
   include(FindOpenSSL)
-else (STANDALONE)
+else (STANDALONE OR USE_SYSTEM_OPENSSL)
   use_prebuilt_binary(openSSL)
   if (WINDOWS)
     set(OPENSSL_LIBRARIES ssleay32 libeay32)
@@ -14,10 +14,8 @@ else (STANDALONE)
     set(OPENSSL_LIBRARIES ssl)
   endif (WINDOWS)
   set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-endif (STANDALONE)
+endif (STANDALONE OR USE_SYSTEM_OPENSSL)
 
-if (LINUX)
+if (LINUX OR DARWIN)
   set(CRYPTO_LIBRARIES crypto)
-elseif (DARWIN)
-  set(CRYPTO_LIBRARIES llcrypto)
-endif (LINUX)
+endif (LINUX OR DARWIN)

indra/cmake/PNG.cmake

@@ -15,5 +15,5 @@ else (STANDALONE)
   else(LINUX)
     set(PNG_LIBRARIES png15)
   endif()
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libpng15)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
 endif (STANDALONE)

indra/cmake/Qt4.cmake

@@ -0,0 +1,12 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  set(Qt4_FIND_REQUIRED ON)
+
+  include(FindQt4)
+
+  find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
+  include(${QT_USE_FILE})
+  add_definitions(${QT_DEFINITIONS})
+endif (STANDALONE)

indra/cmake/StateMachine.cmake

@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+set(STATEMACHINE_INCLUDE_DIRS statemachine)
+set(STATEMACHINE_LIBRARIES statemachine)

indra/cmake/Variables.cmake

@@ -30,6 +30,7 @@ set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX})
 set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
 set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
 set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
+set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)")
 set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
 set(VISTA_ICON OFF CACHE BOOL "Allow vista icon with pre 2008 Visual Studio IDEs. (Assumes replacement old rcdll.dll with new rcdll.dll from win sdk 7.0 or later)")
 
@@ -76,37 +77,36 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
 
-  #SDK Compiler and Deployment targets for XCode
-  if (${XCODE_VERSION} VERSION_LESS 4.0.0)
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-    set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
-  else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  if(${CMAKE_GENERATOR} MATCHES Xcode) 
+    #SDK Compiler and Deployment targets for XCode
+    if (${XCODE_VERSION} VERSION_LESS 4.0.0)
+      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+      set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
+    else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+      set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+    endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  else()
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
     set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
-  endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  endif(${CMAKE_GENERATOR} MATCHES Xcode)
 
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+  ## We currently support only 32-bit i386 builds, so use these:
+  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(ARCH i386)
+  set(WORD_SIZE 32)
 
-  # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
-  # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  # Build only for i386 by default, system default on MacOSX 10.6 is x86_64
-  if (NOT CMAKE_OSX_ARCHITECTURES)
-    set(CMAKE_OSX_ARCHITECTURES i386)
-  endif (NOT CMAKE_OSX_ARCHITECTURES)
-
-  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    set(ARCH universal)
-  else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH ppc)
-    else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH i386)
-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+  ## But if you want to compile for mixed 32/64 bit, try these:
+  # set(CMAKE_OSX_ARCHITECTURES i386;x86_64)
+  # set(ARCH universal)
+  # set(WORD_SIZE 64)
 
+  ## Finally, set up the build output directories
   set(LL_ARCH ${ARCH}_darwin)
   set(LL_ARCH_DIR universal-darwin)
-  set(WORD_SIZE 32)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 

indra/cmake/ViewerMiscLibs.cmake

@@ -19,8 +19,3 @@ else (NOT STANDALONE)
   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   set(STANDALONE ON)
 endif(NOT STANDALONE)
-
-if (WINDOWS)
-  use_prebuilt_binary(dbghelp)
-endif (WINDOWS)
-

indra/cmake/WebKitLibPlugin.cmake

@@ -1,31 +1,10 @@
 # -*- cmake -*-
 include(Linking)
 include(Prebuilt)
+include(LLQtWebkit)
+include(Qt4)
 
 if (STANDALONE)
-    # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
-    find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
-    include(${QT_USE_FILE})
-    set(QTDIR $ENV{QTDIR})
-    if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
-      message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
-        "Qt is found by looking for qmake in your PATH. "
-        "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
-        "or unset QTDIR if the found Qt is correct.")
-    endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
-    find_package(LLQtWebkit REQUIRED QUIET)
-    # Add the plugins.
-	set(QT_PLUGIN_LIBRARIES)
-	foreach(qlibname qgif qjpeg)
-      find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
-      if (QT_PLUGIN_${qlibname})
-	    list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
-	  else (QT_PLUGIN_${qtlibname})
-        message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
-      endif (QT_PLUGIN_${qlibname})
-    endforeach(qlibname)
-    # qjpeg depends on libjpeg
-    list(APPEND QT_PLUGIN_LIBRARIES jpeg)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)

indra/cwdebug/CMakeLists.txt

@@ -1,39 +0,0 @@
-# -*- cmake -*-
-
-project(cwdebug)
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LLMessage)
-include(LLVFS)
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-
-set(cwdebug_SOURCE_FILES
-    debug.cc
-    )
-
-set(cwdebug_HEADER_FILES
-    CMakeLists.txt
-
-    cwdebug.h
-    sys.h
-    debug.h
-    debug_ostream_operators.h
-    )
-
-set_source_files_properties(${cwdebug_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
-if(NOT WORD_SIZE EQUAL 32)
-	if(WINDOWS)
-		add_definitions(/FIXED:NO)
-	else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-		add_definitions(-fPIC)
-	endif(WINDOWS)
-endif (NOT WORD_SIZE EQUAL 32)
-
-list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
-
-add_library (cwdebug ${cwdebug_SOURCE_FILES})

indra/cwdebug/debug.cc

@@ -49,6 +49,8 @@
 namespace debug {
 
 #if CWDEBUG_LOCATION
+ll_thread_local size_t BackTrace::S_number;
+
 void BackTrace::dump_backtrace(void) const
 {
   for (int frame = 0; frame < frames(); ++frame)
@@ -67,6 +69,67 @@ void BackTrace::dump_backtrace(void) const
       Dout(dc::finish, mangled_function_name);
   }
 }
+
+void BackTraces::store_trace(size_t trace)
+{
+  mBackTraces.push_back(trace);
+}
+
+void BackTraces::remove_trace(size_t trace)
+{
+  trace_container_type::iterator iter = mBackTraces.begin();
+  while (iter != mBackTraces.end())
+  {
+	if (*iter == trace)
+	{
+	  *iter = mBackTraces.back();
+	  mBackTraces.pop_back();
+	  return;
+	}
+    ++iter;
+  }
+  DoutFatal(dc::core, "Trace doesn't exist!");
+}
+
+void BackTraces::dump(void) const
+{
+  Dout(dc::backtrace|continued_cf, "Dump for (BackTraces*)" << (void*)this << " (" << mBackTraces.size() << " backtraces): ");
+  for (trace_container_type::const_iterator iter = mBackTraces.begin(); iter != mBackTraces.end(); ++iter)
+  {
+	Dout(dc::continued|nonewline_cf, *iter << ' ');
+  }
+  Dout(dc::finish, "");
+}
+
+BackTraceTracker::BackTraceTracker(BackTraces* back_traces) : mBackTraces(back_traces)
+{
+  BACKTRACE;
+  mTrace = BackTrace::S_number;
+  mBackTraces->store_trace(mTrace);
+}
+
+BackTraceTracker::~BackTraceTracker()
+{
+  mBackTraces->remove_trace(mTrace);
+}
+
+BackTraceTracker::BackTraceTracker(BackTraceTracker const& orig) : mBackTraces(orig.mBackTraces)
+{
+  BACKTRACE;
+  mTrace = BackTrace::S_number;
+  mBackTraces->store_trace(mTrace);
+}
+
+BackTraceTracker& BackTraceTracker::operator=(BackTraceTracker const& orig)
+{
+  mBackTraces->remove_trace(mTrace);
+  mBackTraces = orig.mBackTraces;
+  BACKTRACE;
+  mTrace = BackTrace::S_number;
+  mBackTraces->store_trace(mTrace);
+  return *this;
+}
+
 #endif // CWDEBUG_LOCATION
 
 #if CWDEBUG_ALLOC && CWDEBUG_LOCATION
@@ -173,6 +236,10 @@ void stop_recording_backtraces(void)
       channel_ct backtrace DDCN("BACKTRACE");	//!< This debug channel is used for backtraces.
       channel_ct statemachine DDCN("STATEMACHINE");	//!< This debug channel is used for output related to class AIStateMachine.
       channel_ct caps DDCN("CAPS");		//!< This debug channel is used for output related to Capabilities.
+      channel_ct curl DDCN("CURL");		//!< This debug channel is used for output related to AICurl.
+      channel_ct curlio DDCN("CURLIO");	//!< This debug channel is used to print debug output of libcurl. This includes all HTTP network traffic.
+      channel_ct curltr DDCN("CURLTR");	//!< This debug channel is used to print libcurl API calls.
+      channel_ct snapshot DDCN("SNAPSHOT");	//!< This debug channel is used for output related to snapshots.
 
     } // namespace dc
   } // namespace DEBUGCHANNELS
@@ -411,4 +478,94 @@ void cwdebug_backtrace(int n)
 }
 #endif
 
-#endif // CWDEBUG
+#elif defined(DEBUG_CURLIO)
+
+#include "debug.h"
+#include "aithreadid.h"
+
+namespace debug
+{
+
+namespace libcwd { libcwd_do_type const libcw_do; }
+
+ll_thread_local int Indent::S_indentation;
+
+Indent::Indent(int indent) : M_indent(indent)
+{
+	S_indentation += M_indent;
+}
+
+Indent::~Indent()
+{
+	S_indentation -= M_indent;
+}
+
+std::ostream& operator<<(std::ostream& os, Indent::print_nt)
+{
+  if (Indent::S_indentation)
+	os << std::string(Indent::S_indentation, ' ');
+  return os;
+}
+
+#ifdef DEBUG_CURLIO
+std::ostream& operator<<(std::ostream& os, print_thread_id_t)
+{
+	if (!AIThreadID::in_main_thread_inline())
+	{
+		os << std::hex << (size_t)AIThreadID::getCurrentThread_inline() << std::dec << ' ';
+	}
+	return os;
+}
+#endif
+
+std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s)
+{
+  static char const c2s_tab[7] = { 'a', 'b', 't', 'n', 'v', 'f', 'r' };
+  size_t size = b2s.mSize;
+  for (char const* p1 = b2s.mBuf; size > 0; --size, ++p1)
+  {
+	char c =*p1;
+	if ((c > 31 && c != 92 && c != 127) || (unsigned char)c > 159)
+	  os.put(c);
+	else
+	{
+	  os.put('\\');
+	  if (c > 6 && c < 14)
+	  {
+		os.put(c2s_tab[c - 7]);
+		return os;
+	  }
+	  else if (c == 27)
+	  {
+		os.put('e');
+		return os;
+	  }
+	  else if (c == '\\')
+	  {
+		os.put('\\');
+		return os;
+	  }
+	  std::ostream::char_type old_fill = os.fill('0');
+	  std::ios_base::fmtflags old_flgs = os.flags();
+	  os.width(3);
+	  os << std::oct << (int)((unsigned char)c);
+	  os.setf(old_flgs);
+	  os.fill(old_fill);
+	}
+  }
+  return os;
+}
+
+namespace dc
+{
+
+fake_channel const      warning(1, "WARNING     ");
+fake_channel const         curl(1, "CURL        ");
+fake_channel const       curlio(1, "CURLIO      ");
+fake_channel const statemachine(1, "STATEMACHINE");
+fake_channel const       notice(1, "NOTICE      ");
+
+} // namespace dc
+} // namespace debug
+
+#endif

indra/cwdebug/debug.h

@@ -27,6 +27,94 @@
 
 #ifndef CWDEBUG
 
+#ifdef DEBUG_CURLIO
+
+// If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
+// some of the cwd macro's with something that generates viewer
+// specific debug output. Note that this generates a LOT of
+// output and should not normally be defined.
+
+#include <string>
+#include "llpreprocessor.h"
+
+namespace debug {
+namespace libcwd {
+
+struct buf2str {
+  buf2str(char const* buf, int size) : mBuf(buf), mSize(size) { }
+  char const* mBuf;
+  int mSize;
+};
+
+struct libcwd_do_type {
+ void on() const { }
+};
+extern LL_COMMON_API libcwd_do_type const libcw_do;
+
+} // namespace libcwd
+
+enum print_thread_id_t { print_thread_id };
+inline void init() { }
+struct Indent {
+  int M_indent;
+  static ll_thread_local int S_indentation;
+  enum LL_COMMON_API print_nt { print };
+  LL_COMMON_API Indent(int indent);
+  LL_COMMON_API ~Indent();
+};
+
+extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
+extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
+extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, print_thread_id_t);
+
+namespace dc {
+
+struct fake_channel {
+  int mOn;
+  char const* mLabel;
+  fake_channel(int on, char const* label) : mOn(on), mLabel(label) { }
+  fake_channel(void) : mOn(0) { }
+  bool is_on() const { return !!mOn; }
+  bool is_off() const { return !mOn; }
+  void on() const { }
+  void off() const { }
+};
+extern LL_COMMON_API fake_channel const warning;
+extern LL_COMMON_API fake_channel const curl;
+extern LL_COMMON_API fake_channel const curlio;
+extern LL_COMMON_API fake_channel const statemachine;
+extern LL_COMMON_API fake_channel const notice;
+
+} // namespace dc
+} // namespace debug
+
+#define LIBCWD_DEBUG_CHANNELS debug
+#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; using namespace debug::libcwd; llinfos_nf << print_thread_id << (c).mLabel << ": " << Indent::print;
+#define LibcwDoutStream llcont
+#define LibcwDoutScopeEnd llcont << llendl; } while(0)
+
+#define Debug(x) do { using namespace debug; using namespace debug::libcwd; x; } while(0)
+#define Dout(a, b) do { using namespace debug; using namespace debug::libcwd; if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
+#define DoutEntering(a, b) \
+  int __slviewer_debug_indentation = 2; \
+  { \
+	using namespace debug; \
+	using namespace debug::libcwd; \
+	if ((a).mOn) \
+	  llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
+    else \
+	  __slviewer_debug_indentation = 0; \
+  } \
+  debug::Indent __slviewer_debug_indent(__slviewer_debug_indentation);
+
+#else // !DEBUG_CURLIO
+
+#define Debug(x)
+#define Dout(a, b)
+#define DoutEntering(a, b)
+
+#endif // !DEBUG_CURLIO
+
 #ifndef DOXYGEN         // No need to document this.  See http://libcwd.sourceforge.net/ for more info.
 
 #include <iostream>
@@ -36,9 +124,6 @@
 #define AllocTag2(p, desc)
 #define AllocTag_dynamic_description(p, x)
 #define AllocTag(p, x)
-#define Debug(x)
-#define Dout(a, b)
-#define DoutEntering(a, b)
 #define DoutFatal(a, b) LibcwDoutFatal(::std, , a, b)
 #define ForAllDebugChannels(STATEMENT)
 #define ForAllDebugObjects(STATEMENT)
@@ -88,7 +173,9 @@
 #include <boost/shared_array.hpp>
 #if CWDEBUG_LOCATION
 #include <execinfo.h>		// Needed for 'backtrace'.
+#include "llpreprocessor.h"
 #endif
+#include <set>
 
 #define CWD_API __attribute__ ((visibility("default")))
 
@@ -118,6 +205,10 @@ extern CWD_API channel_ct sdl;
 extern CWD_API channel_ct backtrace;
 extern CWD_API channel_ct statemachine;
 extern CWD_API channel_ct caps;
+extern CWD_API channel_ct curl;
+extern CWD_API channel_ct curlio;
+extern CWD_API channel_ct curltr;
+extern CWD_API channel_ct snapshot;
 
 #endif
 
@@ -186,6 +277,8 @@ class BackTrace {
   private:
     boost::shared_array<void*> M_buffer;
     int M_frames;
+  public:
+  	static ll_thread_local size_t S_number;
   public:
     BackTrace(void** buffer, int frames) : M_buffer(new void* [frames]), M_frames(frames) { std::memcpy(M_buffer.get(), buffer, sizeof(void*) * frames); }
 
@@ -212,19 +305,81 @@ extern pthread_mutex_t backtrace_mutex;
     using namespace debug; \
     void* buffer[32]; \
     int frames = backtrace(buffer, 32); \
-    size_t size; \
     { \
       pthread_mutex_lock(&backtrace_mutex); \
       backtraces.push_back(BackTrace(buffer, frames)); \
-      size = backtraces.size(); \
+      BackTrace::S_number = backtraces.size(); \
       pthread_mutex_unlock(&backtrace_mutex); \
     } \
-    Dout(dc::backtrace, "Stored backtrace #" << size); \
+    Dout(dc::backtrace, "Stored backtrace #" << BackTrace::S_number); \
   } while(0)
+
+class LL_COMMON_API BackTraces {
+  private:
+	typedef std::vector<size_t> trace_container_type;
+	trace_container_type mBackTraces;
+
+  public:
+	void store_trace(size_t trace);
+	void remove_trace(size_t trace);
+
+	void dump(void) const;
+};
+
+class LL_COMMON_API BackTraceTracker {
+  private:
+	BackTraces* mBackTraces;
+	size_t mTrace;
+
+  public:
+	BackTraceTracker(BackTraces* back_traces);
+	~BackTraceTracker();
+
+	BackTraceTracker(BackTraceTracker const&);
+	BackTraceTracker& operator=(BackTraceTracker const&);
+
+	void dump(void) const { mBackTraces->dump(); }
+};
+
 #else
 #define BACKTRACE do { } while(0)
 #endif // CWDEBUG_LOCATION
 
+template<class T>
+class LL_COMMON_API InstanceTracker {
+  private:
+	T const* mInstance;
+	static pthread_mutex_t sInstancesMutex;
+	static std::set<T const*> sInstances;
+	static void remember(T const* instance) { pthread_mutex_lock(&sInstancesMutex); sInstances.insert(instance); pthread_mutex_unlock(&sInstancesMutex); }
+	static void forget(T const* instance) { pthread_mutex_lock(&sInstancesMutex); sInstances.erase(instance); pthread_mutex_unlock(&sInstancesMutex); }
+  public:
+	InstanceTracker(T const* instance) : mInstance(instance) { remember(mInstance); }
+	~InstanceTracker() { forget(mInstance); }
+	InstanceTracker& operator=(InstanceTracker const& orig) { forget(mInstance); mInstance = orig.mInstance; remember(mInstance); return *this; }
+	static void dump(void);
+  private:
+	// Non-copyable. Instead of copying, call InstanceTracker(T const*) with the this pointer of the new instance.
+    InstanceTracker(InstanceTracker const& orig);
+};
+
+template<class T>
+pthread_mutex_t InstanceTracker<T>::sInstancesMutex = PTHREAD_MUTEX_INITIALIZER;
+
+template<class T>
+std::set<T const*> InstanceTracker<T>::sInstances;
+
+template<class T>
+void InstanceTracker<T>::dump(void)
+{
+  pthread_mutex_lock(&sInstancesMutex);
+  for (typename std::set<T const*>::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+  {
+	std::cout << *iter << std::endl;
+  }
+  pthread_mutex_unlock(&sInstancesMutex);
+}
+
 } // namespace debug
 
 //! Debugging macro.

indra/develop.py

@@ -473,26 +473,11 @@ class DarwinSetup(UnixSetup):
 
 class WindowsSetup(PlatformSetup):
     gens = {
-        'vc71' : {
-            'gen' : r'Visual Studio 7 .NET 2003',
-            'ver' : r'7.1'
-            },
-        'vc80' : {
-            'gen' : r'Visual Studio 8 2005',
-            'ver' : r'8.0'
-            },
-        'vc90' : {
-            'gen' : r'Visual Studio 9 2008',
-            'ver' : r'9.0'
-            },
         'vc100' : {
             'gen' : r'Visual Studio 10',
             'ver' : r'10.0'
             }
         }
-    gens['vs2003'] = gens['vc71']
-    gens['vs2005'] = gens['vc80']
-    gens['vs2008'] = gens['vc90']
     gens['vs2010'] = gens['vc100']
 
     search_path = r'C:\windows'
@@ -505,21 +490,21 @@ class WindowsSetup(PlatformSetup):
 
     def _get_generator(self):
         if self._generator is None:
-            for version in 'vc80 vc90 vc100 vc71'.split():
+            for version in 'vc100'.split():
                 if self.find_visual_studio(version):
                     self._generator = version
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
                 print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
-                for version in 'vc80 vc90 vc100 vc71'.split():
+                for version in 'vc100'.split():
                     if self.find_visual_studio_express(version):
                         self._generator = version
                         self.using_express = True
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
                         break
                 else:
-					for version in 'vc80 vc90 vc100 vc71'.split():
+					for version in 'vc100'.split():
 						if self.find_visual_studio_express_single(version):
 							self._generator = version
 							self.using_express = True
@@ -768,8 +753,7 @@ Options:
   -m32 | -m64           build architecture (32-bit or 64-bit)
   -N | --no-distcc      disable use of distcc
   -G | --generator=NAME generator name
-                        Windows: VC71 or VS2003 (default), VC80 (VS2005) 
-                          VC90 (VS2008), or VC100 (VS2010)
+                        Windows: VC100 (VS2010) (default)
                         Mac OS X: Xcode (default), Unix Makefiles
                         Linux: Unix Makefiles (default), KDevelop3
   -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
@@ -782,13 +766,14 @@ Commands:
 
 Command-options for "configure":
   We use cmake variables to change the build configuration.
-  -DSERVER:BOOL=OFF        Don't configure simulator/dataserver/etc
-  -DVIEWER:BOOL=OFF        Don't configure the viewer
-  -DPACKAGE:BOOL=ON        Create "package" target to make installers
-  -DLOCALIZESETUP:BOOL=ON  Create one win_setup target per supported language
-  -DLL_TESTS:BOOL=OFF      Don't generate unit test projects
-  -DEXAMPLEPLUGIN:BOOL=OFF Don't generate example plugin project
-  -VISTA_ICON:BOOL=ON      Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!)
+  -DSERVER:BOOL=OFF          Don't configure simulator/dataserver/etc
+  -DVIEWER:BOOL=OFF          Don't configure the viewer
+  -DPACKAGE:BOOL=ON          Create "package" target to make installers
+  -DLOCALIZESETUP:BOOL=ON    Create one win_setup target per supported language
+  -DLL_TESTS:BOOL=OFF        Don't generate unit test projects
+  -DEXAMPLEPLUGIN:BOOL=OFF   Don't generate example plugin project
+  -DDISABLE_TCMALLOC:BOOL=ON Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)
+  -DVISTA_ICON:BOOL=ON       Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!)
 
 Examples:
   Set up a viewer-only project for your system:

indra/libhacd/CMakeLists.txt

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 2.6.4)
+
+project(libhacd CXX C)
+include(00-Common)
+
+file (GLOB SOURCE_FILES *.cpp )
+file (GLOB INCLUDE_FILES *.h )
+
+IF(WINDOWS)
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ENDIF(WINDOWS)
+
+add_library(hacd ${SOURCE_FILES} ${INCLUDE_FILES})

indra/libhacd/hacdCircularList.h

@@ -0,0 +1,85 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_CIRCULAR_LIST_H
+#define HACD_CIRCULAR_LIST_H
+#include <stdlib.h>
+#include "hacdVersion.h"
+#include "hacdMicroAllocator.h"
+namespace HACD
+{
+	//!	CircularListElement class.
+	template < typename T > class CircularListElement
+	{
+    public:
+        T &                                     GetData() { return m_data; }
+        const T &                               GetData() const { return m_data; }
+        CircularListElement<T> * &				GetNext() { return m_next; }
+        CircularListElement<T> * &				GetPrev() { return m_prev; }
+        const CircularListElement<T> * &		GetNext() const { return m_next; }
+        const CircularListElement<T> * &		GetPrev() const { return m_prev; }        
+        //!	Constructor
+												CircularListElement(const T & data) {m_data = data;}
+												CircularListElement(void){}
+        //! Destructor
+												~CircularListElement(void){}
+    private:
+        T										m_data;
+        CircularListElement<T> *				m_next; 
+        CircularListElement<T> *				m_prev;
+
+												CircularListElement(const CircularListElement & rhs);
+	};
+    
+    
+	//!	CircularList class.
+	template < typename T > class CircularList
+	{
+	public:
+        HeapManager * const     				GetHeapManager() const { return m_heapManager;}
+		void									SetHeapManager(HeapManager * const heapManager) { m_heapManager = heapManager;}
+        CircularListElement<T> *  &             GetHead() { return m_head;}        
+		const CircularListElement<T> *          GetHead() const { return m_head;}
+		bool                                    IsEmpty() const { return (m_size == 0);}
+		size_t                                  GetSize() const { return m_size; }
+		const T &                               GetData() const { return m_head->GetData(); }        
+		T &                                     GetData() { return m_head->GetData();}
+		bool                                    Delete() ;
+        bool                                    Delete(CircularListElement<T> * element);
+		CircularListElement<T> *                Add(const T * data = 0);
+		CircularListElement<T> *                Add(const T & data);
+		bool                                    Next();
+		bool                                    Prev();
+		void									Clear() { while(Delete());};
+        const CircularList&						operator=(const CircularList& rhs);
+		//!	Constructor											
+												CircularList(HeapManager * heapManager)
+												{ 
+													m_head = 0; 
+													m_size = 0;
+                                                    m_heapManager = heapManager;
+												}
+												CircularList(const CircularList& rhs);
+		//! Destructor
+		virtual								    ~CircularList(void) {Clear();};
+	private:
+		CircularListElement<T> *				m_head;		//!< a pointer to the head of the circular list
+		size_t									m_size;		//!< number of element in the circular list
+        HeapManager *                           m_heapManager;
+        
+	};
+}
+#include "hacdCircularList.inl"
+#endif

indra/libhacd/hacdCircularList.inl

@@ -0,0 +1,230 @@
+#pragma once
+#ifndef HACD_CIRCULAR_LIST_INL
+#define HACD_CIRCULAR_LIST_INL
+#include <stdlib.h>
+#include "hacdVersion.h"
+namespace HACD
+{
+	template < typename T > 
+	inline bool CircularList<T>::Delete(CircularListElement<T> * element)
+	{
+        if (!element)
+        {
+            return false;
+        }
+		if (m_size > 1)
+		{
+			CircularListElement<T> * next = element->GetNext();
+			CircularListElement<T> * prev = element->GetPrev();
+            if (m_heapManager)
+            {
+				element->~CircularListElement<T>();
+                heap_free(m_heapManager, element);
+            }
+            else
+            {
+			    delete element;
+            }
+			m_size--;
+            if (element == m_head)
+            {
+                m_head = next;
+            }
+			next->GetPrev() = prev;
+			prev->GetNext() = next;
+			return true;
+		}
+		else if (m_size == 1)
+		{
+            if (m_heapManager)
+            {
+				element->~CircularListElement<T>();
+                heap_free(m_heapManager, m_head);
+            }
+            else
+            {
+			    delete m_head;
+            }
+			m_size--;
+			m_head = 0;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+    
+	template < typename T > 
+	inline bool CircularList<T>::Delete()
+	{
+		if (m_size > 1)
+		{
+			CircularListElement<T> * next = m_head->GetNext();
+			CircularListElement<T> * prev = m_head->GetPrev();
+            if (m_heapManager)
+            {
+				m_head->~CircularListElement<T>();
+                heap_free(m_heapManager, m_head);
+            }
+            else
+            {
+			    delete m_head;
+            }
+			m_size--;
+			m_head = next;
+			next->GetPrev() = prev;
+			prev->GetNext() = next;
+			return true;
+		}
+		else if (m_size == 1)
+		{
+            if (m_heapManager)
+            {
+				m_head->~CircularListElement<T>();
+                heap_free(m_heapManager, m_head);
+            }
+            else
+            {
+			    delete m_head;
+            }
+            m_size--;
+			m_head = 0;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	template < typename T > 
+	inline CircularListElement<T> * CircularList<T>::Add(const T * data)
+	{
+		if (m_size == 0)
+		{
+			if (data)
+			{
+                if (m_heapManager)
+                {
+                    m_head = static_cast< CircularListElement<T> * > (heap_malloc(m_heapManager, sizeof(CircularListElement<T>)));
+                    m_head->GetData().Initialize();
+                    m_head->GetData() = (*data);
+                }
+                else
+                {
+				    m_head = new CircularListElement<T>(*data);
+                }
+			}
+			else
+			{
+                if (m_heapManager)
+                {
+                    m_head = static_cast< CircularListElement<T> * > (heap_malloc(m_heapManager, sizeof(CircularListElement<T>)));
+                    m_head->GetData().Initialize();
+                }
+                else
+                {
+    				m_head = new CircularListElement<T>();
+                }
+			}
+			m_head->GetNext() = m_head->GetPrev() = m_head;
+		}
+		else
+		{
+			CircularListElement<T> * next = m_head->GetNext();
+			CircularListElement<T> * element = m_head;
+			if (data)
+			{
+                if (m_heapManager)
+                {
+                    m_head = static_cast< CircularListElement<T> * > (heap_malloc(m_heapManager, sizeof(CircularListElement<T>)));
+                    m_head->GetData().Initialize();
+                    m_head->GetData() = (*data);
+                }
+                else
+                {
+				    m_head = new CircularListElement<T>(*data);
+                }
+			}
+			else
+			{
+                if (m_heapManager)
+                {
+                    m_head = static_cast< CircularListElement<T> * > (heap_malloc(m_heapManager, sizeof(CircularListElement<T>)));
+                    m_head->GetData().Initialize();
+                }
+                else
+                {
+    				m_head = new CircularListElement<T>();
+                }
+			}
+			m_head->GetNext() = next;
+			m_head->GetPrev() = element;
+			element->GetNext() = m_head;
+			next->GetPrev() = m_head;
+		}
+		m_size++;
+		return m_head;
+	}
+	template < typename T > 
+	inline CircularListElement<T> * CircularList<T>::Add(const T & data)
+	{
+		const T * pData = &data;
+		return Add(pData);
+	}
+	template < typename T > 
+	inline bool CircularList<T>::Next()
+	{
+		if (m_size == 0)
+		{
+			return false;
+		}
+		m_head = m_head->GetNext();
+		return true;
+	}
+	template < typename T > 
+	inline bool CircularList<T>::Prev()
+	{
+		if (m_size == 0)
+		{
+			return false;
+		}
+		m_head = m_head->GetPrev();
+		return true;
+	}
+	template < typename T > 
+	inline CircularList<T>::CircularList(const CircularList& rhs)
+	{
+		if (rhs.m_size > 0)
+		{
+			CircularListElement<T> * current = rhs.m_head;
+			do
+			{
+				current = current->GetNext();
+				Add(current->GetData());
+			}
+			while ( current != rhs.m_head );
+		}
+	}
+    template < typename T > 
+	inline const CircularList<T>& CircularList<T>::operator=(const CircularList& rhs)
+	{
+        if (&rhs != this)
+        {
+            Clear();
+            m_heapManager = rhs.m_heapManager;
+            if (rhs.m_size > 0)
+            {
+                CircularListElement<T> * current = rhs.m_head;
+                do
+                {
+                    current = current->GetNext();
+                    Add(current->GetData());
+                }
+                while ( current != rhs.m_head );
+            }
+        }
+        return (*this);
+	}
+}
+#endif

indra/libhacd/hacdGraph.cpp

@@ -0,0 +1,278 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "hacdGraph.h"
+namespace HACD
+{    
+    
+    GraphEdge::GraphEdge()
+    {
+        m_v1 = -1;
+        m_v2 = -1;
+		m_name = -1;
+        m_error = 0;
+        m_concavity = 0;
+        m_deleted = false;
+#ifdef HACD_PRECOMPUTE_CHULLS
+        m_convexHull = 0;
+#endif
+	}
+   
+    GraphVertex::GraphVertex()
+    {
+        m_convexHull = 0;
+		m_name = -1;
+        m_cc = -1;
+        m_concavity = 0;
+        m_surf = 0;
+        m_deleted = false;
+    }
+    
+    bool GraphVertex::DeleteEdge(long name)
+    {
+        return m_edges.Erase(name);
+    }
+
+    Graph::Graph()
+    {
+        m_nV = 0;
+        m_nE = 0;
+        m_nCCs = 0;
+    }
+    
+    Graph::~Graph()
+    {
+    }
+    
+	void Graph::Allocate(size_t nV, size_t nE)
+	{ 
+		m_nV = nV;
+		m_edges.reserve(nE);
+		m_vertices.resize(nV);
+		for(size_t i = 0; i < nV; i++)
+		{
+			m_vertices[i].m_name = static_cast<long>(i);
+		}
+	}
+
+    long Graph::AddVertex()
+    {
+		size_t name = m_vertices.size();
+		m_vertices.resize(name+1);
+        m_vertices[name].m_name = static_cast<long>(name);
+        m_nV++;
+        return static_cast<long>(name);
+    }
+    
+    long Graph::AddEdge(long v1, long v2)
+    {
+		size_t name = m_edges.size();
+		m_edges.push_back(GraphEdge());
+        m_edges[name].m_name = static_cast<long>(name);
+        m_edges[name].m_v1 = v1;
+        m_edges[name].m_v2 = v2;
+        m_vertices[v1].AddEdge(static_cast<long>(name));
+        m_vertices[v2].AddEdge(static_cast<long>(name));
+        m_nE++;
+		return static_cast<long>(name);
+    }
+
+    bool Graph::DeleteEdge(long name)
+    {
+		if (name < static_cast<long>(m_edges.size()))
+		{
+            long v1 = m_edges[name].m_v1;
+            long v2 = m_edges[name].m_v2;
+			m_edges[name].m_deleted = true;
+            m_vertices[v1].DeleteEdge(name);
+            m_vertices[v2].DeleteEdge(name);
+			m_nE--;
+			return true;
+		}
+		return false;
+    }
+    bool Graph::DeleteVertex(long name)
+    {
+		if (name < static_cast<long>(m_vertices.size()))
+		{
+			m_vertices[name].m_deleted = true;
+            m_vertices[name].m_edges.Clear();
+            m_vertices[name].m_ancestors = std::vector<long>();
+            delete m_vertices[name].m_convexHull;
+			m_vertices[name].m_distPoints.Clear();
+			m_vertices[name].m_boudaryEdges.Clear();
+            m_vertices[name].m_convexHull = 0;
+			m_nV--;
+			return true;
+		}
+		return false;
+    }    
+    bool Graph::EdgeCollapse(long v1, long v2)
+	{
+		long edgeToDelete = GetEdgeID(v1, v2);
+        if (edgeToDelete >= 0) 
+		{
+			// delete the edge (v1, v2)
+			DeleteEdge(edgeToDelete);
+			// add v2 to v1 ancestors
+            m_vertices[v1].m_ancestors.push_back(v2);
+			// add v2's ancestors to v1's ancestors
+			m_vertices[v1].m_ancestors.insert(m_vertices[v1].m_ancestors.begin(),
+											  m_vertices[v2].m_ancestors.begin(), 
+											  m_vertices[v2].m_ancestors.end());
+			// update adjacency information
+			SArray<long, SARRAY_DEFAULT_MIN_SIZE> & v1Edges =  m_vertices[v1].m_edges;
+			long b = -1;
+            long idEdge;
+			for(size_t ed = 0; ed < m_vertices[v2].m_edges.Size(); ++ed) 
+			{
+                idEdge = m_vertices[v2].m_edges[ed];
+				if (m_edges[idEdge].m_v1 == v2)
+				{
+					b = m_edges[idEdge].m_v2;
+				}
+				else
+				{
+					b = m_edges[idEdge].m_v1;
+				}
+				if (GetEdgeID(v1, b) >= 0)
+				{
+					m_edges[idEdge].m_deleted = true;
+					m_vertices[b].DeleteEdge(idEdge);
+					m_nE--;
+				}
+				else
+				{
+					m_edges[idEdge].m_v1 = v1;
+					m_edges[idEdge].m_v2 = b;
+					v1Edges.Insert(idEdge);
+				}
+			}
+			// delete the vertex v2
+            DeleteVertex(v2);			
+            return true;
+        }
+		return false;
+    }
+    
+    long Graph::GetEdgeID(long v1, long v2) const
+    {
+		if (v1 < static_cast<long>(m_vertices.size()) && !m_vertices[v1].m_deleted)
+		{
+            long idEdge;
+			for(size_t ed = 0; ed < m_vertices[v1].m_edges.Size(); ++ed) 
+			{
+                idEdge =  m_vertices[v1].m_edges[ed];
+				if ( (m_edges[idEdge].m_v1 == v2) || 
+					 (m_edges[idEdge].m_v2 == v2)   ) 
+				{
+					return m_edges[idEdge].m_name;
+				}
+			}
+		}
+        return -1;
+    }
+    
+	void Graph::Print() const
+	{
+		std::cout << "-----------------------------" << std::endl;
+        std::cout << "vertices (" << m_nV << ")" << std::endl;
+        for (size_t v = 0; v < m_vertices.size(); ++v) 
+		{
+			const GraphVertex & currentVertex = m_vertices[v];
+			if (!m_vertices[v].m_deleted)
+			{
+
+				std::cout  << currentVertex.m_name	  << "\t";
+				long idEdge;
+				for(size_t ed = 0; ed < currentVertex.m_edges.Size(); ++ed) 
+				{
+                    idEdge = currentVertex.m_edges[ed];
+					std::cout  << "(" << m_edges[idEdge].m_v1 << "," << m_edges[idEdge].m_v2 << ") "; 	  
+				}
+				std::cout << std::endl;
+			}			
+		}
+
+		std::cout << "vertices (" << m_nE << ")" << std::endl;
+		for (size_t e = 0; e < m_edges.size(); ++e) 
+		{
+			const GraphEdge & currentEdge = m_edges[e];
+			if (!m_edges[e].m_deleted)
+			{
+				std::cout  << currentEdge.m_name	  << "\t(" 
+						   << m_edges[e].m_v1		  << "," 
+						   << m_edges[e].m_v2		  << ") "<< std::endl;
+			}			
+		}
+	}
+	void Graph::Clear()
+	{
+		m_vertices.clear();
+		m_edges.clear();
+		m_nV = 0;
+        m_nE = 0;
+	}
+    
+    long Graph::ExtractCCs()
+	{
+        // all CCs to -1
+        for (size_t v = 0; v < m_vertices.size(); ++v) 
+		{
+			if (!m_vertices[v].m_deleted)
+			{
+				m_vertices[v].m_cc = -1;
+			}
+        }
+        
+        // we get the CCs
+        m_nCCs = 0;
+		long v2 = -1;
+        long idEdge;
+		std::vector<long> temp;
+        for (size_t v = 0; v < m_vertices.size(); ++v) 
+		{
+			if (!m_vertices[v].m_deleted && m_vertices[v].m_cc == -1) 
+			{
+                m_vertices[v].m_cc = static_cast<long>(m_nCCs);
+                temp.clear();
+                temp.push_back(m_vertices[v].m_name);
+                while (temp.size()) 
+				{
+                    long vertex = temp[temp.size()-1];
+                    temp.pop_back();                                        
+					for(size_t ed = 0; ed < m_vertices[vertex].m_edges.Size(); ++ed) 
+					{
+                        idEdge =  m_vertices[vertex].m_edges[ed];
+                        if (m_edges[idEdge].m_v1 == vertex) 
+						{
+                            v2 = m_edges[idEdge].m_v2;
+                        }
+                        else 
+						{
+                            v2 = m_edges[idEdge].m_v1;
+                        }
+                        if ( !m_vertices[v2].m_deleted && m_vertices[v2].m_cc == -1) 
+						{
+                            m_vertices[v2].m_cc = static_cast<long>(m_nCCs);
+                            temp.push_back(v2);
+                        }
+                    }
+                }
+                m_nCCs++;
+            }
+        }        
+        return static_cast<long>(m_nCCs);
+    }
+}

indra/libhacd/hacdGraph.h

@@ -0,0 +1,118 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_GRAPH_H
+#define HACD_GRAPH_H
+#include "hacdVersion.h"
+#include "hacdVector.h"
+#include "hacdICHull.h"
+#include <map>
+#include <vector>
+#include "hacdSArray.h"
+//#define HACD_PRECOMPUTE_CHULLS
+
+namespace HACD
+{
+    class GraphVertex;
+    class GraphEdge;
+    class Graph;
+	class HACD;
+       
+    class GraphVertex  
+    {
+    public:
+        bool                                                      AddEdge(long name) 
+                                                                  { 
+                                                                    m_edges.Insert(name); 
+                                                                    return true; 
+                                                                  }
+        bool                                                      DeleteEdge(long name);        
+                                                                  GraphVertex();
+                                                                  ~GraphVertex(){ delete m_convexHull;};      
+    private:
+        long                                                      m_name;
+        long                                                      m_cc;
+        SArray<long, SARRAY_DEFAULT_MIN_SIZE>                     m_edges;
+        bool                                                      m_deleted;
+        std::vector<long>	                                      m_ancestors;
+		SArray<DPoint, SARRAY_DEFAULT_MIN_SIZE>					  m_distPoints;
+
+        Real                                                      m_concavity;
+        double                                                    m_surf;
+        ICHull *                                                  m_convexHull;
+		SArray<unsigned long long, SARRAY_DEFAULT_MIN_SIZE>       m_boudaryEdges;
+        
+
+        friend class GraphEdge;
+        friend class Graph;
+		friend class HACD;
+    };
+    
+	class GraphEdge 
+    {
+    public:
+                                                                 GraphEdge();
+                                                                 ~GraphEdge()
+                                                                 {
+#ifdef HACD_PRECOMPUTE_CHULLS
+                                                                    delete m_convexHull;
+#endif
+                                                                 };
+    private:
+        long                                                     m_name;
+        long                                                     m_v1;
+        long                                                     m_v2;
+        double                                                   m_concavity;
+        Real                                                     m_error;
+#ifdef HACD_PRECOMPUTE_CHULLS
+        ICHull *                                                 m_convexHull;
+#endif
+        bool                                                     m_deleted;
+        
+        friend class GraphVertex;
+        friend class Graph;
+		friend class HACD;
+    };
+    
+    class Graph  
+    {
+    public:
+		size_t									                 GetNEdges() const { return m_nE;}
+		size_t									                 GetNVertices() const { return m_nV;}
+        bool                                                     EdgeCollapse(long v1, long v2);
+        long                                                     AddVertex();
+        long                                                     AddEdge(long v1, long v2);
+        bool                                                     DeleteEdge(long name);	
+        bool                                                     DeleteVertex(long name);
+        long                                                     GetEdgeID(long v1, long v2) const;
+		void									                 Clear();
+        void                                                     Print() const;
+        long                                                     ExtractCCs();
+        
+                                                                 Graph();
+        virtual                                                  ~Graph();      
+		void									                 Allocate(size_t nV, size_t nE);
+
+    private:
+        size_t                                                   m_nCCs;
+        size_t                                                   m_nV;
+        size_t                                                   m_nE;
+        std::vector<GraphEdge>                                   m_edges;
+        std::vector<GraphVertex>                                 m_vertices;
+
+		friend class HACD;
+    };
+}
+#endif

indra/libhacd/hacdHACD.h

@@ -0,0 +1,330 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_HACD_H
+#define HACD_HACD_H
+#include "hacdVersion.h"
+#include "hacdVector.h"
+#include "hacdGraph.h"
+#include "hacdICHull.h"
+#include <set>
+#include <vector>
+#include <queue>
+
+namespace HACD
+{
+    const double                                    sc_pi = 3.14159265;
+	class HACD;
+
+	// just to be able to set the capcity of the container
+	
+	template<class _Ty, class _Container = std::vector<_Ty>, class _Pr = std::less<typename _Container::value_type> >
+	class reservable_priority_queue: public std::priority_queue<_Ty, _Container, _Pr> 
+	{
+        typedef typename std::priority_queue<_Ty, _Container, _Pr>::size_type size_type;
+	public:
+                                                    reservable_priority_queue(size_type capacity = 0) { reserve(capacity); };
+		void										reserve(size_type capacity) { this->c.reserve(capacity); } 
+        size_type									capacity() const { return this->c.capacity(); } 
+	};
+	
+	//! priority queque element
+	class HACD;
+    class GraphEdgePriorityQueue
+    {
+		public:
+			//! Constructor
+			//! @param name edge's id
+			//! @param priority edge's priority
+													GraphEdgePriorityQueue(long name, Real priority)
+													{
+														m_name = name;
+														m_priority = priority;
+													}
+			//! Destructor
+													~GraphEdgePriorityQueue(void){}
+		private:
+			long									m_name;						//!< edge name
+			Real                                    m_priority;					//!< priority
+		//! Operator < for GraphEdgePQ
+        friend bool                                 operator<(const GraphEdgePriorityQueue & lhs, const GraphEdgePriorityQueue & rhs);
+		//! Operator > for GraphEdgePQ
+        friend bool                                 operator>(const GraphEdgePriorityQueue & lhs, const GraphEdgePriorityQueue & rhs);
+		friend class HACD;
+    };
+    inline bool										operator<(const GraphEdgePriorityQueue & lhs, const GraphEdgePriorityQueue & rhs)
+													{
+														return (lhs.m_priority<rhs.m_priority);
+													}
+    inline bool										operator>(const GraphEdgePriorityQueue & lhs, const GraphEdgePriorityQueue & rhs)
+													{
+														return lhs.m_priority>rhs.m_priority;
+													}
+    class ICallback
+    {
+    public:
+		virtual void operator()( char const *aMsg, double aProgress, double aConcavity, size_t aVertices) = 0;
+    };
+	
+	typedef ICallback* CallBackFunction;
+
+	//! Provides an implementation of the Hierarchical Approximate Convex Decomposition (HACD) technique described in "A Simple and Efficient Approach for 3D Mesh Approximate Convex Decomposition" Game Programming Gems 8 - Chapter 2.8, p.202. A short version of the chapter was published in ICIP09 and is available at ftp://ftp.elet.polimi.it/users/Stefano.Tubaro/ICIP_USB_Proceedings_v2/pdfs/0003501.pdf
+    class HACD
+	{            
+    public:
+		//! Gives the targeted number of triangles of the decimated mesh
+		//! @return targeted number of triangles of the decimated mesh
+		size_t										GetTargetNTrianglesDecimatedMesh() const { return m_targetNTrianglesDecimatedMesh;}
+        //! Sets the targeted number of triangles of the decimated mesh
+		//! @param targeted number of triangles of the decimated mesh
+		void										SetNTargetTrianglesDecimatedMesh(size_t  targetNTrianglesDecimatedMesh) { m_targetNTrianglesDecimatedMesh = targetNTrianglesDecimatedMesh;}
+		//! Gives the triangles partitionas an array of size m_nTriangles where the i-th element specifies the cluster to which belong the i-th triangle
+		//! @return triangles partition
+		const long * const							GetPartition() const { return m_partition;}
+        //! Sets the scale factor
+		//! @param scale scale factor
+		void										SetScaleFactor(double  scale) { m_scale = scale;}
+		//! Gives the scale factor
+		//! @return scale factor
+		const double								GetScaleFactor() const { return m_scale;}
+        //! Sets the threshold to detect small clusters. The threshold is expressed as a percentage of the total mesh surface (default 0.25%)
+		//! @param smallClusterThreshold threshold to detect small clusters
+		void										SetSmallClusterThreshold(double  smallClusterThreshold) { m_smallClusterThreshold = smallClusterThreshold;}
+		//! Gives the threshold to detect small clusters. The threshold is expressed as a percentage of the total mesh surface (default 0.25%)
+		//! @return threshold to detect small clusters
+		const double								GetSmallClusterThreshold() const { return m_smallClusterThreshold;}
+		//! Sets the call-back function
+		//! @param callBack pointer to the call-back function
+		void										SetCallBack(CallBackFunction  callBack) { m_callBack = callBack;}
+		//! Gives the call-back function
+		//! @return pointer to the call-back function
+		const CallBackFunction                      GetCallBack() const { return m_callBack;}
+        
+        //! Specifies whether faces points should be added when computing the concavity
+		//! @param addFacesPoints true = faces points should be added
+		void										SetAddFacesPoints(bool  addFacesPoints) { m_addFacesPoints = addFacesPoints;}
+		//! Specifies wheter faces points should be added when computing the concavity
+		//! @return true = faces points should be added
+		const bool									GetAddFacesPoints() const { return m_addFacesPoints;}
+        //! Specifies whether extra points should be added when computing the concavity
+		//! @param addExteraDistPoints true = extra points should be added
+		void										SetAddExtraDistPoints(bool  addExtraDistPoints) { m_addExtraDistPoints = addExtraDistPoints;}
+		//! Specifies wheter extra points should be added when computing the concavity
+		//! @return true = extra points should be added
+		const bool									GetAddExtraDistPoints() const { return m_addExtraDistPoints;}
+        //! Sets the points of the input mesh (Remark: the input points will be scaled and shifted. Use DenormalizeData() to invert those operations)
+		//! @param points pointer to the input points
+		void										SetPoints(Vec3<Real>  * points) { m_points = points;}
+		//! Gives the points of the input mesh (Remark: the input points will be scaled and shifted. Use DenormalizeData() to invert those operations)
+		//! @return pointer to the input points 
+		const Vec3<Real> *                          GetPoints() const { return m_points;}
+		//! Gives the points of the decimated mesh
+		//! @return pointer to the decimated mesh points 
+		const Vec3<Real> *                          GetDecimatedPoints() const { return m_pointsDecimated;}
+		//! Gives the triangles in the decimated mesh 
+		//! @return pointer to the decimated mesh triangles 
+		const Vec3<long>   *			            GetDecimatedTriangles() const { return m_trianglesDecimated;}        
+		//! Gives the number of points in the decimated mesh.
+		//! @return number of points the decimated mesh mesh
+		const size_t								GetNDecimatedPoints() const { return m_nPointsDecimated;}
+		//! Gives the number of triangles in the decimated mesh.
+		//! @return number of triangles the decimated mesh
+		const size_t								GetNDecimatedTriangles() const { return m_nTrianglesDecimated;}
+		//! Sets the triangles of the input mesh.
+		//! @param triangles points pointer to the input points
+		void										SetTriangles(Vec3<long>  * triangles) { m_triangles = triangles;}
+		//! Gives the triangles in the input mesh 
+		//! @return pointer to the input triangles 
+		const Vec3<long>   *			            GetTriangles() const { return m_triangles;}
+		//! Sets the number of points in the input mesh.
+		//! @param nPoints number of points the input mesh
+		void										SetNPoints(size_t nPoints) { m_nPoints = nPoints;}
+		//! Gives the number of points in the input mesh.
+		//! @return number of points the input mesh
+		const size_t								GetNPoints() const { return m_nPoints;}
+		//! Sets the number of triangles in the input mesh.
+		//! @param nTriangles number of triangles in the input mesh
+		void										SetNTriangles(size_t nTriangles) { m_nTriangles = nTriangles;}
+		//! Gives the number of triangles in the input mesh.
+		//! @return number of triangles the input mesh
+		const size_t								GetNTriangles() const { return m_nTriangles;}
+		//! Sets the minimum number of clusters to be generated.
+		//! @param nClusters minimum number of clusters
+		void										SetNClusters(size_t nClusters) { m_nMinClusters = nClusters;}
+		//! Gives the number of generated clusters.
+		//! @return number of generated clusters
+		const size_t								GetNClusters() const { return m_nClusters;}
+		//! Sets the maximum allowed concavity.
+		//! @param concavity maximum concavity
+		void										SetConcavity(double concavity) { m_concavity = concavity;}
+		//! Gives the maximum allowed concavity.
+		//! @return maximum concavity
+		double                                      GetConcavity() const { return m_concavity;}
+		//! Sets the maximum allowed distance to get CCs connected.
+		//! @param concavity maximum distance to get CCs connected
+		void										SetConnectDist(double ccConnectDist) { m_ccConnectDist = ccConnectDist;}
+		//! Gives the maximum allowed distance to get CCs connected.
+		//! @return maximum distance to get CCs connected
+		double                                      GetConnectDist() const { return m_ccConnectDist;}        
+        //! Sets the volume weight.
+		//! @param beta volume weight
+        void										SetVolumeWeight(double beta) { m_beta = beta;}
+		//! Gives the volume weight.
+		//! @return volume weight
+        double                                      GetVolumeWeight() const { return m_beta;}	
+		//! Sets the compacity weight (i.e. parameter alpha in ftp://ftp.elet.polimi.it/users/Stefano.Tubaro/ICIP_USB_Proceedings_v2/pdfs/0003501.pdf).
+		//! @param alpha compacity weight
+        void										SetCompacityWeight(double alpha) { m_alpha = alpha;}
+		//! Gives the compacity weight (i.e. parameter alpha in ftp://ftp.elet.polimi.it/users/Stefano.Tubaro/ICIP_USB_Proceedings_v2/pdfs/0003501.pdf).
+		//! @return compacity weight
+        double                                      GetCompacityWeight() const { return m_alpha;}	
+		//! Sets the maximum number of vertices for each generated convex-hull.
+		//! @param nVerticesPerCH maximum # vertices per CH
+        void										SetNVerticesPerCH(size_t nVerticesPerCH) { m_nVerticesPerCH = nVerticesPerCH;}
+		//! Gives the maximum number of vertices for each generated convex-hull.
+		//! @return maximum # vertices per CH
+		const size_t								GetNVerticesPerCH() const { return m_nVerticesPerCH;}
+		//! Gives the number of vertices for the cluster number numCH.
+		//! @return number of vertices
+		size_t                                      GetNPointsCH(size_t numCH) const;
+		//! Gives the number of triangles for the cluster number numCH.
+		//! @param numCH cluster's number
+		//! @return number of triangles
+        size_t                                      GetNTrianglesCH(size_t numCH) const;
+		//! Gives the vertices and the triangles of the cluster number numCH.
+		//! @param numCH cluster's number
+		//! @param points pointer to the vector of points to be filled
+		//! @param triangles pointer to the vector of triangles to be filled
+		//! @return true if sucess
+        bool                                        GetCH(size_t numCH, Vec3<Real> * const points, Vec3<long> * const triangles);     
+		//! Computes the HACD decomposition.
+		//! @param fullCH specifies whether to generate convex-hulls with a full or limited (i.e. < m_nVerticesPerCH) number of vertices
+        //! @param exportDistPoints specifies wheter distance points should ne exported or not (used only for debugging).
+		//! @return true if sucess
+        bool										Compute(bool fullCH=false, bool exportDistPoints=false);
+#if 0
+		//! Saves the generated convex-hulls in a VRML 2.0 file.
+		//! @param fileName the output file name
+		//! @param uniColor specifies whether the different convex-hulls should have the same color or not
+        //! @param numCluster specifies the cluster to be saved, if numCluster < 0 export all clusters
+        //! @return true if sucess
+		bool										Save(const char * fileName, bool uniColor, long numCluster=-1) const;
+#endif
+		//! Shifts and scales to the data to have all the coordinates between 0.0 and 1000.0.
+		void										NormalizeData();
+		//! Inverse the operations applied by NormalizeData().
+		void										DenormalizeData();
+		//! Destructor.
+													~HACD(void);
+
+	private:
+        //! Constructor.
+													HACD(HeapManager * heapManager = 0);
+
+		//! Gives the edge index.
+		//! @param a first vertex id
+		//! @param b second vertex id
+		//! @return edge's index
+		static unsigned long long					GetEdgeIndex(unsigned long long a, unsigned long long b) 
+													{ 
+														if (a > b) return (a << 32) + b;
+														else	   return (b << 32) + a;
+													}
+		//! Computes the concavity of a cluster.
+		//! @param ch the cluster's convex-hull
+		//! @param distPoints the cluster's points 
+		//! @return cluster's concavity
+		double										Concavity(ICHull & ch, std::map<long, DPoint> & distPoints);
+		//! Computes the perimeter of a cluster.
+		//! @param triIndices the cluster's triangles
+		//! @param distPoints the cluster's points 
+		//! @return cluster's perimeter
+        double										ComputePerimeter(const std::vector<long> & triIndices) const;
+		//! Creates the Graph by associating to each mesh triangle a vertex in the graph and to each couple of adjacent triangles an edge in the graph.
+        void										CreateGraph();	
+		//! Initializes the graph costs and computes the vertices normals
+        void										InitializeDualGraph();
+		//! Computes the cost of an edge
+		//! @param e edge's id
+        void                                        ComputeEdgeCost(size_t e);
+		//! Initializes the priority queue
+		//! @param fast specifies whether fast mode is used
+		//! @return true if success
+        bool                                        InitializePriorityQueue();
+        //! Cleans the intersection between convex-hulls
+        void                                        CleanClusters();
+        //! Computes convex-hulls from partition information
+        //! @param fullCH specifies whether to generate convex-hulls with a full or limited (i.e. < m_nVerticesPerCH) number of vertices
+		void										ComputeConvexHulls(bool fullCH);
+		//! Simplifies the graph
+		//! @param fast specifies whether fast mode is used
+		void										Simplify();
+
+	private:
+        Vec3<long> *								m_trianglesDecimated;		//>! pointer the triangles array
+        Vec3<Real> *                                m_pointsDecimated;			//>! pointer the points array
+        Vec3<long> *								m_triangles;				//>! pointer the triangles array
+        Vec3<Real> *                                m_points;					//>! pointer the points array
+        Vec3<Real> *                                m_facePoints;               //>! pointer to the faces points array
+        Vec3<Real> *                                m_faceNormals;              //>! pointer to the faces normals array
+        Vec3<Real> *                                m_normals;					//>! pointer the normals array
+        Vec3<Real> *                                m_extraDistPoints;          //>! pointer to the faces points array
+        Vec3<Real> *                                m_extraDistNormals;         //>! pointer to the faces normals array
+        size_t										m_nTrianglesDecimated;		//>! number of triangles in the original mesh
+        size_t										m_nPointsDecimated;			//>! number of vertices in the original mesh
+        size_t										m_nTriangles;				//>! number of triangles in the original mesh
+        size_t										m_nPoints;					//>! number of vertices in the original mesh
+        size_t										m_nClusters;				//>! number of clusters
+        size_t										m_nMinClusters;				//>! minimum number of clusters
+        double										m_ccConnectDist;			//>! maximum allowed distance to connect CCs
+        double										m_concavity;				//>! maximum concavity
+		double										m_alpha;					//>! compacity weigth
+        double                                      m_beta;                     //>! volume weigth
+		double										m_gamma;					//>! computation cost
+        double										m_diag;						//>! length of the BB diagonal
+		double										m_scale;					//>! scale factor used for NormalizeData() and DenormalizeData()
+		double										m_flatRegionThreshold;		//>! threshhold to control the contirbution of flat regions concavity (default 1% of m_scale)
+		double										m_smallClusterThreshold;	//>! threshhold to detect small clusters (default 0.25% of the total mesh surface)
+		double										m_area;						//>! surface area
+		Vec3<Real>                                  m_barycenter;				//>! barycenter of the mesh
+        std::vector< long >                         m_cVertices;				//>! array of vertices each belonging to a different cluster
+        ICHull *                                    m_convexHulls;				//>! convex-hulls associated with the final HACD clusters
+		Graph										m_graph;					//>! simplification graph
+        size_t                                      m_nVerticesPerCH;			//>! maximum number of vertices per convex-hull
+		reservable_priority_queue<GraphEdgePriorityQueue, 
+            std::vector<GraphEdgePriorityQueue>,
+			std::greater<std::vector<GraphEdgePriorityQueue>::value_type> > m_pqueue;		//!> priority queue
+													HACD(const HACD & rhs);
+		CallBackFunction							m_callBack;					//>! call-back function
+		long *										m_partition;				//>! array of size m_nTriangles where the i-th element specifies the cluster to which belong the i-th triangle
+		size_t										m_targetNTrianglesDecimatedMesh; //>! specifies the target number of triangles in the decimated mesh. If set to 0 no decimation is applied.
+        HeapManager *                               m_heapManager;              //>! Heap Manager
+        bool                                        m_addFacesPoints;           //>! specifies whether to add faces points or not
+        bool                                        m_addExtraDistPoints;       //>! specifies whether to add extra points for concave shapes or not
+
+        friend HACD * const                         CreateHACD(HeapManager * heapManager = 0);
+        friend void                                 DestroyHACD(HACD * const hacd);
+	};
+    inline HACD * const CreateHACD(HeapManager * heapManager) 
+    { 
+        return new HACD(heapManager);
+    }
+    inline void DestroyHACD(HACD * const hacd) 
+    { 
+        delete hacd;
+    }
+}
+#endif
+

indra/libhacd/hacdICHull.h

@@ -0,0 +1,133 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_ICHULL_H
+#define HACD_ICHULL_H
+#include "hacdVersion.h"
+#include "hacdManifoldMesh.h"
+#include "hacdVector.h"
+#include <vector>
+#include <map>
+#include "hacdMicroAllocator.h"
+
+namespace HACD
+{
+	class DPoint;
+	class HACD;
+	//!	Incremental Convex Hull algorithm (cf. http://maven.smith.edu/~orourke/books/ftp.html ).
+	enum ICHullError
+	{
+		ICHullErrorOK = 0,
+		ICHullErrorCoplanarPoints,
+		ICHullErrorNoVolume,
+		ICHullErrorInconsistent,
+		ICHullErrorNotEnoughPoints
+	};
+	class ICHull
+	{
+		public:
+			static const double									sc_eps;
+			//! 
+            HeapManager * const     							GetHeapManager() const { return m_heapManager;}
+			//!
+			void												SetHeapManager(HeapManager * const heapManager)
+                                                                { 
+                                                                    m_heapManager = heapManager;
+                                                                    m_mesh.SetHeapManager(m_heapManager);
+                                                                }
+			//!
+			bool												IsFlat() { return m_isFlat;}
+			//! 
+            std::map<long, DPoint> *							GetDistPoints() const { return m_distPoints;}
+			//!
+			void												SetDistPoints(std::map<long, DPoint> * distPoints) { m_distPoints = distPoints;}
+			//! Returns the computed mesh
+            TMMesh &                                            GetMesh() { return m_mesh;}
+			//!	Add one point to the convex-hull    
+            bool                                                AddPoint(const Vec3<Real> & point) {return AddPoints(&point, 1);}
+			//!	Add one point to the convex-hull    
+            bool                                                AddPoint(const Vec3<Real> & point, long id);
+			//!	Add points to the convex-hull
+			bool                                                AddPoints(const Vec3<Real> * points, size_t nPoints);	
+			bool												AddPoints(std::vector< Vec3<Real> > points);
+			//!	
+			ICHullError                                         Process();
+            //! 
+            ICHullError                                         Process(unsigned long nPointsCH);
+            //!
+            double                                              ComputeVolume();
+			//!
+			double												ComputeArea();
+            //!
+            bool                                                IsInside(const Vec3<Real> & pt0, const double eps = 0.0);
+			//!
+			double												ComputeDistance(long name, const Vec3<Real> & pt, const Vec3<Real> & normal, bool & insideHull, bool updateIncidentPoints);
+            //!
+            const ICHull &                                      operator=(ICHull & rhs);        
+
+			//!	Constructor
+																ICHull(HeapManager * const heapManager=0);
+			//! Destructor
+			virtual                                             ~ICHull(void) {};
+
+		private:
+            //!	DoubleTriangle builds the initial double triangle.  It first finds 3 noncollinear points and makes two faces out of them, in opposite order. It then finds a fourth point that is not coplanar with that face.  The vertices are stored in the face structure in counterclockwise order so that the volume between the face and the point is negative. Lastly, the 3 newfaces to the fourth point are constructed and the data structures are cleaned up. 
+			ICHullError                                         DoubleTriangle();
+            //!	MakeFace creates a new face structure from three vertices (in ccw order).  It returns a pointer to the face.
+            CircularListElement<TMMTriangle> *                  MakeFace(CircularListElement<TMMVertex> * v0,  
+                                                                         CircularListElement<TMMVertex> * v1,
+                                                                         CircularListElement<TMMVertex> * v2,
+                                                                         CircularListElement<TMMTriangle> * fold);			
+            //!	
+            CircularListElement<TMMTriangle> *                  MakeConeFace(CircularListElement<TMMEdge> * e, CircularListElement<TMMVertex> * v);
+			//!	
+			bool                                                ProcessPoint();
+            //!
+            bool                                                ComputePointVolume(double &totalVolume, bool markVisibleFaces);
+            //!
+            bool                                                FindMaxVolumePoint();
+            //!	
+            bool                                                CleanEdges();
+            //!	
+            bool                                                CleanVertices(unsigned long & addedPoints);
+            //!	
+            bool                                                CleanTriangles();
+            //!	
+            bool                                                CleanUp(unsigned long & addedPoints);
+            //!
+            bool                                                MakeCCW(CircularListElement<TMMTriangle> * f,
+                                                                        CircularListElement<TMMEdge> * e, 
+                                                                        CircularListElement<TMMVertex> * v);
+			void												Clear(); 
+		private:
+            static const long                                   sc_dummyIndex;
+            static const double                                 sc_distMin;
+			TMMesh                                              m_mesh;
+            std::vector<CircularListElement<TMMEdge> *>         m_edgesToDelete;
+            std::vector<CircularListElement<TMMEdge> *>         m_edgesToUpdate;
+            std::vector<CircularListElement<TMMTriangle> *>     m_trianglesToDelete; 
+			std::map<long, DPoint> *							m_distPoints;            
+//			CircularListElement<TMMVertex> *					m_dummyVertex;
+			Vec3<Real>                                          m_normal;
+			bool												m_isFlat;
+            HeapManager *                                       m_heapManager;
+					                                           
+																ICHull(const ICHull & rhs);
+        
+			friend class HACD;
+	};
+
+}
+#endif

indra/libhacd/hacdManifoldMesh.cpp

@@ -0,0 +1,604 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "hacdManifoldMesh.h"
+using namespace std;
+
+
+namespace HACD
+{    
+    Material::Material(void)
+    {
+        m_diffuseColor.X()  = 0.5;
+        m_diffuseColor.Y()  = 0.5;
+        m_diffuseColor.Z()  = 0.5;
+        m_specularColor.X() = 0.5;
+        m_specularColor.Y() = 0.5;
+        m_specularColor.Z() = 0.5;
+        m_ambientIntensity  = 0.4;
+        m_emissiveColor.X() = 0.0;
+        m_emissiveColor.Y() = 0.0;
+        m_emissiveColor.Z() = 0.0;
+        m_shininess         = 0.4;
+        m_transparency      = 0.0;
+    }
+    
+	TMMVertex::TMMVertex(void)
+	{
+        Initialize();
+	}
+    void TMMVertex::Initialize()
+	{
+		m_name = 0;
+        m_id = 0;
+		m_duplicate = 0;
+		m_onHull = false;
+		m_tag = false;
+	}
+
+	TMMVertex::~TMMVertex(void)
+	{
+	}
+	TMMEdge::TMMEdge(void)
+	{
+        Initialize();
+	}
+    void TMMEdge::Initialize()
+	{
+        m_id = 0;
+		m_triangles[0] = m_triangles[1] = m_newFace = 0;
+		m_vertices[0] = m_vertices[1] = 0;
+    }
+	TMMEdge::~TMMEdge(void)
+	{
+	}
+    void TMMTriangle::Initialize()
+	{
+        m_id = 0;
+		for(int i = 0; i < 3; i++)
+		{
+			m_edges[i] = 0;
+			m_vertices[0] = 0;
+		}
+		m_visible = false;
+        m_incidentPoints.Initialize();
+    }
+	TMMTriangle::TMMTriangle(void)
+	{
+        Initialize();
+	}
+	TMMTriangle::~TMMTriangle(void)
+	{
+	}
+	TMMesh::TMMesh(HeapManager * const heapManager):
+        m_vertices(heapManager), 
+        m_edges(heapManager),
+        m_triangles(heapManager)
+	{
+		m_barycenter = Vec3<Real>(0,0,0);
+		m_diag = 1;
+        m_heapManager = heapManager;   
+	}
+	TMMesh::~TMMesh(void)
+	{
+	}
+
+	void TMMesh::Print() 
+	{
+		size_t nV = m_vertices.GetSize();
+		std::cout << "-----------------------------" << std::endl;
+        std::cout << "vertices (" << nV << ")" << std::endl;
+        for(size_t v = 0; v < nV; v++)
+		{
+			const TMMVertex & currentVertex = m_vertices.GetData();
+			std::cout  << currentVertex.m_id	  << ", " 
+		 			   << currentVertex.m_pos.X() << ", " 
+					   << currentVertex.m_pos.Y() << ", "
+					   << currentVertex.m_pos.Z() << std::endl;
+			m_vertices.Next();
+		}
+    
+
+		size_t nE = m_edges.GetSize();
+		std::cout << "edges (" << nE << ")" << std::endl;
+		for(size_t e = 0; e < nE; e++)
+		{
+			const TMMEdge & currentEdge = m_edges.GetData();
+            const CircularListElement<TMMVertex> * v0 = currentEdge.m_vertices[0];
+            const CircularListElement<TMMVertex> * v1 = currentEdge.m_vertices[1];
+            const CircularListElement<TMMTriangle> * f0 = currentEdge.m_triangles[0];
+            const CircularListElement<TMMTriangle> * f1 = currentEdge.m_triangles[1];
+
+			std::cout << "-> (" << v0->GetData().m_name << ", " << v1->GetData().m_name << ")" << std::endl; 
+            std::cout << "-> F0 (" << f0->GetData().m_vertices[0]->GetData().m_name << ", " 
+                                   << f0->GetData().m_vertices[1]->GetData().m_name << ", "
+                                   << f0->GetData().m_vertices[2]->GetData().m_name <<")" << std::endl; 
+            std::cout << "-> F1 (" << f1->GetData().m_vertices[0]->GetData().m_name << ", " 
+                                   << f1->GetData().m_vertices[1]->GetData().m_name << ", "
+                                   << f1->GetData().m_vertices[2]->GetData().m_name << ")" << std::endl;                         
+			m_edges.Next();
+		}
+		size_t nT = m_triangles.GetSize();
+		std::cout << "triangles (" << nT << ")" << std::endl;
+		for(size_t t = 0; t < nT; t++)
+		{
+			const TMMTriangle & currentTriangle = m_triangles.GetData();
+            const CircularListElement<TMMVertex> * v0 = currentTriangle.m_vertices[0];
+            const CircularListElement<TMMVertex> * v1 = currentTriangle.m_vertices[1];
+            const CircularListElement<TMMVertex> * v2 = currentTriangle.m_vertices[2];
+            const CircularListElement<TMMEdge> * e0 = currentTriangle.m_edges[0];
+            const CircularListElement<TMMEdge> * e1 = currentTriangle.m_edges[1];
+            const CircularListElement<TMMEdge> * e2 = currentTriangle.m_edges[2];
+            
+			std::cout << "-> (" << v0->GetData().m_name << ", " << v1->GetData().m_name << ", "<< v2->GetData().m_name << ")" << std::endl; 
+         
+            std::cout << "-> E0 (" << e0->GetData().m_vertices[0]->GetData().m_name << ", " 
+                                   << e0->GetData().m_vertices[1]->GetData().m_name << ")" << std::endl; 
+            std::cout << "-> E1 (" << e1->GetData().m_vertices[0]->GetData().m_name << ", " 
+                                   << e1->GetData().m_vertices[1]->GetData().m_name << ")" << std::endl;
+            std::cout << "-> E2 (" << e2->GetData().m_vertices[0]->GetData().m_name << ", " 
+                                   << e2->GetData().m_vertices[1]->GetData().m_name << ")" << std::endl;   
+			m_triangles.Next();
+		}   
+	}
+#if 0
+    bool TMMesh::Save(const char *fileName)
+    {
+        std::ofstream fout(fileName);
+        std::cout << "Saving " <<  fileName << std::endl;
+		if (SaveVRML2(fout))
+		{
+           fout.close();
+		   return true;
+		}
+        return false;
+    }
+    bool TMMesh::SaveVRML2(std::ofstream &fout)
+    {
+        return SaveVRML2(fout, Material());
+    }
+    bool TMMesh::SaveVRML2(std::ofstream &fout, const Material & material)
+    {
+        if (fout.is_open()) 
+        {
+            size_t nV = m_vertices.GetSize();
+            size_t nT = m_triangles.GetSize();            
+            fout <<"#VRML V2.0 utf8" << std::endl;	    	
+            fout <<"" << std::endl;
+            fout <<"# Vertices: " << nV << std::endl;		
+            fout <<"# Triangles: " << nT << std::endl;		
+            fout <<"" << std::endl;
+            fout <<"Group {" << std::endl;
+            fout <<"	children [" << std::endl;
+            fout <<"		Shape {" << std::endl;
+            fout <<"			appearance Appearance {" << std::endl;
+            fout <<"				material Material {" << std::endl;
+            fout <<"					diffuseColor "      << material.m_diffuseColor.X()      << " " 
+                                                            << material.m_diffuseColor.Y()      << " "
+                                                            << material.m_diffuseColor.Z()      << std::endl;  
+            fout <<"					ambientIntensity "  << material.m_ambientIntensity      << std::endl;
+            fout <<"					specularColor "     << material.m_specularColor.X()     << " " 
+                                                            << material.m_specularColor.Y()     << " "
+                                                            << material.m_specularColor.Z()     << std::endl; 
+            fout <<"					emissiveColor "     << material.m_emissiveColor.X()     << " " 
+                                                            << material.m_emissiveColor.Y()     << " "
+                                                            << material.m_emissiveColor.Z()     << std::endl; 
+            fout <<"					shininess "         << material.m_shininess             << std::endl;
+            fout <<"					transparency "      << material.m_transparency          << std::endl;
+            fout <<"				}" << std::endl;
+            fout <<"			}" << std::endl;
+            fout <<"			geometry IndexedFaceSet {" << std::endl;
+            fout <<"				ccw TRUE" << std::endl;
+            fout <<"				solid TRUE" << std::endl;
+            fout <<"				convex TRUE" << std::endl;
+            if (GetNVertices() > 0) {
+                fout <<"				coord DEF co Coordinate {" << std::endl;
+                fout <<"					point [" << std::endl;
+                for(size_t v = 0; v < nV; v++)
+                {
+                    TMMVertex & currentVertex = m_vertices.GetData();
+                    fout <<"						" << currentVertex.m_pos.X() << " " 
+                                                      << currentVertex.m_pos.Y() << " " 
+                                                      << currentVertex.m_pos.Z() << "," << std::endl;
+                    currentVertex.m_id = v;
+                    m_vertices.Next();
+                }
+                fout <<"					]" << std::endl;
+                fout <<"				}" << std::endl;
+            }
+            if (GetNTriangles() > 0) {
+                fout <<"				coordIndex [ " << std::endl;
+                for(size_t f = 0; f < nT; f++)
+                {
+                    TMMTriangle & currentTriangle = m_triangles.GetData();
+                    fout <<"						" << currentTriangle.m_vertices[0]->GetData().m_id << ", " 
+                                                      << currentTriangle.m_vertices[1]->GetData().m_id << ", "                                                  
+                                                      << currentTriangle.m_vertices[2]->GetData().m_id << ", -1," << std::endl;
+                    m_triangles.Next();
+                }
+                fout <<"				]" << std::endl;
+            }
+            fout <<"			}" << std::endl;
+            fout <<"		}" << std::endl;
+            fout <<"	]" << std::endl;
+            fout <<"}" << std::endl;	
+        }
+        return true;
+    }
+#endif
+    void TMMesh::GetIFS(Vec3<Real> * const points, Vec3<long> * const triangles)
+    {
+        size_t nV = m_vertices.GetSize();
+        size_t nT = m_triangles.GetSize(); 
+
+        for(size_t v = 0; v < nV; v++)
+        {
+            points[v] = m_vertices.GetData().m_pos;
+            m_vertices.GetData().m_id = v;
+            m_vertices.Next();
+        }
+        for(size_t f = 0; f < nT; f++)
+        {
+            TMMTriangle & currentTriangle = m_triangles.GetData();
+            triangles[f].X() = static_cast<long>(currentTriangle.m_vertices[0]->GetData().m_id);
+            triangles[f].Y() = static_cast<long>(currentTriangle.m_vertices[1]->GetData().m_id);
+            triangles[f].Z() = static_cast<long>(currentTriangle.m_vertices[2]->GetData().m_id);
+            m_triangles.Next();
+        }
+    }
+	void TMMesh::Clear()
+    {
+		m_vertices.Clear();
+		m_edges.Clear();
+		m_triangles.Clear();
+	}
+    void TMMesh::Copy(TMMesh & mesh)
+    {
+        Clear();
+        // updating the id's
+        size_t nV = mesh.m_vertices.GetSize();
+        size_t nE = mesh. m_edges.GetSize();
+        size_t nT = mesh.m_triangles.GetSize();
+        for(size_t v = 0; v < nV; v++)
+        {
+            mesh.m_vertices.GetData().m_id = v;
+            mesh.m_vertices.Next();            
+        }
+        for(size_t e = 0; e < nE; e++)
+        {
+            mesh.m_edges.GetData().m_id = e;
+            mesh.m_edges.Next();
+            
+        }        
+        for(size_t f = 0; f < nT; f++)
+        {
+            mesh.m_triangles.GetData().m_id = f;
+            mesh.m_triangles.Next();
+        }
+        // copying data
+        m_vertices  = mesh.m_vertices;
+        m_edges     = mesh.m_edges;
+        m_triangles = mesh.m_triangles;
+        m_heapManager = mesh.m_heapManager;
+ 
+        // generating mapping
+        CircularListElement<TMMVertex> ** vertexMap     = new CircularListElement<TMMVertex> * [nV];
+        CircularListElement<TMMEdge> ** edgeMap         = new CircularListElement<TMMEdge> * [nE];
+        CircularListElement<TMMTriangle> ** triangleMap = new CircularListElement<TMMTriangle> * [nT];
+        for(size_t v = 0; v < nV; v++)
+        {
+            vertexMap[v] = m_vertices.GetHead();
+            m_vertices.Next();            
+        }
+        for(size_t e = 0; e < nE; e++)
+        {
+            edgeMap[e] = m_edges.GetHead();
+            m_edges.Next();            
+        }        
+        for(size_t f = 0; f < nT; f++)
+        {
+            triangleMap[f] = m_triangles.GetHead();
+            m_triangles.Next();
+        }
+        
+        // updating pointers
+        for(size_t v = 0; v < nV; v++)
+        {
+            if (vertexMap[v]->GetData().m_duplicate)
+            {
+                vertexMap[v]->GetData().m_duplicate = edgeMap[vertexMap[v]->GetData().m_duplicate->GetData().m_id];
+            }
+        }
+        for(size_t e = 0; e < nE; e++)
+        {
+            if (edgeMap[e]->GetData().m_newFace)
+            {
+                edgeMap[e]->GetData().m_newFace = triangleMap[edgeMap[e]->GetData().m_newFace->GetData().m_id];
+            }
+			if (nT > 0)
+			{
+				for(int f = 0; f < 2; f++)
+				{
+					if (edgeMap[e]->GetData().m_triangles[f])
+					{
+						edgeMap[e]->GetData().m_triangles[f] = triangleMap[edgeMap[e]->GetData().m_triangles[f]->GetData().m_id];
+					}
+				}            
+			}
+            for(int v = 0; v < 2; v++)
+            {
+                if (edgeMap[e]->GetData().m_vertices[v])
+                {
+                    edgeMap[e]->GetData().m_vertices[v] = vertexMap[edgeMap[e]->GetData().m_vertices[v]->GetData().m_id];
+                }
+            }
+        }        
+        for(size_t f = 0; f < nT; f++)
+        {
+			if (nE > 0)
+			{
+				for(int e = 0; e < 3; e++)
+				{
+					if (triangleMap[f]->GetData().m_edges[e])
+					{
+						triangleMap[f]->GetData().m_edges[e] = edgeMap[triangleMap[f]->GetData().m_edges[e]->GetData().m_id];
+					}
+				}            
+			}
+            for(int v = 0; v < 3; v++)
+            {
+                if (triangleMap[f]->GetData().m_vertices[v])
+                {
+                    triangleMap[f]->GetData().m_vertices[v] = vertexMap[triangleMap[f]->GetData().m_vertices[v]->GetData().m_id];
+                }
+            }
+        }
+        delete [] vertexMap;
+        delete [] edgeMap;
+        delete [] triangleMap;
+        
+    }
+	long  IntersectRayTriangle(const Vec3<double> & P0, const Vec3<double> & dir, 
+							   const Vec3<double> & V0, const Vec3<double> & V1, 
+							   const Vec3<double> & V2, double &t)
+	{
+        const double EPS = 1e-9;
+        const double EPS1 = 1e-6;
+		t = 0.0;
+		Vec3<double> edge1, edge2, edge3;
+		double det;
+		edge1 = V1 - V2;
+		edge2 = V2 - V0;
+		Vec3<double> pvec = dir ^ edge2;
+		det = edge1 * pvec;
+		if (det < EPS && det > -EPS)
+			return 0;
+		Vec3<double> tvec = P0 - V0;
+		Vec3<double> qvec = tvec ^ edge1;
+		t = (edge2 * qvec) / det;
+        if (t < 0.0)
+        {
+            return 0;
+        }
+		edge3 = V0 - V1;
+		Vec3<double> I(P0 + t * dir);
+		Vec3<double> s0 = (I-V0) ^ edge3;
+		Vec3<double> s1 = (I-V1) ^ edge1;
+		Vec3<double> s2 = (I-V2) ^ edge2;
+
+        Vec3<double> normal = edge1 ^ edge2;
+        double diff = normal.GetNorm() - s0.GetNorm() - s1.GetNorm() - s2.GetNorm();            
+
+        if (diff < EPS1 && diff > -EPS1)
+        {
+            return 1;			
+        }
+		return 0;
+	}
+
+    bool IntersectLineLine(const Vec3<double> & p1, const Vec3<double> & p2, 
+                          const Vec3<double> & p3, const Vec3<double> & p4,
+                          Vec3<double> & pa, Vec3<double> & pb, 
+                          double & mua, double & mub)
+    {
+        Vec3<double> p13,p43,p21;
+        double d1343,d4321,d1321,d4343,d2121;
+        double numer,denom;
+        
+        p13.X() = p1.X() - p3.X();
+        p13.Y() = p1.Y() - p3.Y();
+        p13.Z() = p1.Z() - p3.Z();
+        p43.X() = p4.X() - p3.X();
+        p43.Y() = p4.Y() - p3.Y();
+        p43.Z() = p4.Z() - p3.Z();
+        if (p43.X()==0.0 && p43.Y()==0.0 && p43.Z()==0.0)
+            return false;
+        p21.X() = p2.X() - p1.X();
+        p21.Y() = p2.Y() - p1.Y();
+        p21.Z() = p2.Z() - p1.Z();
+        if (p21.X()==0.0 && p21.Y()==0.0 && p21.Z()==0.0)
+            return false;
+        
+        d1343 = p13.X() * p43.X() + p13.Y() * p43.Y() + p13.Z() * p43.Z();
+        d4321 = p43.X() * p21.X() + p43.Y() * p21.Y() + p43.Z() * p21.Z();
+        d1321 = p13.X() * p21.X() + p13.Y() * p21.Y() + p13.Z() * p21.Z();
+        d4343 = p43.X() * p43.X() + p43.Y() * p43.Y() + p43.Z() * p43.Z();
+        d2121 = p21.X() * p21.X() + p21.Y() * p21.Y() + p21.Z() * p21.Z();
+        
+        denom = d2121 * d4343 - d4321 * d4321;
+        if (denom==0.0)
+            return false;
+        numer = d1343 * d4321 - d1321 * d4343;
+        
+        mua = numer / denom;
+        mub = (d1343 + d4321 * (mua)) / d4343;
+        
+        pa.X() = p1.X() + mua * p21.X();
+        pa.Y() = p1.Y() + mua * p21.Y();
+        pa.Z() = p1.Z() + mua * p21.Z();
+        pb.X() = p3.X() + mub * p43.X();
+        pb.Y() = p3.Y() + mub * p43.Y();
+        pb.Z() = p3.Z() + mub * p43.Z();
+        
+        return true;
+    }
+
+	long  IntersectRayTriangle2(const Vec3<double> & P0, const Vec3<double> & dir, 
+							   const Vec3<double> & V0, const Vec3<double> & V1, 
+							   const Vec3<double> & V2, double &r)
+	{
+		Vec3<double> u, v, n;          // triangle vectors
+		Vec3<double> w0, w;          // ray vectors
+		double     a, b;             // params to calc ray-plane intersect
+
+		// get triangle edge vectors and plane normal
+		u = V1 - V0;
+		v = V2 - V0;
+		n = u ^ v;             // cross product
+		if (n.GetNorm() == 0.0)            // triangle is degenerate
+			return -1;                 // do not deal with this case
+
+		w0 = P0 - V0;
+		a = - n * w0;
+		b =   n * dir;
+		if (fabs(b) <= 0.0) {     // ray is parallel to triangle plane
+			if (a == 0.0)                // ray lies in triangle plane
+				return 2;
+			else return 0;             // ray disjoint from plane
+		}
+
+		// get intersect point of ray with triangle plane
+		r = a / b;
+		if (r < 0.0)                   // ray goes away from triangle
+			return 0;                  // => no intersect
+		// for a segment, also test if (r > 1.0) => no intersect
+
+		Vec3<double> I = P0 + r * dir;           // intersect point of ray and plane
+
+		// is I inside T?
+		double uu, uv, vv, wu, wv, D;
+		uu = u * u;
+		uv = u * v;
+		vv = v * v;
+		w  = I - V0;
+		wu = w * u;
+		wv = w * v;
+		D = uv * uv - uu * vv;
+
+		// get and test parametric coords
+		double s, t;
+		s = (uv * wv - vv * wu) / D;
+		if (s < 0.0 || s > 1.0)        // I is outside T
+			return 0;
+		t = (uv * wu - uu * wv) / D;
+		if (t < 0.0 || (s + t) > 1.0)  // I is outside T
+			return 0;
+		return 1;                      // I is in T
+	}
+    
+    
+	bool TMMesh::CheckConsistancy()
+    {
+        size_t nE = m_edges.GetSize();
+        size_t nT = m_triangles.GetSize();
+        for(size_t e = 0; e < nE; e++)
+        {
+            for(int f = 0; f < 2; f++)
+            {
+                if (!m_edges.GetHead()->GetData().m_triangles[f])
+                {
+                    return false;
+                }
+            }            
+			m_edges.Next();
+        }        
+
+        for(size_t f = 0; f < nT; f++)
+        {
+            for(int e = 0; e < 3; e++)
+            {
+                int found = 0;
+                for(int k = 0; k < 2; k++)
+                {
+                    if (m_triangles.GetHead()->GetData().m_edges[e]->GetData().m_triangles[k] == m_triangles.GetHead())
+                    {
+                        found++;
+                    }
+                }
+                if (found != 1)
+                {
+                    return false;
+                }
+            }            
+			m_triangles.Next();
+        }
+
+		return true;
+    }
+	bool TMMesh::Normalize()
+    {
+        size_t nV = m_vertices.GetSize();
+		if (nV == 0)
+		{
+			return false;
+		}
+        m_barycenter = m_vertices.GetHead()->GetData().m_pos;
+		Vec3<Real> min = m_barycenter;
+		Vec3<Real> max = m_barycenter;
+		Real x, y, z;
+        for(size_t v = 1; v < nV; v++)
+        {
+			m_barycenter +=  m_vertices.GetHead()->GetData().m_pos;
+            x = m_vertices.GetHead()->GetData().m_pos.X();
+            y = m_vertices.GetHead()->GetData().m_pos.Y();
+            z = m_vertices.GetHead()->GetData().m_pos.Z();
+            if ( x < min.X()) min.X() = x;
+			else if ( x > max.X()) max.X() = x;
+            if ( y < min.Y()) min.Y() = y;
+			else if ( y > max.Y()) max.Y() = y;
+            if ( z < min.Z()) min.Z() = z;
+			else if ( z > max.Z()) max.Z() = z;
+			m_vertices.Next();
+        }
+		m_barycenter /= static_cast<Real>(nV);
+        m_diag = static_cast<Real>(0.001 * (max-min).GetNorm());
+        const Real invDiag = static_cast<Real>(1.0 / m_diag);
+		if (m_diag != 0.0)
+		{
+	        for(size_t v = 0; v < nV; v++)
+		    {
+				m_vertices.GetHead()->GetData().m_pos = (m_vertices.GetHead()->GetData().m_pos - m_barycenter) * invDiag;
+				m_vertices.Next();
+		    }
+		}
+		return true;
+	}
+	bool TMMesh::Denormalize()
+	{
+        size_t nV = m_vertices.GetSize();
+		if (nV == 0)
+		{
+			return false;
+		}
+		if (m_diag != 0.0)
+		{
+	        for(size_t v = 0; v < nV; v++)
+		    {
+				m_vertices.GetHead()->GetData().m_pos = m_vertices.GetHead()->GetData().m_pos * m_diag + m_barycenter;
+				m_vertices.Next();
+			}
+		}
+		return false;
+    }
+}

indra/libhacd/hacdManifoldMesh.h

@@ -0,0 +1,269 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+All rights reserved.
+
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_MANIFOLD_MESH_H
+#define HACD_MANIFOLD_MESH_H
+#include <iostream>
+#include <fstream>
+#include "hacdVersion.h"
+#include "hacdCircularList.h"
+#include "hacdVector.h"
+#include "hacdSArray.h"
+#include <set>
+#include "hacdMicroAllocator.h"
+namespace HACD
+{
+	class TMMTriangle;
+	class TMMEdge;
+    class TMMesh;
+    class ICHull;
+	class HACD;
+
+    class DPoint  
+    {
+    public:       
+																DPoint(long name=0, Real dist=0, bool computed=false, bool distOnly=false)
+																	:m_name(name),
+																	 m_dist(dist),
+																	 m_computed(computed),
+                                                                     m_distOnly(distOnly){};
+                                                				~DPoint(){};      
+    private:
+		long													m_name;
+		Real                                                    m_dist;
+		bool													m_computed;
+        bool                                                    m_distOnly;
+		friend class TMMTriangle;
+	    friend class TMMesh;
+		friend class GraphVertex;
+        friend class GraphEdge;
+        friend class Graph;
+		friend class ICHull;
+		friend class HACD;
+    };
+
+	//!	Vertex data structure used in a triangular manifold mesh (TMM).
+	class TMMVertex
+	{
+		public:
+            void                                                Initialize();                                                    
+																TMMVertex(void);
+                                                                ~TMMVertex(void);
+        
+        private:
+			Vec3<Real>											m_pos;
+			long												m_name;
+            size_t												m_id;
+			CircularListElement<TMMEdge> *						m_duplicate;		// pointer to incident cone edge (or NULL)
+			bool												m_onHull;
+			bool												m_tag;
+																TMMVertex(const TMMVertex & rhs);
+            
+			friend class HACD;            
+			friend class ICHull;
+            friend class TMMesh;
+            friend class TMMTriangle;
+            friend class TMMEdge;
+	};
+
+	//!	Edge data structure used in a triangular manifold mesh (TMM).
+	class TMMEdge
+	{		
+		public:
+            void                                                Initialize(); 
+																TMMEdge(void);
+																~TMMEdge(void);
+        private:
+            size_t												m_id;
+			CircularListElement<TMMTriangle> *					m_triangles[2];
+			CircularListElement<TMMVertex> *					m_vertices[2];
+			CircularListElement<TMMTriangle> *					m_newFace;
+
+
+																TMMEdge(const TMMEdge & rhs);
+                
+		friend class HACD;
+		friend class ICHull;
+        friend class TMMTriangle;
+        friend class TMMVertex;
+        friend class TMMesh;
+	};
+
+	//!	Triangle data structure used in a triangular manifold mesh (TMM).
+	class TMMTriangle
+	{
+		public:
+            void                                                Initialize(); 
+																TMMTriangle(void);
+																~TMMTriangle(void);
+        private:
+            size_t												m_id;
+			CircularListElement<TMMEdge> *						m_edges[3];
+			CircularListElement<TMMVertex> *					m_vertices[3];
+			SArray<long, SARRAY_DEFAULT_MIN_SIZE>				m_incidentPoints;
+			bool												m_visible;
+																
+																TMMTriangle(const TMMTriangle & rhs);
+        
+		friend class HACD;
+        friend class ICHull;
+        friend class TMMesh;
+        friend class TMMVertex;
+        friend class TMMEdge;
+	};
+    
+    class Material
+    {
+    public:    
+                                                                Material(void);
+                                                                ~Material(void){}        
+//    private:
+        Vec3<double>                                            m_diffuseColor;
+        double                                                  m_ambientIntensity;
+        Vec3<double>                                            m_specularColor;
+        Vec3<double>                                            m_emissiveColor;
+        double                                                  m_shininess;
+        double                                                  m_transparency;
+        
+        friend class TMMesh;
+		friend class HACD;
+    };
+
+	//!	triangular manifold mesh data structure.
+	class TMMesh
+	{
+		public:
+			//! 
+            HeapManager * const     							GetHeapManager() const { return m_heapManager;}
+			//!
+			void												SetHeapManager(HeapManager * const heapManager)
+                                                                { 
+                                                                    m_heapManager = heapManager;
+                                                                    m_vertices.SetHeapManager(m_heapManager);
+                                                                    m_edges.SetHeapManager(m_heapManager);
+                                                                    m_triangles.SetHeapManager(m_heapManager);
+                                                                }
+			//! Returns the number of vertices>
+			inline size_t										GetNVertices() const { return m_vertices.GetSize();}
+			//! Returns the number of edges
+			inline size_t										GetNEdges() const { return m_edges.GetSize();}
+			//! Returns the number of triangles
+			inline size_t										GetNTriangles() const { return m_triangles.GetSize();}
+            //! Returns the vertices circular list
+            inline const CircularList<TMMVertex> &              GetVertices() const { return m_vertices;}
+            //! Returns the edges circular list
+            inline const CircularList<TMMEdge> &				GetEdges() const { return m_edges;}
+            //! Returns the triangles circular list
+            inline const CircularList<TMMTriangle> &			GetTriangles() const { return m_triangles;}
+            //! Returns the vertices circular list
+            inline CircularList<TMMVertex> &                    GetVertices() { return m_vertices;}
+            //! Returns the edges circular list
+            inline CircularList<TMMEdge> &                      GetEdges() { return m_edges;}
+            //! Returns the triangles circular list
+            inline CircularList<TMMTriangle> &                  GetTriangles() { return m_triangles;}               
+			//! Add vertex to the mesh
+			CircularListElement<TMMVertex> *					AddVertex() {return m_vertices.Add();}
+			//! Add vertex to the mesh
+			CircularListElement<TMMEdge> *						AddEdge() {return m_edges.Add();}
+			//! Add vertex to the mesh
+			CircularListElement<TMMTriangle> *					AddTriangle() {return m_triangles.Add();}
+			//! Print mesh information 
+			void												Print();
+            //!
+            void                                                GetIFS(Vec3<Real> * const points, Vec3<long> * const triangles);
+#if 0
+            //! Save mesh 
+            bool												Save(const char *fileName);        
+            //! Save mesh to VRML 2.0 format 
+            bool												SaveVRML2(std::ofstream &fout);             
+            //! Save mesh to VRML 2.0 format 
+            bool												SaveVRML2(std::ofstream &fout, const Material & material);  			
+#endif
+            //!  
+            void												Clear();
+            //!
+            void                                                Copy(TMMesh & mesh);
+			//!
+			bool												CheckConsistancy();
+			//!
+			bool												Normalize();
+			//!
+			bool												Denormalize();
+            //!	Constructor
+																TMMesh(HeapManager * const heapManager);
+			//! Destructor
+			virtual												~TMMesh(void);
+
+		private:
+			CircularList<TMMVertex>								m_vertices;
+			CircularList<TMMEdge>								m_edges;
+			CircularList<TMMTriangle>							m_triangles;
+			Real                                                m_diag;						//>! length of the BB diagonal
+			Vec3<Real>                                          m_barycenter;				//>! barycenter of the mesh
+            HeapManager *                                       m_heapManager;
+
+			// not defined
+																TMMesh(const TMMesh & rhs);
+			friend class ICHull;
+			friend class HACD;
+	};
+	//! IntersectRayTriangle(): intersect a ray with a 3D triangle
+	//!    Input:  a ray R, and a triangle T
+	//!    Output: *I = intersection point (when it exists)
+	//!             0 = disjoint (no intersect)
+	//!             1 = intersect in unique point I1
+	long														IntersectRayTriangle( const Vec3<double> & P0, const Vec3<double> & dir, 
+																					  const Vec3<double> & V0, const Vec3<double> & V1, 
+																					  const Vec3<double> & V2, double &t);
+
+	// intersect_RayTriangle(): intersect a ray with a 3D triangle
+	//    Input:  a ray R, and a triangle T
+	//    Output: *I = intersection point (when it exists)
+	//    Return: -1 = triangle is degenerate (a segment or point)
+	//             0 = disjoint (no intersect)
+	//             1 = intersect in unique point I1
+	//             2 = are in the same plane
+	long														IntersectRayTriangle2(const Vec3<double> & P0, const Vec3<double> & dir, 
+																					   const Vec3<double> & V0, const Vec3<double> & V1, 
+																					   const Vec3<double> & V2, double &r);
+
+    /*
+     Calculate the line segment PaPb that is the shortest route between
+     two lines P1P2 and P3P4. Calculate also the values of mua and mub where
+     Pa = P1 + mua (P2 - P1)
+     Pb = P3 + mub (P4 - P3)
+     Return FALSE if no solution exists.
+     */
+    bool                                                        IntersectLineLine(const Vec3<double> & p1, const Vec3<double> & p2, 
+                                                                                  const Vec3<double> & p3, const Vec3<double> & p4,
+                                                                                  Vec3<double> & pa, Vec3<double> & pb, 
+                                                                                  double & mua, double &mub);
+}
+#endif

indra/libhacd/hacdMeshDecimator.cpp

@@ -0,0 +1,684 @@
+#include <sstream>
+#include <iostream>
+#include <stdlib.h>
+#include <algorithm>
+#include <vector>
+#include "hacdMeshDecimator.h"
+
+namespace HACD
+{
+	MeshDecimator::MeshDecimator(void)
+	{
+		m_triangles					= 0;
+		m_points   					= 0;
+		m_nPoints					= 0;
+		m_nInitialTriangles 		= 0;
+		m_nVertices					= 0;
+		m_nTriangles				= 0;
+		m_nEdges					= 0;
+		m_trianglesTags				= 0;
+		m_ecolManifoldConstraint	= true;
+		m_callBack					= 0;
+	}
+
+	MeshDecimator::~MeshDecimator(void)
+	{
+		ReleaseMemory();
+	}
+	void MeshDecimator::ReleaseMemory()
+	{
+		delete [] m_trianglesTags;
+        std::vector< MDVertex > emptyVertices(0);
+		m_vertices.swap(emptyVertices);
+        std::vector<MDEdge> emptyEdges(0);
+		m_edges.swap(emptyEdges);
+		m_pqueue = 		std::priority_queue<
+				 MDEdgePriorityQueue, 
+				 std::vector<MDEdgePriorityQueue>, 
+				 std::less<MDEdgePriorityQueue> >();
+		m_triangles					= 0;
+		m_points   					= 0;
+		m_nPoints					= 0;
+		m_nInitialTriangles 		= 0;
+		m_nVertices					= 0;
+		m_nTriangles				= 0;
+		m_nEdges					= 0;
+		m_trianglesTags				= 0;
+	}
+	void MeshDecimator::Initialize(size_t nVertices, size_t nTriangles,   Vec3<Float> * points,  Vec3<long> * triangles)
+	{
+		m_nVertices			= nVertices;
+		m_nTriangles		= nTriangles;
+		m_nInitialTriangles = nTriangles;
+		m_points			= points;
+		m_nPoints			= nVertices;
+		m_triangles			= triangles;
+		m_trianglesTags		= new bool[m_nTriangles];
+		m_edges.reserve(3*m_nTriangles);
+		m_vertices.resize(m_nVertices);
+		for(size_t v = 0; v < m_nVertices; ++v)
+		{
+			m_vertices[v].m_tag = true;
+		}
+		long tri[3];
+		MDEdge edge;
+		edge.m_tag = true;
+		edge.m_onBoundary = true;
+        long nEdges = 0;
+		long idEdge;
+		long nTris = static_cast<long>(m_nTriangles);
+		for(long t = 0; t < nTris; ++t)
+		{
+			tri[0] = m_triangles[t].X();
+			tri[1] = m_triangles[t].Y();
+			tri[2] = m_triangles[t].Z();
+			m_trianglesTags[t] = true;
+			for(int k = 0; k < 3; ++k)
+			{
+				edge.m_v1 = tri[k];
+				edge.m_v2 = tri[(k+1)%3];
+				m_vertices[edge.m_v1].m_triangles.Insert(t);
+				idEdge = GetEdge(edge.m_v1, edge.m_v2);
+				if (idEdge == -1)
+				{
+					m_edges.push_back(edge);
+					m_vertices[edge.m_v1].m_edges.Insert(nEdges);
+					m_vertices[edge.m_v2].m_edges.Insert(nEdges);
+					++nEdges;
+				}
+				else
+				{
+					m_edges[idEdge].m_onBoundary = false;
+				}
+			}
+		}
+        m_nEdges = static_cast<size_t>(nEdges);
+		for(size_t v = 0; v < m_nVertices; ++v)
+		{
+			m_vertices[v].m_onBoundary = false;
+			for(size_t itE = 0; itE < m_vertices[v].m_edges.Size(); ++itE)
+			{
+				idEdge = m_vertices[v].m_edges[itE];
+				if (m_edges[idEdge].m_onBoundary)
+				{
+					m_vertices[v].m_onBoundary = true;
+					break;
+				}
+			}
+		}
+	}
+	long MeshDecimator::GetTriangle(long v1, long v2, long v3) const
+	{
+		long i, j, k;
+        long idTriangle;
+		for(size_t it = 0; it < m_vertices[v1].m_triangles.Size(); ++it)
+		{
+            idTriangle = m_vertices[v1].m_triangles[it];
+			i = m_triangles[idTriangle].X();
+			j = m_triangles[idTriangle].Y();
+			k = m_triangles[idTriangle].Z();
+			if ( (i==v1 && j==v2 && k==v3) || (i==v1 && j==v3 && k==v2) ||
+				 (i==v2 && j==v1 && k==v3) || (i==v2 && j==v3 && k==v1) ||
+				 (i==v3 && j==v2 && k==v1) || (i==v3 && j==v1 && k==v2)  )
+			{
+				return idTriangle;
+			}
+		}
+		return -1;
+	}
+	long MeshDecimator::GetEdge(long v1, long v2) const
+	{
+		long idEdge;
+        for(size_t it = 0; it < m_vertices[v1].m_edges.Size(); ++it)
+		{
+            idEdge = m_vertices[v1].m_edges[it];
+			if ( (m_edges[idEdge].m_v1==v1 && m_edges[idEdge].m_v2==v2) || 
+				 (m_edges[idEdge].m_v1==v2 && m_edges[idEdge].m_v2==v1) )
+			{
+				return idEdge;
+			}
+		}
+		return -1;
+	}
+	void MeshDecimator::EdgeCollapse(long v1, long v2)
+	{
+		long u, w;
+		int shift;
+		long idTriangle;
+		for(size_t itT = 0; itT < m_vertices[v2].m_triangles.Size(); ++itT)
+		{
+            idTriangle =  m_vertices[v2].m_triangles[itT];
+			if (m_triangles[idTriangle].X() == v2)
+			{
+				shift = 0;
+				u = m_triangles[idTriangle].Y();
+				w = m_triangles[idTriangle].Z();
+			}
+			else if (m_triangles[idTriangle].Y() == v2)
+			{
+				shift = 1;
+				u = m_triangles[idTriangle].X();
+				w = m_triangles[idTriangle].Z();
+			}
+			else
+			{
+				shift = 2;
+				u = m_triangles[idTriangle].X();
+				w = m_triangles[idTriangle].Y();
+			}
+
+			if ((u == v1) || (w == v1))
+			{
+				m_trianglesTags[idTriangle] = false;
+				m_vertices[u].m_triangles.Erase(idTriangle);						
+				m_vertices[w].m_triangles.Erase(idTriangle);
+				m_nTriangles--;
+			}
+			else if (GetTriangle(v1, u, w) == -1)
+			{
+				m_vertices[v1].m_triangles.Insert(idTriangle);
+				m_triangles[idTriangle][shift] = v1;
+			}
+			else
+			{
+				m_trianglesTags[idTriangle] = false;
+				m_vertices[u].m_triangles.Erase(idTriangle);						
+				m_vertices[w].m_triangles.Erase(idTriangle);
+				m_nTriangles--;
+			}
+		}
+        long idEdge;
+		for(size_t itE = 0; itE < m_vertices[v2].m_edges.Size(); ++itE)
+		{
+            idEdge = m_vertices[v2].m_edges[itE];
+			w = (m_edges[idEdge].m_v1 == v2)? m_edges[idEdge].m_v2 : m_edges[idEdge].m_v1;
+			if (w==v1)
+			{
+				m_edges[idEdge].m_tag = false;
+				m_vertices[w].m_edges.Erase(idEdge);
+				m_nEdges--;
+			}
+			else if ( GetEdge(v1, w) == -1)
+			{
+				if (m_edges[idEdge].m_v1 == v2)	m_edges[idEdge].m_v1 = v1;
+				else							m_edges[idEdge].m_v2 = v1;
+				m_vertices[v1].m_edges.Insert(idEdge);			
+			}
+			else
+			{
+				m_edges[idEdge].m_tag = false;
+				m_vertices[w].m_edges.Erase(idEdge);
+				m_nEdges--;
+			}
+		}
+		m_vertices[v2].m_tag = false;
+		m_nVertices--;
+		// update boundary edges
+		SArray<long, 64> incidentVertices;
+		incidentVertices.PushBack(v1);
+		for(size_t itE = 0; itE < m_vertices[v1].m_edges.Size(); ++itE)
+		{
+			incidentVertices.PushBack((m_edges[idEdge].m_v1!= v1)?m_edges[idEdge].m_v1:m_edges[idEdge].m_v2);
+            idEdge = m_vertices[v1].m_edges[itE];
+			m_edges[idEdge].m_onBoundary = (IsBoundaryEdge(m_edges[idEdge].m_v1, m_edges[idEdge].m_v2) != -1);
+		}		
+		// update boundary vertices
+		long idVertex;
+		for(size_t itV = 0; itV < incidentVertices.Size(); ++itV)
+		{
+			idVertex = incidentVertices[itV];
+			m_vertices[idVertex].m_onBoundary = false;
+			for(size_t itE = 0; itE < m_vertices[idVertex].m_edges.Size(); ++itE)
+			{
+				idEdge = m_vertices[idVertex].m_edges[itE];
+				if (m_edges[idEdge].m_onBoundary)
+				{
+					m_vertices[idVertex].m_onBoundary = true;
+					break;
+				}
+			}
+		}		
+	}
+	long MeshDecimator::IsBoundaryEdge(long v1, long v2) const
+	{
+		long commonTri = -1;
+		long itTriangle1, itTriangle2;
+		for(size_t itT1 = 0; itT1 < m_vertices[v1].m_triangles.Size(); ++itT1)
+		{
+            itTriangle1 = m_vertices[v1].m_triangles[itT1];
+			for(size_t itT2 = 0; itT2 < m_vertices[v2].m_triangles.Size(); ++itT2)
+			{
+                itTriangle2 = m_vertices[v2].m_triangles[itT2];
+				if (itTriangle1 == itTriangle2)
+				{
+					if (commonTri == -1)
+					{
+						commonTri = itTriangle1;
+					}
+					else
+					{
+						return -1;
+					}
+				}
+			}
+		}
+		return commonTri;
+	}
+	bool MeshDecimator::IsBoundaryVertex(long v) const
+	{
+		long idEdge;
+		for(size_t itE = 0; itE < m_vertices[v].m_edges.Size(); ++itE)
+		{
+            idEdge =  m_vertices[v].m_edges[itE];
+			if ( IsBoundaryEdge(m_edges[idEdge].m_v1, m_edges[idEdge].m_v2) != -1) return true;
+		}
+		return false;
+	}
+
+	void MeshDecimator::GetMeshData(Vec3<Float> * points, Vec3<long> * triangles) const
+	{
+		long * map = new long [m_nPoints];
+		long counter = 0;
+		for (size_t v = 0; v < m_nPoints; ++v)
+		{
+			if ( m_vertices[v].m_tag )
+			{
+				points[counter] = m_points[v];
+				map[v] = counter++;
+			}
+		}
+		counter = 0;
+		for (size_t t = 0; t < m_nInitialTriangles; ++t)
+		{
+			if ( m_trianglesTags[t] )
+			{
+				triangles[counter].X() = map[m_triangles[t].X()];
+				triangles[counter].Y() = map[m_triangles[t].Y()];
+				triangles[counter].Z() = map[m_triangles[t].Z()];
+				counter++;
+			}
+		}
+		delete [] map;
+	}
+
+	void MeshDecimator::InitializeQEM()
+	{
+		Vec3<Float> coordMin = m_points[0];
+		Vec3<Float> coordMax = m_points[0];
+		Vec3<Float> coord;
+		for (size_t p = 1; p < m_nPoints ; ++p) 
+		{
+			coord = m_points[p];
+			if (coordMin.X() > coord.X()) coordMin.X() = coord.X();
+			if (coordMin.Y() > coord.Y()) coordMin.Y() = coord.Y();
+			if (coordMin.Z() > coord.Z()) coordMin.Z() = coord.Z();
+			if (coordMax.X() < coord.X()) coordMax.X() = coord.X();
+			if (coordMax.Y() < coord.Y()) coordMax.Y() = coord.Y();
+			if (coordMax.Z() < coord.Z()) coordMax.Z() = coord.Z();
+		}
+		coordMax -= coordMin;
+		m_diagBB = coordMax.GetNorm();
+
+		long i, j, k;
+		Vec3<Float> n;	
+		Float d = 0;
+		Float area = 0;
+		for(size_t v = 0; v < m_nPoints; ++v)
+		{
+			memset(m_vertices[v].m_Q, 0, 10 * sizeof(Float));
+            long idTriangle;
+			for(size_t itT = 0; itT < m_vertices[v].m_triangles.Size(); ++itT)
+			{
+                idTriangle = m_vertices[v].m_triangles[itT];
+				i = m_triangles[idTriangle].X();
+				j = m_triangles[idTriangle].Y();
+				k = m_triangles[idTriangle].Z();
+				n = (m_points[j] - m_points[i])^(m_points[k] - m_points[i]);
+				area = n.GetNorm();
+				n.Normalize();
+				d = - (m_points[v] * n);
+				m_vertices[v].m_Q[0] += area * (n.X() * n.X());
+				m_vertices[v].m_Q[1] += area * (n.X() * n.Y());
+				m_vertices[v].m_Q[2] += area * (n.X() * n.Z());
+				m_vertices[v].m_Q[3] += area * (n.X() * d);
+				m_vertices[v].m_Q[4] += area * (n.Y() * n.Y());
+				m_vertices[v].m_Q[5] += area * (n.Y() * n.Z());
+				m_vertices[v].m_Q[6] += area * (n.Y() * d);
+				m_vertices[v].m_Q[7] += area * (n.Z() * n.Z());
+				m_vertices[v].m_Q[8] += area * (n.Z() * d);
+				m_vertices[v].m_Q[9] += area * (d     * d);
+			}
+		}
+		Vec3<Float> u1, u2;
+		const Float w = static_cast<Float>(1000);
+		long t, v1, v2, v3;
+		for(size_t e = 0; e < m_edges.size(); ++e)
+		{
+			v1 = m_edges[e].m_v1;
+			v2 = m_edges[e].m_v2;
+			t = IsBoundaryEdge(v1, v2);
+			if (t != -1)
+			{
+				if      (m_triangles[t].X() != v1 && m_triangles[t].X() != v2) v3 = m_triangles[t].X();
+				else if (m_triangles[t].Y() != v1 && m_triangles[t].Y() != v2) v3 = m_triangles[t].Y();
+				else														   v3 = m_triangles[t].Z();
+				u1 = m_points[v2] - m_points[v1];
+				u2 = m_points[v3] - m_points[v1];
+				area = w * (u1^u2).GetNorm();
+				u1.Normalize();
+				n =  u2 - (u2 * u1) * u1;
+				n.Normalize();
+
+				d = - (m_points[v1] * n);
+				m_vertices[v1].m_Q[0] += area * (n.X() * n.X());
+				m_vertices[v1].m_Q[1] += area * (n.X() * n.Y());
+				m_vertices[v1].m_Q[2] += area * (n.X() * n.Z());
+				m_vertices[v1].m_Q[3] += area * (n.X() * d);
+				m_vertices[v1].m_Q[4] += area * (n.Y() * n.Y());
+				m_vertices[v1].m_Q[5] += area * (n.Y() * n.Z());
+				m_vertices[v1].m_Q[6] += area * (n.Y() * d);
+				m_vertices[v1].m_Q[7] += area * (n.Z() * n.Z());
+				m_vertices[v1].m_Q[8] += area * (n.Z() * d);
+				m_vertices[v1].m_Q[9] += area * (d * d);
+
+				d = - (m_points[v2] * n);
+				m_vertices[v2].m_Q[0] += area * (n.X() * n.X());
+				m_vertices[v2].m_Q[1] += area * (n.X() * n.Y());
+				m_vertices[v2].m_Q[2] += area * (n.X() * n.Z());
+				m_vertices[v2].m_Q[3] += area * (n.X() * d);
+				m_vertices[v2].m_Q[4] += area * (n.Y() * n.Y());
+				m_vertices[v2].m_Q[5] += area * (n.Y() * n.Z());
+				m_vertices[v2].m_Q[6] += area * (n.Y() * d);
+				m_vertices[v2].m_Q[7] += area * (n.Z() * n.Z());
+				m_vertices[v2].m_Q[8] += area * (n.Z() * d);
+				m_vertices[v2].m_Q[9] += area * (d * d);
+			}
+		}
+	}
+	void MeshDecimator::InitializePriorityQueue()
+	{	
+		double progressOld = -1.0;
+		double progress = 0.0;    
+		char msg[1024];
+		double ptgStep = 1.0;
+		long v1, v2;
+		MDEdgePriorityQueue pqEdge;
+		size_t nE = m_edges.size();
+		for(size_t e = 0; e < nE; ++e)
+		{
+			progress = e * 100.0 / nE;
+			if (fabs(progress-progressOld) > ptgStep && m_callBack)
+			{
+				sprintf(msg, "%3.2f %% \t \t \r", progress);
+				(*m_callBack)(msg, progress, 0.0, m_nVertices);
+				progressOld = progress;
+			}
+
+			if (m_edges[e].m_tag)
+			{
+				v1 = m_edges[e].m_v1;
+				v2 = m_edges[e].m_v2;
+				if ( (!m_ecolManifoldConstraint) || (ManifoldConstraint(v1, v2)))
+				{
+					pqEdge.m_qem = m_edges[e].m_qem = ComputeEdgeCost(v1, v2, m_edges[e].m_pos);
+					pqEdge.m_name = static_cast<long>(e);
+					m_pqueue.push(pqEdge);
+				}
+			}
+		}
+	}
+	double MeshDecimator::ComputeEdgeCost(long v1, long v2, Vec3<Float> & newPos) const
+	{
+		double Q[10];
+		double M[12];
+		Vec3<double> pos;
+		for(int i = 0; i < 10; ++i) Q[i] = m_vertices[v1].m_Q[i] + m_vertices[v2].m_Q[i];
+		M[0] = Q[0]; // (0, 0)
+		M[1] = Q[1]; // (0, 1) 
+		M[2] = Q[2]; // (0, 2)
+		M[3] = Q[3]; // (0, 3)
+		M[4] = Q[1]; // (1, 0)
+		M[5] = Q[4]; // (1, 1)
+		M[6] = Q[5]; // (1, 2)
+		M[7] = Q[6]; // (1, 3)
+		M[8] = Q[2]; // (2, 0)
+		M[9] = Q[5]; // (2, 1)
+		M[10] = Q[7]; // (2, 2);
+		M[11] = Q[8]; // (2, 3);
+		double det =   M[0] * M[5] * M[10] + M[1] * M[6] * M[8] + M[2] * M[4] * M[9]   
+					 - M[0] * M[6] * M[9]  - M[1] * M[4] * M[10]- M[2] * M[5] * M[8]; 
+		if (det != 0.0)
+		{
+			double d = 1.0 / det;
+			pos.X() = d * (M[1]*M[7]*M[10] + M[2]*M[5]*M[11] + M[3]*M[6]*M[9]
+						  -M[1]*M[6]*M[11] - M[2]*M[7]*M[9]  - M[3]*M[5]*M[10]);
+			pos.Y() = d * (M[0]*M[6]*M[11] + M[2]*M[7]*M[8]  + M[3]*M[4]*M[10]
+						  -M[0]*M[7]*M[10] - M[2]*M[4]*M[11] - M[3]*M[6]*M[8]);
+			pos.Z() = d * (M[0]*M[7]*M[9]  + M[1]*M[4]*M[11] + M[3]*M[5]*M[8]
+						  -M[0]*M[5]*M[11] - M[1]*M[7]*M[8]  - M[3]*M[4]*M[9]);
+	  		newPos.X() = static_cast<Float>(pos.X());
+			newPos.Y() = static_cast<Float>(pos.Y());
+			newPos.Z() = static_cast<Float>(pos.Z());
+		}
+		else
+		{
+			const Float w = static_cast<Float>(0.5f);
+			newPos = w * m_points[v1] + w * m_points[v2];
+	  		pos.X() = static_cast<double>(newPos.X());
+			pos.Y() = static_cast<double>(newPos.Y());
+			pos.Z() = static_cast<double>(newPos.Z());
+		}
+
+		double qem = pos.X()  * (Q[0] * pos.X() + Q[1] * pos.Y() + Q[2] * pos.Z() + Q[3]) +  
+					 pos.Y()  * (Q[1] * pos.X() + Q[4] * pos.Y() + Q[5] * pos.Z() + Q[6]) +
+					 pos.Z()  * (Q[2] * pos.X() + Q[5] * pos.Y() + Q[7] * pos.Z() + Q[8]) +
+								(Q[3] * pos.X() + Q[6] * pos.Y() + Q[8] * pos.Z() + Q[9]) ;
+
+		Vec3<Float> d1;
+		Vec3<Float> d2;
+		Vec3<Float> n1;
+		Vec3<Float> n2;
+        Vec3<Float> oldPosV1 =  m_points[v1];
+        Vec3<Float> oldPosV2 =  m_points[v2];
+
+		SArray<long, SARRAY_DEFAULT_MIN_SIZE> triangles = m_vertices[v1].m_triangles;
+		long idTriangle;
+		for(size_t itT = 0; itT < m_vertices[v2].m_triangles.Size(); ++itT)
+		{
+            idTriangle = m_vertices[v2].m_triangles[itT];
+			triangles.Insert(idTriangle);
+		}
+		long a[3];
+        for(size_t itT = 0; itT != triangles.Size(); ++itT)
+		{
+            idTriangle = triangles[itT];
+			a[0] = m_triangles[idTriangle].X();
+			a[1] = m_triangles[idTriangle].Y();
+			a[2] = m_triangles[idTriangle].Z();
+
+			d1 = m_points[a[1]] - m_points[a[0]];
+			d2 = m_points[a[2]] - m_points[a[0]];
+			n1 = d1^d2;
+
+            m_points[v1] = newPos;
+            m_points[v2] = newPos;
+
+			d1 = m_points[a[1]] - m_points[a[0]];
+			d2 = m_points[a[2]] - m_points[a[0]];
+            n2 = d1^d2;
+
+            m_points[v1] = oldPosV1;
+            m_points[v2] = oldPosV2;
+
+            n1.Normalize();
+            n2.Normalize();
+			if (n1*n2 < 0.0) 
+            {
+                return std::numeric_limits<double>::max();
+            }
+		}
+		if ( m_ecolManifoldConstraint && !ManifoldConstraint(v1, v2))
+		{
+			return std::numeric_limits<double>::max();
+		}
+		return qem;
+	}
+	bool MeshDecimator::ManifoldConstraint(long v1, long v2) const
+	{
+		std::set<long> vertices;
+		long a, b;
+        long idEdge1;
+        long idEdge2;
+		long idEdgeV1V2;
+		for(size_t itE1 = 0; itE1 < m_vertices[v1].m_edges.Size(); ++itE1)
+		{
+            idEdge1 = m_vertices[v1].m_edges[itE1];
+			a = (m_edges[idEdge1].m_v1 == v1) ? m_edges[idEdge1].m_v2 : m_edges[idEdge1].m_v1;
+			vertices.insert(a);
+			if (a != v2)
+			{
+				for(size_t itE2 = 0; itE2 < m_vertices[v2].m_edges.Size(); ++itE2)
+				{
+                    idEdge2 = m_vertices[v2].m_edges[itE2];
+					b = (m_edges[idEdge2].m_v1 == v2) ? m_edges[idEdge2].m_v2 : m_edges[idEdge2].m_v1;
+					vertices.insert(b);
+					if ( a==b )
+					{
+						if (GetTriangle(v1, v2, a) == -1)
+						{
+							return false;
+						}
+					}
+				}
+			}
+			else
+			{
+				idEdgeV1V2 = idEdge1;
+			}
+		}
+		if (vertices.size() <= 4 || ( m_vertices[v1].m_onBoundary && m_vertices[v2].m_onBoundary && !m_edges[idEdgeV1V2].m_onBoundary))
+		{
+			return false;
+		}
+		return true;
+	}
+	bool MeshDecimator::EdgeCollapse(double & qem)
+	{
+		MDEdgePriorityQueue currentEdge;
+		long v1, v2;
+		bool done = false;
+		do
+		{
+			done = false;
+			if (m_pqueue.size() == 0)
+			{
+				done = true;
+				break;
+			}
+			else
+			{
+				currentEdge = m_pqueue.top();
+				m_pqueue.pop();
+			}
+		}
+		while ( (!m_edges[currentEdge.m_name].m_tag) || (m_edges[currentEdge.m_name].m_qem != currentEdge.m_qem));
+		
+		if (done) return false;
+		v1 = m_edges[currentEdge.m_name].m_v1;
+		v2 = m_edges[currentEdge.m_name].m_v2;
+
+		qem = currentEdge.m_qem;
+		EdgeCollapse(v1, v2);
+		m_points[v1] = m_edges[currentEdge.m_name].m_pos ;
+		for(int k = 0; k < 10; k++) m_vertices[v1].m_Q[k] += m_vertices[v2].m_Q[k];
+
+		// Update priority queue
+		long idEdge;
+        long a, b;
+        SArray<long, SARRAY_DEFAULT_MIN_SIZE> incidentVertices;
+		for(size_t itE = 0; itE < m_vertices[v1].m_edges.Size(); ++itE)
+		{
+            idEdge = m_vertices[v1].m_edges[itE];
+			a = m_edges[idEdge].m_v1;
+			b = m_edges[idEdge].m_v2;
+            incidentVertices.PushBack((a != v1)?a:b);
+			MDEdgePriorityQueue pqEdge;
+			pqEdge.m_qem = m_edges[idEdge].m_qem = ComputeEdgeCost(a, b, m_edges[idEdge].m_pos);
+			pqEdge.m_name = idEdge;
+			m_pqueue.push(pqEdge);
+		}
+        long idVertex;
+		for(size_t itV = 0; itV< incidentVertices.Size(); ++itV)
+		{
+            idVertex = incidentVertices[itV];
+		    for(size_t itE = 0; itE < m_vertices[idVertex].m_edges.Size(); ++itE)
+		    {
+                idEdge = m_vertices[idVertex].m_edges[itE];
+			    a = m_edges[idEdge].m_v1;
+			    b = m_edges[idEdge].m_v2;
+			    if ( a!=v1 && b!=v1)
+			    {
+				    MDEdgePriorityQueue pqEdge;
+				    pqEdge.m_qem = m_edges[idEdge].m_qem = ComputeEdgeCost(a, b, m_edges[idEdge].m_pos);
+				    pqEdge.m_name = idEdge;
+				    m_pqueue.push(pqEdge);
+			    }
+		    }
+        }
+		return true;	
+	}
+	bool MeshDecimator::Decimate(size_t targetNVertices, size_t targetNTriangles, double targetError)
+	{
+		double qem = 0.0;
+		double progressOld = -1.0;
+		double progress = 0.0;    
+		char msg[1024];
+		double ptgStep = 1.0;
+
+		if (m_callBack)
+		{
+			std::ostringstream msg;
+			msg << "+ Mesh" << std::endl;
+			msg << "\t # vertices                     \t" << m_nPoints << std::endl;
+			msg << "\t # triangles                    \t" << m_nTriangles << std::endl;
+			msg << "+ Parameters" << std::endl;
+			msg << "\t target # of vertices           \t" << targetNVertices << std::endl;
+			msg << "\t target # of triangles          \t" << targetNTriangles << std::endl;
+			msg << "\t QEM			                  \t" << targetError << std::endl;
+			(*m_callBack)(msg.str().c_str(), 0.0, 0.0, m_nPoints);
+		}
+		
+		if (m_callBack) (*m_callBack)("+ Initialize QEM \n", 0.0, 0.0, m_nPoints);
+		InitializeQEM();
+		if (m_callBack) (*m_callBack)("+ Initialize priority queue \n", 0.0, 0.0, m_nPoints);
+		InitializePriorityQueue();
+		if (m_callBack) (*m_callBack)("+ Simplification \n", 0.0, 0.0, m_nPoints);
+		double invDiag2 = 1.0 / (m_diagBB * m_diagBB);
+		while((m_pqueue.size() > 0) && 
+			  (m_nEdges > 0) && 
+			  (m_nVertices > targetNVertices) &&
+			  (m_nTriangles > targetNTriangles) &&
+			  (qem < targetError))
+		{
+			progress = 100.0 - m_nVertices * 100.0 / m_nPoints;
+			if (fabs(progress-progressOld) > ptgStep && m_callBack)
+			{
+				sprintf(msg, "%3.2f %% V = %lu \t QEM = %f \t \t \r", progress, static_cast<unsigned long>(m_nVertices), sqrt(qem));
+				(*m_callBack)(msg, progress, qem, m_nVertices);
+				progressOld = progress;
+			}
+			if (!EdgeCollapse(qem)) break;
+			qem *= invDiag2;
+		}
+		if (m_callBack)
+		{
+			std::ostringstream msg;
+			msg << "+ Simplification output" << std::endl;
+			msg << "\t # vertices                     \t" << m_nVertices << std::endl;
+			msg << "\t # triangles                    \t" << m_nTriangles << std::endl;
+			msg << "\t QEM					          \t" << qem << std::endl;
+			(*m_callBack)(msg.str().c_str(), 100.0, qem, m_nVertices);
+		}
+		return true;
+	}
+}

indra/libhacd/hacdMeshDecimator.h

@@ -0,0 +1,116 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+All rights reserved.
+
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#pragma once
+#ifndef HACD_MESH_DECEMATOR_H
+#define HACD_MESH_DECEMATOR_H
+#include <queue>
+#include <set>
+#include <vector>
+#include <limits>
+#include "hacdVersion.h"
+#include "hacdVector.h"
+#include "hacdSArray.h"
+#include "hacdHACD.h"
+
+namespace HACD
+{
+	typedef double Float;
+	struct MDVertex
+	{
+		SArray<long, SARRAY_DEFAULT_MIN_SIZE>   m_edges;	
+		SArray<long, SARRAY_DEFAULT_MIN_SIZE>	m_triangles;	
+		Float									m_Q[10];
+												// 0 1 2 3
+	  											//   4 5 6
+	   											//     7 8
+		  										//       9
+		bool									m_tag;
+		bool									m_onBoundary;
+	};
+	
+	struct MDEdge
+	{
+		long									m_v1;		
+		long									m_v2;		
+		double									m_qem;	
+		Vec3<Float>								m_pos;
+		bool									m_onBoundary;
+		bool									m_tag;
+	};
+	struct MDEdgePriorityQueue
+	{
+		long									m_name;		
+		double									m_qem;	
+		inline	friend bool						operator<(const MDEdgePriorityQueue & lhs, const MDEdgePriorityQueue & rhs) { return (lhs.m_qem > rhs.m_qem);}
+		inline	friend bool						operator>(const MDEdgePriorityQueue & lhs, const MDEdgePriorityQueue & rhs) { return (lhs.m_qem < rhs.m_qem);}
+	};
+
+	class MeshDecimator
+	{
+	public:
+		//! Sets the call-back function
+		//! @param callBack pointer to the call-back function
+		void									SetCallBack(CallBackFunction  callBack) { m_callBack = callBack;}
+		//! Gives the call-back function
+		//! @return pointer to the call-back function
+		const CallBackFunction                  GetCallBack() const { return m_callBack;}
+
+		inline void								SetEColManifoldConstraint(bool ecolManifoldConstraint) { m_ecolManifoldConstraint = ecolManifoldConstraint; }
+		inline size_t							GetNVertices()const {return m_nVertices;};
+		inline size_t							GetNTriangles() const {return m_nTriangles;};
+		inline size_t							GetNEdges() const {return m_nEdges;};
+		void									GetMeshData(Vec3<Float> * points, Vec3<long> * triangles) const;
+		void									ReleaseMemory();
+		void									Initialize(size_t nVertices, size_t nTriangles, 
+														   Vec3<Float> *  points, 
+														   Vec3<long> * triangles);		
+		bool 									Decimate(size_t targetNVertices = 100, 
+														 size_t targetNTriangles = 0, 
+														 double targetError = std::numeric_limits<double>::max());
+
+												MeshDecimator(void);
+												~MeshDecimator(void);
+	private : 
+		void									EdgeCollapse(long v1, long v2);
+		long									GetTriangle(long v1, long v2, long v3) const;
+		long									GetEdge(long v1, long v2) const;
+		long									IsBoundaryEdge(long v1, long v2) const;
+		bool									IsBoundaryVertex(long v) const;
+		void									InitializePriorityQueue();
+		void									InitializeQEM();
+		bool									ManifoldConstraint(long v1, long v2) const;
+		double									ComputeEdgeCost(long v1, long v2, Vec3<Float> & pos) const;
+		bool									EdgeCollapse(double & error);
+	private:
+		Vec3<long> *							m_triangles;			
+		Vec3<Float> *							m_points;		
+		size_t									m_nPoints;
+		size_t									m_nInitialTriangles;
+		size_t									m_nVertices;
+		size_t									m_nTriangles;
+		size_t									m_nEdges;
+		double									m_diagBB;
+		std::vector<MDVertex>					m_vertices;
+		std::vector<MDEdge>						m_edges;
+		std::priority_queue<
+			 MDEdgePriorityQueue, 
+			 std::vector<MDEdgePriorityQueue>, 
+			 std::less<MDEdgePriorityQueue> >	m_pqueue;
+		CallBackFunction						m_callBack;					//>! call-back function
+		bool *									m_trianglesTags;
+		bool									m_ecolManifoldConstraint;
+	};
+}
+#endif

indra/libhacd/hacdMicroAllocator.cpp

@@ -0,0 +1,993 @@
+#include "hacdMicroAllocator.h"
+
+/*!
+**
+** Copyright (c) 2009 by John W. Ratcliff mailto:jratcliffscarab@gmail.com
+**
+** If you find this code useful or you are feeling particularily generous I would
+** ask that you please go to http://www.amillionpixels.us and make a donation
+** to Troy DeMolay.
+**
+**
+** If you wish to contact me you can use the following methods:
+**
+** Skype ID: jratcliff63367
+** email: jratcliffscarab@gmail.com
+**
+**
+** The MIT license:
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is furnished
+** to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in all
+** copies or substantial portions of the Software.
+
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+** WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+
+#include <new>
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#if defined(__APPLE__) || defined(LINUX)
+#include <pthread.h>
+#endif
+
+
+#pragma warning(disable:4100)
+
+namespace HACD
+{
+
+//==================================================================================
+class MemMutex
+{
+	public:
+		MemMutex(void);
+		~MemMutex(void);
+
+	public:
+		// Blocking Lock.
+		void Lock(void);
+
+		// Unlock.
+		void Unlock(void);
+
+private:
+		#if defined(_WIN32) || defined(_XBOX)
+		CRITICAL_SECTION m_Mutex;
+		#elif defined(__APPLE__) || defined(LINUX)
+		pthread_mutex_t  m_Mutex;
+		#endif
+};
+
+//==================================================================================
+MemMutex::MemMutex(void)
+{
+#if defined(_WIN32) || defined(_XBOX)
+	InitializeCriticalSection(&m_Mutex);
+#elif defined(__APPLE__) || defined(LINUX)
+	pthread_mutexattr_t mta;
+	pthread_mutexattr_init(&mta);
+	pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
+	pthread_mutex_init(&m_Mutex, &mta);
+	pthread_mutexattr_destroy(&mta);
+#endif
+}
+
+//==================================================================================
+MemMutex::~MemMutex(void)
+{
+#if defined(_WIN32) || defined(_XBOX)
+	DeleteCriticalSection(&m_Mutex);
+#elif defined(__APPLE__) || defined(LINUX)
+	pthread_mutex_destroy(&m_Mutex);
+#endif
+}
+
+//==================================================================================
+// Blocking Lock.
+//==================================================================================
+void MemMutex::Lock(void)
+{
+#if defined(_WIN32) || defined(_XBOX)
+	EnterCriticalSection(&m_Mutex);
+#elif defined(__APPLE__) || defined(LINUX)
+	pthread_mutex_lock(&m_Mutex);
+#endif
+}
+
+//==================================================================================
+// Unlock.
+//==================================================================================
+void MemMutex::Unlock(void)
+{
+#if defined(_WIN32) || defined(_XBOX)
+	LeaveCriticalSection(&m_Mutex);
+#elif defined(__APPLE__) || defined(LINUX)
+	pthread_mutex_unlock(&m_Mutex);
+#endif
+}
+
+
+
+struct ChunkHeader
+{
+  ChunkHeader   *mNextChunk;
+};
+
+// interface to add and remove new chunks to the master list.
+class MicroChunkUpdate
+{
+public:
+  virtual void addMicroChunk(NxU8 *memStart,NxU8 *memEnd,MemoryChunk *chunk) = 0;
+  virtual void removeMicroChunk(MemoryChunk *chunk) = 0;
+};
+
+class MemoryHeader
+{
+public:
+  MemoryHeader *mNext;
+};
+
+// a single fixed size chunk for micro-allocations.
+class MemoryChunk
+{
+public:
+  MemoryChunk(void)
+  {
+    mData       = 0;
+    mDataEnd    = 0;
+    mUsedCount  = 0;
+    mFreeList   = 0;
+    mMyHeap     = false;
+    mChunkSize  = 0;
+  }
+
+  NxU8 * init(NxU8 *chunkBase,NxU32 chunkSize,NxU32 maxChunks)
+  {
+    mChunkSize  = chunkSize;
+    mData     =  chunkBase;
+    mDataEnd  = mData+(chunkSize*maxChunks);
+    mFreeList = (MemoryHeader *) mData;
+    MemoryHeader *scan = mFreeList;
+    NxU8 *data = mData;
+    data+=chunkSize;
+    for (NxU32 i=0; i<(maxChunks-1); i++)
+    {
+        MemoryHeader *next = (MemoryHeader *)data;
+        scan->mNext = next;
+        data+=chunkSize;
+        scan = next;
+    }
+    scan->mNext = 0;
+    return mDataEnd;
+  }
+
+  inline void * allocate(MicroHeap *heap,NxU32 chunkSize,NxU32 maxChunks,MicroChunkUpdate *update)
+  {
+    void *ret = 0;
+
+    if ( mData == 0 )
+    {
+        mMyHeap = true;
+        mData = (NxU8 *)heap->micro_malloc( chunkSize * maxChunks );
+        init(mData,chunkSize,maxChunks);
+        update->addMicroChunk(mData,mDataEnd,this);
+    }
+    if ( mFreeList )
+    {
+        mUsedCount++;
+        ret = mFreeList;
+        mFreeList = mFreeList->mNext;
+    }
+    return ret;
+  }
+
+  inline void deallocate(void *p,MicroHeap *heap,MicroChunkUpdate *update)
+  {
+#ifdef _DEBUG
+    assert(mUsedCount);
+    NxU8 *s = (NxU8 *)p;
+    assert( s >= mData && s < mDataEnd );
+#endif
+    MemoryHeader *mh = mFreeList;
+    mFreeList = (MemoryHeader *)p;
+    mFreeList->mNext = mh;
+    mUsedCount--;
+    if ( mUsedCount == 0 && mMyHeap  ) // free the heap back to the application if we are done with this.
+    {
+        update->removeMicroChunk(this);
+        heap->micro_free(mData);
+        mMyHeap = false;
+        mData   = 0;
+        mDataEnd = 0;
+        mFreeList = 0;
+    }
+  }
+
+  NxU32 getChunkSize(void) const { return mChunkSize; };
+
+  bool isInside(const NxU8 *p) const
+  {
+	  return p>=mData && p < mDataEnd; 
+  }
+
+private:
+  bool          mMyHeap;
+  NxU8         *mData;
+  NxU8         *mDataEnd;
+  NxU32         mUsedCount;
+  MemoryHeader *mFreeList;
+  NxU32         mChunkSize;
+};
+
+#define DEFAULT_CHUNKS 32
+
+class MemoryChunkChunk
+{
+public:
+  MemoryChunkChunk(void)
+  {
+    mNext = 0;
+    mChunkSize = 0;
+	mMaxChunks = 0;
+  }
+
+  ~MemoryChunkChunk(void)
+  {
+  }
+
+  inline void * allocate(MemoryChunk *&current,MicroChunkUpdate *update)
+  {
+    void *ret = 0;
+
+    MemoryChunkChunk *scan = this;
+    while ( scan && ret == 0 )
+    {
+      for (NxU32 i=0; i<DEFAULT_CHUNKS; i++)
+      {
+          ret = scan->mChunks[i].allocate(mHeap,mChunkSize,mMaxChunks,update);
+          if ( ret )
+          {
+            current = &scan->mChunks[i];
+            scan = 0;
+            break;
+          }
+      }
+      if ( scan )
+        scan = scan->mNext;
+    }
+
+    if ( !ret )
+    {
+        MemoryChunkChunk *mcc = (MemoryChunkChunk *)mHeap->micro_malloc( sizeof(MemoryChunkChunk) );
+        new ( mcc ) MemoryChunkChunk;
+        MemoryChunkChunk *onext = mNext;
+        mNext = mcc;
+        mcc->mNext = onext;
+        ret = mcc->mChunks[0].allocate(mHeap,mChunkSize,mMaxChunks,update);
+        current = &mcc->mChunks[0];
+    }
+
+    return ret;
+  }
+
+  NxU8 * init(NxU8 *chunkBase,NxU32 fixedSize,NxU32 chunkSize,MemoryChunk *&current,MicroHeap *heap)
+  {
+    mHeap = heap;
+    mChunkSize = chunkSize;
+	mMaxChunks = fixedSize/chunkSize;
+    current = &mChunks[0];
+    chunkBase = mChunks[0].init(chunkBase,chunkSize,mMaxChunks);
+    return chunkBase;
+  }
+
+  MicroHeap        *mHeap;
+  NxU32             mChunkSize;
+  NxU32             mMaxChunks;
+  MemoryChunkChunk *mNext;
+  MemoryChunk       mChunks[DEFAULT_CHUNKS];
+};
+
+class FixedMemory
+{
+public:
+  FixedMemory(void)
+  {
+    mCurrent = 0;
+  }
+
+  void * allocate(MicroChunkUpdate *update)
+  {
+    void *ret = mCurrent->allocate(mChunks.mHeap,mChunks.mChunkSize,mChunks.mMaxChunks,update);
+    if ( ret == 0 )
+    {
+        ret = mChunks.allocate(mCurrent,update);
+    }
+	return ret;
+  }
+
+  NxU8 * init(NxU8 *chunkBase,NxU32 chunkSize,NxU32 fixedSize,MicroHeap *heap)
+  {
+	mMemBegin = chunkBase;
+	mMemEnd   = chunkBase+fixedSize;
+    mChunks.init(chunkBase,fixedSize,chunkSize,mCurrent,heap);
+	return mMemEnd;
+  }
+
+  NxU8            *mMemBegin;
+  NxU8            *mMemEnd;
+  MemoryChunk     *mCurrent; // the current memory chunk we are operating in.
+  MemoryChunkChunk mChunks;  // the collection of all memory chunks used.
+};
+
+class MicroChunk
+{
+public:
+
+  void set(NxU8 *memStart,NxU8 *memEnd,MemoryChunk *mc)
+  {
+    mMemStart = memStart;
+    mMemEnd   = memEnd;
+    mChunk    = mc;
+    mPad      = 0;
+  }
+
+  inline bool inside(const NxU8 *p) const
+  {
+    return p >= mMemStart && p < mMemEnd;
+  }
+
+  NxU8        *mMemStart;
+  NxU8        *mMemEnd;
+  MemoryChunk *mChunk;
+  NxU8        *mPad; // padding to make it 16 byte aligned.
+};
+
+class MyMicroAllocator : public MicroAllocator, public MicroChunkUpdate, public MemMutex
+{
+public:
+  MyMicroAllocator(MicroHeap *heap,void *baseMem,NxU32 initialSize,NxU32 chunkSize)
+  {
+    mLastMicroChunk     = 0;
+    mMicroChunks        = 0;
+    mMicroChunkCount    = 0;
+    mMaxMicroChunks		= 0;
+	mHeap               = heap;
+	mChunkSize          = chunkSize;
+
+    // 0 through 8 bytes
+    for (NxU32 i=0; i<=8; i++)
+    {
+        mFixedAllocators[i] = &mAlloc[0];
+    }
+
+    // 9 through 16 bytes
+    for (NxU32 i=9; i<=16; i++)
+    {
+        mFixedAllocators[i] = &mAlloc[1];
+    }
+
+    // 17 through 32 bytes
+    for (NxU32 i=17; i<=32; i++)
+    {
+        mFixedAllocators[i] = &mAlloc[2];
+    }
+
+    // 33 through 64
+    for (NxU32 i=33; i<=64; i++)
+    {
+        mFixedAllocators[i] = &mAlloc[3];
+    }
+
+    // 65 through 128
+    for (NxU32 i=65; i<=128; i++)
+    {
+        mFixedAllocators[i] = &mAlloc[4];
+    }
+
+    // 129 through 255
+    for (NxU32 i=129; i<257; i++)
+    {
+        mFixedAllocators[i] = &mAlloc[5];
+    }
+
+    mBaseMem = (NxU8 *)baseMem;
+    mBaseMemEnd = mBaseMem+initialSize;
+
+    NxU8 *chunkBase = (NxU8 *)baseMem+sizeof(MyMicroAllocator);
+
+
+    chunkBase+=32;
+	NxU64 ptr = (NxU64)chunkBase;
+	ptr = ptr>>4;
+	ptr = ptr<<4; // make sure it is 16 byte aligned.
+	chunkBase = (NxU8 *)ptr;
+
+    mChunkStart = chunkBase;
+    chunkBase = mAlloc[0].init(chunkBase,8,chunkSize,heap);
+    chunkBase = mAlloc[1].init(chunkBase,16,chunkSize,heap);
+    chunkBase = mAlloc[2].init(chunkBase,32,chunkSize,heap);
+    chunkBase = mAlloc[3].init(chunkBase,64,chunkSize,heap);
+    chunkBase = mAlloc[4].init(chunkBase,128,chunkSize,heap);
+    chunkBase = mAlloc[5].init(chunkBase,256,chunkSize,heap);
+	mChunkEnd = chunkBase;
+
+    assert(chunkBase <= mBaseMemEnd );
+
+  }
+
+  ~MyMicroAllocator(void)
+  {
+    if ( mMicroChunks )
+    {
+        mHeap->micro_free(mMicroChunks);
+    }
+  }
+
+  virtual NxU32           getChunkSize(MemoryChunk *chunk) 
+  {
+	  return chunk ? chunk->getChunkSize() : 0;
+  }
+
+  // we have to steal one byte out of every allocation to record the size, so we can efficiently de-allocate it later.
+  virtual void * malloc(size_t size)
+  {
+    void *ret = 0;
+	Lock();
+   assert( size <= 256 );
+   if ( size <= 256 )
+   {
+     ret = mFixedAllocators[size]->allocate(this);
+   }
+   Unlock();
+    return ret;
+  }
+
+  virtual void   free(void *p,MemoryChunk *chunk)
+  {
+    Lock();
+    chunk->deallocate(p,mHeap,this);
+	Unlock();
+  }
+
+  // perform a binary search on the sorted list of chunks.
+  MemoryChunk * binarySearchMicroChunks(const NxU8 *p)
+  {
+	  MemoryChunk *ret = 0;
+
+	  NxU32 low = 0;
+	  NxU32 high = mMicroChunkCount;
+
+	  while ( low != high )
+	  {
+		  NxU32 mid = (high-low)/2+low;
+		  MicroChunk &chunk = mMicroChunks[mid];
+		  if ( chunk.inside(p))
+		  {
+			  mLastMicroChunk = &chunk;
+			  ret = chunk.mChunk;
+			  break;
+		  }
+		  else
+		  {
+			  if ( p > chunk.mMemEnd )
+			  {
+				  low = mid+1;
+			  }
+			  else
+			  {
+				  high = mid;
+			  }
+		  }
+	  }
+
+	  return ret;
+  }
+
+  virtual MemoryChunk *   isMicroAlloc(const void *p)  // returns true if this pointer is handled by the micro-allocator.
+  {
+    MemoryChunk *ret = 0;
+
+	Lock();
+
+    const NxU8 *s = (const NxU8 *)p;
+
+    if ( s >= mChunkStart && s < mChunkEnd )
+    {
+        NxU32 index = (NxU32)(s-mChunkStart)/mChunkSize;
+        assert(index>=0 && index < 6 );
+        ret = &mAlloc[index].mChunks.mChunks[0];
+		assert( ret->isInside(s) );
+    }
+	else if ( mMicroChunkCount )
+	{
+        if ( mLastMicroChunk && mLastMicroChunk->inside(s) )
+        {
+            ret = mLastMicroChunk->mChunk;
+        }
+        else
+        {
+			if ( mMicroChunkCount >= 4 )
+			{
+				ret = binarySearchMicroChunks(s);
+#ifdef _DEBUG
+				if (ret )
+				{
+					assert( ret->isInside(s) );
+				}
+				else 
+				{
+					for (NxU32 i=0; i<mMicroChunkCount; i++)
+					{
+						assert( !mMicroChunks[i].inside(s) );
+					}
+				}
+#endif
+			}
+			else
+			{
+				for (NxU32 i=0; i<mMicroChunkCount; i++)
+				{
+					if ( mMicroChunks[i].inside(s) )
+					{
+						ret = mMicroChunks[i].mChunk;
+						assert( ret->isInside(s) );
+						mLastMicroChunk = &mMicroChunks[i];
+						break;
+					}
+				}
+			}
+        }
+	}
+#ifdef _DEBUG
+	if ( ret )
+		assert( ret->isInside(s) );
+#endif
+	Unlock();
+    return ret;
+  }
+
+  MicroHeap * getMicroHeap(void) const { return mHeap; };
+
+  void allocateMicroChunks(void)
+  {
+    if ( mMaxMicroChunks == 0 )
+    {
+        mMaxMicroChunks = 64; // initial reserve.
+        mMicroChunks = (MicroChunk *)mHeap->micro_malloc( sizeof(MicroChunk)*mMaxMicroChunks );
+    }
+    else
+    {
+        mMaxMicroChunks*=2;
+        mMicroChunks = (MicroChunk *)mHeap->micro_realloc( mMicroChunks, sizeof(MicroChunk)*mMaxMicroChunks);
+    }
+  }
+
+  // perform an insertion sort of the new chunk.
+  virtual void addMicroChunk(NxU8 *memStart,NxU8 *memEnd,MemoryChunk *chunk)
+  {
+    if ( mMicroChunkCount >= mMaxMicroChunks )
+    {
+        allocateMicroChunks();
+    }
+
+    bool inserted = false;
+    for (NxU32 i=0; i<mMicroChunkCount; i++)
+    {
+        if ( memEnd < mMicroChunks[i].mMemStart )
+        {
+            for (NxU32 j=mMicroChunkCount; j>i; j--)
+            {
+                mMicroChunks[j] = mMicroChunks[j-1];
+            }
+            mMicroChunks[i].set( memStart, memEnd, chunk );
+			mLastMicroChunk = &mMicroChunks[i];
+            mMicroChunkCount++;
+            inserted = true;
+            break;
+        }
+    }
+    if ( !inserted )
+    {
+        mMicroChunks[mMicroChunkCount].set(memStart,memEnd,chunk);
+		mLastMicroChunk = &mMicroChunks[mMicroChunkCount];
+        mMicroChunkCount++;
+    }
+  }
+
+  virtual void removeMicroChunk(MemoryChunk *chunk)
+  {
+    mLastMicroChunk = 0;
+    #ifdef _DEBUG
+    bool removed = false;
+    #endif
+    for (NxU32 i=0; i<mMicroChunkCount; i++)
+    {
+        if ( mMicroChunks[i].mChunk == chunk )
+        {
+            mMicroChunkCount--;
+            for (NxU32 j=i; j<mMicroChunkCount; j++)
+            {
+                mMicroChunks[j] = mMicroChunks[j+1];
+            }
+            #ifdef _DEBUG
+            removed = true;
+            #endif
+            break;
+        }
+    }
+#ifdef _DEBUG
+    assert(removed);
+#endif
+  }
+
+  inline void * inline_malloc(size_t size)
+  {
+     Lock();
+     void *ret = mFixedAllocators[size]->allocate(this);
+	 Unlock();
+	 return ret;
+  }
+
+  inline void            inline_free(void *p,MemoryChunk *chunk) // free relative to previously located MemoryChunk
+  {
+	Lock();
+    chunk->deallocate(p,mHeap,this);
+	Unlock();
+  }
+
+  inline MemoryChunk *   inline_isMicroAlloc(const void *p) // returns pointer to the chunk this memory belongs to, or null if not a micro-allocated block.
+  {
+    MemoryChunk *ret = 0;
+
+	Lock();
+
+    const NxU8 *s = (const NxU8 *)p;
+
+    if ( s >= mChunkStart && s < mChunkEnd )
+    {
+        NxU32 index = (NxU32)(s-mChunkStart)/mChunkSize;
+        assert(index>=0 && index < 6 );
+        ret = &mAlloc[index].mChunks.mChunks[0];
+    }
+	else if ( mMicroChunkCount )
+	{
+        if ( mLastMicroChunk && mLastMicroChunk->inside(s) )
+        {
+            ret = mLastMicroChunk->mChunk;
+        }
+        else
+        {
+			if ( mMicroChunkCount >= 4 )
+			{
+				ret = binarySearchMicroChunks(s);
+			}
+			else
+			{
+				for (NxU32 i=0; i<mMicroChunkCount; i++)
+				{
+					if ( mMicroChunks[i].inside(s) )
+					{
+						ret = mMicroChunks[i].mChunk;
+						mLastMicroChunk = &mMicroChunks[i];
+						break;
+					}
+				}
+			}
+        }
+	}
+
+	Unlock();
+
+    return ret;
+  }
+
+
+private:
+  MicroHeap   *mHeap;
+  NxU8        *mBaseMem;
+  NxU8        *mBaseMemEnd;
+  FixedMemory *mFixedAllocators[257];
+  NxU32        mChunkSize;
+  NxU8        *mChunkStart;
+  NxU8        *mChunkEnd;
+
+  NxU32        mMaxMicroChunks;
+  NxU32        mMicroChunkCount;
+  MicroChunk  *mLastMicroChunk;
+  MicroChunk  *mMicroChunks;
+
+  FixedMemory  mAlloc[6];
+};
+
+
+MicroAllocator *createMicroAllocator(MicroHeap *heap,NxU32 chunkSize)
+{
+    NxU32 initialSize = chunkSize*6+sizeof(MyMicroAllocator)+32;
+    void *baseMem = heap->micro_malloc(initialSize);
+    MyMicroAllocator *mc = (MyMicroAllocator *)baseMem;
+    new ( mc ) MyMicroAllocator(heap,baseMem,initialSize,chunkSize);
+    return static_cast< MicroAllocator *>(mc);
+}
+
+void releaseMicroAllocator(MicroAllocator *m)
+{
+    MyMicroAllocator *mc = static_cast< MyMicroAllocator *>(m);
+	MicroHeap *mh = mc->getMicroHeap();
+    mc->~MyMicroAllocator();
+	mh->micro_free(mc);
+}
+
+class MyHeapManager : public MicroHeap, public HeapManager
+{
+public:
+  MyHeapManager(NxU32 defaultChunkSize)
+  {
+    mMicro = createMicroAllocator(this,defaultChunkSize);
+  }
+
+  ~MyHeapManager(void)
+  {
+    releaseMicroAllocator(mMicro);
+  }
+
+  // heap allocations used by the micro allocator.
+  virtual void * micro_malloc(size_t size)
+  {
+    return ::malloc(size);
+  }
+
+  virtual void   micro_free(void *p)
+  {
+    return ::free(p);
+  }
+
+  virtual void * micro_realloc(void *oldMem,size_t newSize)
+  {
+    return ::realloc(oldMem,newSize);
+  }
+
+  virtual void * heap_malloc(size_t size)
+  {
+    void *ret;
+
+    if ( size <= 256 ) // micro allocator only handles allocations between 0 and 256 bytes in length.
+    {
+        ret = mMicro->malloc(size);
+    }
+    else
+    {
+        ret = ::malloc(size);
+    }
+    return ret;
+  }
+
+  virtual void   heap_free(void *p)
+  {
+    MemoryChunk *chunk = mMicro->isMicroAlloc(p);
+    if ( chunk )
+    {
+        mMicro->free(p,chunk);
+    }
+    else
+    {
+        ::free(p);
+    }
+  }
+
+  virtual void * heap_realloc(void *oldMem,size_t newSize)
+  {
+    void *ret = 0;
+
+    MemoryChunk *chunk = mMicro->isMicroAlloc(oldMem);
+    if ( chunk )
+    {
+        ret = heap_malloc(newSize);
+        NxU32 oldSize = chunk->getChunkSize();
+        if ( oldSize < newSize )
+        {
+            memcpy(ret,oldMem,oldSize);
+        }
+        else
+        {
+            memcpy(ret,oldMem,newSize);
+        }
+        mMicro->free(oldMem,chunk);
+    }
+    else
+    {
+        ret = ::realloc(oldMem,newSize);
+    }
+
+    return ret;
+  }
+
+  inline void * inline_heap_malloc(size_t size)
+  {
+    return size<=256 ? ((MyMicroAllocator *)mMicro)->inline_malloc(size) : ::malloc(size);
+  }
+
+  inline void   inline_heap_free(void *p)
+  {
+	  MemoryChunk *chunk = ((MyMicroAllocator *)mMicro)->inline_isMicroAlloc(p);
+	  if ( chunk )
+	  {
+		  ((MyMicroAllocator *)mMicro)->inline_free(p,chunk);
+	  }
+	  else
+	  {
+		  ::free(p);
+	  }
+
+  }
+
+private:
+  MicroAllocator *mMicro;
+};
+
+
+HeapManager * createHeapManager(NxU32 defaultChunkSize)
+{
+    MyHeapManager *m = (MyHeapManager *)::malloc(sizeof(MyHeapManager));
+    new ( m ) MyHeapManager(defaultChunkSize);
+    return static_cast< HeapManager *>(m);
+}
+
+void          releaseHeapManager(HeapManager *heap)
+{
+    MyHeapManager *m = static_cast< MyHeapManager *>(heap);
+    m->~MyHeapManager();
+	free(m);
+}
+
+
+#define TEST_SIZE 63
+#define TEST_ALLOC_COUNT 8192
+#define TEST_RUN 40000000
+#define TEST_INLINE 1
+
+#ifdef WIN32
+#include <windows.h>
+#pragma comment(lib,"winmm.lib")
+#else
+static NxU32 timeGetTime(void)
+{
+	return 0;
+}
+#endif
+#include <stdio.h>
+
+void performUnitTests(void)
+{
+    void *allocs[TEST_ALLOC_COUNT];
+    for (NxU32 i=0; i<TEST_ALLOC_COUNT; i++)
+    {
+        allocs[i] = 0;
+    }
+
+
+    HeapManager *hm = createHeapManager(65536*32);
+
+
+    {
+
+      NxU32 stime = timeGetTime();
+      srand(0);
+
+
+      for (NxU32 i=0; i<TEST_RUN; i++)
+      {
+          NxU32 index = rand()&(TEST_ALLOC_COUNT-1);
+          if ( allocs[index] )
+          {
+#if TEST_INLINE
+              heap_free(hm, allocs[index] );
+#else
+              hm->heap_free( allocs[index] );
+#endif
+              allocs[index] = 0;
+          }
+          else
+          {
+              NxU32 asize = (rand()&TEST_SIZE);
+			  if ( (rand()&127)==0) asize+=256; // one out of every 15 allocs is larger than 256 bytes.
+#if TEST_INLINE
+              allocs[index] = heap_malloc(hm,asize);
+#else
+              allocs[index] = hm->heap_malloc(asize);
+#endif
+          }
+      }
+
+      for (NxU32 i=0; i<TEST_ALLOC_COUNT; i++)
+      {
+          if ( allocs[i] )
+          {
+#if TEST_INLINE
+              heap_free(hm,allocs[i] );
+#else
+              hm->heap_free(allocs[i] );
+#endif
+			  allocs[i] = 0;
+          }
+      }
+
+      NxU32 etime = timeGetTime();
+      printf("Micro allocation test took %d milliseconds.\r\n", etime - stime );
+
+    }
+
+    {
+
+      NxU32 stime = timeGetTime();
+      srand(0);
+
+
+      for (NxU32 i=0; i<TEST_RUN; i++)
+      {
+          NxU32 index = rand()&(TEST_ALLOC_COUNT-1);
+          if ( allocs[index] )
+          {
+              ::free( allocs[index] );
+              allocs[index] = 0;
+          }
+          else
+          {
+              NxU32 asize = (rand()&TEST_SIZE);
+			  if ( (rand()&127)==0) asize+=256; // one out of every 15 allocs is larger than 256 bytes.
+              allocs[index] = ::malloc(asize);
+          }
+      }
+
+      for (NxU32 i=0; i<TEST_ALLOC_COUNT; i++)
+      {
+          if ( allocs[i] )
+          {
+              ::free(allocs[i] );
+			  allocs[i] = 0;
+          }
+      }
+
+      NxU32 etime = timeGetTime();
+      printf("Standard malloc/free test took %d milliseconds.\r\n", etime - stime );
+
+    }
+
+    releaseHeapManager(hm);
+}
+
+void * heap_malloc(HeapManager *hm,size_t size)
+{
+    return ((MyHeapManager *)hm)->inline_heap_malloc(size);
+}
+
+void   heap_free(HeapManager *hm,void *p)
+{
+    ((MyHeapManager *)hm)->inline_heap_free(p);
+}
+
+void * heap_realloc(HeapManager *hm,void *oldMem,size_t newSize)
+{
+    return hm->heap_realloc(oldMem,newSize);
+}
+
+}; // end of namespace

indra/libhacd/hacdMicroAllocator.h

@@ -0,0 +1,204 @@
+#ifndef MICRO_ALLOCATOR_H
+
+#define MICRO_ALLOCATOR_H
+
+/*!
+**
+** Copyright (c) 2009 by John W. Ratcliff mailto:jratcliffscarab@gmail.com
+**
+** If you find this code useful or you are feeling particularily generous I would
+** ask that you please go to http://www.amillionpixels.us and make a donation
+** to Troy DeMolay.
+**
+** If you wish to contact me you can use the following methods:
+**
+** Skype ID: jratcliff63367
+** email: jratcliffscarab@gmail.com
+**
+**
+** The MIT license:
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is furnished
+** to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in all
+** copies or substantial portions of the Software.
+
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+** WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+
+// This code snippet provides a high speed micro-allocator.
+//
+// The concept is that you reserve an initial bank of memory for small allocations.  Ideally a megabyte or two.
+// The amount of memory reserved is equal to chunkSize*6
+//
+// All micro-allocations are split into 6 seperate pools.
+//    They are: 0-8 bytes
+//              9-32 bytes
+//              33-64 bytes
+//              65-128 bytes
+//              129-256 bytes
+//
+// On creation of the micro-allocation system you preserve a certiain amount of memory for each of these banks.
+//
+// The user provides a heap interface to callback for additional memory as needed.
+//
+// In most cases allocations are order-N and frees are order-N as well.
+//
+// The larger a buffer you provide, the closer to 'order-N' the allocator behaves.
+//
+// This kind of a micro-allocator is ideal for use with STL as it does many tiny allocations.
+// All allocations are 16 byte aligned (with the exception of the 8 byte allocations, which are 8 byte aligned every other one).
+//
+#include <stdio.h>
+
+#ifdef WIN32
+	typedef __int64				NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned __int64	NxU64;
+	typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+	typedef unsigned char		NxU8;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#elif __gnu_linux__
+	typedef long long			NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned long long	NxU64;
+    typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+	typedef unsigned char		NxU8;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#elif __APPLE__
+	typedef long long			NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned long long	NxU64;
+	typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+	typedef unsigned char		NxU8;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#elif __CELLOS_LV2__
+	typedef long long			NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned long long	NxU64;
+	typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+	typedef unsigned char		NxU8;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#elif _XBOX
+	typedef __int64				NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned __int64	NxU64;
+	typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+	typedef unsigned char		NxU8;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#elif defined(__PPCGEKKO__)
+	typedef long long			NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned long long	NxU64;
+	typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#else
+	#error Unknown platform!
+#endif
+
+
+namespace HACD
+{
+
+// user provided heap allocator
+class MicroHeap
+{
+public:
+  virtual void * micro_malloc(size_t size) = 0;
+  virtual void   micro_free(void *p) = 0;
+  virtual void * micro_realloc(void *oldMen,size_t newSize) = 0;
+};
+
+class MemoryChunk;
+
+class MicroAllocator
+{
+public:
+  virtual void *          malloc(size_t size) = 0;
+  virtual void            free(void *p,MemoryChunk *chunk) = 0; // free relative to previously located MemoryChunk
+  virtual MemoryChunk *   isMicroAlloc(const void *p) = 0; // returns pointer to the chunk this memory belongs to, or null if not a micro-allocated block.
+  virtual NxU32           getChunkSize(MemoryChunk *chunk) = 0;
+};
+
+MicroAllocator *createMicroAllocator(MicroHeap *heap,NxU32 chunkSize=32768); // initial chunk size 32k per block.
+void            releaseMicroAllocator(MicroAllocator *m);
+
+class HeapManager
+{
+public:
+  virtual void * heap_malloc(size_t size) = 0;
+  virtual void   heap_free(void *p) = 0;
+  virtual void * heap_realloc(void *oldMem,size_t newSize) = 0;
+};
+
+
+// creates a heap manager that uses micro-allocations for all allocations < 256 bytes and standard malloc/free for anything larger.
+HeapManager * createHeapManager(NxU32 defaultChunkSize=32768);
+void          releaseHeapManager(HeapManager *heap);
+
+// about 10% faster than using the virtual interface, inlines the functions as much as possible.
+void * heap_malloc(HeapManager *hm,size_t size);
+void   heap_free(HeapManager *hm,void *p);
+void * heap_realloc(HeapManager *hm,void *oldMem,size_t newSize);
+
+void performUnitTests(void);
+
+//
+
+}; // end of namespace
+
+#endif

indra/libhacd/hacdRaycastMesh.cpp

@@ -0,0 +1,280 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "hacdRaycastMesh.h"
+#include <math.h>
+#include <assert.h>
+#include <limits>
+#include "hacdManifoldMesh.h"
+namespace HACD
+{
+	bool BBox::Raycast(const Vec3<Float> & origin, const Vec3<Float> & dir, Float & distMin) const
+	{
+		Vec3<Float> d = m_max - m_min;
+		Float r2 = 0.25 * (d.X()*d.X()+d.Y()*d.Y()+d.Z()*d.Z());
+		Vec3<Float> c = 0.5 * m_max + 0.5 * m_min;
+		Vec3<Float> u = (c-origin);
+		Vec3<Float> a = u - (u * dir) * dir;
+		Float dist2 = (a.X()*a.X()+a.Y()*a.Y()+a.Z()*a.Z());
+		distMin = (u.X()*u.X()+u.Y()*u.Y()+u.Z()*u.Z());
+		if ( distMin > r2 ) // origin outside the sphere of center c and radius r 
+		{
+			distMin = sqrt(distMin) - sqrt(r2); // the distance to any point inside the sphere is higher than |origin - c| - r
+		}
+		else
+		{
+			distMin = 0.0;
+		}
+		if (dist2 > r2) return false;
+		return true;
+	}	
+	void RMNode::ComputeBB()
+	{
+		if (m_triIDs.Size() == 0)
+		{
+			return;
+		}
+		Vec3<long> * const triangles = m_rm->m_triangles;			
+		Vec3<Float> * const vertices = m_rm->m_vertices;
+		const Float minFloat = std::numeric_limits<Float>::min();
+		const Float maxFloat = std::numeric_limits<Float>::max();
+		m_bBox.m_max = Vec3<Float>(minFloat, minFloat, minFloat);
+		m_bBox.m_min = Vec3<Float>(maxFloat, maxFloat, maxFloat);
+		Float x, y, z;
+		long v, f;
+		for(size_t id = 0; id < m_triIDs.Size(); ++id)
+		{
+			f = m_triIDs[id];
+			for(size_t k = 0; k < 3; ++k)
+			{
+				v = triangles[f][k];
+				x = vertices[v].X();
+				y = vertices[v].Y();
+				z = vertices[v].Z();
+				if ( x < m_bBox.m_min.X()) m_bBox.m_min.X() = x;
+				if ( x > m_bBox.m_max.X()) m_bBox.m_max.X() = x;
+				if ( y < m_bBox.m_min.Y()) m_bBox.m_min.Y() = y;
+				if ( y > m_bBox.m_max.Y()) m_bBox.m_max.Y() = y;
+				if ( z < m_bBox.m_min.Z()) m_bBox.m_min.Z() = z;
+				if ( z > m_bBox.m_max.Z()) m_bBox.m_max.Z() = z;
+			}
+        }
+	}
+	void RaycastMesh::ComputeBB()
+	{
+		if (m_nVertices == 0)
+		{
+			return;
+		}
+		m_bBox.m_min = m_vertices[0];
+		m_bBox.m_max = m_vertices[0];
+		Float x, y, z;
+        for (size_t v = 1; v < m_nVertices ; v++) 
+        {
+            x = m_vertices[v].X();
+            y = m_vertices[v].Y();
+            z = m_vertices[v].Z();
+            if ( x < m_bBox.m_min.X()) m_bBox.m_min.X() = x;
+			else if ( x > m_bBox.m_max.X()) m_bBox.m_max.X() = x;
+            if ( y < m_bBox.m_min.Y()) m_bBox.m_min.Y() = y;
+			else if ( y > m_bBox.m_max.Y()) m_bBox.m_max.Y() = y;
+            if ( z < m_bBox.m_min.Z()) m_bBox.m_min.Z() = z;
+			else if ( z > m_bBox.m_max.Z()) m_bBox.m_max.Z() = z;
+        }
+	}
+	void RaycastMesh::Initialize(size_t nVertices, size_t nTriangles, 
+								Vec3<Float> *  vertices,  Vec3<long> * triangles, 
+								size_t maxDepth, size_t minLeafSize, Float minAxisSize)
+	{
+		m_triangles  = triangles;			
+		m_vertices   = vertices;		
+		m_nVertices  = nVertices;
+		m_nTriangles = nTriangles;
+		delete [] m_nodes;
+		m_nNodes = 0;
+		m_nMaxNodes = 0;
+		for(size_t k = 0; k < maxDepth; k++)
+		{
+			m_nMaxNodes += (1 << maxDepth);
+		}
+		m_nodes = new RMNode[m_nMaxNodes];
+		RMNode & root = m_nodes[AddNode()];
+		root.m_triIDs.Resize(nTriangles);
+		for(size_t t = 0; t < m_nTriangles; ++t) root.m_triIDs.PushBack(t);
+		root.m_rm = this;
+		root.m_id = 0;
+		root.Create(0, maxDepth, minLeafSize, minAxisSize);
+	}
+	RaycastMesh::RaycastMesh(void)
+	{
+		m_triangles  = 0;			
+		m_vertices   = 0;		
+		m_nVertices  = 0;
+		m_nTriangles = 0;
+		m_nodes		 = 0;
+		m_nNodes	 = 0;
+		m_nMaxNodes  = 0;
+	}
+	RaycastMesh::~RaycastMesh(void)
+	{
+		delete [] m_nodes;
+	}
+	void RMNode::Create(size_t depth, size_t maxDepth, size_t minLeafSize, Float minAxisSize)
+	{
+		ComputeBB();
+		Vec3<Float> d = m_bBox.m_max - m_bBox.m_min;
+		Float maxDiff = std::max<Float>(d.X(), std::max<Float>(d.Y(), d.Z()));
+		RMSplitAxis split;
+		if		(d.X() == maxDiff) split = RMSplitAxis_X;
+		else if (d.Y() == maxDiff) split = RMSplitAxis_Y;
+		else					   split = RMSplitAxis_Z;
+	
+		if (depth == maxDepth || minLeafSize >= m_triIDs.Size() || maxDiff < minAxisSize)
+		{
+			m_leaf = true;
+			return;
+		}
+		m_idLeft  = m_rm->AddNode();
+		m_idRight = m_rm->AddNode();
+		RMNode & leftNode  = m_rm->m_nodes[m_idLeft];	
+		RMNode & rightNode = m_rm->m_nodes[m_idRight];
+		leftNode.m_id      = m_idLeft;
+		rightNode.m_id     = m_idRight;
+		leftNode.m_bBox    = m_bBox;
+		rightNode.m_bBox   = m_bBox;
+		leftNode.m_rm	   = m_rm;
+		rightNode.m_rm	   = m_rm;
+
+		if ( split == RMSplitAxis_X)
+		{
+			leftNode.m_bBox.m_max.X() = leftNode.m_bBox.m_max.X() - d.X() * 0.5;
+			rightNode.m_bBox.m_min.X() = leftNode.m_bBox.m_max.X();
+		}
+		else if ( split == RMSplitAxis_Y)
+		{
+			leftNode.m_bBox.m_max.Y() = leftNode.m_bBox.m_max.Y() - d.Y() * 0.5;
+			rightNode.m_bBox.m_min.Y() = leftNode.m_bBox.m_max.Y();
+		}
+		else
+		{
+			leftNode.m_bBox.m_max.Z() = leftNode.m_bBox.m_max.Z() - d.Z() * 0.5;
+			rightNode.m_bBox.m_min.Z() = leftNode.m_bBox.m_max.Z();
+		}
+		long f;
+		long pts[3];
+		long v;
+		Vec3<long> * const triangles = m_rm->m_triangles;			
+		Vec3<Float> * const vertices = m_rm->m_vertices;
+		leftNode.m_triIDs.Resize(m_triIDs.Size());
+		rightNode.m_triIDs.Resize(m_triIDs.Size());
+		bool found;
+		for(size_t id = 0; id < m_triIDs.Size(); ++id)
+		{
+			f = m_triIDs[id];
+			pts[0] = triangles[f].X();
+            pts[1] = triangles[f].Y();
+            pts[2] = triangles[f].Z();
+
+			found = false;
+			for (int k = 0; k < 3; ++k)
+			{
+				v = pts[k];
+				if ( vertices[v].X() <= leftNode.m_bBox.m_max.X() && 
+					 vertices[v].X() >= leftNode.m_bBox.m_min.X() &&
+					 vertices[v].Y() <= leftNode.m_bBox.m_max.Y() && 
+					 vertices[v].Y() >= leftNode.m_bBox.m_min.Y() &&
+					 vertices[v].Z() <= leftNode.m_bBox.m_max.Z() && 
+					 vertices[v].Z() >= leftNode.m_bBox.m_min.Z() )
+				{
+					leftNode.m_triIDs.PushBack(f);
+					found = true;
+					break;
+				}
+			}
+			if (!found)
+			{
+				for (int k = 0; k < 3; ++k)
+				{
+					v = pts[k];
+					if ( vertices[v].X() <= rightNode.m_bBox.m_max.X() && 
+						 vertices[v].X() >= rightNode.m_bBox.m_min.X() &&
+						 vertices[v].Y() <= rightNode.m_bBox.m_max.Y() && 
+						 vertices[v].Y() >= rightNode.m_bBox.m_min.Y() &&
+						 vertices[v].Z() <= rightNode.m_bBox.m_max.Z() && 
+						 vertices[v].Z() >= rightNode.m_bBox.m_min.Z() )
+					{
+						rightNode.m_triIDs.PushBack(f);
+						break;
+					}
+				}		
+			}
+		}
+		rightNode.Create(depth+1, maxDepth, minLeafSize, minAxisSize);
+		leftNode.Create(depth+1, maxDepth, minLeafSize, minAxisSize);
+		m_triIDs.Clear();
+	}
+	bool RaycastMesh::Raycast(const Vec3<Float> & from, const Vec3<Float> & dir, long & triID, Float & distance, Vec3<Real> & hitPoint, Vec3<Real> & hitNormal) const
+	{
+		distance = std::numeric_limits<Float>::max();
+		if (m_nNodes == 0) return false;
+		return m_nodes[0].Raycast(from, dir, triID, distance, hitPoint, hitNormal);
+	}
+	bool RMNode::Raycast(const Vec3<Float> & from, const Vec3<Float> & dir, long & triID, Float & distance, Vec3<Real> & hitPoint, Vec3<Real> & hitNormal) const 
+	{
+		Float distToSphere;
+		if (m_bBox.Raycast(from, dir, distToSphere) && (distToSphere < distance))
+		{
+			if (m_leaf)
+			{
+				long f, i1, j1, k1;
+				Vec3<long> * const triangles = m_rm->m_triangles;			
+				Vec3<Float> * const vertices = m_rm->m_vertices;
+				Vec3<Real> u1, v1, normal1;
+				double dist = 0.0;
+				long nhit = 0;
+				bool ret = false;
+				for(size_t id = 0; id < m_triIDs.Size(); ++id)
+				{
+					f = m_triIDs[id];
+					i1 = triangles[f].X();
+					j1 = triangles[f].Y();
+					k1 = triangles[f].Z();
+					u1 = vertices[j1] - vertices[i1];
+					v1 = vertices[k1] - vertices[i1];
+					normal1 = (u1 ^ v1);
+					if (dir * normal1 > 0.0)
+					{
+						nhit = IntersectRayTriangle(from, dir, vertices[i1], vertices[j1], vertices[k1], dist);
+						if (nhit==1 && distance>dist)
+						{
+							normal1.Normalize();
+							hitNormal = normal1;
+							hitPoint = from + dist * dir;
+							distance = dist;
+							triID = f;
+							ret = true;
+						}						
+					}
+				}
+				return ret;
+			}
+			bool ret1 = false;
+			bool ret2 = false;
+			if (m_idRight >= 0) ret1 = m_rm->m_nodes[m_idRight].Raycast(from, dir, triID, distance, hitPoint, hitNormal);
+			if (m_idLeft >= 0)  ret2 = m_rm->m_nodes[m_idLeft].Raycast(from, dir, triID, distance, hitPoint, hitNormal);
+			return ret1 || ret2;
+		}
+		return false;
+	}
+}

indra/libhacd/hacdRaycastMesh.h

@@ -0,0 +1,97 @@
+
+
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef RAYCAST_MESH_H
+#define RAYCAST_MESH_H
+#include "hacdSArray.h"
+#include <vector>
+#include "hacdVersion.h"
+#include "hacdVector.h"
+#include "hacdSArray.h"
+
+namespace HACD
+{
+	typedef double Float;
+	class RaycastMesh;
+	class RMNode;
+	class BBox
+	{
+	public:
+		bool									Raycast(const Vec3<Float> & origin, const Vec3<Float> & dir, Float & distance) const;
+												BBox(void){}
+												~BBox(void){}
+	private:
+		Vec3<Float>								m_min;	
+		Vec3<Float>								m_max;
+		friend class RMNode;
+		friend class RaycastMesh;
+	};
+
+	enum RMSplitAxis
+	{
+		RMSplitAxis_X,
+		RMSplitAxis_Y,
+		RMSplitAxis_Z
+	};
+	class RMNode
+	{
+	public:
+		void									ComputeBB();
+		bool									Raycast(const Vec3<Float> & from, const Vec3<Float> & dir, long & triID, Float & distance, Vec3<Real> & hitPoint, Vec3<Real> & hitNormal) const;
+		void									Create(size_t depth, size_t maxDepth, size_t minLeafSize, Float minAxisSize);
+												~RMNode(void){}
+												RMNode(void)
+												{
+													m_idRight = m_idLeft = m_id = -1;
+													m_rm = 0;
+													m_leaf = false;
+												}
+		long									m_id;
+		long									m_idLeft;
+		long									m_idRight;
+		BBox									m_bBox;		
+		SArray<long, SARRAY_DEFAULT_MIN_SIZE>	m_triIDs;
+		RaycastMesh *							m_rm;
+		bool									m_leaf;
+	};
+
+	class RaycastMesh
+	{
+	public:
+	size_t										GetNNodes() const { return m_nNodes;}
+	size_t										AddNode() { m_nNodes++; return m_nNodes-1; }
+	void										ComputeBB();
+	bool										Raycast(const Vec3<Float> & from, const Vec3<Float> & dir, long & triID, Float & distance, Vec3<Real> & hitPoint, Vec3<Real> & hitNormal) const;
+	void										Initialize(size_t nVertices, size_t nTriangles, 
+														   Vec3<Float> *  vertices,  Vec3<long> * triangles, 
+														   size_t maxDepth=15, size_t minLeafSize = 4, Float minAxisSize = 2.0);	
+												RaycastMesh(void);
+												~RaycastMesh(void);
+	private : 
+
+	private:
+		Vec3<long> *							m_triangles;			
+		Vec3<Float> *							m_vertices;		
+		size_t									m_nVertices;
+		size_t									m_nTriangles;
+		RMNode *								m_nodes;
+		BBox									m_bBox;
+		size_t									m_nNodes;
+		size_t									m_nMaxNodes;
+		friend class RMNode;
+	};
+}
+#endif

indra/libhacd/hacdSArray.h

@@ -0,0 +1,154 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_SARRAY_H
+#define HACD_SARRAY_H
+#include "hacdVersion.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#define SARRAY_DEFAULT_MIN_SIZE 16
+
+namespace HACD
+{
+	//!	SArray.
+    template < typename T, size_t N > class SArray
+    {
+        public:
+            T &                     operator[](size_t i)       
+                                    {
+                                        T * const data = Data();
+                                        return data[i];
+                                    }
+            const T &               operator[](size_t i) const 
+                                    {
+                                        const T * const data = Data();
+                                        return data[i];
+                                    }
+            size_t                  Size() const               
+                                    { 
+                                        return m_size;
+                                    }
+            T * const               Data()
+                                    { 
+                                        return (m_maxSize == N)? m_data0 : m_data;
+                                    }
+            const T * const         Data() const
+                                    { 
+                                        return (m_maxSize == N)? m_data0 : m_data;
+                                    }
+            void                    Clear()
+                                    {
+                                        m_size = 0;
+                                        delete [] m_data;
+                                        m_data    = 0;
+                                        m_maxSize = N;
+                                    }
+            void                    PopBack()
+                                    {
+                                        --m_size;
+                                    }
+			void                    Resize(size_t size)
+									{
+										if (size > m_maxSize)
+										{
+                                            T * temp = new T[size];
+											memcpy(temp, Data(), m_size*sizeof(T));
+                                            delete [] m_data;
+                                            m_data = temp;
+                                            m_maxSize = size;
+										}
+									}
+            void                    PushBack(const T &  value)
+                                    {
+                                        if (m_size==m_maxSize)
+                                        {
+                                            size_t maxSize = (m_maxSize << 1);                                            
+                                            T * temp = new T[maxSize];
+                                            memcpy(temp, Data(), m_maxSize*sizeof(T));
+                                            delete [] m_data;
+                                            m_data = temp;
+                                            m_maxSize = maxSize;
+                                        }
+                                        T * const data = Data();
+                                        data[m_size++] = value;
+                                    }
+            bool                    Find(const T & value, size_t & pos)
+                                    {
+                                        T * const data = Data();
+                                        for(pos = 0; pos < m_size; ++pos)
+                                            if (value == data[pos]) return true;
+                                        return false;
+                                    }
+            bool                    Insert(const T & value)
+                                    {
+                                        size_t pos;
+                                        if (Find(value, pos)) return false;
+                                        PushBack(value);
+                                        return true;
+                                    }
+            bool                    Erase(const T & value)
+                                    {
+                                        size_t pos;
+                                        T * const data = Data();
+                                        if (Find(value, pos))
+                                        {
+                                            for(size_t j = pos+1;  j < m_size; ++j)
+                                                data[j-1] = data[j];
+                                            --m_size;
+                                            return true;
+                                        }
+                                        return false;
+                                    }
+            void                    operator=(const SArray & rhs)       
+                                    {
+                                        if (m_maxSize < rhs.m_size)
+                                        {
+                                            delete [] m_data;
+                                            m_maxSize = rhs.m_maxSize;
+                                            m_data = new T[m_maxSize];
+                                        }
+                                        m_size = rhs.m_size;
+                                        memcpy(Data(), rhs.Data(), m_size*sizeof(T));
+                                    }
+            void                    Initialize()
+                                    {
+                                        m_data    = 0;
+                                        m_size    = 0;
+                                        m_maxSize = N;
+                                    }
+                                    SArray(const SArray & rhs)
+                                    {
+                                        m_data    = 0;
+                                        m_size    = 0;
+                                        m_maxSize = N;
+                                        *this    = rhs;
+                                    }
+                                    SArray()
+                                    {
+                                        Initialize();
+                                    }
+                                    ~SArray()
+                                    {
+                                        delete [] m_data;
+                                    }
+        private:
+            T                       m_data0[N];
+            T *                     m_data;
+            size_t                  m_size;
+            size_t                  m_maxSize;
+       };    
+}
+#endif

indra/libhacd/hacdVector.h

@@ -0,0 +1,69 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_VECTOR_H
+#define HACD_VECTOR_H
+#include <math.h>
+#include <iostream>
+#include "hacdVersion.h"
+
+namespace HACD
+{
+    typedef double Real;
+	//!	Vector dim 3.
+	template < typename T > class Vec3
+	{
+	public:
+		T &					operator[](size_t i) { return m_data[i];}
+		const T	&			operator[](size_t i) const { return m_data[i];}
+		T &					X();
+		T &					Y();
+		T &					Z();
+		const T	&			X() const;
+		const T	&			Y() const;
+		const T	&			Z() const;
+		void				Normalize();
+		T					GetNorm() const;
+		void				operator= (const Vec3 & rhs);
+		void				operator+=(const Vec3 & rhs);
+		void				operator-=(const Vec3 & rhs);
+		void				operator-=(T a);
+		void				operator+=(T a);
+		void				operator/=(T a);
+		void				operator*=(T a);
+		Vec3				operator^ (const Vec3 & rhs) const;
+		T			    	operator* (const Vec3 & rhs) const;
+		Vec3				operator+ (const Vec3 & rhs) const;
+		Vec3				operator- (const Vec3 & rhs) const;
+		Vec3				operator- () const;
+		Vec3				operator* (T rhs) const;
+		Vec3				operator/ (T rhs) const;
+							Vec3();
+							Vec3(T a);
+							Vec3(T x, T y, T z);
+							Vec3(const Vec3 & rhs);
+		/*virtual*/			~Vec3(void);
+
+	private:
+		T					m_data[3];
+	};
+    template<typename T>
+    const bool Colinear(const Vec3<T> & a, const Vec3<T> & b, const Vec3<T> & c);
+    template<typename T>
+    const T Volume(const Vec3<T> & a, const Vec3<T> & b, const Vec3<T> & c, const Vec3<T> & d);
+    
+}
+#include "hacdVector.inl"	// template implementation
+#endif

indra/libhacd/hacdVector.inl

@@ -0,0 +1,178 @@
+#pragma once
+#ifndef HACD_VECTOR_INL
+#define HACD_VECTOR_INL
+namespace HACD
+{
+	template <typename T> 
+	inline Vec3<T> operator*(T lhs, const Vec3<T> & rhs)
+	{
+		return Vec3<T>(lhs * rhs.X(), lhs * rhs.Y(), lhs * rhs.Z());
+	}
+	template <typename T> 
+	inline T & Vec3<T>::X() 
+	{
+		return m_data[0];
+	}
+	template <typename T>	
+	inline  T &	Vec3<T>::Y() 
+	{
+		return m_data[1];
+	}
+	template <typename T>	
+	inline  T &	Vec3<T>::Z() 
+	{
+		return m_data[2];
+	}
+	template <typename T>	
+	inline  const T & Vec3<T>::X() const 
+	{
+		return m_data[0];
+	}
+	template <typename T>	
+	inline  const T & Vec3<T>::Y() const 
+	{
+		return m_data[1];
+	}
+	template <typename T>	
+	inline  const T & Vec3<T>::Z() const 
+	{
+		return m_data[2];
+	}
+	template <typename T>	
+	inline  void Vec3<T>::Normalize()
+	{
+		T n = sqrt(m_data[0]*m_data[0]+m_data[1]*m_data[1]+m_data[2]*m_data[2]);
+		if (n != 0.0) (*this) /= n;
+	}
+	template <typename T>	
+	inline  T Vec3<T>::GetNorm() const 
+	{ 
+		return sqrt(m_data[0]*m_data[0]+m_data[1]*m_data[1]+m_data[2]*m_data[2]);
+	}
+	template <typename T>	
+	inline  void Vec3<T>::operator= (const Vec3 & rhs)
+	{ 
+		this->m_data[0] = rhs.m_data[0]; 
+		this->m_data[1] = rhs.m_data[1]; 
+		this->m_data[2] = rhs.m_data[2]; 
+	}
+	template <typename T>	
+	inline  void Vec3<T>::operator+=(const Vec3 & rhs)
+	{ 
+		this->m_data[0] += rhs.m_data[0]; 
+		this->m_data[1] += rhs.m_data[1]; 
+		this->m_data[2] += rhs.m_data[2]; 
+	}     
+	template <typename T>  
+	inline void Vec3<T>::operator-=(const Vec3 & rhs)
+	{ 
+		this->m_data[0] -= rhs.m_data[0]; 
+		this->m_data[1] -= rhs.m_data[1]; 
+		this->m_data[2] -= rhs.m_data[2]; 
+	}
+	template <typename T>  
+	inline void Vec3<T>::operator-=(T a)
+	{ 
+		this->m_data[0] -= a; 
+		this->m_data[1] -= a; 
+		this->m_data[2] -= a; 
+	}
+	template <typename T>  
+	inline void Vec3<T>::operator+=(T a)
+	{ 
+		this->m_data[0] += a; 
+		this->m_data[1] += a; 
+		this->m_data[2] += a; 
+	}
+	template <typename T>  
+	inline void Vec3<T>::operator/=(T a)
+	{ 
+		this->m_data[0] /= a; 
+		this->m_data[1] /= a; 
+		this->m_data[2] /= a; 
+	}
+	template <typename T>  
+	inline void Vec3<T>::operator*=(T a)
+	{ 
+		this->m_data[0] *= a; 
+		this->m_data[1] *= a; 
+		this->m_data[2] *= a; 
+	}  
+	template <typename T>	
+	inline Vec3<T> Vec3<T>::operator^ (const Vec3<T> & rhs) const
+	{
+		return Vec3<T>(m_data[1] * rhs.m_data[2] - m_data[2] * rhs.m_data[1],
+					   m_data[2] * rhs.m_data[0] - m_data[0] * rhs.m_data[2],
+					   m_data[0] * rhs.m_data[1] - m_data[1] * rhs.m_data[0]);
+	}
+	template <typename T>
+	inline T Vec3<T>::operator*(const Vec3<T> & rhs) const
+	{
+		return (m_data[0] * rhs.m_data[0] + m_data[1] * rhs.m_data[1] + m_data[2] * rhs.m_data[2]);
+	}        
+	template <typename T>
+	inline Vec3<T> Vec3<T>::operator+(const Vec3<T> & rhs) const
+	{
+		return Vec3<T>(m_data[0] + rhs.m_data[0],m_data[1] + rhs.m_data[1],m_data[2] + rhs.m_data[2]);
+	}
+	template <typename T> 
+	inline  Vec3<T> Vec3<T>::operator-(const Vec3<T> & rhs) const
+	{
+		return Vec3<T>(m_data[0] - rhs.m_data[0],m_data[1] - rhs.m_data[1],m_data[2] - rhs.m_data[2]) ;
+	}     
+	template <typename T> 
+	inline  Vec3<T> Vec3<T>::operator-() const
+	{
+		return Vec3<T>(-m_data[0],-m_data[1],-m_data[2]) ;
+	}     
+
+	template <typename T> 
+	inline Vec3<T> Vec3<T>::operator*(T rhs) const
+	{
+		return Vec3<T>(rhs * this->m_data[0], rhs * this->m_data[1], rhs * this->m_data[2]);
+	}
+	template <typename T>
+	inline Vec3<T> Vec3<T>::operator/ (T rhs) const
+	{
+		return Vec3<T>(m_data[0] / rhs, m_data[1] / rhs, m_data[2] / rhs);
+	}
+	template <typename T>
+	inline Vec3<T>::Vec3(T a) 
+	{ 
+		m_data[0] = m_data[1] = m_data[2] = a; 
+	}
+	template <typename T>
+	inline Vec3<T>::Vec3(T x, T y, T z)
+	{
+		m_data[0] = x;
+		m_data[1] = y;
+		m_data[2] = z;
+	}
+	template <typename T>
+	inline Vec3<T>::Vec3(const Vec3 & rhs)
+	{		
+		m_data[0] = rhs.m_data[0];
+		m_data[1] = rhs.m_data[1];
+		m_data[2] = rhs.m_data[2];
+	}
+	template <typename T>
+	inline Vec3<T>::~Vec3(void){};
+
+	template <typename T>
+	inline Vec3<T>::Vec3() {}
+    
+    template<typename T>
+    inline const bool Colinear(const Vec3<T> & a, const Vec3<T> & b, const Vec3<T> & c)
+    {
+        return  ((c.Z() - a.Z()) * (b.Y() - a.Y()) - (b.Z() - a.Z()) * (c.Y() - a.Y()) == 0.0 /*EPS*/) &&
+                ((b.Z() - a.Z()) * (c.X() - a.X()) - (b.X() - a.X()) * (c.Z() - a.Z()) == 0.0 /*EPS*/) &&
+                ((b.X() - a.X()) * (c.Y() - a.Y()) - (b.Y() - a.Y()) * (c.X() - a.X()) == 0.0 /*EPS*/);
+    }
+    
+    template<typename T>
+    inline const T Volume(const Vec3<T> & a, const Vec3<T> & b, const Vec3<T> & c, const Vec3<T> & d)
+    {
+        return (a-d) * ((b-d) ^ (c-d));
+    }
+}
+#endif //HACD_VECTOR_INL

indra/libhacd/hacdVersion.h

@@ -0,0 +1,20 @@
+/* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com)
+ All rights reserved.
+ 
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+ 3. The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#pragma once
+#ifndef HACD_VERSION_H
+#define HACD_VERSION_H
+#define HACD_VERSION_MAJOR 0
+#define HACD_VERSION_MINOR 0
+#endif

indra/libndhacd/CMakeLists.txt

@@ -0,0 +1,9 @@
+project(libndhacd)
+
+include_directories(${LIBS_OPEN_DIR}/libhacd)
+
+set (SOURCE_FILES LLConvexDecomposition.cpp nd_hacdConvexDecomposition.cpp nd_hacdStructs.cpp nd_hacdUtils.cpp nd_EnterExitTracer.cpp nd_StructTracer.cpp )
+file(GLOB HEADER_FILES *.h)
+
+add_library( nd_hacdConvexDecomposition STATIC ${SOURCE_FILES} ${HEADER_FILES})
+

indra/libndhacd/LLConvexDecomposition.cpp

@@ -0,0 +1,80 @@
+/** 
+ * @file   LLConvexDecomposition.cpp
+ * @author falcon@lindenlab.com
+ * @brief  A stub implementation of LLConvexDecomposition interface
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * 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;
+ * version 2.1 of the License only.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#if defined(_WINDOWS)
+#	include "windowsincludes.h"
+#endif
+
+#ifndef NULL
+#define NULL 0 
+#endif
+
+#include "nd_hacdConvexDecomposition.h"
+
+#include "LLConvexDecomposition.h"
+
+
+/*static */bool LLConvexDecomposition::s_isInitialized = false;
+
+/*static*/LLConvexDecomposition* LLConvexDecomposition::getInstance()
+{
+	if ( !s_isInitialized )
+	{
+		return NULL;
+	}
+	else
+	{
+		return nd_hacdConvexDecomposition::getInstance();
+	}
+}
+
+/*static */LLCDResult LLConvexDecomposition::initSystem()
+{
+	LLCDResult result = nd_hacdConvexDecomposition::initSystem();
+	if ( result == LLCD_OK )
+	{
+		s_isInitialized = true;
+	}
+	return result;
+}
+
+/*static */LLCDResult LLConvexDecomposition::initThread()
+{
+	return nd_hacdConvexDecomposition::initThread();
+}
+
+/*static */LLCDResult LLConvexDecomposition::quitThread()
+{
+	return nd_hacdConvexDecomposition::quitThread();
+}
+
+/*static */LLCDResult LLConvexDecomposition::quitSystem()
+{
+	return nd_hacdConvexDecomposition::quitSystem();
+}
+
+

indra/libndhacd/LLConvexDecomposition.h

@@ -0,0 +1,231 @@
+/** 
+ * @file LLConvexDecomposition.cpp
+ * @brief LLConvexDecomposition interface definition
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ * 
+ * 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;
+ * version 2.1 of the License only.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_CONVEX_DECOMPOSITION
+#define LL_CONVEX_DECOMPOSITION
+
+typedef int bool32;
+
+#if defined(_WIN32) || defined(_WIN64)
+#define LLCD_CALL __cdecl
+#else
+#define LLCD_CALL
+#endif
+
+struct LLCDParam
+{
+	enum LLCDParamType
+	{
+		LLCD_INVALID = 0,
+		LLCD_INTEGER,
+		LLCD_FLOAT,
+		LLCD_BOOLEAN,
+		LLCD_ENUM
+	};
+
+	struct LLCDEnumItem
+	{
+		const char*	mName;
+		int			mValue;
+	};
+
+	union LLCDValue
+	{
+		float	mFloat;
+		int		mIntOrEnumValue;
+		bool32	mBool;
+	};
+
+	union LLCDParamDetails
+	{
+		struct {
+			LLCDValue mLow;
+			LLCDValue mHigh;
+			LLCDValue mDelta;
+		} mRange;
+
+		struct {
+			int				mNumEnums;
+			LLCDEnumItem*	mEnumsArray;
+		} mEnumValues;
+	};
+
+	const char*					mName;
+	const char*					mDescription;
+	LLCDParamType				mType;
+	LLCDParamDetails			mDetails;
+	LLCDValue					mDefault;
+	int							mStage;
+
+	// WARNING: Only the LLConvexDecomposition implementation
+	// should change this value
+	int							mReserved;
+};
+
+struct LLCDStageData 
+{
+	const char*	mName;
+	const char* mDescription;
+	bool32 mSupportsCallback;
+};
+
+struct LLCDMeshData
+{
+	enum IndexType 
+	{
+		INT_16,
+		INT_32
+	};
+
+	const float*	mVertexBase;
+	int				mVertexStrideBytes;
+	int				mNumVertices;
+	const void*		mIndexBase;
+	IndexType		mIndexType;
+	int				mIndexStrideBytes;
+	int				mNumTriangles;
+};
+
+struct LLCDHull
+{
+	const float*	mVertexBase;
+	int				mVertexStrideBytes;
+	int				mNumVertices;
+};
+
+enum LLCDResult
+{
+	LLCD_OK = 0,
+	LLCD_UNKOWN_ERROR,
+	LLCD_NULL_PTR,
+	LLCD_INVALID_STAGE,
+	LLCD_UNKNOWN_PARAM,
+	LLCD_BAD_VALUE,
+	LLCD_REQUEST_OUT_OF_RANGE,
+	LLCD_INVALID_MESH_DATA,
+	LLCD_INVALID_HULL_DATA,
+	LLCD_STAGE_NOT_READY,
+	LLCD_INVALID_THREAD,
+	LLCD_NOT_IMPLEMENTED
+};
+
+// This callback will receive a string describing the current subtask being performed 
+// as well as a pair of numbers indicating progress. (The values should not be interpreted
+// as a completion percentage as 'current' may be greater than 'final'.)
+// If the callback returns zero, the decomposition will be terminated
+typedef int				(LLCD_CALL *llcdCallbackFunc)(const char* description, int current, int final);
+
+class LLConvexDecomposition
+{
+public:
+	// Obtain a pointer to the actual implementation
+	static LLConvexDecomposition* getInstance();
+
+	static LLCDResult initSystem();
+	static LLCDResult initThread();
+	static LLCDResult quitThread();
+	static LLCDResult quitSystem();
+
+	// Generate a decomposition object handle
+	virtual void genDecomposition(int& decomp) = 0;
+	// Delete decomposition object handle
+	virtual void deleteDecomposition(int decomp) = 0;
+	// Bind given decomposition handle
+	// Commands operate on currently bound decomposition
+	virtual void bindDecomposition(int decomp) = 0;
+
+	// Sets *paramsOut to the address of the LLCDParam array and returns
+	// the number of parameters
+	virtual int getParameters(const LLCDParam** paramsOut) = 0;
+
+
+	// Sets *stagesOut to the address of the LLCDStageData array and returns
+	// the number of stages
+	virtual int getStages(const LLCDStageData** stagesOut) = 0;
+
+
+	// Set a parameter by name. Pass enum values as integers.
+	virtual LLCDResult	setParam(const char* name, float val)	= 0;
+	virtual LLCDResult	setParam(const char* name, int val)		= 0; 
+	virtual LLCDResult	setParam(const char* name, bool val)	= 0;
+
+
+	// Set incoming mesh data. Data is copied to local buffers and will
+	// persist until the next setMeshData call
+	virtual LLCDResult	setMeshData( const LLCDMeshData* data, bool vertex_based ) = 0;
+
+
+	// Register a callback to be called periodically during the specified stage
+	// See the typedef above for more information
+	virtual LLCDResult	registerCallback( int stage, llcdCallbackFunc callback ) = 0;
+
+
+	// Execute the specified decomposition stage
+	virtual LLCDResult	executeStage(int stage) = 0;
+	virtual LLCDResult	buildSingleHull() = 0 ;
+
+
+	// Gets the number of hulls generated by the specified decompositions stage
+	virtual int getNumHullsFromStage(int stage) = 0;
+
+
+	// Populates hullOut to reference the internal copy of the requested hull
+	// The data will persist only until the next executeStage call for that stage.
+	virtual LLCDResult	getHullFromStage( int stage, int hull, LLCDHull* hullOut ) = 0;
+	virtual LLCDResult  getSingleHull( LLCDHull* hullOut ) = 0 ;
+
+	// TODO: Implement lock of some kind to disallow this call if data not yet ready
+	// Populates the meshDataOut to reference the utility's copy of the mesh geometry
+	// for the hull and stage specified. 
+	// You must copy this data if you want to continue using it after the next executeStage
+	// call
+	virtual LLCDResult	getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut) = 0;
+
+
+	// Creates a mesh from hullIn and temporarily stores it internally in the utility.
+	// The mesh data persists only until the next call to getMeshFromHull
+	virtual LLCDResult	getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut ) = 0;
+
+	// Takes meshIn, generates a single convex hull from it, converts that to a mesh
+	// stored internally, and populates meshOut to reference the internally stored data.
+	// The data is persistent only until the next call to generateSingleHullMeshFromMesh
+	virtual LLCDResult generateSingleHullMeshFromMesh( LLCDMeshData* meshIn, LLCDMeshData* meshOut) = 0;
+
+	//
+	/// Debug
+	virtual void loadMeshData(const char* fileIn, LLCDMeshData** meshDataOut) = 0;
+
+	virtual bool isFunctional()=0;
+
+private:
+	static bool s_isInitialized;
+};
+
+// Pull in our trace interface
+#include "ndConvexDecomposition.h"
+
+#endif //LL_CONVEX_DECOMPOSITION
+

indra/libndhacd/LLConvexDecompositionStubImpl.cpp

@@ -0,0 +1,148 @@
+/** 
+ * @file   LLConvexDecompositionStubImpl.cpp
+ * @author falcon@lindenlab.com
+ * @brief  A stub implementation of LLConvexDecomposition
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * 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;
+ * version 2.1 of the License only.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+
+#include <string.h>
+#include <memory>
+#include "LLConvexDecompositionStubImpl.h"
+
+LLConvexDecomposition* LLConvexDecompositionImpl::getInstance()
+{
+	return NULL;
+}
+
+LLCDResult LLConvexDecompositionImpl::initSystem()
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::initThread()
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::quitThread()
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::quitSystem()
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+void LLConvexDecompositionImpl::genDecomposition(int& decomp)
+{
+
+}
+
+void LLConvexDecompositionImpl::deleteDecomposition(int decomp)
+{
+
+}
+
+void LLConvexDecompositionImpl::bindDecomposition(int decomp)
+{
+
+}
+
+LLCDResult LLConvexDecompositionImpl::setParam(const char* name, float val)
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::setParam(const char* name, bool val)
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::setParam(const char* name, int val)
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::setMeshData( const LLCDMeshData* data, bool vertex_based )
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::registerCallback(int stage, llcdCallbackFunc callback )
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::buildSingleHull()
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::executeStage(int stage)
+{
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+int LLConvexDecompositionImpl::getNumHullsFromStage(int stage)
+{
+	return 0;
+}
+
+LLCDResult LLConvexDecompositionImpl::getSingleHull( LLCDHull* hullOut ) 
+{
+	memset( hullOut, 0, sizeof(LLCDHull) );
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::getHullFromStage( int stage, int hull, LLCDHull* hullOut )
+{
+	memset( hullOut, 0, sizeof(LLCDHull) );
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut )
+{
+	memset( meshDataOut, 0, sizeof(LLCDMeshData) );
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult	LLConvexDecompositionImpl::getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut )
+{
+	memset( meshOut, 0, sizeof(LLCDMeshData) );
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+LLCDResult LLConvexDecompositionImpl::generateSingleHullMeshFromMesh(LLCDMeshData* meshIn, LLCDMeshData* meshOut)
+{
+	memset( meshOut, 0, sizeof(LLCDMeshData) );
+	return LLCD_NOT_IMPLEMENTED;
+}
+
+void LLConvexDecompositionImpl::loadMeshData(const char* fileIn, LLCDMeshData** meshDataOut)
+{
+	static LLCDMeshData meshData;
+	memset( &meshData, 0, sizeof(LLCDMeshData) );
+	*meshDataOut = &meshData;
+}

indra/libndhacd/LLConvexDecompositionStubImpl.h

@@ -0,0 +1,97 @@
+/** 
+ * @file   LLConvexDecompositionStubImpl.h
+ * @author falcon@lindenlab.com
+ * @brief  A stub implementation of LLConvexDecomposition
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * 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;
+ * version 2.1 of the License only.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+
+#ifndef LL_CONVEX_DECOMP_UTIL_H
+#define LL_CONVEX_DECOMP_UTIL_H
+
+#include "LLConvexDecomposition.h"
+
+class LLConvexDecompositionImpl : public LLConvexDecomposition
+{
+	public:
+
+		virtual ~LLConvexDecompositionImpl() {}
+
+		static LLConvexDecomposition* getInstance();
+		static LLCDResult initSystem();
+		static LLCDResult initThread();
+		static LLCDResult quitThread();
+		static LLCDResult quitSystem();
+
+		// Generate a decomposition object handle
+		void genDecomposition(int& decomp);
+		// Delete decomposition object handle
+		void deleteDecomposition(int decomp);
+		// Bind given decomposition handle
+		// Commands operate on currently bound decomposition
+		void bindDecomposition(int decomp);
+
+		// Sets *paramsOut to the address of the LLCDParam array and returns
+		// the length of the array
+		int getParameters(const LLCDParam** paramsOut) 
+		{ 
+			*paramsOut = NULL; 
+			return 0; 
+		}
+
+		int getStages(const LLCDStageData** stagesOut) 
+		{ 
+			*stagesOut = NULL; 
+			return 0; 
+		}
+
+		// Set a parameter by name. Returns false if out of bounds or unsupported parameter
+		LLCDResult	setParam(const char* name, float val);
+		LLCDResult	setParam(const char* name, int val);
+		LLCDResult	setParam(const char* name, bool val);
+		LLCDResult	setMeshData( const LLCDMeshData* data, bool vertex_based );
+		LLCDResult	registerCallback(int stage, llcdCallbackFunc callback );
+
+		LLCDResult	executeStage(int stage);
+		LLCDResult	buildSingleHull() ;
+
+		int getNumHullsFromStage(int stage);
+
+		LLCDResult	getHullFromStage( int stage, int hull, LLCDHull* hullOut );
+		LLCDResult  getSingleHull( LLCDHull* hullOut ) ;
+		
+		// TODO: Implement lock of some kind to disallow this call if data not yet ready
+		LLCDResult	getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut);
+		LLCDResult	getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut );
+
+		// For visualizing convex hull shapes in the viewer physics shape display
+		LLCDResult generateSingleHullMeshFromMesh( LLCDMeshData* meshIn, LLCDMeshData* meshOut);
+
+		/// Debug
+		void loadMeshData(const char* fileIn, LLCDMeshData** meshDataOut);
+
+	private:
+		LLConvexDecompositionImpl() {}
+};
+
+#endif //LL_CONVEX_DECOMP_UTIL_H

indra/libndhacd/ndConvexDecomposition.h

@@ -0,0 +1,58 @@
+#ifndef ND_CONVEXDECOMPOSITION_H
+#define ND_CONVEXDECOMPOSITION_H
+
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ND_HASCONVEXDECOMP_TRACER
+ #define ND_HASCONVEXDECOMP_TRACER
+#endif
+
+class ndConvexDecompositionTracer
+{
+public:
+	enum ETraceLevel
+	{
+		eNone = 0,
+		eTraceFunctions = 0x1,
+		eTraceData = 0x2,
+	};
+	
+	virtual ~ndConvexDecompositionTracer()
+	{ }
+
+	virtual void trace( char const *a_strMsg ) = 0;
+
+	virtual void startTraceData( char const *a_strWhat) = 0;
+	virtual void traceData( char const *a_strData ) = 0;
+	virtual void endTraceData() = 0;
+
+	virtual int getLevel() = 0;
+
+	virtual void addref() = 0;
+	virtual void release() = 0;
+};
+
+class ndConvexDecompositionTracable
+{
+public:
+	virtual void setTracer( ndConvexDecompositionTracer *) = 0;
+};
+
+
+#endif

indra/libndhacd/nd_EnterExitTracer.cpp

@@ -0,0 +1,51 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "nd_EnterExitTracer.h"
+
+#include <vector>
+#include <sstream>
+
+void EnterExitTracer::doTrace( char const *aPrefix )
+{
+	if( !mFunc || !mTracer )
+		return;
+
+	if( ndConvexDecompositionTracer::eTraceFunctions == (mTracer->getLevel() & ndConvexDecompositionTracer::eTraceFunctions ) )
+		return;
+
+	std::stringstream str;
+	if( aPrefix )
+		str << aPrefix;
+
+	str << mFunc;	
+	mTracer->trace( str.str().c_str() );
+}
+
+EnterExitTracer::EnterExitTracer( char const *aFunc, ndConvexDecompositionTracer *aTracer )
+	: mFunc( aFunc )
+	, mTracer( aTracer )
+{
+	doTrace( "enter: " );
+}
+
+EnterExitTracer::~EnterExitTracer( )
+{
+	doTrace( "exit: " );
+}
+

indra/libndhacd/nd_EnterExitTracer.h

@@ -0,0 +1,43 @@
+#ifndef ND_ENTEREXITTRACER_H
+#define ND_ENTEREXITTRACER_H
+
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "ndConvexDecomposition.h"
+
+class EnterExitTracer
+{
+	char const *mFunc;
+	ndConvexDecompositionTracer *mTracer;
+
+	void doTrace( char const *aPrefix );
+
+public:
+	EnterExitTracer( char const *aFunc, ndConvexDecompositionTracer *aTracer );
+	~EnterExitTracer( );
+	
+};
+
+#ifdef __GNUC__
+   #define TRACE_FUNC(ATRACER) EnterExitTracer oETTrace( __PRETTY_FUNCTION__, ATRACER );
+#else
+   #define TRACE_FUNC(ATRACER) EnterExitTracer oETTrace( __FUNCTION__, ATRACER );
+#endif
+
+#endif

indra/libndhacd/nd_StructTracer.cpp

@@ -0,0 +1,188 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "nd_StructTracer.h"
+#include <sstream>
+#include <iomanip>
+
+using namespace std;
+
+namespace ndStructTracer
+{
+	bool doTrace( ndConvexDecompositionTracer *aTracer )
+	{
+		if( !aTracer )
+			return false;
+
+		return ndConvexDecompositionTracer::eTraceData == (aTracer->getLevel() & ndConvexDecompositionTracer::eTraceData) ;
+	}
+
+
+	template<typename T> void traceVecDbl( T const &aValue, ndConvexDecompositionTracer *aTracer )
+	{
+		stringstream str;
+		str << fixed
+			<< "\tX: " << aValue.X()
+			<< " Y: " << aValue.Y()
+			<< " Z: " << aValue.Z();
+
+		aTracer->traceData( str.str().c_str() );
+	}
+
+	template< typename T> void traceVecDoubles( vector< T > const &aVertices, ndConvexDecompositionTracer *aTracer )
+	{
+		for( size_t i = 0; i < aVertices.size(); ++i )
+			traceVecDbl( aVertices[i], aTracer ); 
+	}
+
+	void traceVertices( vector< tVecDbl > const &aVertices, ndConvexDecompositionTracer *aTracer )
+	{
+		aTracer->traceData( "Triangles\n" );
+		traceVecDoubles( aVertices, aTracer );
+	}
+
+	void traceTriangles( vector< tVecLong > const &aTriangles, ndConvexDecompositionTracer *aTracer )
+	{
+		aTracer->traceData( "Vertices\n" );
+		traceVecDoubles( aTriangles, aTracer );
+	}
+
+	void trace( DecompData const &aData, ndConvexDecompositionTracer *aTracer )
+	{
+		if( !doTrace( aTracer ) )
+			return;
+
+		aTracer->startTraceData("Hulls");
+
+		stringstream str;
+		str << "Hulls: " << aData.mHulls.size();
+		aTracer->traceData( str.str().c_str() );
+		str.seekp(0);
+
+		for( size_t i = 0; i < aData.mHulls.size(); ++i )
+		{
+			str << "Hull #" << i;
+			aTracer->traceData( str.str().c_str() );
+			str.seekp(0);
+
+			DecompHull const &oHull( aData.mHulls[i] );
+			traceVertices( oHull.mVertices, aTracer );
+			traceTriangles( oHull.mTriangles, aTracer );
+		}
+
+		aTracer->endTraceData();
+	}
+
+	template< typename T> void traceVertex( T aX, T aY, T aZ, ndConvexDecompositionTracer *aTracer )
+	{
+		stringstream str;
+		str << fixed
+			<< "X: " << aX
+			<< "Y: " << aY
+			<< "Z: " << aZ;
+
+		aTracer->traceData( str.str().c_str() );
+	}
+
+	template< typename T> void traceTriangle( void *& aPtr, int aStride, ndConvexDecompositionTracer *aTracer )
+	{
+		T *pData = reinterpret_cast< T* >(aPtr);
+		long X( pData[0] ),	Y( pData[1] ),	Z( pData[2] );
+
+		traceVertex( X, Y, Z, aTracer );
+
+		pData += aStride;
+		aPtr = pData;
+	}
+
+	void traceVertices( int aNumVertices, float const *aVertices, int aStride, ndConvexDecompositionTracer *aTracer )
+	{
+		for( int i = 0; i < aNumVertices; ++i )
+		{
+			float X( aVertices[0] ), Y( aVertices[1] ), Z( aVertices[2] );
+			traceVertex( X, Y, Z, aTracer );
+			aVertices += aStride;
+		}
+	}
+
+	void traceTriangles( LLCDMeshData const *aData, ndConvexDecompositionTracer *aTracer )
+	{
+		int nCount = aData->mNumTriangles;
+		int nStride = aData->mIndexStrideBytes;
+		void *pData = const_cast<void*>( aData->mIndexBase );
+		int nIndexType = aData->mIndexType;
+
+		if ( LLCDMeshData::INT_16 == nIndexType )
+			nStride /= 2;
+		else
+			nStride /= 4;
+			
+		for ( int i = 0; i < nCount; ++i )
+		{
+			if( LLCDMeshData::INT_16  == nIndexType )
+				traceTriangle< hacdUINT16 >( pData, nStride, aTracer );
+			else
+				traceTriangle< hacdUINT32 >( pData, nStride, aTracer );
+		}
+	}
+
+	void trace( LLCDMeshData const *aData, bool aVertexBased, ndConvexDecompositionTracer *aTracer )
+	{
+		if( !doTrace( aTracer ) )
+			return;
+
+		aTracer->startTraceData("LLCDMeshData");
+
+		string strVBased("true");
+		if( !aVertexBased )
+			strVBased = "false";
+
+		stringstream str;
+		str << "LLCDMeshData vertex based: " << strVBased
+			<< "# vertices " << aData->mNumVertices
+			<< "# triangles " << aData->mNumTriangles;
+
+		aTracer->traceData( str.str().c_str() );
+
+		traceVertices( aData->mNumVertices, aData->mVertexBase, aData->mVertexStrideBytes/sizeof(float), aTracer );
+
+		if( !aVertexBased )
+			traceTriangles( aData, aTracer );
+			
+		aTracer->endTraceData();
+	}
+
+	void trace( LLCDHull const *aData, ndConvexDecompositionTracer *aTracer )
+	{
+		if( !doTrace( aTracer ) )
+			return;
+
+		aTracer->startTraceData("LLCDHull");
+
+		stringstream str;
+		str << "LLCDHull # vertices " << aData->mNumVertices;
+
+		aTracer->traceData( str.str().c_str() );
+
+		traceVertices( aData->mNumVertices, aData->mVertexBase, aData->mVertexStrideBytes/sizeof(float), aTracer );
+
+
+		aTracer->endTraceData();
+	}
+};
+

indra/libndhacd/nd_StructTracer.h

@@ -0,0 +1,34 @@
+#ifndef ND_STRUCTTRACER_H
+#define ND_STRUCTTRACER_H
+
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#include "ndConvexDecomposition.h"
+#include "LLConvexDecomposition.h"
+#include "nd_hacdStructs.h"
+
+namespace ndStructTracer
+{
+	void trace( DecompData const &aData, ndConvexDecompositionTracer *aTracer );
+	void trace( LLCDMeshData const *aData, bool aVertexBased, ndConvexDecompositionTracer *aTracer );
+	void trace( LLCDHull const *aData, ndConvexDecompositionTracer *aTracer );
+};
+
+#endif

indra/libndhacd/nd_hacdConvexDecomposition.cpp

@@ -0,0 +1,393 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <string.h>
+#include <memory>
+#include "nd_hacdConvexDecomposition.h"
+
+#include "nd_hacdDefines.h"
+#include "nd_hacdStructs.h"
+#include "nd_hacdUtils.h"
+#include "ndConvexDecomposition.h"
+#include "nd_EnterExitTracer.h"
+#include "nd_StructTracer.h"
+
+LLCDStageData nd_hacdConvexDecomposition::mStages[1];
+
+LLCDParam nd_hacdConvexDecomposition::mParams[4];
+LLCDParam::LLCDEnumItem nd_hacdConvexDecomposition::mMethods[1];
+LLCDParam::LLCDEnumItem nd_hacdConvexDecomposition::mQuality[1];
+LLCDParam::LLCDEnumItem nd_hacdConvexDecomposition::mSimplify[1];
+
+LLConvexDecomposition* nd_hacdConvexDecomposition::getInstance()
+{
+	static nd_hacdConvexDecomposition sImpl;
+	return &sImpl;
+}
+
+nd_hacdConvexDecomposition::nd_hacdConvexDecomposition()
+{
+	mNextId = 0;
+	mCurrentDecoder = 0;
+	mSingleHullMeshFromMesh = new HACDDecoder();
+	mTracer = 0;
+}
+
+nd_hacdConvexDecomposition::~nd_hacdConvexDecomposition()
+{
+	if( mTracer )
+		mTracer->release();
+}
+
+LLCDResult nd_hacdConvexDecomposition::initSystem()
+{
+	memset( &mStages[0], 0, sizeof( mStages ) );
+	memset( &mParams[0], 0, sizeof( mParams ) );
+	memset( &mMethods[0], 0, sizeof( mMethods ) );
+	memset( &mQuality[0], 0, sizeof( mQuality ) );
+	memset( &mSimplify[0], 0, sizeof( mSimplify ) );
+
+	mStages[0].mName = "Decompose";
+	mStages[0].mDescription = NULL;
+
+	mMethods[0].mName = "Default";
+	mMethods[0].mValue = 0;
+
+	mQuality[0].mName = "Default";
+	mQuality[0].mValue = 0;
+
+	mSimplify[0].mName = "None";
+	mSimplify[0].mValue = 0;
+
+	mParams[0].mName = "nd_AlwaysNeedTriangles";
+	mParams[0].mDescription = 0;
+	mParams[0].mType = LLCDParam::LLCD_BOOLEAN;
+	mParams[0].mDefault.mBool = true;
+
+	mParams[1].mName = "Method";
+	mParams[1].mType = LLCDParam::LLCD_ENUM;
+	mParams[1].mDetails.mEnumValues.mNumEnums = sizeof(mMethods)/sizeof(LLCDParam::LLCDEnumItem);
+	mParams[1].mDetails.mEnumValues.mEnumsArray = mMethods;
+	mParams[1].mDefault.mIntOrEnumValue = 0;
+
+	mParams[2].mName = "Decompose Quality";
+	mParams[2].mType = LLCDParam::LLCD_ENUM;
+	mParams[2].mDetails.mEnumValues.mNumEnums = sizeof(mQuality)/sizeof(LLCDParam::LLCDEnumItem);
+	mParams[2].mDetails.mEnumValues.mEnumsArray = mQuality;
+	mParams[2].mDefault.mIntOrEnumValue = 0;
+
+	mParams[3].mName = "Simplify Method";
+	mParams[3].mType = LLCDParam::LLCD_ENUM;
+	mParams[3].mDetails.mEnumValues.mNumEnums = sizeof(mSimplify)/sizeof(LLCDParam::LLCDEnumItem);
+	mParams[3].mDetails.mEnumValues.mEnumsArray = mSimplify;
+	mParams[3].mDefault.mIntOrEnumValue = 0;
+
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::initThread()
+{
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::quitThread()
+{
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::quitSystem()
+{
+	return LLCD_OK;
+}
+
+void nd_hacdConvexDecomposition::genDecomposition( int& decomp )
+{
+	HACDDecoder *pGen = new HACDDecoder();
+	decomp = mNextId;
+	++mNextId;
+
+	mDecoders[ decomp ] = pGen;
+}
+
+void nd_hacdConvexDecomposition::deleteDecomposition( int decomp )
+{
+	delete mDecoders[ decomp ];
+	mDecoders.erase( decomp );
+}
+
+void nd_hacdConvexDecomposition::bindDecomposition( int decomp )
+{
+	TRACE_FUNC( mTracer );
+	mCurrentDecoder = decomp;
+}
+
+LLCDResult nd_hacdConvexDecomposition::setParam( const char* name, float val )
+{
+	TRACE_FUNC( mTracer );
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::setParam( const char* name, bool val )
+{
+	TRACE_FUNC( mTracer );
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::setParam( const char* name, int val )
+{
+	TRACE_FUNC( mTracer );
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::setMeshData( const LLCDMeshData* data, bool vertex_based )
+{
+	TRACE_FUNC( mTracer );
+	ndStructTracer::trace( data, vertex_based, mTracer );
+
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+	return ::setMeshData( data, vertex_based, pC );
+}
+
+LLCDResult nd_hacdConvexDecomposition::registerCallback( int stage, llcdCallbackFunc callback )
+{
+	TRACE_FUNC( mTracer );
+	if( mDecoders.end() == mDecoders.find( mCurrentDecoder ) )
+		return LLCD_STAGE_NOT_READY;
+
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+	pC->mCallback = callback;
+
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::buildSingleHull()
+{
+	TRACE_FUNC( mTracer );
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::executeStage( int stage )
+{
+	TRACE_FUNC( mTracer );
+	if ( stage < 0 || stage >= NUM_STAGES )
+		return LLCD_INVALID_STAGE;
+
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+	tHACD *pHACD = init( 1, MIN_NUMBER_OF_CLUSTERS, MAX_VERTICES_PER_HULL, CONNECT_DISTS[0], pC );
+
+	DecompData oRes = decompose( pHACD );
+	ndStructTracer::trace( oRes, mTracer );
+
+	delete pHACD;
+
+	pC->mStages[ stage ] = oRes;
+
+	return LLCD_OK;
+}
+
+int nd_hacdConvexDecomposition::getNumHullsFromStage( int stage )
+{
+	TRACE_FUNC( mTracer );
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+
+	if ( !pC )
+		return 0;
+
+	if ( stage < 0 || static_cast<size_t>(stage) >= pC->mStages.size() )
+		return 0;
+
+	return pC->mStages[stage].mHulls.size();
+}
+
+DecompData toSingleHull( HACDDecoder *aDecoder, LLCDResult &aRes, ndConvexDecompositionTracer *aTracer )
+{
+	TRACE_FUNC( aTracer );
+	aRes = LLCD_REQUEST_OUT_OF_RANGE;
+
+	for ( int i = 0; i < TO_SINGLE_HULL_TRIES; ++i )
+	{
+		tHACD *pHACD = init( CONCAVITY_FOR_SINGLE_HULL[i], 1, MAX_VERTICES_PER_HULL, CONNECT_DISTS[i], aDecoder );
+
+		DecompData oRes = decompose( pHACD );
+		delete pHACD;
+
+		ndStructTracer::trace( oRes, aTracer );
+
+		if ( oRes.mHulls.size() == 1 )
+		{
+			aRes = LLCD_OK;
+			return oRes;
+		}
+	}
+
+	return DecompData();
+}
+
+LLCDResult nd_hacdConvexDecomposition::getSingleHull( LLCDHull* hullOut )
+{
+	TRACE_FUNC( mTracer );
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+
+	memset( hullOut, 0, sizeof( LLCDHull ) );
+
+	LLCDResult res;
+
+	// Will already trace oRes
+	DecompData oRes = ::toSingleHull( pC, res, mTracer );
+
+	if ( LLCD_OK != res || oRes.mHulls.size() != 1 )
+		return res;
+
+	pC->mSingleHull = oRes.mHulls[0];
+	pC->mSingleHull.toLLHull( hullOut );
+
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::getHullFromStage( int stage, int hull, LLCDHull* hullOut )
+{
+	TRACE_FUNC( mTracer );
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+
+	memset( hullOut, 0, sizeof( LLCDHull ) );
+
+	if ( stage < 0 || static_cast<size_t>(stage) >= pC->mStages.size() )
+		return LLCD_INVALID_STAGE;
+
+	DecompData &oData = pC->mStages[ stage ];
+
+	if ( hull < 0 ||static_cast<size_t>(hull) >= oData.mHulls.size() )
+		return LLCD_REQUEST_OUT_OF_RANGE;
+
+	oData.mHulls[ hull ].toLLHull( hullOut );
+	ndStructTracer::trace( hullOut, mTracer );
+
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut )
+{
+	TRACE_FUNC( mTracer );
+	HACDDecoder *pC = mDecoders[ mCurrentDecoder ];
+
+	memset( meshDataOut, 0, sizeof( LLCDHull ) );
+
+	if ( stage < 0 || static_cast<size_t>(stage) >= pC->mStages.size() )
+		return LLCD_INVALID_STAGE;
+
+	DecompData &oData = pC->mStages[ stage ];
+
+	if ( hull < 0 || static_cast<size_t>(hull) >= oData.mHulls.size() )
+		return LLCD_REQUEST_OUT_OF_RANGE;
+
+	oData.mHulls[ hull ].toLLMesh( meshDataOut );
+	ndStructTracer::trace( meshDataOut, true, mTracer );
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut )
+{
+	TRACE_FUNC( mTracer );
+	memset( meshOut, 0, sizeof( LLCDMeshData ) );
+
+	mMeshToHullVertices.clear();
+	mMeshToHullTriangles.clear();
+
+	if( !hullIn || !hullIn->mVertexBase || !meshOut )
+		return LLCD_NULL_PTR;
+	if( hullIn->mVertexStrideBytes < 3*sizeof(float) || hullIn->mNumVertices < 3 )
+		return LLCD_INVALID_HULL_DATA;
+
+	LLCDResult oRet = convertHullToMesh( hullIn, mMeshToHullVertices, mMeshToHullTriangles );
+
+	if( LLCD_OK != oRet )
+		return oRet;
+
+	meshOut->mVertexStrideBytes = sizeof( float )*3;
+	meshOut->mNumVertices = mMeshToHullVertices.size()/3;
+	meshOut->mVertexBase = &mMeshToHullVertices[0];
+
+	meshOut->mIndexType = LLCDMeshData::INT_32;
+	meshOut->mIndexStrideBytes = sizeof( hacdUINT32 ) * 3;
+	meshOut->mNumTriangles = mMeshToHullTriangles.size()/3;
+	meshOut->mIndexBase = &mMeshToHullTriangles[0];
+
+	return LLCD_OK;
+}
+
+LLCDResult nd_hacdConvexDecomposition::generateSingleHullMeshFromMesh( LLCDMeshData* meshIn, LLCDMeshData* meshOut )
+{
+	TRACE_FUNC( mTracer );
+	memset( meshOut, 0, sizeof( LLCDMeshData ) );
+	mSingleHullMeshFromMesh->clear();
+	LLCDResult res = ::setMeshData( meshIn, meshIn->mNumVertices > 3, mSingleHullMeshFromMesh );
+
+	if ( LLCD_OK != res )
+		return res;
+
+	// Will already trace oRes
+	DecompData oRes = ::toSingleHull( mSingleHullMeshFromMesh, res, mTracer );
+
+	if ( LLCD_OK != res || oRes.mHulls.size() != 1 )
+		return res;
+
+	mSingleHullMeshFromMesh->mSingleHull = oRes.mHulls[0];
+	mSingleHullMeshFromMesh->mSingleHull.toLLMesh( meshOut );
+
+	return LLCD_OK;
+}
+
+void nd_hacdConvexDecomposition::loadMeshData( const char* fileIn, LLCDMeshData** meshDataOut )
+{
+	TRACE_FUNC( mTracer );
+	static LLCDMeshData meshData;
+	memset( &meshData, 0, sizeof( LLCDMeshData ) );
+	*meshDataOut = &meshData;
+}
+
+int nd_hacdConvexDecomposition::getParameters( const LLCDParam** paramsOut )
+{
+	TRACE_FUNC( mTracer );
+	*paramsOut = mParams;
+	return sizeof(mParams)/sizeof(LLCDParam);
+}
+
+int nd_hacdConvexDecomposition::getStages( const LLCDStageData** stagesOut )
+{
+	TRACE_FUNC( mTracer );
+
+	*stagesOut = mStages;
+	return sizeof(mStages)/sizeof(LLCDStageData);
+}
+
+void nd_hacdConvexDecomposition::setTracer( ndConvexDecompositionTracer * aTracer)
+{
+	if( mTracer )
+		mTracer->release();
+
+	mTracer = aTracer;
+
+	if( mTracer )
+		mTracer->addref();
+}
+
+
+bool nd_hacdConvexDecomposition::isFunctional()
+{
+	return true;
+}

indra/libndhacd/nd_hacdConvexDecomposition.h

@@ -0,0 +1,103 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ND_HACD_CONVEXDECOMP_H
+#define ND_HACD_CONVEXDECOMP_H
+
+#include "LLConvexDecomposition.h"
+
+#include <map>
+#include <vector>
+
+struct HACDDecoder;
+
+class nd_hacdConvexDecomposition : public LLConvexDecomposition, public ndConvexDecompositionTracable
+{
+	int mNextId;
+	int mCurrentDecoder;
+	std::map< int, HACDDecoder * > mDecoders;
+	HACDDecoder *mSingleHullMeshFromMesh;
+
+	std::vector< float > mMeshToHullVertices;
+	std::vector< int > mMeshToHullTriangles;
+
+	ndConvexDecompositionTracer *mTracer;
+
+	static LLCDStageData mStages[1];
+
+	static LLCDParam mParams[4];
+	static LLCDParam::LLCDEnumItem mMethods[1];
+	static LLCDParam::LLCDEnumItem mQuality[1];
+	static LLCDParam::LLCDEnumItem mSimplify[1];
+
+public:
+	virtual ~nd_hacdConvexDecomposition();
+
+	static LLConvexDecomposition* getInstance();
+	static LLCDResult initSystem();
+	static LLCDResult initThread();
+	static LLCDResult quitThread();
+	static LLCDResult quitSystem();
+
+	// Generate a decomposition object handle
+	void genDecomposition( int& decomp );
+	// Delete decomposition object handle
+	void deleteDecomposition( int decomp );
+	// Bind given decomposition handle
+	// Commands operate on currently bound decomposition
+	void bindDecomposition( int decomp );
+
+	// Sets *paramsOut to the address of the LLCDParam array and returns
+	// the length of the array
+	int getParameters( const LLCDParam** paramsOut );
+	int getStages( const LLCDStageData** stagesOut ) ;
+
+	// Set a parameter by name. Returns false if out of bounds or unsupported parameter
+	LLCDResult	setParam( const char* name, float val );
+	LLCDResult	setParam( const char* name, int val );
+	LLCDResult	setParam( const char* name, bool val );
+	LLCDResult	setMeshData( const LLCDMeshData* data, bool vertex_based );
+	LLCDResult	registerCallback( int stage, llcdCallbackFunc callback );
+
+	LLCDResult	executeStage( int stage );
+	LLCDResult	buildSingleHull() ;
+
+	int getNumHullsFromStage( int stage );
+
+	LLCDResult	getHullFromStage( int stage, int hull, LLCDHull* hullOut );
+	LLCDResult  getSingleHull( LLCDHull* hullOut ) ;
+
+	// TODO: Implement lock of some kind to disallow this call if data not yet ready
+	LLCDResult	getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut );
+	LLCDResult	getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut );
+
+	// For visualizing convex hull shapes in the viewer physics shape display
+	LLCDResult generateSingleHullMeshFromMesh( LLCDMeshData* meshIn, LLCDMeshData* meshOut );
+
+	/// Debug
+	void loadMeshData( const char* fileIn, LLCDMeshData** meshDataOut );
+
+	virtual void setTracer( ndConvexDecompositionTracer *);
+
+	virtual bool isFunctional();
+
+private:
+	nd_hacdConvexDecomposition();
+};
+
+#endif

indra/libndhacd/nd_hacdDefines.h

@@ -0,0 +1,46 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ND_HACD_DEFINES_H
+#define ND_HACD_DEFINES_H
+
+#include "hacdHACD.h"
+
+#define NUM_STAGES 1
+
+typedef unsigned short hacdUINT16;
+typedef unsigned int hacdUINT32;
+
+typedef HACD::HACD tHACD;
+typedef HACD::Vec3< double > tVecDbl;
+typedef HACD::Vec3< long > tVecLong;
+
+typedef tVecLong ( *fFromIXX )( void const *&, int );
+
+const int MAX_VERTICES_PER_HULL     = 256;    // see http://wiki.secondlife.com/wiki/Mesh/Mesh_physics
+const int MIN_NUMBER_OF_CLUSTERS    = 1;
+
+int const TO_SINGLE_HULL_TRIES = 10;
+
+// Use a high value so HACD will generate just one hull. For now we use the same concavity for each run.
+int const CONCAVITY_FOR_SINGLE_HULL[  TO_SINGLE_HULL_TRIES ] = { 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000 };
+
+// Max distance to connect CC. Increase this each run.
+double const CONNECT_DISTS[ TO_SINGLE_HULL_TRIES ] = { 30, 60, 120, 240, 480, 960, 1920, 3840, 7680, 10000 };
+
+#endif

indra/libndhacd/nd_hacdStructs.cpp

@@ -0,0 +1,107 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "nd_hacdStructs.h"
+#include "LLConvexDecomposition.h"
+
+void DecompHull::clear()
+{
+	mVertices.clear();
+	mTriangles.clear();
+	mLLVertices.clear();
+	mLLTriangles.clear();
+}
+
+void DecompHull::computeLLVertices()
+{
+	if ( mLLVertices.size()*3 != mVertices.size() )
+	{
+		for ( size_t i = 0; i < mVertices.size(); ++i )
+		{
+			mLLVertices.push_back( static_cast<float>( mVertices[i].X() ) );
+			mLLVertices.push_back( static_cast<float>( mVertices[i].Y() ) );
+			mLLVertices.push_back( static_cast<float>( mVertices[i].Z() ) );
+		}
+	}
+}
+
+void DecompHull::computeLLTriangles()
+{
+	if ( mLLTriangles.size()*3 != mTriangles.size() )
+	{
+		for ( size_t i = 0; i < mTriangles.size(); ++i )
+		{
+			mLLTriangles.push_back( mTriangles[i].X() );
+			mLLTriangles.push_back( mTriangles[i].Y() );
+			mLLTriangles.push_back( mTriangles[i].Z() );
+		}
+	}
+
+}
+
+void DecompHull::toLLHull( LLCDHull *aHull )
+{
+	computeLLVertices();
+
+	aHull->mVertexBase = &mLLVertices[0];
+	aHull->mVertexStrideBytes = sizeof( float ) * 3;
+	aHull->mNumVertices = mVertices.size();
+}
+
+void DecompHull::toLLMesh( LLCDMeshData *aMesh )
+{
+	computeLLVertices();
+	computeLLTriangles();
+
+	aMesh->mIndexType = LLCDMeshData::INT_32;
+	aMesh->mVertexBase = &mLLVertices[0];
+	aMesh->mNumVertices = mVertices.size();
+	aMesh->mVertexStrideBytes = sizeof( float ) * 3;
+
+	aMesh->mIndexBase = &mLLTriangles[0];
+	aMesh->mIndexStrideBytes = sizeof( hacdUINT32 ) * 3;
+	aMesh->mNumTriangles = mTriangles.size();
+}
+
+void DecompData::clear()
+{
+	mHulls.clear();
+}
+
+HACDDecoder::HACDDecoder()
+{
+	mStages.resize( NUM_STAGES );
+	mCallback = 0;
+}
+
+void HACDDecoder::clear()
+{
+	mVertices.clear();
+	mTriangles.clear();
+
+	for ( size_t i = 0;  i < mStages.size(); ++i )
+		mStages[i].clear();
+
+	mSingleHull.clear();
+
+	mCallback = 0;
+}
+
+
+
+

indra/libndhacd/nd_hacdStructs.h

@@ -0,0 +1,77 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ND_HACD_DECOMPSTRUCTS_H
+#define ND_HACD_DECOMPSTRUCTS_H
+
+#include "nd_hacdDefines.h"
+#include "hacdHACD.h"
+#include "LLConvexDecomposition.h"
+#include <vector>
+
+struct LLCDHull;
+struct LLCDMeshData;
+
+struct DecompHull
+{
+	std::vector< tVecDbl > mVertices;
+	std::vector< tVecLong > mTriangles;
+
+	std::vector< float > mLLVertices;
+	std::vector< hacdUINT32 > mLLTriangles;
+
+	void clear();
+
+	void computeLLVertices();
+
+	void computeLLTriangles();
+
+	void toLLHull( LLCDHull *aHull );
+	void toLLMesh( LLCDMeshData *aMesh );
+};
+
+struct DecompData
+{
+	std::vector< DecompHull > mHulls;
+
+	void clear();
+};
+
+struct HACDDecoder: public HACD::ICallback
+{
+	std::vector< tVecDbl > mVertices;
+	std::vector< tVecLong > mTriangles;
+
+	std::vector< DecompData > mStages;
+	DecompHull mSingleHull;
+
+	llcdCallbackFunc mCallback;
+
+	HACDDecoder();
+	void clear();
+
+	virtual void operator()( char const *aMsg, double aProgress, double aConcavity, size_t aVertices)
+	{
+		if( mCallback )
+			(*mCallback)(aMsg, static_cast<int>(aProgress), aVertices );
+	}
+
+};
+
+
+#endif

indra/libndhacd/nd_hacdUtils.cpp

@@ -0,0 +1,183 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "nd_hacdUtils.h"
+
+tHACD* init( int nConcavity, int nClusters, int nMaxVerticesPerHull, double dMaxConnectDist, HACDDecoder *aData )
+{
+	tHACD *pDec = HACD::CreateHACD(0);
+	pDec->SetPoints( &aData->mVertices[0] );
+	pDec->SetNPoints( aData->mVertices.size() );
+
+	if ( aData->mTriangles.size() )
+	{
+		pDec->SetTriangles( &aData->mTriangles[0] );
+		pDec->SetNTriangles( aData->mTriangles.size() );
+	}
+
+	pDec->SetCompacityWeight( 0.1f );
+	pDec->SetVolumeWeight( 0 );
+	pDec->SetNClusters( nClusters );
+	pDec->SetAddExtraDistPoints( true );
+	pDec->SetAddFacesPoints( true );
+	pDec->SetNVerticesPerCH( nMaxVerticesPerHull );
+	pDec->SetConcavity( nConcavity );
+	pDec->SetConnectDist( dMaxConnectDist );
+
+	pDec->SetCallBack( aData );
+
+	return pDec;
+}
+
+DecompData decompose( tHACD *aHACD )
+{
+	aHACD->Compute();
+
+	DecompData oRet;
+
+	int nClusters = aHACD->GetNClusters();
+
+	for ( int i = 0; i < nClusters; ++i )
+	{
+		int nVertices = aHACD->GetNPointsCH( i );
+		int nTriangles = aHACD->GetNTrianglesCH( i );
+		DecompHull oHull;
+
+		oHull.mVertices.resize( nVertices );
+		oHull.mTriangles.resize( nTriangles );
+		aHACD->GetCH( i, &oHull.mVertices[0], &oHull.mTriangles[0] );
+
+		oRet.mHulls.push_back( oHull );
+	}
+
+	return oRet;
+}
+
+tVecLong fromI16( void const *& pPtr, int aStride )
+{
+	hacdUINT16 const *pVal = reinterpret_cast< hacdUINT16 const * >( pPtr );
+	tVecLong oRet( pVal[0], pVal[1], pVal[2] );
+	pVal += aStride / 2;
+	pPtr = pVal;
+	return oRet;
+}
+
+tVecLong fromI32( void const *& pPtr, int aStride )
+{
+	hacdUINT32 const *pVal = reinterpret_cast< hacdUINT32 const * >( pPtr );
+	tVecLong oRet( pVal[0], pVal[1], pVal[2] );
+	pVal += aStride / 4;
+	pPtr = pVal;
+	return oRet;
+}
+
+LLCDResult setMeshData( const LLCDMeshData* data, bool vertex_based, HACDDecoder *aDec )
+{
+	if ( !data || !data->mVertexBase || ( data->mNumVertices < 3 ) || ( data->mVertexStrideBytes != 12 && data->mVertexStrideBytes != 16 ) )
+		return LLCD_INVALID_MESH_DATA;
+
+	if ( !vertex_based && ( ( data->mNumTriangles < 1 ) || ! data->mIndexBase ) )
+		return LLCD_INVALID_MESH_DATA;
+
+	aDec->clear();
+	int nCount = data->mNumVertices;
+	float const* pVertex = data->mVertexBase;
+	int nStride = data->mVertexStrideBytes / sizeof( float );
+
+	for ( int i = 0; i < nCount; ++i )
+	{
+		tVecDbl oPt( pVertex[0], pVertex[1], pVertex[2] );
+		aDec->mVertices.push_back( oPt );
+		pVertex += nStride;
+	}
+
+	if ( !vertex_based )
+	{
+		fFromIXX pFunc = 0;
+		nCount = data->mNumTriangles;
+		nStride = data->mIndexStrideBytes;
+		void const *pData = data->mIndexBase;
+
+		if ( data->mIndexType == LLCDMeshData::INT_16 )
+			pFunc = fromI16;
+		else
+			pFunc = fromI32;
+
+		for ( int i = 0; i < nCount; ++i )
+		{
+			tVecLong oVal( ( *pFunc )( pData, nStride ) );
+			aDec->mTriangles.push_back( oVal );
+		}
+	}
+
+	return LLCD_OK;
+}
+
+LLCDResult convertHullToMesh( const LLCDHull* aHull, std::vector< float > &aVerticesOut, std::vector< int > &aTrianglesOut )
+{
+	if( !aHull || !aHull->mVertexBase )
+		return LLCD_NULL_PTR;
+	if( aHull->mVertexStrideBytes < 3*sizeof(float) || aHull->mNumVertices < 3 )
+		return LLCD_INVALID_HULL_DATA;
+
+	HACD::ICHull oHull;
+
+	int nCount = aHull->mNumVertices;
+	float const *pVertex = aHull->mVertexBase;
+	int nStride = aHull->mVertexStrideBytes / sizeof( float );
+
+	std::vector< tVecDbl > vcPoints;
+
+	for ( int i = 0; i < nCount; ++i )
+	{
+		vcPoints.push_back( tVecDbl( pVertex[0], pVertex[1], pVertex[2] ) ); 
+		pVertex += nStride;
+	}
+
+	oHull.AddPoints( &vcPoints[0], vcPoints.size() );
+
+	HACD::ICHullError eErr = oHull.Process( MAX_VERTICES_PER_HULL );
+	if( HACD::ICHullErrorOK != eErr )
+		return LLCD_INVALID_HULL_DATA;
+
+	HACD::TMMesh &oMesh = oHull.GetMesh();
+
+	std::vector< tVecDbl > vPoints;
+	std::vector< tVecLong > vTriangles;
+
+	vPoints.resize( oMesh.GetNVertices() );
+	vTriangles.resize( oMesh.GetNTriangles() );
+
+	oMesh.GetIFS( &vPoints[0], &vTriangles[0] );
+
+	for( size_t i = 0; i < vPoints.size(); ++i )
+	{
+		aVerticesOut.push_back( static_cast<float>( vPoints[i].X() ) );
+		aVerticesOut.push_back( static_cast<float>( vPoints[i].Y() ) );
+		aVerticesOut.push_back( static_cast<float>( vPoints[i].Z() ) );
+	}
+
+	for( size_t i = 0; i < vTriangles.size(); ++i )
+	{
+		aTrianglesOut.push_back( vTriangles[i].X() );
+		aTrianglesOut.push_back( vTriangles[i].Y() );
+		aTrianglesOut.push_back( vTriangles[i].Z() );
+	}
+
+	return LLCD_OK;
+}

indra/libndhacd/nd_hacdUtils.h

@@ -0,0 +1,34 @@
+/**
+ * copyright 2011 sl.nicky.ml@googlemail.com
+ *
+ * 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;
+ * version 2.1 of the License only.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ND_HACD_UTILS_H
+#define ND_HACD_UTILS_H
+
+#include "nd_hacdStructs.h"
+#include "LLConvexDecomposition.h"
+
+tHACD* init( int nConcavity, int nClusters, int nMaxVerticesPerHull, double dMaxConnectDist, HACDDecoder *aData );
+DecompData decompose( tHACD *aHACD );
+
+tVecLong fromI16( void *& pPtr, int aStride );
+tVecLong fromI32( void *& pPtr, int aStride );
+
+LLCDResult setMeshData( const LLCDMeshData* data, bool vertex_based, HACDDecoder *aDec );
+LLCDResult convertHullToMesh( const LLCDHull* aHull, std::vector< float > &aVerticesOut, std::vector< int > &aTrianglesOut );
+
+#endif

indra/libndhacd/windowsincludes.h

@@ -0,0 +1,59 @@
+/** 
+ * @file windowsincludes.h
+ * @brief includes that need to be involved in the windows version of llconvexdecompositionstub
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * 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;
+ * version 2.1 of the License only.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER				// Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
+#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
+#endif						
+
+#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
+#endif
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <windows.h>
+
+
+
+// TODO: reference additional headers your program requires here

indra/libopenjpeg/CMakeLists.txt

@@ -7,14 +7,15 @@ include(00-Common)
 
 # OPENJPEG version number, useful for packaging and doxygen doc:
 set(OPENJPEG_VERSION_MAJOR 1)
-set(OPENJPEG_VERSION_MINOR 4)
-set(OPENJPEG_VERSION_BUILD 0)
+set(OPENJPEG_VERSION_MINOR 5)
+set(OPENJPEG_VERSION_BUILD 2)
 set(OPENJPEG_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
 
 set(openjpeg_SOURCE_FILES
     bio.c
     cio.c
+    cidx_manager.c
     dwt.c
     event.c
     image.c
@@ -26,20 +27,26 @@ set(openjpeg_SOURCE_FILES
     mqc.c
     openjpeg.c
     pi.c
+    phix_manager.c
+    ppix_manager.c
     raw.c
     t1.c
     t2.c
     tcd.c
     tgt.c
+    thix_manager.c
+    tpix_manager.c
 )
 
 set(openjpeg_HEADER_FILES
     bio.h
     cio.h
+    cidx_manager.h
     dwt.h
-    event.h 
+    event.h
     fix.h
     image.h
+    indexbox_manager.h
     int.h
     j2k.h
     j2k_lib.h
@@ -48,6 +55,7 @@ set(openjpeg_HEADER_FILES
     mct.h
     mqc.h
     openjpeg.h
+    opj_config.h
     opj_includes.h
     opj_malloc.h
     pi.h

indra/libopenjpeg/cidx_manager.c

@@ -0,0 +1,211 @@
+/*
+ * $Id: cidx_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+
+/* 
+ * Write CPTR Codestream finder box
+ *
+ * @param[in] coff offset of j2k codestream
+ * @param[in] clen length of j2k codestream
+ * @param[in] cio  file output handle
+ */
+void write_cptr(int coff, int clen, opj_cio_t *cio);
+
+
+/* 
+ * Write main header index table (box)
+ *
+ * @param[in] coff offset of j2k codestream
+ * @param[in] cstr_info codestream information
+ * @param[in] cio  file output handle
+ * @return         length of mainmhix box
+ */
+int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
+
+
+/* 
+ * Check if EPH option is used
+ *
+ * @param[in] coff    offset of j2k codestream
+ * @param[in] markers marker information
+ * @param[in] marknum number of markers
+ * @param[in] cio     file output handle
+ * @return            true if EPH is used
+ */
+opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio);
+
+
+int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen)
+{
+  int len, i, lenp;
+  opj_jp2_box_t *box;
+  int num_box = 0;
+  opj_bool  EPHused;
+  (void)image; /* unused ? */
+
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
+
+  for (i=0;i<2;i++){
+  
+    if(i)
+      cio_seek( cio, lenp);
+
+    lenp = cio_tell( cio);
+
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_CIDX, 4);  /* CIDX           */
+    write_cptr( offset, cstr_info.codestream_size, cio);
+
+    write_manf( i, num_box, box, cio);
+    
+    num_box = 0;
+    box[num_box].length = write_mainmhix( offset, cstr_info, cio);
+    box[num_box].type = JPIP_MHIX;
+    num_box++;
+
+    box[num_box].length = write_tpix( offset, cstr_info, j2klen, cio);
+    box[num_box].type = JPIP_TPIX;
+    num_box++;
+      
+    box[num_box].length = write_thix( offset, cstr_info, cio);
+    box[num_box].type = JPIP_THIX;
+    num_box++;
+
+    EPHused = check_EPHuse( offset, cstr_info.marker, cstr_info.marknum, cio);
+      
+    box[num_box].length = write_ppix( offset, cstr_info, EPHused, j2klen, cio);
+    box[num_box].type = JPIP_PPIX;
+    num_box++;
+    
+    box[num_box].length = write_phix( offset, cstr_info, EPHused, j2klen, cio);
+    box[num_box].type = JPIP_PHIX;
+    num_box++;
+      
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L             */
+    cio_seek( cio, lenp+len);
+  }
+
+  opj_free( box);
+  
+  return len;
+}
+
+void write_cptr(int coff, int clen, opj_cio_t *cio)
+{
+  int len, lenp;
+
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);               /* L [at the end]     */
+  cio_write( cio, JPIP_CPTR, 4);   /* T                  */
+  cio_write( cio, 0, 2);           /* DR  A PRECISER !!  */
+  cio_write( cio, 0, 2);           /* CONT               */
+  cio_write( cio, coff, 8);    /* COFF A PRECISER !! */
+  cio_write( cio, clen, 8);    /* CLEN               */
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);         /* L                  */
+  cio_seek( cio, lenp+len);
+}
+
+void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio)
+{
+  int len, lenp, i;
+  
+  lenp = cio_tell( cio); 
+  cio_skip( cio, 4);                         /* L [at the end]                    */
+  cio_write( cio, JPIP_MANF,4);              /* T                                 */
+
+  if (second){                          /* Write only during the second pass */
+    for( i=0; i<v; i++){
+      cio_write( cio, box[i].length, 4);  /* Box length                     */ 
+      cio_write( cio, box[i].type, 4); /* Box type                       */
+    }
+  }
+
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);                   /* L                                 */
+  cio_seek( cio, lenp+len);
+}
+
+int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
+{
+  int i;
+  int len, lenp;
+  
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);                               /* L [at the end]                    */
+  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
+
+  cio_write( cio, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
+
+  for(i = 1; i < cstr_info.marknum; i++){    /* Marker restricted to 1 apparition, skip SOC marker */
+    cio_write( cio, cstr_info.marker[i].type, 2);
+    cio_write( cio, 0, 2);
+    cio_write( cio, cstr_info.marker[i].pos-coff, 8);
+    cio_write( cio, cstr_info.marker[i].len, 2);
+  }
+
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L           */
+  cio_seek( cio, lenp+len);
+  
+  return len;
+}
+
+opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio)
+{
+  opj_bool EPHused = OPJ_FALSE;
+  int i=0;
+  int org_pos;
+  unsigned int Scod;
+
+  for(i = 0; i < marknum; i++){
+    if( markers[i].type == J2K_MS_COD){
+      org_pos = cio_tell( cio);
+      cio_seek( cio, coff+markers[i].pos+2);
+      
+      Scod = cio_read( cio, 1);
+      if( ((Scod >> 2) & 1))
+	EPHused = OPJ_TRUE;
+      cio_seek( cio, org_pos);
+
+      break;
+    }
+  }    
+  return EPHused;
+}

indra/libopenjpeg/cidx_manager.h

@@ -0,0 +1,56 @@
+/*
+ * $Id: cidx_manager.h 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.h from 2KAN indexer
+ */
+
+
+#ifndef  CIDX_MANAGER_H_
+# define CIDX_MANAGER_H_
+
+#include "openjpeg.h"
+
+
+/* 
+ * Write Codestream index box (superbox)
+ *
+ * @param[in] offset    offset of j2k codestream
+ * @param[in] cio       file output handle
+ * @param[in] image     image data
+ * @param[in] cstr_info codestream information
+ * @param[in] j2klen    length of j2k codestream
+ * @return              length of cidx box
+ */
+int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen);
+
+
+#endif      /* !CIDX_MANAGER_H_ */

indra/libopenjpeg/cio.c

@@ -126,13 +126,13 @@ unsigned char *cio_getbp(opj_cio_t *cio) {
 /*
  * Write a byte.
  */
-bool cio_byteout(opj_cio_t *cio, unsigned char v) {
+opj_bool cio_byteout(opj_cio_t *cio, unsigned char v) {
 	if (cio->bp >= cio->end) {
 		opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
-		return false;
+		return OPJ_FALSE;
 	}
 	*cio->bp++ = v;
-	return true;
+	return OPJ_TRUE;
 }
 
 /*
@@ -152,7 +152,7 @@ unsigned char cio_bytein(opj_cio_t *cio) {
  * v : value to write
  * n : number of bytes to write
  */
-unsigned int cio_write(opj_cio_t *cio, unsigned int v, int n) {
+unsigned int cio_write(opj_cio_t *cio, unsigned int64 v, int n) {
 	int i;
 	for (i = n - 1; i >= 0; i--) {
 		if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )

indra/libopenjpeg/cio.h

@@ -31,6 +31,13 @@
 
 #ifndef __CIO_H
 #define __CIO_H
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define int64 __int64
+#else
+#define int64 long long
+#endif
+
 /**
 @file cio.h
 @brief Implementation of a byte input-output process (CIO)
@@ -63,7 +70,7 @@ Write some bytes
 @param n Number of bytes to write
 @return Returns the number of bytes written or 0 if an error occured
 */
-unsigned int cio_write(opj_cio_t *cio, unsigned int v, int n);
+unsigned int cio_write(opj_cio_t *cio, unsigned int64 v, int n);
 /**
 Read some bytes
 @param cio CIO handle