# | Line 236 | Line 236 | namespace oopse { | |
---|---|---|
236 | } | |
237 | ||
238 | void SelectionEvaluator::compareProperty(StuntDouble* sd, OOPSEBitSet& bs, int property, int comparator, float comparisonValue) { | |
239 | < | double propertyValue = 0.0; |
239 | > | RealType propertyValue = 0.0; |
240 | switch (property) { | |
241 | case Token::mass: | |
242 | propertyValue = sd->getMass(); | |
# | Line 254 | Line 254 | namespace oopse { | |
254 | } | |
255 | } | |
256 | break; | |
257 | + | case Token::x: |
258 | + | propertyValue = sd->getPos().x(); |
259 | + | break; |
260 | + | case Token::y: |
261 | + | propertyValue = sd->getPos().y(); |
262 | + | break; |
263 | + | case Token::z: |
264 | + | propertyValue = sd->getPos().z(); |
265 | + | break; |
266 | default: | |
267 | unrecognizedAtomProperty(property); | |
268 | } | |
# | Line 422 | Line 431 | namespace oopse { | |
431 | } | |
432 | ||
433 | ||
434 | < | double SelectionEvaluator::getCharge(Atom* atom) { |
435 | < | double charge =0.0; |
434 | > | RealType SelectionEvaluator::getCharge(Atom* atom) { |
435 | > | RealType charge =0.0; |
436 | AtomType* atomType = atom->getAtomType(); | |
437 | if (atomType->isCharge()) { | |
438 | GenericData* data = atomType->getPropertyByName("Charge"); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |