Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Render heightfields -> render spanners.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-11-18 19:49:08 -08:00
parent 0cc92dc87e
commit d273e7c399
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -462,7 +462,7 @@ Menu::Menu() :
QMenu* metavoxelOptionsMenu = developerMenu->addMenu("Metavoxels"); QMenu* metavoxelOptionsMenu = developerMenu->addMenu("Metavoxels");
addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::DisplayHermiteData, 0, false, addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::DisplayHermiteData, 0, false,
Application::getInstance()->getMetavoxels(), SLOT(refreshVoxelData())); Application::getInstance()->getMetavoxels(), SLOT(refreshVoxelData()));
addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderHeightfields, 0, true); addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderSpanners, 0, true);
addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderDualContourSurfaces, 0, true); addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderDualContourSurfaces, 0, true);
addActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::NetworkSimulator, 0, this, addActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::NetworkSimulator, 0, this,
SLOT(showMetavoxelNetworkSimulator())); SLOT(showMetavoxelNetworkSimulator()));

2
interface/src/Menu.h
View file

@ -451,9 +451,9 @@ namespace MenuOption {
const QString RenderEntitiesAsScene = "Render Entities as Scene"; const QString RenderEntitiesAsScene = "Render Entities as Scene";
const QString RenderFocusIndicator = "Show Eye Focus"; const QString RenderFocusIndicator = "Show Eye Focus";
const QString RenderHeadCollisionShapes = "Show Head Collision Shapes"; const QString RenderHeadCollisionShapes = "Show Head Collision Shapes";
const QString RenderHeightfields = "Render Heightfields";
const QString RenderLookAtVectors = "Show Look-at Vectors"; const QString RenderLookAtVectors = "Show Look-at Vectors";
const QString RenderSkeletonCollisionShapes = "Show Skeleton Collision Shapes"; const QString RenderSkeletonCollisionShapes = "Show Skeleton Collision Shapes";
const QString RenderSpanners = "Render Spanners";
const QString RenderTargetFramerate = "Framerate"; const QString RenderTargetFramerate = "Framerate";
const QString RenderTargetFramerateUnlimited = "Unlimited"; const QString RenderTargetFramerateUnlimited = "Unlimited";
const QString RenderTargetFramerate60 = "60"; const QString RenderTargetFramerate60 = "60";

8
interface/src/MetavoxelSystem.cpp
View file

@ -1723,8 +1723,10 @@ int BufferRenderVisitor::visit(MetavoxelInfo& info) {
} }
void DefaultMetavoxelRendererImplementation::render(MetavoxelData& data, MetavoxelInfo& info, const MetavoxelLOD& lod) { void DefaultMetavoxelRendererImplementation::render(MetavoxelData& data, MetavoxelInfo& info, const MetavoxelLOD& lod) {
SpannerRenderVisitor spannerRenderVisitor(lod); if (Menu::getInstance()->isOptionChecked(MenuOption::RenderSpanners)) {
data.guide(spannerRenderVisitor); SpannerRenderVisitor spannerRenderVisitor(lod);
data.guide(spannerRenderVisitor);
}
Application::getInstance()->getTextureCache()->setPrimaryDrawBuffers(true, true); Application::getInstance()->getTextureCache()->setPrimaryDrawBuffers(true, true);
@ -1953,7 +1955,7 @@ public:
void HeightfieldRenderer::render(bool cursor) { void HeightfieldRenderer::render(bool cursor) {
// create the buffer objects lazily // create the buffer objects lazily
Heightfield* heightfield = static_cast<Heightfield*>(_spanner); Heightfield* heightfield = static_cast<Heightfield*>(_spanner);
if (!heightfield->getHeight() || !Menu::getInstance()->isOptionChecked(MenuOption::RenderHeightfields)) { if (!heightfield->getHeight()) {
return; return;
} }
int width = heightfield->getHeight()->getWidth(); int width = heightfield->getHeight()->getWidth();