Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-09 21:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more work on smart pointers

Browse source
This commit is contained in:
ZappoMan 2015-05-22 21:45:57 -07:00
parent 8b78fc4190
commit 9fa9942861
8 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/RenderableBoxEntityItem.cpp
View file

@ -60,6 +60,5 @@ void RenderableBoxEntityItem::render(RenderArgs* args) {
glPopMatrix();
glPopMatrix();
// FIX ME!
//RenderableDebugableEntityItem::render(this, args);
RenderableDebugableEntityItem::render(this, args);
};

6
libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
View file

@ -19,7 +19,7 @@
#include "RenderableDebugableEntityItem.h"
void RenderableDebugableEntityItem::renderBoundingBox(EntityItemPointer entity, RenderArgs* args,
void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, RenderArgs* args,
float puffedOut, glm::vec4& color) {
glm::vec3 position = entity->getPosition();
glm::vec3 center = entity->getCenter();
@ -39,7 +39,7 @@ void RenderableDebugableEntityItem::renderBoundingBox(EntityItemPointer entity,
glPopMatrix();
}
void RenderableDebugableEntityItem::renderHoverDot(EntityItemPointer entity, RenderArgs* args) {
void RenderableDebugableEntityItem::renderHoverDot(EntityItem* entity, RenderArgs* args) {
glm::vec3 position = entity->getPosition();
glm::vec3 center = entity->getCenter();
glm::vec3 dimensions = entity->getDimensions();
@ -65,7 +65,7 @@ void RenderableDebugableEntityItem::renderHoverDot(EntityItemPointer entity, Ren
glPopMatrix();
}
void RenderableDebugableEntityItem::render(EntityItemPointer entity, RenderArgs* args) {
void RenderableDebugableEntityItem::render(EntityItem* entity, RenderArgs* args) {
bool debugSimulationOwnership = args->_debugFlags & RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP;
if (debugSimulationOwnership) {

6
libraries/entities-renderer/src/RenderableDebugableEntityItem.h
View file

@ -16,9 +16,9 @@
class RenderableDebugableEntityItem {
public:
static void renderBoundingBox(EntityItemPointer entity, RenderArgs* args, float puffedOut, glm::vec4& color);
static void renderHoverDot(EntityItemPointer entity, RenderArgs* args);
static void render(EntityItemPointer entity, RenderArgs* args);
static void renderBoundingBox(EntityItem* entity, RenderArgs* args, float puffedOut, glm::vec4& color);
static void renderHoverDot(EntityItem* entity, RenderArgs* args);
static void render(EntityItem* entity, RenderArgs* args);
};
#endif // hifi_RenderableDebugableEntityItem_h

3
libraries/entities-renderer/src/RenderableLineEntityItem.cpp
View file

@ -38,6 +38,5 @@ void RenderableLineEntityItem::render(RenderArgs* args) {
DependencyManager::get<DeferredLightingEffect>()->renderLine(p1, p2, lineColor, lineColor);
glPopMatrix();
// FIX ME
//RenderableDebugableEntityItem::render(this, args);
RenderableDebugableEntityItem::render(this, args);
};

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

@ -193,12 +193,10 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
if (!didDraw) {
glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f);
// FIX ME
//RenderableDebugableEntityItem::renderBoundingBox(this, args, 0.0f, greenColor);
RenderableDebugableEntityItem::renderBoundingBox(this, args, 0.0f, greenColor);
}
// FIX ME
//RenderableDebugableEntityItem::render(this, args);
RenderableDebugableEntityItem::render(this, args);
}
Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) {

6
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -103,8 +103,7 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
if (_entityTree) {
_entityTree->lockForRead();
// FIX ME!!
EntityItemPointer entity = nullptr; // const_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(EntityItemID(identity)));
EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(identity));
if (entity) {
results = entity->getProperties();
@ -163,8 +162,7 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
if (_entityTree) {
_entityTree->lockForWrite();
// FIX ME!!
EntityItemPointer entity = nullptr; // const_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
if (entity) {
if (entity->getLocked()) {
shouldDelete = false;

7
libraries/entities/src/EntitySimulation.cpp
View file

@ -39,15 +39,10 @@ void EntitySimulation::updateEntities() {
void EntitySimulation::getEntitiesToDelete(VectorOfEntities& entitiesToDelete) {
// FIX ME!!!
/*
for (auto entityItr : _entitiesToDelete) {
EntityItemPointer entity = (*entityItr);
for (auto entity : _entitiesToDelete) {
// this entity is still in its tree, so we insert into the external list
entitiesToDelete.push_back(entity);
++entityItr;
}
*/
_entitiesToDelete.clear();
}

4
libraries/entities/src/EntityTreeElement.cpp
View file

@ -560,8 +560,7 @@ bool EntityTreeElement::findSpherePenetration(const glm::vec3& center, float rad
if (findSphereSpherePenetration(center, radius, entityCenter, entityRadius, penetration)) {
// return true on first valid entity penetration
// FIX ME!!
//*penetratedObject = (void*)(entity);
*penetratedObject = (void*)(entity.get());
return true;
}
@ -641,7 +640,6 @@ EntityItemPointer EntityTreeElement::getEntityWithEntityItemID(const EntityItemI
void EntityTreeElement::cleanupEntities() {
uint16_t numberOfEntities = _entityItems->size();
for (uint16_t i = 0; i < numberOfEntities; i++) {
// FIX ME!!
EntityItemPointer entity = (*_entityItems)[i];
entity->_element = NULL;