From 942032688d86240ff6a7f6e2922e4c1d938938e1 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 11 Nov 2017 19:14:26 -1000 Subject: [PATCH] MAPA generation fix --- hecl/blender/hecl/mapa.py | 11 ++--------- hecl/extern/boo | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/hecl/blender/hecl/mapa.py b/hecl/blender/hecl/mapa.py index 0929f6e54..955441946 100644 --- a/hecl/blender/hecl/mapa.py +++ b/hecl/blender/hecl/mapa.py @@ -44,7 +44,7 @@ def cook(writebuf, mesh_obj): # Create map surfaces and borders island_faces = list(bm_master.faces) - prev_loop_emit = None + #prev_loop_emit = None out_count = 0 loop_ranges = [] loop_iter = 0 @@ -91,15 +91,8 @@ def cook(writebuf, mesh_obj): loop_set = set() edge_set = set() loop_count = len(max_sl) - if prev_loop_emit: - vert_pool.loop_out_map(writebuf, prev_loop_emit) - vert_pool.loop_out_map(writebuf, max_sl[0]) - loop_count += 2 - loop_set.add(prev_loop_emit) - loop_set.add(max_sl[0]) for loop in max_sl: vert_pool.loop_out_map(writebuf, loop) - prev_loop_emit = loop loop_set.add(loop) for edge in loop.face.edges: if edge.seam: @@ -146,7 +139,7 @@ def cook(writebuf, mesh_obj): norm_avg.normalize() loop_ranges.append((loop_iter, loop_count, edge_ranges, pos_avg, norm_avg)) - loop_iter += loop_count + edge_count + loop_iter = edge_iter # No more surfaces writebuf(struct.pack('B', 0)) diff --git a/hecl/extern/boo b/hecl/extern/boo index 165314b81..420dcee55 160000 --- a/hecl/extern/boo +++ b/hecl/extern/boo @@ -1 +1 @@ -Subproject commit 165314b81794237f7a3bed10c1baafb2fc2ed9f1 +Subproject commit 420dcee55234c718f757cb6370bbef4779bc4470