Surface: Added getter methods for the rest of Surface's property values

Plus various refactorings to Surface to separate the client-only state for plotted decoration sources. Todo for later: Move plotted decoration sources to the map renderer.
skyjake · Mar 16, 2013 · d3e60a9 · d3e60a9
1 parent e18a918
commit d3e60a9
Show file tree

Hide file tree

Showing 26 changed files with 880 additions and 706 deletions.
diff --git a/doomsday/client/include/map/plane.h b/doomsday/client/include/map/plane.h
@@ -36,16 +36,15 @@ class Sector;
  */
 /// @addtogroup map
 ///@{
-#define PS_base                 surface().base
-#define PS_tangent              surface().tangent
-#define PS_bitangent            surface().bitangent
-#define PS_normal               surface().normal
-#define PS_material             surface().material
-#define PS_offset               surface().offset
-#define PS_visoffset            surface().visOffset
-#define PS_rgba                 surface().rgba
-#define PS_flags                surface().flags
-#define PS_inflags              surface().inFlags
+#define PS_base                 surface().soundEmitter()
+#define PS_tangent              surface().tangent()
+#define PS_bitangent            surface().bitangent()
+#define PS_normal               surface().normal()
+#define PS_material             surface().material()
+#define PS_offset               surface().materialOrigin()
+#define PS_visoffset            surface().visMaterialOrigin()
+#define PS_rgba                 surface().colorAndAlpha()
+#define PS_flags                surface().flags()
 ///@}
 
 /**

diff --git a/doomsday/client/include/map/r_world.h b/doomsday/client/include/map/r_world.h
@@ -109,7 +109,7 @@ void R_OrderVertices(LineDef *line, Sector const *sector, Vertex *verts[2]);
  */
 boolean R_FindBottomTop2(SideDefSection section, int lineFlags,
     Sector const *frontSec, Sector const *backSec, SideDef const *frontDef, SideDef const *backDef,
-    coord_t *low, coord_t *hi, float matOffset[2]);
+    coord_t *low, coord_t *hi, pvec2f_t matOffset);
 boolean R_FindBottomTop(SideDefSection section, int lineFlags,
     Sector const *frontSec, Sector const *backSec, SideDef const *frontDef, SideDef const *backDef,
     coord_t *low, coord_t *hi) /* matOffset = 0 */;