Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refining once more for sir gcc on Ubuntu

Browse source
This commit is contained in:
Sam Gateau 2015-05-27 01:32:40 -07:00
parent a5c5cc9b70
commit 58e3fe695c
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
interface/src/Application.cpp
View file

@ -3175,17 +3175,18 @@ const ViewFrustum* Application::getDisplayViewFrustum() const {
} }
// WorldBox Render Data & rendering functions // WorldBox Render Data & rendering functions
namespace render {
class WorldBoxRenderData { class WorldBoxRenderData {
public: public:
typedef Payload<WorldBoxRenderData> Payload; typedef render::Payload<WorldBoxRenderData> Payload;
typedef Payload::DataPointer Pointer; typedef Payload::DataPointer Pointer;
static ItemID _item; // unique WorldBoxRenderData static render::ItemID _item; // unique WorldBoxRenderData
}; };
ItemID WorldBoxRenderData::_item = 0; render::ItemID WorldBoxRenderData::_item = 0;
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(); }
template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); } template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); }
template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) { template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) {
@ -3422,13 +3423,13 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
render::Scene::PendingChanges pendingChanges; render::Scene::PendingChanges pendingChanges;
// Make sure the WorldBox is in the scene // Make sure the WorldBox is in the scene
if (render::WorldBoxRenderData::_item == 0) { if (WorldBoxRenderData::_item == 0) {
auto worldBoxRenderData = render::WorldBoxRenderData::Pointer(new render::WorldBoxRenderData()); auto worldBoxRenderData = WorldBoxRenderData::Pointer(new WorldBoxRenderData());
auto worldBoxRenderPayload = render::PayloadPointer(new render::WorldBoxRenderData::Payload(worldBoxRenderData)); auto worldBoxRenderPayload = render::PayloadPointer(new WorldBoxRenderData::Payload(worldBoxRenderData));
render::WorldBoxRenderData::_item = _main3DScene->allocateID(); WorldBoxRenderData::_item = _main3DScene->allocateID();
pendingChanges.resetItem(render::WorldBoxRenderData::_item, worldBoxRenderPayload); pendingChanges.resetItem(WorldBoxRenderData::_item, worldBoxRenderPayload);
} }