Changeset 972 for cpp/frams/vm


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/vm/classes/genoobj.cpp

    r955 r972  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    6464void GenoObj::get_autoname(ExtValue *ret)
    6565{
    66         Model m(*this);
     66        Model m(*this, Model::SHAPE_UNKNOWN);
    6767        ret->setString(AutoName::makeName(m));
    6868}
     
    9797void GenoObj::get_f0genotype(ExtValue *ret)
    9898{
    99         ret->setString(getConverted('0').getGenes());
     99        ret->setString(getConverted(Geno::F0_FORMAT_LIST).getGenes());
    100100}
    101101
     
    105105        {
    106106                char ch = v.getInt();
    107                 return SString(&ch,1);
     107                return SString(&ch, 1);
    108108        }
    109109        if (v.getType() == TString)
     
    144144#ifdef __CODEGUARD__
    145145        static GenoObj static_genoobj;
    146         static Param static_genoparam(geno_paramtab,&static_genoobj);
     146        static Param static_genoparam(geno_paramtab, &static_genoobj);
    147147#else
    148148        static Param static_genoparam(geno_paramtab);
Note: See TracChangeset for help on using the changeset viewer.