Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Seth Alves 2015-04-24 18:36:41 -07:00
parent 03706359f5
commit ac46f84291
3 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -677,26 +677,11 @@ void EntityTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
if (bigEnoughToRender) {
renderProxies(entityItem, args);
// XXX
// auto nodeList = DependencyManager::get<NodeList>();
// const QUuid& myNodeID = nodeList->getSessionUUID();
// XXX
Glower* glower = NULL;
if (entityItem->getGlowLevel() > 0.0f) {
glower = new Glower(entityItem->getGlowLevel());
}
// XXX glow things we are simulating
// if (entityItem->getSimulatorID() == myNodeID) {
// if (glower) delete glower;
// glower = new Glower();
// }
// XXX glow things we are simulating
entityItem->render(args);
args->_itemsRendered++;
if (glower) {

16
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -119,25 +119,17 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
glm::vec3 dimensions = getDimensions();
float size = glm::length(dimensions);
// XXX
auto nodeList = DependencyManager::get<NodeList>();
const QUuid& myNodeID = nodeList->getSessionUUID();
// XXX
auto nodeList = DependencyManager::get<NodeList>(); // XXX for debugging
const QUuid& myNodeID = nodeList->getSessionUUID(); // XXX for debugging
if (drawAsModel
&& getSimulatorID() != myNodeID // XXX
&& getSimulatorID() != myNodeID // XXX for debugging
) {
remapTextures();
glPushMatrix();
{
float alpha = getLocalRenderAlpha();
// XXX
// if (getSimulatorID() == myNodeID) {
// alpha = 1.0;
// }
// XXX
if (!_model || _needsModelReload) {
// TODO: this getModel() appears to be about 3% of model render time. We should optimize
PerformanceTimer perfTimer("getModel");

11
libraries/entities/src/EntityItem.cpp
View file

@ -1151,14 +1151,13 @@ void EntityItem::updateVelocityInDomainUnits(const glm::vec3& value) {
}
void EntityItem::updateVelocity(const glm::vec3& value) {
auto distance = glm::distance(_velocity, value);
if (distance > MIN_VELOCITY_DELTA) {
_dirtyFlags |= EntityItem::DIRTY_VELOCITY;
if (distance < MIN_VELOCITY_DELTA) {
if (glm::distance(_velocity, value) > MIN_VELOCITY_DELTA) {
if (glm::length(value) < MIN_VELOCITY_DELTA) {
_velocity = ENTITY_ITEM_ZERO_VEC3;
} else {
_velocity = value;
}
_dirtyFlags |= EntityItem::DIRTY_VELOCITY;
}
}
@ -1176,15 +1175,15 @@ void EntityItem::updateGravityInDomainUnits(const glm::vec3& value) {
void EntityItem::updateGravity(const glm::vec3& value) {
if (glm::distance(_gravity, value) > MIN_GRAVITY_DELTA) {
_dirtyFlags |= EntityItem::DIRTY_VELOCITY;
_gravity = value;
_dirtyFlags |= EntityItem::DIRTY_VELOCITY;
}
}
void EntityItem::updateAcceleration(const glm::vec3& value) {
if (glm::distance(_acceleration, value) > MIN_ACCELERATION_DELTA) {
_dirtyFlags |= EntityItem::DIRTY_VELOCITY;
_acceleration = value;
_dirtyFlags |= EntityItem::DIRTY_VELOCITY;
}
}