From acf77a9d31acb069fb8cdc4c030688f79986b785 Mon Sep 17 00:00:00 2001 From: yvt Date: Sat, 7 Sep 2013 23:47:04 +0900 Subject: [PATCH] Bitmap atlas generation fix (solves GLOptimizedVoxelModel's texturing bug) --- Sources/binpack2d/binpack2d.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Sources/binpack2d/binpack2d.hpp b/Sources/binpack2d/binpack2d.hpp index 50d62977..7f96deed 100644 --- a/Sources/binpack2d/binpack2d.hpp +++ b/Sources/binpack2d/binpack2d.hpp @@ -23,9 +23,6 @@ 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. */ - - - /** * BinPack2D is a 2 dimensional, multi-bin, bin-packer. ( Texture Atlas Array! ) * It supports an arbitrary number of bins, at arbitrary sizes. @@ -361,6 +358,8 @@ public: } } + return false; // yvt: BitmapAtlasGenerator doesn't support rotated contents. + // EXPERIMENTAL - TRY ROTATED? content.Rotate(); for( Coord::List::iterator itor = topLefts.begin(); itor != topLefts.end(); itor++ ) {