Updated ib-compress.

3rdparty/ib-compress/indexbuffercompression.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -788,7 +788,7 @@ void CompressIndexBuffer( const Ty* triangles,
         CompressTriangleCodes1<Ty>( triangles, triangleCount, vertexRemap, vertexCount, output );
         break;
 
-    case ICBF_AUTO:
+    case IBCF_AUTO:
 
         if ( ContainsDegenerates( triangles, triangleCount ) )
         {

3rdparty/ib-compress/indexbuffercompression.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

3rdparty/ib-compress/indexbuffercompressionformat.h

@@ -1,3 +1,27 @@
+/*
+Copyright (c) 2014-2015, Conor Stokes
+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.
+*/
 #ifndef INDEX_BUFFER_COMPRESSION_FORMAT_H__
 #define INDEX_BUFFER_COMPRESSION_FORMAT_H__
 #pragma once
@@ -12,7 +36,7 @@ enum IndexBufferCompressionFormat
 
     // Automatically pick the best encoding dependent on whether degenerate triangles are detected in the mesh.
     // Will take longer to compress (due to the degenerate triangle check).
-    ICBF_AUTO = 2
+    IBCF_AUTO = 2
 };
 
 #endif // -- INDEX_BUFFER_COMPRESSION_FORMAT_H__

3rdparty/ib-compress/indexbufferdecompression.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -465,7 +465,7 @@ void DecompressIndexBuffer( Ty* triangles, uint32_t triangleCount, ReadBitstream
         DecompressTriangleCodes1<Ty>( triangles, triangleCount, input );
         break;
 
-    default: // ICBF_AUTO:
+    default: // IBCF_AUTO:
         break;
     }
 }

3rdparty/ib-compress/indexbufferdecompression.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

3rdparty/ib-compress/indexcompressionconstants.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

3rdparty/ib-compress/readbitstream.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

3rdparty/ib-compress/writebitstream.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014, Conor Stokes
+Copyright (c) 2014-2015, Conor Stokes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

tools/geometryc/geometryc.cpp

@@ -142,7 +142,7 @@ void triangleCompress(bx::WriterI* _writer, uint16_t* _indices, uint32_t _numInd
 	uint32_t* vertexRemap = (uint32_t*)malloc(_numVertices*sizeof(uint32_t) );
 
 	WriteBitstream writer;
-	CompressIndexBuffer(_indices, _numIndices/3, vertexRemap, _numVertices, ICBF_AUTO, writer);
+	CompressIndexBuffer(_indices, _numIndices/3, vertexRemap, _numVertices, IBCF_AUTO, writer);
 	writer.Finish();
 	printf( "uncompressed: %10d, compressed: %10d, ratio: %0.2f%%\n"
 		, _numIndices*2