Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:13:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made RenderArgs a default ctor

Browse source
This commit is contained in:
Atlante45 2015-05-04 17:22:46 +02:00
parent 6b04ceffba
commit 12fcb35717
4 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,11 +87,10 @@ void Overlays::renderHUD() {
QReadLocker lock(&_lock); QReadLocker lock(&_lock);
auto lodManager = DependencyManager::get<LODManager>(); auto lodManager = DependencyManager::get<LODManager>();
RenderArgs args = { NULL, Application::getInstance()->getViewFrustum(), RenderArgs args(NULL, Application::getInstance()->getViewFrustum(),
lodManager->getOctreeSizeScale(), lodManager->getOctreeSizeScale(),
lodManager->getBoundaryLevelAdjust(), lodManager->getBoundaryLevelAdjust(),
RenderArgs::DEFAULT_RENDER_MODE, RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE, RenderArgs::DEFAULT_RENDER_MODE, RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
foreach(Overlay* thisOverlay, _overlaysHUD) { foreach(Overlay* thisOverlay, _overlaysHUD) {
if (thisOverlay->is3D()) { if (thisOverlay->is3D()) {
@ -125,11 +124,10 @@ void Overlays::renderWorld(bool drawFront,
float myAvatarScale = 1.0f; float myAvatarScale = 1.0f;
auto lodManager = DependencyManager::get<LODManager>(); auto lodManager = DependencyManager::get<LODManager>();
RenderArgs args = { NULL, Application::getInstance()->getDisplayViewFrustum(), RenderArgs args(NULL, Application::getInstance()->getDisplayViewFrustum(),
lodManager->getOctreeSizeScale(), lodManager->getOctreeSizeScale(),
lodManager->getBoundaryLevelAdjust(), lodManager->getBoundaryLevelAdjust(),
renderMode, renderSide, renderDebugFlags, renderMode, renderSide, renderDebugFlags);
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
foreach(Overlay* thisOverlay, _overlaysWorld) { foreach(Overlay* thisOverlay, _overlaysWorld) {

4
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -392,8 +392,8 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode,
ViewFrustum* frustum = (renderMode == RenderArgs::SHADOW_RENDER_MODE) ? ViewFrustum* frustum = (renderMode == RenderArgs::SHADOW_RENDER_MODE) ?
_viewState->getShadowViewFrustum() : _viewState->getCurrentViewFrustum(); _viewState->getShadowViewFrustum() : _viewState->getCurrentViewFrustum();
RenderArgs args = { this, frustum, getSizeScale(), getBoundaryLevelAdjust(), renderMode, renderSide, RenderArgs args(this, frustum, getSizeScale(), getBoundaryLevelAdjust(),
renderDebugFlags, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; renderMode, renderSide, renderDebugFlags);
_tree->lockForRead(); _tree->lockForRead();

4
libraries/octree/src/OctreeRenderer.cpp
View file

@ -167,8 +167,8 @@ bool OctreeRenderer::renderOperation(OctreeElement* element, void* extraData) {
void OctreeRenderer::render(RenderArgs::RenderMode renderMode, void OctreeRenderer::render(RenderArgs::RenderMode renderMode,
RenderArgs::RenderSide renderSide, RenderArgs::RenderSide renderSide,
RenderArgs::DebugFlags renderDebugFlags) { RenderArgs::DebugFlags renderDebugFlags) {
RenderArgs args = { this, _viewFrustum, getSizeScale(), getBoundaryLevelAdjust(), renderMode, renderSide, RenderArgs args(this, _viewFrustum, getSizeScale(), getBoundaryLevelAdjust(),
renderDebugFlags, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; renderMode, renderSide, renderDebugFlags);
if (_tree) { if (_tree) {
_tree->lockForRead(); _tree->lockForRead();
_tree->recurseTreeWithOperation(renderOperation, &args); _tree->recurseTreeWithOperation(renderOperation, &args);

32
libraries/shared/src/RenderArgs.h
View file

@ -22,10 +22,36 @@ public:
enum RenderSide { MONO, STEREO_LEFT, STEREO_RIGHT }; enum RenderSide { MONO, STEREO_LEFT, STEREO_RIGHT };
enum DebugFlags { enum DebugFlags {
RENDER_DEBUG_NONE=0, RENDER_DEBUG_NONE = 0,
RENDER_DEBUG_HULLS=1, RENDER_DEBUG_HULLS = 1,
RENDER_DEBUG_SIMULATION_OWNERSHIP=2 RENDER_DEBUG_SIMULATION_OWNERSHIP = 2,
}; };
RenderArgs(OctreeRenderer* _renderer = nullptr,
ViewFrustum* _viewFrustum = nullptr,
float _sizeScale = 1.0f,
int _boundaryLevelAdjust = 0,
RenderMode _renderMode = DEFAULT_RENDER_MODE,
RenderSide _renderSide = MONO,
DebugFlags _debugFlags = RENDER_DEBUG_NONE,
int _elementsTouched = 0,
int _itemsRendered = 0,
int _itemsOutOfView = 0,
int _itemsTooSmall = 0,
int _meshesConsidered = 0,
int _meshesRendered = 0,
int _meshesOutOfView = 0,
int _meshesTooSmall = 0,
int _materialSwitches = 0,
int _trianglesRendered = 0,
int _quadsRendered = 0,
int _translucentMeshPartsRendered = 0,
int _opaqueMeshPartsRendered = 0) {
}
OctreeRenderer* _renderer; OctreeRenderer* _renderer;
ViewFrustum* _viewFrustum; ViewFrustum* _viewFrustum;