THursday morning the frustum culling seems broken in one particular angle

This commit is contained in:
samcake 2016-02-11 10:05:39 -08:00
parent 6922c9adf0
commit 355b8ee40d
9 changed files with 12 additions and 10 deletions

View file

@ -3600,7 +3600,7 @@ public:
static render::ItemID _item; // unique WorldBoxRenderData static render::ItemID _item; // unique WorldBoxRenderData
}; };
render::ItemID WorldBoxRenderData::_item = 0; render::ItemID WorldBoxRenderData::_item { render::Item::INVALID_ITEM_ID };
namespace render { namespace render {
template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); } template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); }

View file

@ -239,7 +239,7 @@ protected:
virtual void updatePalms(); virtual void updatePalms();
render::ItemID _renderItemID; render::ItemID _renderItemID{ render::Item::INVALID_ITEM_ID };
ThreadSafeValueCache<glm::vec3> _leftPalmPositionCache { glm::vec3() }; ThreadSafeValueCache<glm::vec3> _leftPalmPositionCache { glm::vec3() };
ThreadSafeValueCache<glm::quat> _leftPalmRotationCache { glm::quat() }; ThreadSafeValueCache<glm::quat> _leftPalmRotationCache { glm::quat() };

View file

@ -92,7 +92,7 @@ public:
protected: protected:
float updatePulse(); float updatePulse();
render::ItemID _renderItemID; render::ItemID _renderItemID{ render::Item::INVALID_ITEM_ID };
bool _isLoaded; bool _isLoaded;
float _alpha; float _alpha;

View file

@ -96,7 +96,7 @@ private:
QVector<QVector<glm::vec3>> _points; QVector<QVector<glm::vec3>> _points;
bool _dimensionsInitialized = true; bool _dimensionsInitialized = true;
render::ItemID _myMetaItem; render::ItemID _myMetaItem{ render::Item::INVALID_ITEM_ID };
bool _showCollisionHull = false; bool _showCollisionHull = false;

View file

@ -37,7 +37,7 @@ protected:
void createPipelines(); void createPipelines();
render::ScenePointer _scene; render::ScenePointer _scene;
render::ItemID _renderItemId; render::ItemID _renderItemId{ render::Item::INVALID_ITEM_ID };
NetworkTexturePointer _texture; NetworkTexturePointer _texture;
gpu::PipelinePointer _untexturedPipeline; gpu::PipelinePointer _untexturedPipeline;

View file

@ -129,7 +129,7 @@ private:
NetworkTexturePointer _zTexture; NetworkTexturePointer _zTexture;
const int MATERIAL_GPU_SLOT = 3; const int MATERIAL_GPU_SLOT = 3;
render::ItemID _myItem; render::ItemID _myItem{ render::Item::INVALID_ITEM_ID };
static gpu::PipelinePointer _pipeline; static gpu::PipelinePointer _pipeline;
ShapeInfo _shapeInfo; ShapeInfo _shapeInfo;

View file

@ -54,7 +54,7 @@ private:
Model* _model; Model* _model;
bool _needsInitialSimulation; bool _needsInitialSimulation;
render::ItemID _myMetaItem; render::ItemID _myMetaItem{ render::Item::INVALID_ITEM_ID };
}; };
#endif // hifi_RenderableZoneEntityItem_h #endif // hifi_RenderableZoneEntityItem_h

View file

@ -37,7 +37,7 @@ public:
protected: protected:
std::shared_ptr<AnimDebugDrawData> _animDebugDrawData; std::shared_ptr<AnimDebugDrawData> _animDebugDrawData;
std::shared_ptr<AnimDebugDrawPayload> _animDebugDrawPayload; std::shared_ptr<AnimDebugDrawPayload> _animDebugDrawPayload;
render::ItemID _itemID; render::ItemID _itemID{ render::Item::INVALID_ITEM_ID };
static gpu::PipelinePointer _pipeline; static gpu::PipelinePointer _pipeline;

View file

@ -109,11 +109,13 @@ Octree::Indices Octree::indexConcreteCellPath(const Locations& path) const {
Octree::Index Octree::allocateCell(Index parent, const Location& location) { Octree::Index Octree::allocateCell(Index parent, const Location& location) {
if (_cells[parent].hasChild(location.octant())) { if (_cells[parent].hasChild(location.octant())) {
assert(_cells[parent].child(location.octant()) == INVALID_CELL);
return _cells[parent].child(location.octant()); return _cells[parent].child(location.octant());
} }
assert(_cells[parent].getlocation().child(location.octant()) == location); if (!(_cells[parent].getlocation().child(location.octant()) == location)) {
auto parentLoc = _cells[parent].getlocation();
assert(false);
}
Index newIndex; Index newIndex;
if (_freeCells.empty()) { if (_freeCells.empty()) {