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

This commit is contained in:
samcake 2018-05-25 10:30:45 -07:00
commit 051776ab1d
7 changed files with 14 additions and 32 deletions

View file

@ -46,6 +46,13 @@ bool Billboard3DOverlay::applyTransformTo(Transform& transform, bool force) {
return transformChanged; return transformChanged;
} }
void Billboard3DOverlay::update(float duration) {
if (isFacingAvatar()) {
_renderVariableDirty = true;
}
Parent::update(duration);
}
Transform Billboard3DOverlay::evalRenderTransform() { Transform Billboard3DOverlay::evalRenderTransform() {
Transform transform = getTransform(); Transform transform = getTransform();
bool transformChanged = applyTransformTo(transform, true); bool transformChanged = applyTransformTo(transform, true);

View file

@ -18,6 +18,7 @@
class Billboard3DOverlay : public Planar3DOverlay, public PanelAttachable, public Billboardable { class Billboard3DOverlay : public Planar3DOverlay, public PanelAttachable, public Billboardable {
Q_OBJECT Q_OBJECT
using Parent = Planar3DOverlay;
public: public:
Billboard3DOverlay() {} Billboard3DOverlay() {}
@ -26,6 +27,8 @@ public:
void setProperties(const QVariantMap& properties) override; void setProperties(const QVariantMap& properties) override;
QVariant getProperty(const QString& property) override; QVariant getProperty(const QString& property) override;
void update(float duration) override;
protected: protected:
virtual bool applyTransformTo(Transform& transform, bool force = false) override; virtual bool applyTransformTo(Transform& transform, bool force = false) override;

View file

@ -51,11 +51,6 @@ void Image3DOverlay::update(float deltatime) {
_texture = DependencyManager::get<TextureCache>()->getTexture(_url); _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
_textureIsLoaded = false; _textureIsLoaded = false;
} }
if (usecTimestampNow() > _transformExpiry) {
Transform transform = getTransform();
applyTransformTo(transform);
setTransform(transform);
}
Parent::update(deltatime); Parent::update(deltatime);
} }

View file

@ -83,15 +83,6 @@ xColor Text3DOverlay::getBackgroundColor() {
return result; return result;
} }
void Text3DOverlay::update(float deltatime) {
if (usecTimestampNow() > _transformExpiry) {
Transform transform = getTransform();
applyTransformTo(transform);
setTransform(transform);
}
Parent::update(deltatime);
}
void Text3DOverlay::render(RenderArgs* args) { void Text3DOverlay::render(RenderArgs* args) {
if (!_renderVisible || !getParentVisible()) { if (!_renderVisible || !getParentVisible()) {
return; // do nothing if we're not visible return; // do nothing if we're not visible
@ -306,13 +297,4 @@ QSizeF Text3DOverlay::textSize(const QString& text) const {
float pointToWorldScale = (maxHeight / FIXED_FONT_SCALING_RATIO) * _lineHeight; float pointToWorldScale = (maxHeight / FIXED_FONT_SCALING_RATIO) * _lineHeight;
return QSizeF(extents.x, extents.y) * pointToWorldScale; return QSizeF(extents.x, extents.y) * pointToWorldScale;
} }
bool Text3DOverlay::findRayIntersection(const glm::vec3 &origin, const glm::vec3 &direction, float &distance,
BoxFace &face, glm::vec3& surfaceNormal) {
Transform transform = getTransform();
applyTransformTo(transform, true);
setTransform(transform);
return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal);
}

View file

@ -30,8 +30,6 @@ public:
~Text3DOverlay(); ~Text3DOverlay();
virtual void render(RenderArgs* args) override; virtual void render(RenderArgs* args) override;
virtual void update(float deltatime) override;
virtual const render::ShapeKey getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;
// getters // getters
@ -60,9 +58,6 @@ public:
QSizeF textSize(const QString& test) const; // Meters QSizeF textSize(const QString& test) const; // Meters
virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance,
BoxFace& face, glm::vec3& surfaceNormal) override;
virtual Text3DOverlay* createClone() const override; virtual Text3DOverlay* createClone() const override;
private: private:

View file

@ -1174,7 +1174,7 @@ bool GLTFReader::addArrayOfType(const QByteArray& bin, int byteOffset, int byteL
break; break;
} }
case GLTFAccessorComponentType::UNSIGNED_INT: { case GLTFAccessorComponentType::UNSIGNED_INT: {
readArray<quint8>(bin, byteOffset, byteLength, outarray, accessorType); readArray<quint32>(bin, byteOffset, byteLength, outarray, accessorType);
break; break;
} }
case GLTFAccessorComponentType::UNSIGNED_SHORT: { case GLTFAccessorComponentType::UNSIGNED_SHORT: {

View file

@ -190,7 +190,7 @@ namespace GLTFBufferViewTarget {
struct GLTFBufferView { struct GLTFBufferView {
int buffer; //required int buffer; //required
int byteLength; //required int byteLength; //required
int byteOffset; int byteOffset { 0 };
int target; int target;
QMap<QString, bool> defined; QMap<QString, bool> defined;
void dump() { void dump() {
@ -470,7 +470,7 @@ namespace GLTFAccessorComponentType {
} }
struct GLTFAccessor { struct GLTFAccessor {
int bufferView; int bufferView;
int byteOffset; int byteOffset { 0 };
int componentType; //required int componentType; //required
int count; //required int count; //required
int type; //required int type; //required