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

try to get more coherent names

Browse source
This commit is contained in:
Sam Gateau 2014-10-27 11:49:51 -07:00
parent 541e528e57
commit 89f9e5b01b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/gpu/Batch.h
View file

@ -28,9 +28,9 @@
} }
}; };
#define PROFILE_SCOPE(name) ProfileRange profileRangeThis(name); #define PROFILE_RANGE(name) ProfileRange profileRangeThis(name);
#else #else
#define PROFILE_SCOPE(name) #define PROFILE_RANGE(name)
#endif #endif
namespace gpu { namespace gpu {

6
interface/src/renderer/Model.cpp
View file

@ -395,7 +395,7 @@ void Model::setJointStates(QVector<JointState> states) {
} }
bool Model::render(float alpha, RenderMode mode, RenderArgs* args) { bool Model::render(float alpha, RenderMode mode, RenderArgs* args) {
PROFILE_SCOPE(__FUNCTION__); PROFILE_RANGE(__FUNCTION__);
// render the attachments // render the attachments
foreach (Model* attachment, _attachments) { foreach (Model* attachment, _attachments) {
attachment->render(alpha, mode); attachment->render(alpha, mode);
@ -562,7 +562,7 @@ bool Model::render(float alpha, RenderMode mode, RenderArgs* args) {
// Render! // Render!
{ {
PROFILE_SCOPE("render Batch"); PROFILE_RANGE("render Batch");
::gpu::backend::renderBatch(batch); ::gpu::backend::renderBatch(batch);
batch.clear(); batch.clear();
} }
@ -1555,7 +1555,7 @@ void Model::segregateMeshGroups() {
int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, float alphaThreshold, int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, float alphaThreshold,
bool hasTangents, bool hasSpecular, bool isSkinned, RenderArgs* args) { bool hasTangents, bool hasSpecular, bool isSkinned, RenderArgs* args) {
PROFILE_SCOPE(__FUNCTION__); PROFILE_RANGE(__FUNCTION__);
bool dontCullOutOfViewMeshParts = Menu::getInstance()->isOptionChecked(MenuOption::DontCullOutOfViewMeshParts); bool dontCullOutOfViewMeshParts = Menu::getInstance()->isOptionChecked(MenuOption::DontCullOutOfViewMeshParts);
bool cullTooSmallMeshParts = !Menu::getInstance()->isOptionChecked(MenuOption::DontCullTooSmallMeshParts); bool cullTooSmallMeshParts = !Menu::getInstance()->isOptionChecked(MenuOption::DontCullTooSmallMeshParts);
bool dontReduceMaterialSwitches = Menu::getInstance()->isOptionChecked(MenuOption::DontReduceMaterialSwitches); bool dontReduceMaterialSwitches = Menu::getInstance()->isOptionChecked(MenuOption::DontReduceMaterialSwitches);