Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 20:35:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-05-25 15:01:15 -07:00
commit 84f541285f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/ShapeEntityItem.cpp
View file

@ -155,13 +155,13 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
bool successPropertyFits = true; bool successPropertyFits = true;
APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape())); APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor()); APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
APPEND_ENTITY_PROPERTY(PROP_COLOR, getAlpha()); APPEND_ENTITY_PROPERTY(PROP_ALPHA, getAlpha());
} }
// This value specifes how the shape should be treated by physics calculations. // This value specifes how the shape should be treated by physics calculations.
// For now, all polys will act as spheres // For now, all polys will act as spheres
ShapeType ShapeEntityItem::getShapeType() const { ShapeType ShapeEntityItem::getShapeType() const {
return SHAPE_TYPE_ELLIPSOID; return (_shape == entity::Shape::Cube) ? SHAPE_TYPE_BOX : SHAPE_TYPE_SPHERE;
} }
void ShapeEntityItem::setColor(const rgbColor& value) { void ShapeEntityItem::setColor(const rgbColor& value) {