From cf7342f8b7ef2b708fa0d58af855f64aee97951b Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 18 Sep 2014 02:39:18 -0300 Subject: [PATCH] Use C++11's in-line member initializers instead of default constructors with initializer lists, for some structs. --HG-- branch : minor --- src/modules/audio/openal/Source.h | 12 +++------ src/modules/graphics/Texture.cpp | 23 ------------------ src/modules/graphics/Texture.h | 14 +++++------ src/modules/graphics/opengl/Image.h | 6 ++--- src/modules/image/magpie/FormatHandler.h | 13 +++++----- src/modules/window/Window.cpp | 17 ------------- src/modules/window/Window.h | 31 +++++++++++------------- src/modules/window/sdl/Window.cpp | 8 ------ src/modules/window/sdl/Window.h | 6 ++--- 9 files changed, 33 insertions(+), 97 deletions(-) diff --git a/src/modules/audio/openal/Source.h b/src/modules/audio/openal/Source.h index 2b0d8bc54..3be26e7da 100644 --- a/src/modules/audio/openal/Source.h +++ b/src/modules/audio/openal/Source.h @@ -165,15 +165,9 @@ private: struct Cone { - int innerAngle; // degrees - int outerAngle; // degrees - float outerVolume; - - Cone() - : innerAngle(360) - , outerAngle(360) - , outerVolume(0.0f) - {} + int innerAngle = 360; // degrees + int outerAngle = 360; // degrees + float outerVolume = 0.0f; } cone; float offsetSamples; diff --git a/src/modules/graphics/Texture.cpp b/src/modules/graphics/Texture.cpp index 245f10220..b48f8a2bf 100644 --- a/src/modules/graphics/Texture.cpp +++ b/src/modules/graphics/Texture.cpp @@ -27,29 +27,6 @@ namespace graphics Texture::Filter Texture::defaultFilter; -Texture::Filter::Filter() - : min(FILTER_LINEAR) - , mag(FILTER_LINEAR) - , mipmap(FILTER_NONE) - , anisotropy(1.0f) -{ -} - -Texture::Wrap::Wrap() - : s(WRAP_CLAMP) - , t(WRAP_CLAMP) -{ -} - -Texture::Texture() - : width(0) - , height(0) - , filter(getDefaultFilter()) - , wrap() - , vertices() -{ -} - Texture::~Texture() { } diff --git a/src/modules/graphics/Texture.h b/src/modules/graphics/Texture.h index 5a0158926..f9e0600a0 100644 --- a/src/modules/graphics/Texture.h +++ b/src/modules/graphics/Texture.h @@ -57,18 +57,16 @@ public: struct Filter { - Filter(); - FilterMode min; - FilterMode mag; - FilterMode mipmap; - float anisotropy; + FilterMode min = FILTER_LINEAR; + FilterMode mag = FILTER_LINEAR; + FilterMode mipmap = FILTER_NONE; + float anisotropy = 1.0f; }; struct Wrap { - Wrap(); - WrapMode s; - WrapMode t; + WrapMode s = WRAP_CLAMP; + WrapMode t = WRAP_CLAMP; }; Texture(); diff --git a/src/modules/graphics/opengl/Image.h b/src/modules/graphics/opengl/Image.h index b8ed275da..8f38eaa0c 100644 --- a/src/modules/graphics/opengl/Image.h +++ b/src/modules/graphics/opengl/Image.h @@ -60,10 +60,8 @@ public: struct Flags { - bool mipmaps; - bool sRGB; - - Flags() : mipmaps(false), sRGB(false) {} + bool mipmaps = false; + bool sRGB = false;; }; /** diff --git a/src/modules/image/magpie/FormatHandler.h b/src/modules/image/magpie/FormatHandler.h index 5ee9435de..bde3d1bef 100644 --- a/src/modules/image/magpie/FormatHandler.h +++ b/src/modules/image/magpie/FormatHandler.h @@ -44,18 +44,17 @@ public: // Raw RGBA pixel data. struct DecodedImage { - int width, height; - size_t size; - unsigned char *data; - DecodedImage() : width(0), height(0), size(0), data(0) {} + int width = 0; + int height = 0; + size_t size = 0; + unsigned char *data = nullptr; }; // Pixel data encoded in a particular format. struct EncodedImage { - size_t size; - unsigned char *data; - EncodedImage() : size(0), data(0) {} + size_t size = 0; + unsigned char *data = nullptr; }; /** diff --git a/src/modules/window/Window.cpp b/src/modules/window/Window.cpp index 5d1865519..68dc0c602 100644 --- a/src/modules/window/Window.cpp +++ b/src/modules/window/Window.cpp @@ -38,23 +38,6 @@ void Window::swapBuffers() { } -WindowSettings::WindowSettings() - : fullscreen(false) - , fstype(Window::FULLSCREEN_TYPE_EXCLUSIVE) - , vsync(true) - , msaa(0) - , resizable(false) - , minwidth(1) - , minheight(1) - , borderless(false) - , centered(true) - , display(0) - , highdpi(false) - , sRGB(false) - , refreshrate(0.0) -{ -} - bool Window::getConstant(const char *in, Window::FullscreenType &out) { return fullscreenTypes.find(in, out); diff --git a/src/modules/window/Window.h b/src/modules/window/Window.h index 54c098041..070912876 100644 --- a/src/modules/window/Window.h +++ b/src/modules/window/Window.h @@ -186,23 +186,20 @@ private: struct WindowSettings { - WindowSettings(); - - bool fullscreen; // = false - Window::FullscreenType fstype; // = FULLSCREEN_TYPE_EXCLUSIVE - bool vsync; // = true - int msaa; // = 0 - bool resizable; // = false - int minwidth; // = 1 - int minheight; // = 1 - bool borderless; // = false - bool centered; // = true - int display; // = 0 - bool highdpi; // false - bool sRGB; // false - double refreshrate; // 0.0 - -}; // WindowSettings + bool fullscreen = false; + Window::FullscreenType fstype = Window::FULLSCREEN_TYPE_EXCLUSIVE; + bool vsync = true; + int msaa = 0; + bool resizable = false; + int minwidth = 1; + int minheight = 1; + bool borderless = false; + bool centered = true; + int display = 0; + bool highdpi = false; + bool sRGB = false; + double refreshrate = 0.0; +}; } // window } // love diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 07992dad6..c7d15bfd7 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -57,14 +57,6 @@ Window::~Window() SDL_QuitSubSystem(SDL_INIT_VIDEO); } -Window::_currentMode::_currentMode() - : width(800) - , height(600) - , settings() - , icon(0) -{ -} - bool Window::setWindow(int width, int height, WindowSettings *settings) { WindowSettings f; diff --git a/src/modules/window/sdl/Window.h b/src/modules/window/sdl/Window.h index f07df0a3f..723272b8c 100644 --- a/src/modules/window/sdl/Window.h +++ b/src/modules/window/sdl/Window.h @@ -111,10 +111,8 @@ private: struct _currentMode { - _currentMode(); - - int width; - int height; + int width = 800; + int height = 600; WindowSettings settings; Object::StrongRef icon;