Refactor out unnecessary virtuals

Author: yozhijk

App/Core/renderer.h

@@ -94,7 +94,7 @@ namespace Baikal
 
 
         /**
-            Forbidden stuff.
+            Disallow copies and moves.
          */
         Renderer(Renderer const&) = delete;
         Renderer& operator = (Renderer const&) = delete;

App/Scene/Collector/collector.h

@@ -68,25 +68,25 @@ namespace Baikal
         virtual ~Collector();
 
         // Clear collector state (CreateIterator returns invalid iterator if the collector is empty)
-        virtual void Clear();
+        void Clear();
         // Create an iterator of objects
-        virtual Iterator* CreateIterator() const;
+        Iterator* CreateIterator() const;
         // Collect objects and their dependencies
-        virtual void Collect(Iterator* iter, ExpandFunc expand_func);
+        void Collect(Iterator* iter, ExpandFunc expand_func);
         // Commit collected objects
-        virtual void Commit();
+        void Commit();
         // Given a budnle check if all collected objects are in the bundle and do not require update
-        virtual bool NeedsUpdate(Bundle const* bundle, ChangedFunc cahnged_func) const;
+        bool NeedsUpdate(Bundle const* bundle, ChangedFunc cahnged_func) const;
         // Get number of objects in the collection
-        virtual std::size_t GetNumItems() const;
+        std::size_t GetNumItems() const;
         // Create serialised bundle (randomly accessible dump of objects)
-        virtual Bundle* CreateBundle() const;
+        Bundle* CreateBundle() const;
         // Get item index within a collection
-        virtual std::uint32_t GetItemIndex(void const* item) const;
+        std::uint32_t GetItemIndex(void const* item) const;
         // Finalization function
-        virtual void Finalize(FinalizeFunc finalize_func);
+        void Finalize(FinalizeFunc finalize_func);
 
-        // Forbidden stuff
+        // Disallow copies and moves
         Collector(Collector const&) = delete;
         Collector& operator = (Collector const&) = delete;
 

App/Scene/iterator.h

@@ -57,7 +57,7 @@ namespace Baikal
         // Retrieve with uncoditional cast: caller is responsible of all the implications, no type check here
         template <typename T> T* ItemAs() const { return reinterpret_cast<T*>(Item()); }
 
-        // TODO: support these later
+        // Disable copies and moves
         Iterator(Iterator const&) = delete;
         Iterator& operator = (Iterator const&) = delete;
     };

App/Scene/light.h

@@ -59,16 +59,16 @@ namespace Baikal
         //virtual RadeonRays::float3 GetRadiantPower() const = 0;
 
         // Set and get position
-        virtual RadeonRays::float3 GetPosition() const;
-        virtual void SetPosition(RadeonRays::float3 const& p);
+        RadeonRays::float3 GetPosition() const;
+        void SetPosition(RadeonRays::float3 const& p);
 
         // Set and get direction
-        virtual RadeonRays::float3 GetDirection() const;
-        virtual void SetDirection(RadeonRays::float3 const& d);
+        RadeonRays::float3 GetDirection() const;
+        void SetDirection(RadeonRays::float3 const& d);
 
         // Set and get emitted radiance (differential)
-        virtual RadeonRays::float3 GetEmittedRadiance() const;
-        virtual void SetEmittedRadiance(RadeonRays::float3 const& e);
+        RadeonRays::float3 GetEmittedRadiance() const;
+        void SetEmittedRadiance(RadeonRays::float3 const& e);
 
         // Iterator for all the textures used by the light
         virtual Iterator* CreateTextureIterator() const;
@@ -123,8 +123,8 @@ namespace Baikal
         SpotLight();
         // Get and set inner and outer falloff angles: they are set as cosines of angles between light direction
         // and cone opening.
-        virtual void SetConeShape(RadeonRays::float2 angles);
-        virtual RadeonRays::float2 GetConeShape() const;
+        void SetConeShape(RadeonRays::float2 angles);
+        RadeonRays::float2 GetConeShape() const;
 
     private:
         // Opening angles (x - inner, y - outer)
@@ -146,13 +146,13 @@ namespace Baikal
     public:
         ImageBasedLight();
         // Get and set illuminant texture
-        virtual void SetTexture(Texture const* texture);
-        virtual Texture const* GetTexture() const;
+        void SetTexture(Texture const* texture);
+        Texture const* GetTexture() const;
 
         // Get and set multiplier.
         // Multiplier is used to adjust emissive power.
-        virtual float GetMultiplier() const;
-        virtual void SetMultiplier(float m);
+        float GetMultiplier() const;
+        void SetMultiplier(float m);
 
         // Iterator for all the textures used by the light
         Iterator* CreateTextureIterator() const override;
@@ -170,9 +170,9 @@ namespace Baikal
     public:
         AreaLight(Shape const* shape, std::size_t idx);
         // Get parent shape
-        virtual Shape const* GetShape() const;
+        Shape const* GetShape() const;
         // Get parent prim idx
-        virtual std::size_t GetPrimitiveIdx() const;
+        std::size_t GetPrimitiveIdx() const;
 
     private:
         // Parent shape

App/Scene/material.h

@@ -102,22 +102,21 @@ namespace Baikal
         virtual Iterator* CreateTextureIterator() const;
         // Iterator of inputs
         virtual Iterator* CreateInputIterator() const;
+        // Check if material has emissive components
+        virtual bool HasEmission() const;
 
         // Set input value
         // If specific data type is not supported throws std::runtime_error
-        virtual void SetInputValue(std::string const& name, RadeonRays::float4 const& value);
-        virtual void SetInputValue(std::string const& name, Texture const* texture);
-        virtual void SetInputValue(std::string const& name, Material const* material);
+        void SetInputValue(std::string const& name, RadeonRays::float4 const& value);
+        void SetInputValue(std::string const& name, Texture const* texture);
+        void SetInputValue(std::string const& name, Material const* material);
 
-        virtual InputValue GetInputValue(std::string const& name) const;
+        InputValue GetInputValue(std::string const& name) const;
 
         // Check if material is two-sided (normal direction does not matter and can be reversed)
-        virtual bool IsTwoSided() const;
+        bool IsTwoSided() const;
         // Set two-sidedness
-        virtual void SetTwoSided(bool twosided);
-
-        // Check if material has emissive components
-        virtual bool HasEmission() const;
+        void SetTwoSided(bool twosided);
 
     protected:
         // Register specific input
@@ -126,7 +125,6 @@ namespace Baikal
         void ClearInputs();
 
     private:
-
         class InputIterator;
 
         using InputMap = std::map<std::string, Input>;
@@ -165,8 +163,8 @@ namespace Baikal
 
         SingleBxdf(BxdfType type);
 
-        virtual BxdfType GetBxdfType() const;
-        virtual void SetBxdfType(BxdfType type);
+        BxdfType GetBxdfType() const;
+        void SetBxdfType(BxdfType type);
 
         // Check if material has emissive components
         bool HasEmission() const override;
@@ -187,8 +185,8 @@ namespace Baikal
 
         MultiBxdf(Type type);
 
-        virtual Type GetType() const;
-        virtual void SetType(Type type);
+        Type GetType() const;
+        void SetType(Type type);
 
         // Check if material has emissive components
         bool HasEmission() const override;

App/Scene/scene_object.h

@@ -41,13 +41,13 @@ namespace Baikal
         virtual ~SceneObject() = 0;
 
         // Check if the object has been changed since last reset
-        virtual bool IsDirty() const;
+        bool IsDirty() const;
         // Set dirty flag
-        virtual void SetDirty(bool dirty) const;
+        void SetDirty(bool dirty) const;
 
         // Set & get name
-        virtual void SetName(std::string const& name);
-        virtual std::string GetName() const;
+        void SetName(std::string const& name);
+        std::string GetName() const;
 
         SceneObject(SceneObject const&) = delete;
         SceneObject& operator = (SceneObject const&) = delete;

App/Scene/scene_tracker.h

@@ -61,7 +61,7 @@ namespace Baikal
         virtual ~SceneTracker();
 
         // Given a scene this method produces (or loads from cache) corresponding GPU representation.
-        virtual ClwScene& CompileScene(Scene1 const& scene, Collector& mat_collector, Collector& tex_collector) const;
+        ClwScene& CompileScene(Scene1 const& scene, Collector& mat_collector, Collector& tex_collector) const;
 
 
         // Get underlying intersection API.

App/Scene/shape.h

@@ -53,8 +53,8 @@ namespace Baikal
         virtual ~Shape() = 0;
 
         // Get and set material
-        virtual void SetMaterial(Material const* material);
-        virtual Material const* GetMaterial() const;
+        void SetMaterial(Material const* material);
+        Material const* GetMaterial() const;
 
         // Forbidden stuff
         Shape(Shape const&) = delete;
@@ -75,27 +75,31 @@ namespace Baikal
         Mesh();
 
         // Set and get index array
-        virtual void SetIndices(std::uint32_t const* indices, std::size_t num_indices);
-        virtual std::size_t GetNumIndices() const;
-        virtual std::uint32_t const* GetIndices() const;
+        void SetIndices(std::uint32_t const* indices, std::size_t num_indices);
+        std::size_t GetNumIndices() const;
+        std::uint32_t const* GetIndices() const;
 
         // Set and get vertex array
-        virtual void SetVertices(RadeonRays::float3 const* vertices, std::size_t num_vertices);
-        virtual void SetVertices(float const* vertices, std::size_t num_vertices);
-        virtual std::size_t GetNumVertices() const;
-        virtual RadeonRays::float3 const* GetVertices() const;
+        void SetVertices(RadeonRays::float3 const* vertices, std::size_t num_vertices);
+        void SetVertices(float const* vertices, std::size_t num_vertices);
+        std::size_t GetNumVertices() const;
+        RadeonRays::float3 const* GetVertices() const;
 
         // Set and get normal array
-        virtual void SetNormals(RadeonRays::float3 const* normals, std::size_t num_normals);
-        virtual void SetNormals(float const* normals, std::size_t num_normals);
-        virtual std::size_t GetNumNormals() const;
-        virtual RadeonRays::float3 const* GetNormals() const;
+        void SetNormals(RadeonRays::float3 const* normals, std::size_t num_normals);
+        void SetNormals(float const* normals, std::size_t num_normals);
+        std::size_t GetNumNormals() const;
+        RadeonRays::float3 const* GetNormals() const;
 
         // Set and get UV array
-        virtual void SetUVs(RadeonRays::float2 const* uvs, std::size_t num_uvs);
-        virtual void SetUVs(float const* uvs, std::size_t num_uvs);
-        virtual std::size_t GetNumUVs() const;
-        virtual RadeonRays::float2 const* GetUVs() const;
+        void SetUVs(RadeonRays::float2 const* uvs, std::size_t num_uvs);
+        void SetUVs(float const* uvs, std::size_t num_uvs);
+        std::size_t GetNumUVs() const;
+        RadeonRays::float2 const* GetUVs() const;
+        
+        // Forbidden stuff
+        Mesh(Mesh const&) = delete;
+        Mesh& operator = (Mesh const&) = delete;
 
     private:
         std::unique_ptr<RadeonRays::float3[]> m_vertices;