X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FDecal.cpp;h=686877aa3a11611268fc126c03546294a7fe2279;hb=6c2be7b3030442d0ffda2d712ef2159283de2f22;hp=0857befe22c46ab4bec14b89d9844188ffd530ee;hpb=afdb97f1c3e430801a1fd0c1b04a8a2102e8f1ac;p=lugaru.git

diff --git a/Source/Graphic/Decal.cpp b/Source/Graphic/Decal.cpp
index 0857bef..686877a 100644
--- a/Source/Graphic/Decal.cpp
+++ b/Source/Graphic/Decal.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -23,23 +23,23 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Environment/Terrain.hpp"
 #include "Graphic/Models.hpp"
 
-Decal::Decal() :
-    position(),
-    type(shadowdecal),
-    opacity(0),
-    rotation(0),
-    alivetime(0),
-    brightness(0)
+Decal::Decal()
+    : position()
+    , type(shadowdecal)
+    , opacity(0)
+    , rotation(0)
+    , alivetime(0)
+    , brightness(0)
 {
 }
 
-Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, float _brightness, int whichx, int whichy, float size, const Terrain& terrain, bool first) :
-    position(_position),
-    type(_type),
-    opacity(_opacity),
-    rotation(_rotation),
-    alivetime(0),
-    brightness(_brightness)
+Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, float _brightness, int whichx, int whichy, float size, const Terrain& terrain, bool first)
+    : position(_position)
+    , type(_type)
+    , opacity(_opacity)
+    , rotation(_rotation)
+    , alivetime(0)
+    , brightness(_brightness)
 {
     float placex, placez;
     placex = (float)whichx * terrain.scale + terrain.scale;
@@ -71,7 +71,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[1].y = terrain.heightmap[whichx][whichy] * terrain.scale + .01;
     }
 
-
     placex = (float)whichx * terrain.scale;
     placez = (float)whichy * terrain.scale + terrain.scale;
 
@@ -95,13 +94,13 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
     }
 }
 
-Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, float size, const Model& model, int i, int which) :
-    position(_position),
-    type(_type),
-    opacity(_opacity),
-    rotation(_rotation),
-    alivetime(0),
-    brightness(0)
+Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, float size, const Model& model, int i, int which)
+    : position(_position)
+    , type(_type)
+    , opacity(_opacity)
+    , rotation(_rotation)
+    , alivetime(0)
+    , brightness(0)
 {
     float placex, placez;
     if (which == 0) {
@@ -115,7 +114,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[0].z = placez;
         vertex[0].y = model.getTriangleVertex(i, 0).y;
 
-
         placex = model.getTriangleVertex(i, 1).x;
         placez = model.getTriangleVertex(i, 1).z;
 
@@ -126,7 +124,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[1].z = placez;
         vertex[1].y = model.getTriangleVertex(i, 1).y;
 
-
         placex = model.getTriangleVertex(i, 2).x;
         placez = model.getTriangleVertex(i, 2).z;
 
@@ -147,7 +144,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[0].z = placez;
         vertex[0].y = placex;
 
-
         placex = model.getTriangleVertex(i, 1).y;
         placez = model.getTriangleVertex(i, 1).z;
 
@@ -158,7 +154,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[1].z = placez;
         vertex[1].y = placex;
 
-
         placex = model.getTriangleVertex(i, 2).y;
         placez = model.getTriangleVertex(i, 2).z;
 
@@ -179,7 +174,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[0].z = model.getTriangleVertex(i, 0).z;
         vertex[0].y = placez;
 
-
         placex = model.getTriangleVertex(i, 1).x;
         placez = model.getTriangleVertex(i, 1).y;
 
@@ -190,7 +184,6 @@ Decal::Decal(XYZ _position, decal_type _type, float _opacity, float _rotation, f
         vertex[1].z = model.getTriangleVertex(i, 1).z;
         vertex[1].y = placez;
 
-
         placex = model.getTriangleVertex(i, 2).x;
         placez = model.getTriangleVertex(i, 2).y;