1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 14 Oct 2016 20:59:55 +0200
Subject: [PATCH] Fix build against bullet with profiler disabled (Fixes #3592)
---
apps/openmw/mwgui/debugwindow.cpp | 7 +++++++
apps/openmw/mwphysics/physicssystem.cpp | 3 +++
2 files changed, 10 insertions(+)
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 37ea347..a29910f 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -7,6 +7,8 @@
#include <LinearMath/btQuickprof.h>
+#ifndef BT_NO_PROFILE
+
namespace
{
void bulletDumpRecursive(CProfileIterator* pit, int spacing, std::stringstream& os)
@@ -71,6 +73,7 @@ namespace
}
}
+#endif // BT_NO_PROFILE
namespace MWGui
{
@@ -92,10 +95,13 @@ namespace MWGui
MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
mMainWidget->setSize(viewSize);
+
+
}
void DebugWindow::onFrame(float dt)
{
+#ifndef BT_NO_PROFILE
if (!isVisible())
return;
@@ -115,6 +121,7 @@ namespace MWGui
size_t previousPos = mBulletProfilerEdit->getVScrollPosition();
mBulletProfilerEdit->setCaption(stream.str());
mBulletProfilerEdit->setVScrollPosition(std::min(previousPos, mBulletProfilerEdit->getVScrollRange()-1));
+#endif
}
}
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 954d195..e442fbd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -14,6 +14,7 @@
#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
+
#include <LinearMath/btQuickprof.h>
#include <components/nifbullet/bulletnifloader.hpp>
@@ -1363,8 +1364,10 @@ namespace MWPhysics
for (std::set<Object*>::iterator it = mAnimatedObjects.begin(); it != mAnimatedObjects.end(); ++it)
(*it)->animateCollisionShapes(mCollisionWorld);
+#ifndef BT_NO_PROFILE
CProfileManager::Reset();
CProfileManager::Increment_Frame_Counter();
+#endif
}
void PhysicsSystem::debugDraw()
|
