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

Update Model::endScene to require RenderArgs

Browse source
This commit is contained in:
Ryan Huffman 2015-05-22 16:17:01 -07:00
parent 8380eec03b
commit 822ae800c5
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -504,7 +504,7 @@ void EntityTreeRenderer::render(RenderArgs* renderArgs) {
// we must call endScene while we still have the tree locked so that no one deletes a model
// on us while rendering the scene
Model::endScene(renderArgs->_renderMode, renderArgs);
Model::endScene(renderArgs);
_tree->unlock();
glPushMatrix();

4
libraries/render-utils/src/Model.cpp
View file

@ -1846,7 +1846,7 @@ void Model::setupBatchTransform(gpu::Batch& batch, RenderArgs* args) {
batch.setViewTransform(_transforms[0]);
}
void Model::endScene(RenderMode mode, RenderArgs* args) {
void Model::endScene(RenderArgs* args) {
PROFILE_RANGE(__FUNCTION__);
@ -1855,6 +1855,8 @@ void Model::endScene(RenderMode mode, RenderArgs* args) {
glPushMatrix();
#endif
auto mode = args->_renderMode;
RenderArgs::RenderSide renderSide = RenderArgs::MONO;
if (args) {
renderSide = args->_renderSide;

2
libraries/render-utils/src/Model.h
View file

@ -103,7 +103,7 @@ public:
// Scene rendering support
static void startScene(RenderArgs::RenderSide renderSide);
bool renderInScene(float alpha = 1.0f, RenderArgs* args = NULL);
static void endScene(RenderArgs::RenderMode mode = RenderArgs::DEFAULT_RENDER_MODE, RenderArgs* args = NULL);
static void endScene(RenderArgs* args);
/// Sets the URL of the model to render.
/// \param fallback the URL of a fallback model to render if the requested model fails to load