godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks

Browse Source 
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.
This commit is contained in:
Rémi Verschelde
2020-05-14 13:23:58 +02:00
parent 710b34b702
commit 0be6d925dc
1552 changed files with 1 additions and 33876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
servers/rendering/rasterizer.h
View File

@@ -38,7 +38,6 @@
#include "core/self_list.h"
class RasterizerScene {
public:
/* SHADOW ATLAS API */
@@ -227,7 +226,6 @@ public:
InstanceBase() :
dependency_item(this) {
base_type = RS::INSTANCE_NONE;
cast_shadows = RS::SHADOW_CASTING_SETTING_ON;
receive_shadows = true;
@@ -302,7 +300,6 @@ public:
};
class RasterizerStorage {
Color default_clear_color;
public:
@@ -763,7 +760,6 @@ public:
};
struct Light {
bool enabled;
Color color;
Transform2D xform;
@@ -842,7 +838,6 @@ public:
struct Item;
struct TextureBinding {
TextureBindingID binding_id;
_FORCE_INLINE_ void create(RS::CanvasItemTextureFilter p_item_filter, RS::CanvasItemTextureRepeat p_item_repeat, RID p_texture, RID p_normalmap, RID p_specular, RS::CanvasItemTextureFilter p_filter, RS::CanvasItemTextureRepeat p_repeat, RID p_multimesh) {
@@ -871,7 +866,6 @@ public:
//also easier to wrap to avoid mistakes
struct Polygon {
PolygonID polygon_id;
Rect2 rect_cache;
@@ -898,7 +892,6 @@ public:
//item
struct Item {
//commands are allocated in blocks of 4k to improve performance
//and cache coherence.
//blocks always grow but never shrink.
@@ -912,7 +905,6 @@ public:
};
struct Command {
enum Type {
TYPE_RECT,
@@ -932,7 +924,6 @@ public:
};
struct CommandRect : public Command {
Rect2 rect;
Color modulate;
Rect2 source;
@@ -948,7 +939,6 @@ public:
};
struct CommandNinePatch : public Command {
Rect2 rect;
Rect2 source;
float margin[4];
@@ -965,7 +955,6 @@ public:
};
struct CommandPolygon : public Command {
RS::PrimitiveType primitive;
Polygon polygon;
Color specular_shininess;
@@ -976,7 +965,6 @@ public:
};
struct CommandPrimitive : public Command {
uint32_t point_count;
Vector2 points[4];
Vector2 uvs[4];
@@ -989,7 +977,6 @@ public:
};
struct CommandMesh : public Command {
RID mesh;
Transform2D transform;
Color modulate;
@@ -999,7 +986,6 @@ public:
};
struct CommandMultiMesh : public Command {
RID multimesh;
Color specular_shininess;
TextureBinding texture_binding;
@@ -1007,7 +993,6 @@ public:
};
struct CommandParticles : public Command {
RID particles;
Color specular_shininess;
TextureBinding texture_binding;
@@ -1015,13 +1000,11 @@ public:
};
struct CommandTransform : public Command {
Transform2D xform;
CommandTransform() { type = TYPE_TRANSFORM; }
};
struct CommandClipIgnore : public Command {
bool ignore;
CommandClipIgnore() {
type = TYPE_CLIP_IGNORE;
@@ -1077,7 +1060,6 @@ public:
//must update rect
if (commands == nullptr) {
rect = Rect2();
rect_dirty = false;
return rect;
@@ -1090,29 +1072,24 @@ public:
const Item::Command *c = commands;
while (c) {
Rect2 r;
switch (c->type) {
case Item::Command::TYPE_RECT: {
const Item::CommandRect *crect = static_cast<const Item::CommandRect *>(c);
r = crect->rect;
} break;
case Item::Command::TYPE_NINEPATCH: {
const Item::CommandNinePatch *style = static_cast<const Item::CommandNinePatch *>(c);
r = style->rect;
} break;
case Item::Command::TYPE_POLYGON: {
const Item::CommandPolygon *polygon = static_cast<const Item::CommandPolygon *>(c);
r = polygon->polygon.rect_cache;
} break;
case Item::Command::TYPE_PRIMITIVE: {
const Item::CommandPrimitive *primitive = static_cast<const Item::CommandPrimitive *>(c);
for (uint32_t j = 0; j < primitive->point_count; j++) {
if (j == 0) {
@@ -1123,7 +1100,6 @@ public:
}
} break;
case Item::Command::TYPE_MESH: {
const Item::CommandMesh *mesh = static_cast<const Item::CommandMesh *>(c);
AABB aabb = RasterizerStorage::base_singleton->mesh_get_aabb(mesh->mesh, RID());
@@ -1131,7 +1107,6 @@ public:
} break;
case Item::Command::TYPE_MULTIMESH: {
const Item::CommandMultiMesh *multimesh = static_cast<const Item::CommandMultiMesh *>(c);
AABB aabb = RasterizerStorage::base_singleton->multimesh_get_aabb(multimesh->multimesh);
@@ -1139,7 +1114,6 @@ public:
} break;
case Item::Command::TYPE_PARTICLES: {
const Item::CommandParticles *particles_cmd = static_cast<const Item::CommandParticles *>(c);
if (particles_cmd->particles.is_valid()) {
AABB aabb = RasterizerStorage::base_singleton->particles_get_aabb(particles_cmd->particles);
@@ -1148,7 +1122,6 @@ public:
} break;
case Item::Command::TYPE_TRANSFORM: {
const Item::CommandTransform *transform = static_cast<const Item::CommandTransform *>(c);
xf = transform->xform;
found_xform = true;
@@ -1231,7 +1204,6 @@ public:
}
struct CustomData {
virtual ~CustomData() {}
};
@@ -1305,7 +1277,6 @@ public:
virtual void canvas_debug_viewport_shadows(Light *p_lights_with_shadow) = 0;
struct LightOccluderInstance {
bool enabled;
RID canvas;
RID polygon;