Surface|World: Cleanup

skyjake · Aug 17, 2013 · 45f189f · 45f189f
1 parent f49bb78
commit 45f189f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 40 deletions.
diff --git a/doomsday/client/include/world/surface.h b/doomsday/client/include/world/surface.h
@@ -117,25 +117,25 @@ class Surface : public de::MapElement
             de::Vector3f const &tintColor = de::Vector3f(1, 1, 1));
 
     /**
-     * Returns the tangent space matrix for the surface.
+     * Returns the normalized tangent space matrix for the surface.
      * (col0: tangent, col1: bitangent, col2: normal)
      */
     de::Matrix3f const &tangentMatrix() const;
 
     /**
      * Returns a copy of the normalized tangent vector for the surface.
      */
-    de::Vector3f tangent() const;
+    inline de::Vector3f tangent() const { return tangentMatrix().column(0); }
 
     /**
      * Returns a copy of the normalized bitangent vector for the surface.
      */
-    de::Vector3f bitangent() const;
+    inline de::Vector3f bitangent() const { return tangentMatrix().column(1); }
 
     /**
      * Returns a copy of the normalized normal vector for the surface.
      */
-    de::Vector3f normal() const;
+    inline de::Vector3f normal() const { return tangentMatrix().column(2); }
 
     /**
      * Change the tangent space normal vector for the surface. If changed,
@@ -388,7 +388,7 @@ class Surface : public de::MapElement
      *
      * @param newBlendMode  New blendmode.
      */
-    bool setBlendMode(blendmode_t newBlendMode);
+    void setBlendMode(blendmode_t newBlendMode);
 
 #ifdef __CLIENT__
 

diff --git a/doomsday/client/src/world/surface.cpp b/doomsday/client/src/world/surface.cpp
@@ -23,8 +23,6 @@
 #include <de/Log>
 
 #include "de_defs.h" // Def_GetGenerator
-#include "dd_main.h"
-
 #include "Materials"
 
 #include "world/map.h"
@@ -157,8 +155,7 @@ DENG2_PIMPL(Surface)
         }
     }
 
-    void notifyTintColorChanged(Vector3f const &oldTintColor,
-                                int changedComponents)
+    void notifyTintColorChanged(Vector3f const &oldTintColor, int changedComponents)
     {
         DENG2_FOR_PUBLIC_AUDIENCE(TintColorChange, i)
         {
@@ -193,8 +190,7 @@ DENG2_PIMPL(Surface)
 };
 
 Surface::Surface(MapElement &owner, float opacity, Vector3f const &tintColor)
-    : MapElement(DMU_SURFACE, &owner),
-      d(new Instance(this))
+    : MapElement(DMU_SURFACE, &owner), d(new Instance(this))
 {
 #ifdef __CLIENT__
     _decorationData.needsUpdate = true;
@@ -216,21 +212,6 @@ Matrix3f const &Surface::tangentMatrix() const
     return d->tangentMatrix;
 }
 
-Vector3f Surface::tangent() const
-{
-    return tangentMatrix().column(0);
-}
-
-Vector3f Surface::bitangent() const
-{
-    return tangentMatrix().column(1);
-}
-
-Vector3f Surface::normal() const
-{
-    return tangentMatrix().column(2);
-}
-
 void Surface::setNormal(Vector3f const &newNormal)
 {
     Vector3f oldNormal = normal();
@@ -249,6 +230,16 @@ void Surface::setNormal(Vector3f const &newNormal)
     }
 }
 
+int Surface::flags() const
+{
+    return d->flags;
+}
+
+void Surface::setFlags(int flagsToChange, FlagOp operation)
+{
+    applyFlagOperation(d->flags, flagsToChange, operation);
+}
+
 bool Surface::hasMaterial() const
 {
     return d->material != 0;
@@ -269,16 +260,6 @@ Material &Surface::material() const
     throw MissingMaterialError("Surface::material", "No material is bound");
 }
 
-int Surface::flags() const
-{
-    return d->flags;
-}
-
-void Surface::setFlags(int flagsToChange, FlagOp operation)
-{
-    applyFlagOperation(d->flags, flagsToChange, operation);
-}
-
 bool Surface::setMaterial(Material *newMaterial, bool isMissingFix)
 {
     if(d->material != newMaterial)
@@ -403,7 +384,6 @@ Vector2f const &Surface::visMaterialOriginDelta() const
 void Surface::lerpVisMaterialOrigin()
 {
     // $smoothmaterialorigin
-
     d->visMaterialOriginDelta = d->oldMaterialOrigin[0] * (1 - frameTimePos)
         + d->materialOrigin * frameTimePos - d->materialOrigin;
 
@@ -453,7 +433,7 @@ float Surface::opacity() const
 
 void Surface::setOpacity(float newOpacity)
 {
-    DENG_ASSERT(d->isSideMiddle() || d->isSectorExtraPlane());
+    DENG_ASSERT(d->isSideMiddle() || d->isSectorExtraPlane()); // sanity check
 
     newOpacity = de::clamp(0.f, newOpacity, 1.f);
     if(!de::fequal(d->opacity, newOpacity))
@@ -505,13 +485,12 @@ blendmode_t Surface::blendMode() const
     return d->blendMode;
 }
 
-bool Surface::setBlendMode(blendmode_t newBlendMode)
+void Surface::setBlendMode(blendmode_t newBlendMode)
 {
     if(d->blendMode != newBlendMode)
     {
         d->blendMode = newBlendMode;
     }
-    return true;
 }
 
 #ifdef __CLIENT__