mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-05-29 11:19:54 +02:00
c9cdaadeb5
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale. It now uses a new member variable _modelScale instead. This is important because the notion of "Avatar" space does NOT include scale, so this is now reflected correctly in the SpatiallyNestable class. Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale field. a new _dimensions member variable is used instead. The SpatiallyNestable scale field for entities should always be one. Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale. This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint. Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions. Added qDebug stream support for Transform class.
92 lines
3.1 KiB
C++
92 lines
3.1 KiB
C++
//
|
|
// OverlaysPayload.cpp
|
|
// interface/src/ui/overlays
|
|
//
|
|
// Copyright 2014 High Fidelity, Inc.
|
|
//
|
|
// Distributed under the Apache License, Version 2.0.
|
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
//
|
|
|
|
#include <limits>
|
|
#include <typeinfo>
|
|
|
|
#include <avatar/AvatarManager.h>
|
|
#include <avatar/MyAvatar.h>
|
|
#include <LODManager.h>
|
|
#include <render/Scene.h>
|
|
|
|
#include "Image3DOverlay.h"
|
|
#include "Circle3DOverlay.h"
|
|
#include "Cube3DOverlay.h"
|
|
#include "ImageOverlay.h"
|
|
#include "Line3DOverlay.h"
|
|
#include "ModelOverlay.h"
|
|
#include "Overlays.h"
|
|
#include "Rectangle3DOverlay.h"
|
|
#include "Sphere3DOverlay.h"
|
|
#include "Grid3DOverlay.h"
|
|
#include "TextOverlay.h"
|
|
#include "Text3DOverlay.h"
|
|
|
|
|
|
namespace render {
|
|
template <> const ItemKey payloadGetKey(const Overlay::Pointer& overlay) {
|
|
auto builder = ItemKey::Builder().withTypeShape();
|
|
if (overlay->is3D()) {
|
|
if (std::static_pointer_cast<Base3DOverlay>(overlay)->getDrawInFront()) {
|
|
builder.withLayered();
|
|
}
|
|
if (overlay->isTransparent()) {
|
|
builder.withTransparent();
|
|
}
|
|
} else {
|
|
builder.withViewSpace();
|
|
}
|
|
return builder.build();
|
|
}
|
|
template <> const Item::Bound payloadGetBound(const Overlay::Pointer& overlay) {
|
|
return overlay->getBounds();
|
|
}
|
|
template <> int payloadGetLayer(const Overlay::Pointer& overlay) {
|
|
// Magic number while we are defining the layering mechanism:
|
|
const int LAYER_2D = 2;
|
|
const int LAYER_3D_FRONT = 1;
|
|
const int LAYER_3D = 0;
|
|
|
|
if (overlay->is3D()) {
|
|
auto overlay3D = std::dynamic_pointer_cast<Base3DOverlay>(overlay);
|
|
if (overlay3D->getDrawInFront()) {
|
|
return LAYER_3D_FRONT;
|
|
} else {
|
|
return LAYER_3D;
|
|
}
|
|
} else {
|
|
return LAYER_2D;
|
|
}
|
|
}
|
|
template <> void payloadRender(const Overlay::Pointer& overlay, RenderArgs* args) {
|
|
if (args) {
|
|
if (overlay->getAnchor() == Overlay::MY_AVATAR) {
|
|
auto batch = args->_batch;
|
|
auto avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
|
|
glm::quat myAvatarRotation = avatar->getOrientation();
|
|
glm::vec3 myAvatarPosition = avatar->getPosition();
|
|
float angle = glm::degrees(glm::angle(myAvatarRotation));
|
|
glm::vec3 axis = glm::axis(myAvatarRotation);
|
|
float myAvatarScale = avatar->getModelScale();
|
|
Transform transform = Transform();
|
|
transform.setTranslation(myAvatarPosition);
|
|
transform.setRotation(glm::angleAxis(angle, axis));
|
|
transform.setScale(myAvatarScale);
|
|
batch->setModelTransform(transform);
|
|
overlay->render(args);
|
|
} else {
|
|
overlay->render(args);
|
|
}
|
|
}
|
|
}
|
|
template <> const ShapeKey shapeGetShapeKey(const Overlay::Pointer& overlay) {
|
|
return overlay->getShapeKey();
|
|
}
|
|
}
|