summaryrefslogtreecommitdiff
path: root/scene/resources/texture.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-05-14 13:23:58 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-05-14 16:54:55 +0200
commit0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (patch)
treea27e497da7104dd0a64f98a04fa3067668735e91 /scene/resources/texture.h
parent710b34b70227becdc652b4ae027fe0ac47409642 (diff)
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Which means that reduz' beloved style which we all became used to will now be changed automatically to remove the first empty line. This makes us lean closer to 1TBS (the one true brace style) instead of hybridating it with some Allman-inspired spacing. There's still the case of braces around single-statement blocks that needs to be addressed (but clang-format can't help with that, but clang-tidy may if we agree about it). Part of #33027.
Diffstat (limited to 'scene/resources/texture.h')
-rw-r--r--scene/resources/texture.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 5d4131ec4c..005f899512 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -51,7 +51,6 @@ public:
};
class Texture2D : public Texture {
-
GDCLASS(Texture2D, Texture);
OBJ_SAVE_TYPE(Texture2D); // Saves derived classes with common type so they can be interchanged.
@@ -81,7 +80,6 @@ public:
class BitMap;
class ImageTexture : public Texture2D {
-
GDCLASS(ImageTexture, Texture2D);
RES_BASE_EXTENSION("tex");
@@ -133,7 +131,6 @@ public:
};
class StreamTexture2D : public Texture2D {
-
GDCLASS(StreamTexture2D, Texture2D);
public:
@@ -220,7 +217,6 @@ public:
};
class AtlasTexture : public Texture2D {
-
GDCLASS(AtlasTexture, Texture2D);
RES_BASE_EXTENSION("atlastex");
@@ -264,7 +260,6 @@ public:
class Mesh;
class MeshTexture : public Texture2D {
-
GDCLASS(MeshTexture, Texture2D);
RES_BASE_EXTENSION("meshtex");
@@ -302,13 +297,11 @@ public:
};
class LargeTexture : public Texture2D {
-
GDCLASS(LargeTexture, Texture2D);
RES_BASE_EXTENSION("largetex");
protected:
struct Piece {
-
Point2 offset;
Ref<Texture2D> texture;
};
@@ -373,7 +366,6 @@ public:
VARIANT_ENUM_CAST(TextureLayered::LayeredType)
class ImageTextureLayered : public TextureLayered {
-
GDCLASS(ImageTextureLayered, TextureLayered);
LayeredType layered_type;
@@ -413,7 +405,6 @@ public:
};
class Texture2DArray : public ImageTextureLayered {
-
GDCLASS(Texture2DArray, ImageTextureLayered)
public:
Texture2DArray() :
@@ -421,7 +412,6 @@ public:
};
class Cubemap : public ImageTextureLayered {
-
GDCLASS(Cubemap, ImageTextureLayered);
public:
@@ -430,7 +420,6 @@ public:
};
class CubemapArray : public ImageTextureLayered {
-
GDCLASS(CubemapArray, ImageTextureLayered);
public:
@@ -439,7 +428,6 @@ public:
};
class StreamTextureLayered : public TextureLayered {
-
GDCLASS(StreamTextureLayered, TextureLayered);
public:
@@ -498,7 +486,6 @@ public:
};
class StreamTexture2DArray : public StreamTextureLayered {
-
GDCLASS(StreamTexture2DArray, StreamTextureLayered)
public:
StreamTexture2DArray() :
@@ -506,7 +493,6 @@ public:
};
class StreamCubemap : public StreamTextureLayered {
-
GDCLASS(StreamCubemap, StreamTextureLayered);
public:
@@ -515,7 +501,6 @@ public:
};
class StreamCubemapArray : public StreamTextureLayered {
-
GDCLASS(StreamCubemapArray, StreamTextureLayered);
public:
@@ -532,7 +517,6 @@ public:
};
class CurveTexture : public Texture2D {
-
GDCLASS(CurveTexture, Texture2D);
RES_BASE_EXTENSION("curvetex")
@@ -582,7 +566,6 @@ class GradientTexture : public Texture2D {
public:
struct Point {
-
float offset;
Color color;
bool operator<(const Point &p_ponit) const {
@@ -659,7 +642,6 @@ private:
RID proxy;
struct Frame {
-
Ref<Texture2D> texture;
float delay_sec;