copy edit;

1 files changed, 9 insertions, 1 deletions

diff --git a/megapixels/commands/misc/obj2ply.py b/megapixels/commands/misc/obj2ply.py
index 8d0cec60..61fdefbd 100644
--- a/megapixels/commands/misc/obj2ply.py
+++ b/megapixels/commands/misc/obj2ply.py
@@ -10,10 +10,12 @@ import click
 @click.option('-c', '--float_colors/--int_colors', 'float_colors', default=False, help='pass if RGB colors are floats, not ints, in the obj')
 @click.option('-u', '--unwind/--wind', 'unwind', default=False, help='pass to reverse winding order on faces (if surface normals are upside down)')
 @click.option('-y', '--flip_y/--no_flip_y', 'flip_y', default=False, help='flip Y axis')
+@click.option('-z', '--flip_z/--no_flip_z', 'flip_z', default=False, help='flip Z axis')
+@click.option('-s', '--swap_xy/--no_swap_xy', 'swap_xy', default=False, help='swap axes so things rotate correctly')
 @click.option('-i', '--input_fn', required=True, help='input OBJ filename')
 @click.option('-o', '--output_fn', help='output PLY filename')
 @click.pass_context
-def cli(ctx, float_colors, unwind, flip_y, input_fn, output_fn):
+def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, input_fn, output_fn):
   """
   click command for converting OBJ to PLY  
   """
@@ -44,6 +46,12 @@ def cli(ctx, float_colors, unwind, flip_y, input_fn, output_fn):
       if N[0] == 'v':
         if flip_y:
           N[2] = str(float(N[2]) * -1)
+        if swap_xy:
+          tmp = N[2]
+          N[2] = N[1]
+          N[1] = tmp
+        if flip_z:
+          N[2] = str(float(N[2]) * -1)
         if float_colors:
           vertexes.append([
             N[1],