World|Line|Sector: Relocated missing material fixing to Line::Side

When a missing material fix is applied, automatically mark reverb
data for the adjoining sector cluster dirty.

Also applied the fluent interface pattern to Surface as typically
one configures several properties at once.

doomsday/client/include/world/line.h

@@ -534,6 +534,16 @@ class Line : public de::MapElement
          */
         void setShadowVisCount(int newCount);
 
+#ifdef __CLIENT__
+
+        /**
+         * Do as in the original DOOM if the texture has not been defined -
+         * extend the floor/ceiling to fill the space (unless it is skymasked).
+         */
+        void fixMissingMaterials();
+
+#endif // __CLIENT__
+
     protected:
         int property(DmuArgs &args) const;
         int setProperty(DmuArgs const &args);

doomsday/client/include/world/sector.h

@@ -453,11 +453,6 @@ class Sector : public de::MapElement
      */
     void setLightColor(de::Vector3f const &newLightColor);
 
-    /// @copydoc setLightColor()
-    inline void setLightColor(float red, float green, float blue) {
-        setLightColor(de::Vector3f(red, green, blue));
-    }
-
     /**
      * Change the strength of the specified @a component of the ambient light
      * color in the sector. The LightColorChange audience is notified whenever
@@ -559,11 +554,6 @@ class Sector : public de::MapElement
      */
     LightGridData &lightGridData();
 
-    /**
-     * Perform missing material fixes again for all line sides in the sector.
-     */
-    void fixMissingMaterialsForSides();
-
 #endif // __CLIENT__
 
 protected:

doomsday/client/include/world/surface.h

@@ -131,7 +131,7 @@ class Surface : public de::MapElement
      *
      * @param newNormal  New normal vector (will be normalized if needed).
      */
-    void setNormal(de::Vector3f const &newNormal);
+    Surface &setNormal(de::Vector3f const &newNormal);
 
     /**
      * Returns a copy of the current @ref surfaceFlags of the surface.
@@ -144,7 +144,7 @@ class Surface : public de::MapElement
      * @param flagsToChange  Flags to change the value of.
      * @param operation      Logical operation to perform on the flags.
      */
-    void setFlags(int flagsToChange, de::FlagOp operation = de::SetFlags);
+    Surface &setFlags(int flagsToChange, de::FlagOp operation = de::SetFlags);
 
     /**
      * Returns @c true iff the surface is flagged @a flagsToTest.
@@ -200,7 +200,7 @@ class Surface : public de::MapElement
      * @param newMaterial   New material to apply. Use @c 0 to clear.
      * @param isMissingFix  @c true= this is a fix for a "missing" material.
      */
-    bool setMaterial(Material *newMaterial, bool isMissingFix = false);
+    Surface &setMaterial(Material *newMaterial, bool isMissingFix = false);
 
     /**
      * Returns the material origin offset of the surface.
@@ -212,7 +212,7 @@ class Surface : public de::MapElement
      *
      * @param newOrigin  New origin offset in map coordinate space units.
      */
-    void setMaterialOrigin(de::Vector2f const &newOrigin);
+    Surface &setMaterialOrigin(de::Vector2f const &newOrigin);
 
     /**
      * Change the specified @a component of the material origin for the surface.
@@ -224,7 +224,7 @@ class Surface : public de::MapElement
      *
      * @see setMaterialorigin(), setMaterialOriginX(), setMaterialOriginY()
      */
-    void setMaterialOriginComponent(int component, float newPosition);
+    Surface &setMaterialOriginComponent(int component, float newPosition);
 
     /**
      * Change the position of the X axis component of the material origin for the
@@ -235,7 +235,9 @@ class Surface : public de::MapElement
      *
      * @see setMaterialOriginComponent(), setMaterialOriginY()
      */
-    inline void setMaterialOriginX(float newPosition) { setMaterialOriginComponent(0, newPosition); }
+    inline Surface &setMaterialOriginX(float newPosition) {
+        return setMaterialOriginComponent(0, newPosition);
+    }
 
     /**
      * Change the position of the Y axis component of the material origin for the
@@ -246,7 +248,9 @@ class Surface : public de::MapElement
      *
      * @see setMaterialOriginComponent(), setMaterialOriginX()
      */
-    inline void setMaterialOriginY(float newPosition) { setMaterialOriginComponent(1, newPosition); }
+    inline Surface &setMaterialOriginY(float newPosition) {
+        return setMaterialOriginComponent(1, newPosition);
+    }
 
     /**
      * Compose a URI for the surface's material. If no material is bound then a
@@ -272,7 +276,7 @@ class Surface : public de::MapElement
      *
      * @see opacity()
      */
-    void setOpacity(float newOpacity);
+    Surface &setOpacity(float newOpacity);
 
     /**
      * Returns the tint color of the surface. The TintColorChange audience is notified
@@ -324,7 +328,7 @@ class Surface : public de::MapElement
      *
      * @see tintColor(), setTintColorComponent(), setTintRed(), setTintGreen(), setTintBlue()
      */
-    void setTintColor(de::Vector3f const &newTintColor);
+    Surface &setTintColor(de::Vector3f const &newTintColor);
 
     /**
      * Change the strength of the specified @a component of the tint color for the
@@ -335,7 +339,7 @@ class Surface : public de::MapElement
      *
      * @see setTintColor(), setTintRed(), setTintGreen(), setTintBlue()
      */
-    void setTintColorComponent(int component, float newStrength);
+    Surface &setTintColorComponent(int component, float newStrength);
 
     /**
      * Change the strength of the red component of the tint color for the surface.
@@ -345,7 +349,9 @@ class Surface : public de::MapElement
      *
      * @see setTintColorComponent(), setTintGreen(), setTintBlue()
      */
-    inline void setTintRed(float newStrength)  { setTintColorComponent(0, newStrength); }
+    inline Surface &setTintRed(float newStrength) {
+        return setTintColorComponent(0, newStrength);
+    }
 
     /**
      * Change the strength of the green component of the tint color for the surface.
@@ -355,7 +361,9 @@ class Surface : public de::MapElement
      *
      * @see setTintColorComponent(), setTintRed(), setTintBlue()
      */
-    inline void setTintGreen(float newStrength) { setTintColorComponent(1, newStrength); }
+    inline Surface &setTintGreen(float newStrength) {
+        return setTintColorComponent(1, newStrength);
+    }
 
     /**
      * Change the strength of the blue component of the tint color for the surface.
@@ -365,7 +373,9 @@ class Surface : public de::MapElement
      *
      * @see setTintColorComponent(), setTintRed(), setTintGreen()
      */
-    inline void setTintBlue(float newStrength)  { setTintColorComponent(2, newStrength); }
+    inline Surface &setTintBlue(float newStrength) {
+        return setTintColorComponent(2, newStrength);
+    }
 
     /**
      * Returns the blendmode for the surface.
@@ -377,7 +387,7 @@ class Surface : public de::MapElement
      *
      * @param newBlendMode  New blendmode.
      */
-    void setBlendMode(blendmode_t newBlendMode);
+    Surface &setBlendMode(blendmode_t newBlendMode);
 
 #ifdef __CLIENT__
 

doomsday/client/src/dd_main.cpp

@@ -3001,12 +3001,9 @@ DENG_EXTERN_C void R_SetupMap(int mode, int flags)
     // Update all sectors.
     /// @todo Refactor away.
     foreach(Sector *sector, map.sectors())
+    foreach(LineSide *side, sector->sides())
     {
-        sector->fixMissingMaterialsForSides();
-        foreach(SectorCluster *cluster, sector->clusters())
-        {
-            cluster->markReverbDirty();
-        }
+        side->fixMissingMaterials();
     }
 #endif
 

doomsday/client/src/world/api_mapedit.cpp

@@ -313,18 +313,21 @@ void MPE_LineAddSide(int lineIdx, int sideId, short flags, ddstring_t const *top
     side.addSections();
 
     // Assign the resolved material if found.
-    side.top().setMaterial(findMaterialInDict(topMaterialUri));
-    side.top().setMaterialOrigin(Vector2f(topOffsetX, topOffsetY));
-    side.top().setTintColor(Vector3f(topRed, topGreen, topBlue));
-
-    side.middle().setMaterial(findMaterialInDict(middleMaterialUri));
-    side.middle().setMaterialOrigin(Vector2f(middleOffsetX, middleOffsetY));
-    side.middle().setTintColor(Vector3f(middleRed, middleGreen, middleBlue));
-    side.middle().setOpacity(middleOpacity);
-
-    side.bottom().setMaterial(findMaterialInDict(bottomMaterialUri));
-    side.bottom().setMaterialOrigin(Vector2f(bottomOffsetX, bottomOffsetY));
-    side.bottom().setTintColor(Vector3f(bottomRed, bottomGreen, bottomBlue));
+    side.top()
+        .setMaterial(findMaterialInDict(topMaterialUri))
+        .setMaterialOrigin(Vector2f(topOffsetX, topOffsetY))
+        .setTintColor(Vector3f(topRed, topGreen, topBlue));
+
+    side.middle()
+        .setMaterial(findMaterialInDict(middleMaterialUri))
+        .setMaterialOrigin(Vector2f(middleOffsetX, middleOffsetY))
+        .setTintColor(Vector3f(middleRed, middleGreen, middleBlue))
+        .setOpacity(middleOpacity);
+
+    side.bottom()
+        .setMaterial(findMaterialInDict(bottomMaterialUri))
+        .setMaterialOrigin(Vector2f(bottomOffsetX, bottomOffsetY))
+        .setTintColor(Vector3f(bottomRed, bottomGreen, bottomBlue));
 }
 
 #undef MPE_PlaneCreate
@@ -341,9 +344,10 @@ int MPE_PlaneCreate(int sectorIdx, coord_t height, ddstring_t const *materialUri
 
     plane->setIndexInArchive(archiveIndex);
 
-    plane->surface().setMaterial(findMaterialInDict(materialUri));
-    plane->surface().setTintColor(Vector3f(tintRed, tintGreen, tintBlue));
-    plane->surface().setMaterialOrigin(Vector2f(matOffsetX, matOffsetY));
+    plane->surface()
+        .setMaterial(findMaterialInDict(materialUri))
+        .setTintColor(Vector3f(tintRed, tintGreen, tintBlue))
+        .setMaterialOrigin(Vector2f(matOffsetX, matOffsetY));
 
     if(!plane->isSectorFloor() && !plane->isSectorCeiling())
     {