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
|
From 807f550386a1eac6f7306589a4e4a01e783e65df Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Thu, 13 Feb 2020 19:15:33 +0100
Subject: [PATCH] Fix building mwrender/sky with OSG 3.6.5
OSG commit aff574b completely replaces the method of doing user-defined
query geometry, removing support for modifying the default geometry.
---
apps/openmw/mwrender/sky.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 3996f472c2..e13f5a7b65 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -558,16 +558,22 @@ class Sun : public CelestialBody
osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
oqn->setQueriesEnabled(true);
+#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
+ // With OSG 3.6.5, the method of providing user defined query geometry has been completely replaced
+ osg::ref_ptr<osg::QueryGeometry> queryGeom = new osg::QueryGeometry(oqn->getName());
+#else
+ auto* queryGeom = oqn->getQueryGeometry();
+#endif
+
// Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
// so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
// is only called once.
// Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
- oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
+ queryGeom->setDataVariance(osg::Object::STATIC);
// Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
// normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
// circumvent this.
- osg::Geometry* queryGeom = oqn->getQueryGeometry();
queryGeom->setVertexArray(mGeom->getVertexArray());
queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
queryGeom->removePrimitiveSet(0, oqn->getQueryGeometry()->getNumPrimitiveSets());
@@ -578,6 +584,10 @@ class Sun : public CelestialBody
// Still need a proper bounding sphere.
oqn->setInitialBound(queryGeom->getBound());
+#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
+ oqn->setQueryGeometry(queryGeom.release());
+#endif
+
osg::StateSet* queryStateSet = new osg::StateSet;
if (queryVisible)
{
|
