Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

segregateMeshGroups() --> createRenderItems()

Browse source
This commit is contained in:
Andrew Meadows 2016-07-19 09:43:59 -07:00
parent 726928c14c
commit d8fa0d1dd1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -575,7 +575,7 @@ void Model::renderSetup(RenderArgs* args) {
}
if (!_meshGroupsKnown && isLoaded()) {
segregateMeshGroups();
createRenderItems();
}
}
@ -600,7 +600,7 @@ bool Model::addToScene(std::shared_ptr<render::Scene> scene,
bool showCollisionHull) {
if ((!_meshGroupsKnown || showCollisionHull != _showCollisionHull) && isLoaded()) {
_showCollisionHull = showCollisionHull;
segregateMeshGroups();
createRenderItems();
}
bool somethingAdded = false;
@ -1236,7 +1236,7 @@ AABox Model::getRenderableMeshBound() const {
}
}
void Model::segregateMeshGroups() {
void Model::createRenderItems() {
Geometry::Pointer geometry;
bool showingCollisionHull = false;
if (_showCollisionHull && _collisionGeometry) {
@ -1303,7 +1303,7 @@ void Model::segregateMeshGroups() {
bool Model::initWhenReady(render::ScenePointer scene) {
if (isActive() && isRenderable() && !_meshGroupsKnown && isLoaded()) {
segregateMeshGroups();
createRenderItems();
render::PendingChanges pendingChanges;

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

@ -377,7 +377,7 @@ protected:
void recalculateMeshBoxes(bool pickAgainstTriangles = false);
void segregateMeshGroups(); // used to calculate our list of translucent vs opaque meshes
void createRenderItems(); // used to calculate our list of translucent vs opaque meshes
static model::MaterialPointer _collisionHullMaterial;
bool _meshGroupsKnown;