Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-28 19:29:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix warnings in overlays

Browse source
This commit is contained in:
ZappoMan 2014-11-15 20:24:00 -08:00
parent 59c13f3c38
commit b511f868d5
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/ui/overlays/BillboardOverlay.cpp
View file

@ -26,12 +26,14 @@ BillboardOverlay::BillboardOverlay() :
BillboardOverlay::BillboardOverlay(const BillboardOverlay* billboardOverlay) : BillboardOverlay::BillboardOverlay(const BillboardOverlay* billboardOverlay) :
Base3DOverlay(billboardOverlay), Base3DOverlay(billboardOverlay),
_newTextureNeeded(true),
_scale(billboardOverlay->_scale),
_isFacingAvatar(billboardOverlay->_isFacingAvatar),
_fromImage(billboardOverlay->_fromImage),
_url(billboardOverlay->_url), _url(billboardOverlay->_url),
_billboard(billboardOverlay->_billboard) _billboard(billboardOverlay->_billboard),
_size(),
_billboardTexture(),
_newTextureNeeded(true),
_fromImage(billboardOverlay->_fromImage),
_scale(billboardOverlay->_scale),
_isFacingAvatar(billboardOverlay->_isFacingAvatar)
{ {
} }

11
interface/src/ui/overlays/ImageOverlay.cpp
View file

@ -29,12 +29,13 @@ ImageOverlay::ImageOverlay() :
ImageOverlay::ImageOverlay(const ImageOverlay* imageOverlay) : ImageOverlay::ImageOverlay(const ImageOverlay* imageOverlay) :
Overlay2D(imageOverlay), Overlay2D(imageOverlay),
_textureID(0),
_textureBound(false),
_wantClipFromImage(false),
_renderImage(imageOverlay->_renderImage),
_imageURL(imageOverlay->_imageURL), _imageURL(imageOverlay->_imageURL),
_textureImage(imageOverlay->_textureImage) _textureImage(imageOverlay->_textureImage),
_textureID(0),
_fromImage(),
_renderImage(imageOverlay->_renderImage),
_textureBound(false),
_wantClipFromImage(false)
{ {
} }

6
interface/src/ui/overlays/ModelOverlay.cpp
View file

@ -26,10 +26,10 @@ ModelOverlay::ModelOverlay(const ModelOverlay* modelOverlay) :
Base3DOverlay(modelOverlay), Base3DOverlay(modelOverlay),
_model(), _model(),
_modelTextures(QVariantMap()), _modelTextures(QVariantMap()),
_scale(modelOverlay->_scale),
_updateModel(false),
_url(modelOverlay->_url), _url(modelOverlay->_url),
_rotation(modelOverlay->_rotation) _rotation(modelOverlay->_rotation),
_scale(modelOverlay->_scale),
_updateModel(false)
{ {
_model.init(); _model.init();
if (_url.isValid()) { if (_url.isValid()) {

18
interface/src/ui/overlays/Overlay.cpp
View file

@ -41,20 +41,22 @@ Overlay::Overlay() :
Overlay::Overlay(const Overlay* overlay) : Overlay::Overlay(const Overlay* overlay) :
_parent(NULL), _parent(NULL),
_isLoaded(overlay->_isLoaded),
_alpha(overlay->_alpha), _alpha(overlay->_alpha),
_lastPulseUpdate(usecTimestampNow()),
_alphaPulse(overlay->_alphaPulse),
_anchor(overlay->_anchor),
_color(overlay->_color),
_colorPulse(overlay->_colorPulse),
_glowLevel(overlay->_glowLevel), _glowLevel(overlay->_glowLevel),
_glowLevelPulse(overlay->_glowLevelPulse), _pulse(overlay->_pulse),
_pulseDirection(overlay->_pulseDirection),
_pulseMax(overlay->_pulseMax), _pulseMax(overlay->_pulseMax),
_pulseMin(overlay->_pulseMin), _pulseMin(overlay->_pulseMin),
_pulsePeriod(overlay->_pulsePeriod), _pulsePeriod(overlay->_pulsePeriod),
_pulseDirection(overlay->_pulseDirection),
_lastPulseUpdate(usecTimestampNow()),
_glowLevelPulse(overlay->_glowLevelPulse),
_alphaPulse(overlay->_alphaPulse),
_colorPulse(overlay->_colorPulse),
_color(overlay->_color),
_visible(overlay->_visible), _visible(overlay->_visible),
_isLoaded(overlay->_isLoaded) _anchor(overlay->_anchor),
_scriptEngine(NULL)
{ {
} }