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

move 3D overlay rendering into the render portion that supports lighting and shadows

Browse source
This commit is contained in:
ZappoMan 2014-10-29 21:08:37 -07:00
parent d49b617a4a
commit 2570caca40
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Application.cpp
View file

@ -2790,6 +2790,12 @@ void Application::updateShadowMap() {
_entities.render(RenderArgs::SHADOW_RENDER_MODE);
}
// render JS/scriptable overlays
{
PerformanceTimer perfTimer("3dOverlays");
_overlays.render3D(RenderArgs::SHADOW_RENDER_MODE);
}
glDisable(GL_POLYGON_OFFSET_FILL);
glPopMatrix();
@ -2986,6 +2992,12 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
_entities.render();
}
// render JS/scriptable overlays
{
PerformanceTimer perfTimer("3dOverlays");
_overlays.render3D();
}
// render the ambient occlusion effect if enabled
if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
PerformanceTimer perfTimer("ambientOcclusion");
@ -3059,12 +3071,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
PerformanceTimer perfTimer("inWorldInterface");
emit renderingInWorldInterface();
}
// render JS/scriptable overlays
{
PerformanceTimer perfTimer("3dOverlays");
_overlays.render3D();
}
}
if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {

4
interface/src/ui/overlays/Overlays.cpp
View file

@ -89,7 +89,7 @@ void Overlays::render2D() {
}
}
void Overlays::render3D() {
void Overlays::render3D(RenderArgs::RenderMode renderMode) {
QReadLocker lock(&_lock);
if (_overlays3D.size() == 0) {
return;
@ -104,7 +104,7 @@ void Overlays::render3D() {
RenderArgs args = { NULL, Application::getInstance()->getViewFrustum(),
Menu::getInstance()->getVoxelSizeScale(), Menu::getInstance()->getBoundaryLevelAdjust(),
RenderArgs::DEFAULT_RENDER_MODE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
renderMode, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
foreach(Overlay* thisOverlay, _overlays3D) {

2
interface/src/ui/overlays/Overlays.h
View file

@ -39,7 +39,7 @@ public:
~Overlays();
void init(QGLWidget* parent);
void update(float deltatime);
void render3D();
void render3D(RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE);
void render2D();
public slots: