Changeset 972 for cpp/frams/_demos/shapeconvert.cpp

Timestamp:

07/03/20 00:32:23 (4 years ago)

Author:

Maciej Komosinski

Message:

• separate "0" and "0s" formats (for SHAPE_BALL_AND_STICK and SHAPE_SOLIDS, respectively)
• converting to format list (Geno::F0_FORMAT_LIST = "0,0s")
• (optional) declaring Model as SHAPE_BALL_AND_STICK or SHAPE_SOLIDS (or SHAPE_UNKNOWN)

File:

• cpp/frams/_demos/shapeconvert.cpp (modified) (4 diffs)

cpp/frams/_demos/shapeconvert.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -46 +46 @@
                 if (ar[0] == '-')
                         switch (ar[1])
-                {
+                        {
                         case 's': shape = (Part::Shape)atol(ar + 2);
                                 if ((shape != Part::SHAPE_ELLIPSOID) && (shape != Part::SHAPE_CUBOID) && (shape != Part::SHAPE_CYLINDER))
@@ -56 +56 @@
                         case 't': thickness = atof(ar + 2); break;
                         case 'h': puts("Usage: shapeconvert [-sSHAPE] [-tTHICKNESS] [genotype_or_stdin]\n\tSHAPE: 1=ellipsoid, 2=cuboid, 3(default)=cylinder\n\tTHICKNESS: used for Part.sy/sz (default=0.2)"); break;
-                }
+                        }
                 else
                         if (!gen_arg)
@@ -67 +67 @@
                 loadSString(VirtFILE::Vstdin, gen);
         Geno g(gen);
-        Model m(g);
+        Model m(g, Model::SHAPE_UNKNOWN);
 
         if (!m.isValid())