Merge branch 'rover' into 'master'

Support spheres in DebugDrawer

See merge request OpenMW/openmw!5199

Author: Capostrophic

components/debug/debugdraw.cpp

@@ -216,6 +216,57 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
     geom.addPrimitiveSet(indices);
 }
 
+static void generateSphere(osg::Geometry& geom, float radius, int segments, int rings)
+{
+    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
+    osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array;
+    osg::ref_ptr<osg::DrawElementsUShort> indices = new osg::DrawElementsUShort(osg::DrawElementsUShort::TRIANGLES, 0);
+    int vertexCount = segments * (rings + 1);
+    vertices->reserve(vertexCount);
+    normals->reserve(vertexCount);
+    int indexCount = segments * rings * 2 * 3;
+    indices->reserve(indexCount);
+
+    for (int i = 0; i <= rings; ++i)
+    {
+        float phi = (float(i) / float(rings)) * osg::PIf;
+        for (int j = 0; j < segments; ++j)
+        {
+            float theta = (float(j) / float(segments)) * osg::PIf * 2.f;
+            auto pos = sphereCoordToCartesian(theta, phi, radius);
+            vertices->push_back(pos);
+            pos.normalize();
+            normals->push_back(pos);
+        }
+    }
+
+    for (int i = 0; i < rings; ++i)
+    {
+        int ringTopBase = i * segments;
+        int ringBottomBase = ringTopBase + segments;
+
+        for (int j = 0; j < segments; ++j)
+        {
+            auto v1 = static_cast<GLushort>(ringTopBase + j);
+            auto v2 = static_cast<GLushort>(ringTopBase + (j + 1) % segments);
+            auto v3 = static_cast<GLushort>(ringBottomBase + j);
+            auto v4 = static_cast<GLushort>(ringBottomBase + (j + 1) % segments);
+
+            indices->push_back(v1);
+            indices->push_back(v4);
+            indices->push_back(v2);
+
+            indices->push_back(v4);
+            indices->push_back(v1);
+            indices->push_back(v3);
+        }
+    }
+
+    geom.setVertexArray(vertices);
+    geom.setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
+    geom.addPrimitiveSet(indices);
+}
+
 static int getIndexBufferReadFromFrame(const unsigned int& nFrame)
 {
     return nFrame % 2;
@@ -255,6 +306,7 @@ namespace Debug
         , mLinesToDraw(copy.mLinesToDraw)
         , mCubeGeometry(copy.mCubeGeometry)
         , mCylinderGeometry(copy.mCylinderGeometry)
+        , mSphereGeometry(copy.mSphereGeometry)
         , mWireCubeGeometry(copy.mWireCubeGeometry)
     {
     }
@@ -294,6 +346,9 @@ namespace Debug
                 case DrawShape::Cylinder:
                     geometry = mCylinderGeometry;
                     break;
+                case DrawShape::Sphere:
+                    geometry = mSphereGeometry;
+                    break;
                 case DrawShape::WireCube:
                     geometry = mWireCubeGeometry;
                     break;
@@ -341,6 +396,11 @@ Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager)
     cylinderGeom->setUseVertexBufferObjects(true);
     generateCylinder(*cylinderGeom, .5, 1., 20);
 
+    auto sphereGeom = new osg::Geometry;
+    sphereGeom->setSupportsDisplayList(false);
+    sphereGeom->setUseVertexBufferObjects(true);
+    generateSphere(*sphereGeom, .5, 20, 10);
+
     auto wireCube = new osg::Geometry;
     wireCube->setSupportsDisplayList(false);
     wireCube->setUseVertexBufferObjects(true);
@@ -352,6 +412,7 @@ Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager)
         mCustomDebugDrawer[i]->setStateSet(stateset);
         mCustomDebugDrawer[i]->mWireCubeGeometry = wireCube;
         mCustomDebugDrawer[i]->mCubeGeometry = cubeGeometry;
+        mCustomDebugDrawer[i]->mSphereGeometry = sphereGeom;
         mCustomDebugDrawer[i]->mCylinderGeometry = cylinderGeom;
     }
 }
@@ -375,6 +436,12 @@ void Debug::DebugDrawer::drawCubeMinMax(osg::Vec3f min, osg::Vec3f max, osg::Vec
     drawCube(pos, dims, color);
 }
 
+void Debug::DebugDrawer::drawSphere(osg::Vec3f position, float radius, osg::Vec3f color)
+{
+    mCustomDebugDrawer[getIndexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(
+        { position, osg::Vec3f(radius, radius, radius) * 2, color, DrawShape::Sphere });
+}
+
 void Debug::DebugDrawer::addDrawCall(const DrawCall& draw)
 {
     mCustomDebugDrawer[getIndexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(draw);

components/debug/debugdraw.hpp

@@ -39,6 +39,7 @@ namespace Debug
     {
         Cube,
         Cylinder,
+        Sphere,
         WireCube,
     };
 
@@ -64,6 +65,10 @@ namespace Debug
         {
             return { pos, dims, color, DrawShape::Cylinder };
         }
+        static DrawCall sphere(osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite)
+        {
+            return { pos, dims, color, DrawShape::Sphere };
+        }
     };
 
     class DebugCustomDraw : public osg::Drawable
@@ -79,6 +84,7 @@ namespace Debug
 
         osg::ref_ptr<osg::Geometry> mCubeGeometry;
         osg::ref_ptr<osg::Geometry> mCylinderGeometry;
+        osg::ref_ptr<osg::Geometry> mSphereGeometry;
         osg::ref_ptr<osg::Geometry> mWireCubeGeometry;
 
         virtual void drawImplementation(osg::RenderInfo&) const override;
@@ -97,6 +103,7 @@ namespace Debug
         void drawCube(
             osg::Vec3f mPosition, osg::Vec3f mDims = osg::Vec3(50., 50., 50.), osg::Vec3f mColor = colorWhite);
         void drawCubeMinMax(osg::Vec3f min, osg::Vec3f max, osg::Vec3f mColor = colorWhite);
+        void drawSphere(osg::Vec3f position, float radius = 25., osg::Vec3f color = colorWhite);
         void addDrawCall(const DrawCall& draw);
         void addLine(const osg::Vec3& start, const osg::Vec3& end, const osg::Vec3 color = colorWhite);