diff --git a/src/basics/Color.h b/src/basics/Color.h index e851cc4..bc3e83f 100644 --- a/src/basics/Color.h +++ b/src/basics/Color.h @@ -9,7 +9,7 @@ namespace basics { class BASICSSHARED_EXPORT Color { public: - Color(); + Color() = default; Color(const Color &col); Color(double r, double g, double b, double a=1.0); diff --git a/src/basics/Color.inline.cpp b/src/basics/Color.inline.cpp index 1f38abc..c72de09 100644 --- a/src/basics/Color.inline.cpp +++ b/src/basics/Color.inline.cpp @@ -12,11 +12,6 @@ # define METHSPEC #endif -METHSPEC Color::Color(): - r(0.0), g(0.0), b(0.0), a(0.0) -{ -} - METHSPEC Color::Color(double r, double g, double b, double a): r(r), g(g), b(b), a(a) { diff --git a/src/basics/Vector3.h b/src/basics/Vector3.h index 797e8c1..778f69d 100644 --- a/src/basics/Vector3.h +++ b/src/basics/Vector3.h @@ -43,7 +43,7 @@ typedef struct class BASICSSHARED_EXPORT Vector3 { public: - Vector3(); + Vector3() = default; Vector3(double x, double y, double z); Vector3(const VectorSpherical &v); diff --git a/src/basics/Vector3.inline.cpp b/src/basics/Vector3.inline.cpp index 7d2e6a5..38f0f7f 100644 --- a/src/basics/Vector3.inline.cpp +++ b/src/basics/Vector3.inline.cpp @@ -14,10 +14,6 @@ METHSPEC Vector3::Vector3(double x, double y, double z): { } -METHSPEC Vector3::Vector3() -{ -} - METHSPEC Vector3 Vector3::add(double x, double y, double z) const { return Vector3(this->x + x, this->y + y, this->z + z); diff --git a/src/render/software/CanvasFragment.cpp b/src/render/software/CanvasFragment.cpp index 20ce8a0..dcef1e0 100644 --- a/src/render/software/CanvasFragment.cpp +++ b/src/render/software/CanvasFragment.cpp @@ -1,9 +1,5 @@ #include "CanvasFragment.h" -CanvasFragment::CanvasFragment() -{ -} - CanvasFragment::CanvasFragment(double z, const Vector3 &location, int client, bool opaque): opaque(opaque), z(z), location(location), client(client) { diff --git a/src/render/software/CanvasFragment.h b/src/render/software/CanvasFragment.h index 520415c..cb328cc 100644 --- a/src/render/software/CanvasFragment.h +++ b/src/render/software/CanvasFragment.h @@ -15,7 +15,7 @@ namespace software { class SOFTWARESHARED_EXPORT CanvasFragment { public: - CanvasFragment(); + CanvasFragment() = default; CanvasFragment(double z, const Vector3 &location, int client=0, bool opaque=true); void setColor(const Color &col); diff --git a/src/render/software/CanvasPixel.cpp b/src/render/software/CanvasPixel.cpp index aa11a38..877195c 100644 --- a/src/render/software/CanvasPixel.cpp +++ b/src/render/software/CanvasPixel.cpp @@ -23,6 +23,7 @@ const CanvasFragment *CanvasPixel::getFrontFragment() const void CanvasPixel::reset() { count = 0; + composite = COLOR_BLACK; } void CanvasPixel::pushFragment(const CanvasFragment &fragment) diff --git a/src/render/software/CanvasPixel.h b/src/render/software/CanvasPixel.h index 314e5b0..d2965d7 100644 --- a/src/render/software/CanvasPixel.h +++ b/src/render/software/CanvasPixel.h @@ -5,7 +5,7 @@ #include "CanvasFragment.h" -const int MAX_FRAGMENT_COUNT = 7; +const int MAX_FRAGMENT_COUNT = 2; namespace paysages { namespace software { diff --git a/src/render/software/CanvasPortion.cpp b/src/render/software/CanvasPortion.cpp index 805cb02..dbf2950 100644 --- a/src/render/software/CanvasPortion.cpp +++ b/src/render/software/CanvasPortion.cpp @@ -69,7 +69,6 @@ void CanvasPortion::preparePixels() delete[] pixels; } pixels = new CanvasPixel[width * height]; - clear(); } void CanvasPortion::discardPixels(bool save)