Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 13:25:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

filled in the rest of the properties

Browse source
This commit is contained in:
Thijs Wenker 2014-11-06 00:34:59 +01:00
parent 709ad84933
commit d3d80d3fe2
8 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,4 +327,15 @@ Circle3DOverlay* Circle3DOverlay::createClone() {
void Circle3DOverlay::writeToClone(Circle3DOverlay* clone) {
Planar3DOverlay::writeToClone(clone);
clone->setStartAt(getStartAt());
clone->setEndAt(getEndAt());
clone->setOuterRadius(getOuterRadius());
clone->setInnerRadius(getInnerRadius());
clone->setHasTickMarks(getHasTickMarks());
clone->setMajorTickMarksAngle(getMajorTickMarksAngle());
clone->setMinorTickMarksAngle(getMinorTickMarksAngle());
clone->setMajorTickMarksLength(getMajorTickMarksLength());
clone->setMinorTickMarksLength(getMinorTickMarksLength());
clone->setMajorTickMarksColor(getMajorTickMarksColor());
clone->setMinorTickMarksColor(getMinorTickMarksColor());
}

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

@ -160,6 +160,6 @@ ImageOverlay* ImageOverlay::createClone() {
void ImageOverlay::writeToClone(ImageOverlay* clone) {
Overlay2D::writeToClone(clone);
clone->_imageURL = _imageURL;
clone->_textureImage = _textureImage;
clone->_textureImage = QImage::QImage(_textureImage);
clone->_renderImage = _renderImage;
}

1
interface/src/ui/overlays/Line3DOverlay.cpp
View file

@ -89,4 +89,5 @@ Line3DOverlay* Line3DOverlay::createClone() {
void Line3DOverlay::writeToClone(Line3DOverlay* clone) {
Base3DOverlay::writeToClone(clone);
clone->setEnd(getEnd());
}

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

@ -140,3 +140,15 @@ ModelOverlay* ModelOverlay::createClone() {
writeToClone(clone);
return clone;
}
void ModelOverlay::writeToClone(ModelOverlay* clone) {
Base3DOverlay::writeToClone(clone);
clone->_url = _url;
if (clone->_url.isValid()) {
clone->_updateModel = true;
clone->_isLoaded = false;
}
clone->_rotation = _rotation;
clone->_scale = _scale;
clone->_updateModel = _updateModel;
}

3
interface/src/ui/overlays/ModelOverlay.h
View file

@ -31,7 +31,8 @@ public:
virtual ModelOverlay* createClone();
private:
virtual void writeToClone(ModelOverlay* clone);
Model _model;
QUrl _url;

1
interface/src/ui/overlays/Planar3DOverlay.cpp
View file

@ -105,4 +105,5 @@ bool Planar3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::ve
void Planar3DOverlay::writeToClone(Planar3DOverlay* clone) {
Base3DOverlay::writeToClone(clone);
clone->setDimensions(getDimensions());
}

8
interface/src/ui/overlays/Text3DOverlay.cpp
View file

@ -187,4 +187,12 @@ Text3DOverlay* Text3DOverlay::createClone() {
void Text3DOverlay::writeToClone(Text3DOverlay* clone) {
Planar3DOverlay::writeToClone(clone);
clone->setText(getText());
clone->setLineHeight(getLineHeight());
clone->setLeftMargin(getLeftMargin());
clone->setTopMargin(getTopMargin());
clone->setRightMargin(getRightMargin());
clone->setBottomMargin(getBottomMargin());
clone->setIsFacingAvatar(getIsFacingAvatar());
clone->_backgroundColor = getBackgroundColor();
}

5
interface/src/ui/overlays/TextOverlay.cpp
View file

@ -133,4 +133,9 @@ TextOverlay* TextOverlay::createClone() {
void TextOverlay::writeToClone(TextOverlay* clone) {
Overlay2D::writeToClone(clone);
clone->_text = QString::QString(_text);
clone->_backgroundColor = _backgroundColor;
clone->_leftMargin = _leftMargin;
clone->_topMargin = _topMargin;
clone->_fontSize = _fontSize;
}