Removing inlining of virtual function

BZFlag-Dev · Oct 18, 2023 · 961caa8 · 961caa8
1 parent 3b9de59
commit 961caa8
Show file tree

Hide file tree

Showing 33 changed files with 113 additions and 80 deletions.
diff --git a/include/BillboardSceneNode.h b/include/BillboardSceneNode.h
@@ -68,10 +68,7 @@ class BillboardSceneNode : public SceneNode
         ~BillboardRenderNode();
         void        setColor(const GLfloat* rgba);
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
         void        setFrame(float u, float v);
         void        setFrameSize(float du, float dv);
     private:

diff --git a/include/BoltSceneNode.h b/include/BoltSceneNode.h
@@ -50,7 +50,7 @@ class BoltSceneNode : public SceneNode
         invisible = _invisible;
     }
 
-    virtual void move(const GLfloat pos[3], const GLfloat forward[3]);
+    void move(const GLfloat pos[3], const GLfloat forward[3]);
     void        addLight(SceneRenderer&);
 
     void        notifyStyleChange();
@@ -67,10 +67,7 @@ class BoltSceneNode : public SceneNode
         void        setColor(const GLfloat* rgba);
         void        setTextureColor(const GLfloat* rgba);
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
         void        setAnimation(int cu, int cv);
 
         void        renderGeoBolt();

diff --git a/include/EighthDBaseSceneNode.h b/include/EighthDBaseSceneNode.h
@@ -38,10 +38,7 @@ class EighthDBaseSceneNode : public EighthDimSceneNode
                               const float size[3], float rotation);
         ~EighthDBaseRenderNode();
         void        render();
-        const GLfloat * getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const EighthDBaseSceneNode *sceneNode;
         GLfloat corner[8][3];

diff --git a/include/EighthDBoxSceneNode.h b/include/EighthDBoxSceneNode.h
@@ -40,10 +40,7 @@ class EighthDBoxSceneNode : public EighthDimSceneNode
                              const float size[3], float rotation);
         ~EighthDBoxRenderNode();
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const EighthDBoxSceneNode* sceneNode;
         GLfloat     corner[8][3];

diff --git a/include/EighthDPyrSceneNode.h b/include/EighthDPyrSceneNode.h
@@ -40,10 +40,7 @@ class EighthDPyrSceneNode : public EighthDimSceneNode
                              const float size[3], float rotation);
         ~EighthDPyrRenderNode();
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const EighthDPyrSceneNode* sceneNode;
         GLfloat     corner[5][3];

diff --git a/include/EighthDimSceneNode.h b/include/EighthDimSceneNode.h
@@ -44,10 +44,7 @@ class EighthDimSceneNode : public SceneNode
         ~EighthDimRenderNode();
         void        render();
         void        setPolygon(int index, const GLfloat[3][3]);
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const EighthDimSceneNode* sceneNode;
         int     numPolygons;

diff --git a/include/EighthDimShellNode.h b/include/EighthDimShellNode.h
@@ -45,10 +45,7 @@ class EighthDimShellNode : public SceneNode
         {
             return;
         }
-        const GLfloat* getPosition() const
-        {
-            return renderNode->getPosition();
-        }
+        const GLfloat* getPosition() const override;
     public:
         const OpenGLGState* getGState() const;
     private:

diff --git a/include/FlagWarpSceneNode.h b/include/FlagWarpSceneNode.h
@@ -42,10 +42,7 @@ class FlagWarpSceneNode : public SceneNode
         FlagWarpRenderNode(const FlagWarpSceneNode*);
         ~FlagWarpRenderNode();
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const FlagWarpSceneNode* sceneNode;
     };

diff --git a/include/LaserSceneNode.h b/include/LaserSceneNode.h
@@ -48,10 +48,7 @@ class LaserSceneNode : public SceneNode
         LaserRenderNode(const LaserSceneNode*);
         ~LaserRenderNode();
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         void renderFlatLaser();
         void renderGeoLaser();

diff --git a/include/MeshPolySceneNode.h b/include/MeshPolySceneNode.h
@@ -66,10 +66,7 @@ class MeshPolySceneNode : public WallSceneNode
         const GLfloat* getVertex(int i) const;
         const GLfloat (*getVertices() const)[3];
         int getVertexCount() const;
-        const GLfloat* getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         void drawV() const; // draw with just vertices
         void drawVT() const; // draw with texcoords

diff --git a/include/PolyWallSceneNode.h b/include/PolyWallSceneNode.h
@@ -50,10 +50,7 @@ class PolyWallSceneNode : public WallSceneNode
             style = _style;
         }
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return wall->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         void        drawV() const;
         void        drawVT() const;

diff --git a/include/QuadWallSceneNode.h b/include/QuadWallSceneNode.h
@@ -85,10 +85,7 @@ class QuadWallSceneNode : public WallSceneNode
         void        render();
         void        renderShadow();
         const GLfloat*  getVertex(int i) const;
-        const GLfloat*  getPosition() const
-        {
-            return wall->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         void        drawV() const;
         void        drawVT() const;

diff --git a/include/SphereSceneNode.h b/include/SphereSceneNode.h
@@ -87,10 +87,7 @@ class SphereLodSceneNode : public SphereSceneNode
         ~SphereLodRenderNode();
         void setLod(int lod);
         void render();
-        const GLfloat* getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
 
     private:
         const SphereLodSceneNode* sceneNode;
@@ -148,7 +145,7 @@ class SphereFragmentSceneNode : public SceneNode
         ~FragmentRenderNode();
         const GLfloat*  getVertex() const;
         void        render();
-        const GLfloat*  getPosition() const;
+        const GLfloat*  getPosition() const override;
     private:
         const SphereBspSceneNode*   sceneNode;
         int     theta, phi;
@@ -194,10 +191,7 @@ class SphereBspSceneNode : public SphereSceneNode
         void        setHighResolution(bool);
         void        setBaseIndex(int index);
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const SphereBspSceneNode* sceneNode;
         bool        highResolution;
@@ -216,7 +210,7 @@ class SphereBspSceneNode : public SphereSceneNode
 /******************************************************************************/
 
 
-#endif // BZF_FLAG_SCENE_NODE_H
+#endif // BZF_SPHERE_SCENE_NODE_H
 
 // Local Variables: ***
 // mode: C++ ***

diff --git a/include/TankSceneNode.h b/include/TankSceneNode.h
@@ -80,10 +80,7 @@ class TankIDLSceneNode : public SceneNode
         IDLRenderNode(const TankIDLSceneNode*);
         ~IDLRenderNode();
         void        render();
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         const TankIDLSceneNode* sceneNode;
         static const int    idlFaces[][5];
@@ -172,10 +169,7 @@ class TankSceneNode : public SceneNode
         void        setTankSize(TankGeometryEnums::TankSize);
         void        sortOrder(bool above, bool towards, bool left);
         void        setNarrowWithDepth(bool narrow);
-        const GLfloat*  getPosition() const
-        {
-            return sceneNode->getSphere();
-        }
+        const GLfloat* getPosition() const override;
 
         void        render();
         void        renderPart(TankGeometryEnums::TankPart part);

diff --git a/include/TriWallSceneNode.h b/include/TriWallSceneNode.h
@@ -65,10 +65,7 @@ class TriWallSceneNode : public WallSceneNode
         void        render();
         void        renderShadow();
         const GLfloat*  getVertex(int i) const;
-        const GLfloat*  getPosition() const
-        {
-            return wall->getSphere();
-        }
+        const GLfloat* getPosition() const override;
     private:
         void        drawV() const;
         void        drawVT() const;

diff --git a/src/bzfs/ShotManager.h b/src/bzfs/ShotManager.h
@@ -255,7 +255,7 @@ class ShockwaveLogic: public FlightLogic
     bool PointInSphere ( fvec3& point, Shot& shot );
 };
 }
-#endif  /*__SPAWNPOLICY_H__ */
+#endif  /* __SHOT_MANAGER_H__ */
 
 // Local Variables: ***
 // mode: C++ ***

diff --git a/src/geometry/BillboardSceneNode.cxx b/src/geometry/BillboardSceneNode.cxx
@@ -331,6 +331,11 @@ BillboardSceneNode::BillboardRenderNode::~BillboardRenderNode()
     // do nothing
 }
 
+const GLfloat* BillboardSceneNode::BillboardRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void            BillboardSceneNode::BillboardRenderNode::
 setFrame(float _u, float _v)
 {

diff --git a/src/geometry/BoltSceneNode.cxx b/src/geometry/BoltSceneNode.cxx
@@ -247,6 +247,11 @@ BoltSceneNode::BoltRenderNode::~BoltRenderNode()
     // do nothing
 }
 
+const GLfloat* BoltSceneNode::BoltRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void            BoltSceneNode::BoltRenderNode::setAnimation(
     int _cu, int _cv)
 {

diff --git a/src/geometry/EighthDBaseSceneNode.cxx b/src/geometry/EighthDBaseSceneNode.cxx
@@ -128,6 +128,11 @@ EighthDBaseSceneNode::EighthDBaseRenderNode::~EighthDBaseRenderNode()
     // do nothing
 }
 
+const GLfloat* EighthDBaseSceneNode::EighthDBaseRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void EighthDBaseSceneNode::EighthDBaseRenderNode::render()
 {
     myColor3f(1.0f, 1.0f, 1.0f);

diff --git a/src/geometry/EighthDBoxSceneNode.cxx b/src/geometry/EighthDBoxSceneNode.cxx
@@ -134,6 +134,11 @@ EighthDBoxSceneNode::EighthDBoxRenderNode::~EighthDBoxRenderNode()
     // do nothing
 }
 
+const GLfloat* EighthDBoxSceneNode::EighthDBoxRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void            EighthDBoxSceneNode::EighthDBoxRenderNode::render()
 {
     myColor3f(1.0f, 1.0f, 1.0f);

diff --git a/src/geometry/EighthDPyrSceneNode.cxx b/src/geometry/EighthDPyrSceneNode.cxx
@@ -138,6 +138,11 @@ EighthDPyrSceneNode::EighthDPyrRenderNode::~EighthDPyrRenderNode()
     // do nothing
 }
 
+const GLfloat* EighthDPyrSceneNode::EighthDPyrRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void            EighthDPyrSceneNode::EighthDPyrRenderNode::render()
 {
     myColor3f(1.0f, 1.0f, 1.0f);

diff --git a/src/geometry/EighthDimSceneNode.cxx b/src/geometry/EighthDimSceneNode.cxx
@@ -93,6 +93,11 @@ EighthDimSceneNode::EighthDimRenderNode::~EighthDimRenderNode()
     delete[] poly;
 }
 
+const GLfloat* EighthDimSceneNode::EighthDimRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void            EighthDimSceneNode::EighthDimRenderNode::render()
 {
     // draw polygons

diff --git a/src/geometry/EighthDimShellNode.cxx b/src/geometry/EighthDimShellNode.cxx
@@ -123,6 +123,10 @@ EighthDimShellNode::ShellRenderNode::~ShellRenderNode()
     return;
 }
 
+const GLfloat* EighthDimShellNode::ShellRenderNode::getPosition() const
+{
+    return renderNode->getPosition();
+}
 
 const OpenGLGState* EighthDimShellNode::ShellRenderNode::getGState() const
 {

diff --git a/src/geometry/FlagWarpSceneNode.cxx b/src/geometry/FlagWarpSceneNode.cxx
@@ -112,6 +112,11 @@ FlagWarpSceneNode::FlagWarpRenderNode::~FlagWarpRenderNode()
     // do nothing
 }
 
+const GLfloat* FlagWarpSceneNode::FlagWarpRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void            FlagWarpSceneNode::FlagWarpRenderNode::render()
 {
     // make a perturbed ring

diff --git a/src/geometry/LaserSceneNode.cxx b/src/geometry/LaserSceneNode.cxx
@@ -135,6 +135,11 @@ LaserSceneNode::LaserRenderNode::~LaserRenderNode()
     // do nothing
 }
 
+const GLfloat* LaserSceneNode::LaserRenderNode::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 void LaserSceneNode::LaserRenderNode::render()
 {
     const bool blackFog = BZDBCache::blend && RENDERER.isFogActive();

diff --git a/src/geometry/MeshPolySceneNode.cxx b/src/geometry/MeshPolySceneNode.cxx
@@ -48,6 +48,11 @@ MeshPolySceneNode::Geometry::~Geometry()
     return;
 }
 
+const GLfloat*  MeshPolySceneNode::Geometry::getPosition() const
+{
+    return sceneNode->getSphere();
+}
+
 inline void MeshPolySceneNode::Geometry::drawV() const
 {
     const int count = vertices.getSize();

diff --git a/src/geometry/MeshRenderNode.cxx b/src/geometry/MeshRenderNode.cxx
@@ -45,6 +45,11 @@ OpaqueRenderNode::OpaqueRenderNode(MeshDrawMgr* _drawMgr,
 }
 
 
+const GLfloat* OpaqueRenderNode::getPosition() const
+{
+    return NULL;
+}
+
 void OpaqueRenderNode::render()
 {
     const bool switchLights = (exts != NULL);
@@ -120,6 +125,10 @@ AlphaGroupRenderNode::AlphaGroupRenderNode(MeshDrawMgr* _drawMgr,
     return;
 }
 
+const GLfloat* AlphaGroupRenderNode::getPosition() const
+{
+    return pos;
+}
 
 void AlphaGroupRenderNode::setPosition(const GLfloat* _pos)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,6 +123,10 @@ EighthDimShellNode::ShellRenderNode::~ShellRenderNode() @@
         return;
     }
+    const GLfloat* EighthDimShellNode::ShellRenderNode::getPosition() const
+    {
+        return renderNode->getPosition();
+    }
     const OpenGLGState* EighthDimShellNode::ShellRenderNode::getGState() const
     {
@@ Expand Down @@