Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Style: Apply clang-format (5.0) to some missed files

Browse Source
This commit is contained in:
Rémi Verschelde
2018-05-31 08:58:37 +02:00
parent e823a366d0
commit 43b7ebf0a0
7 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@@ -1303,7 +1303,6 @@ Transform2D RasterizerStorageGLES2::skeleton_bone_get_transform_2d(RID p_skeleto
} }
void RasterizerStorageGLES2::skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) { void RasterizerStorageGLES2::skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) {
} }
void RasterizerStorageGLES2::update_dirty_skeletons() { void RasterizerStorageGLES2::update_dirty_skeletons() {

4
modules/csg/register_types.cpp
View File

@@ -30,8 +30,8 @@
#include "register_types.h" #include "register_types.h"
#include "csg_shape.h"
#include "csg_gizmos.h" #include "csg_gizmos.h"
#include "csg_shape.h"
void register_csg_types() { void register_csg_types() {
@@ -51,9 +51,7 @@ void register_csg_types() {
EditorPlugins::add_by_type<EditorPluginCSG>(); EditorPlugins::add_by_type<EditorPluginCSG>();
#endif #endif
#endif #endif
} }
void unregister_csg_types() { void unregister_csg_types() {
} }

2
scene/2d/skeleton_2d.cpp
View File

@@ -121,7 +121,6 @@ void Bone2D::apply_rest() {
void Bone2D::set_default_length(float p_length) { void Bone2D::set_default_length(float p_length) {
default_length = p_length; default_length = p_length;
} }
float Bone2D::get_default_length() const { float Bone2D::get_default_length() const {
@@ -152,7 +151,6 @@ String Bone2D::get_configuration_warning() const {
warning += "\n"; warning += "\n";
} }
warning += TTR("This bone lacks a proper REST pose. Go to the Skeleton2D node and set one."); warning += TTR("This bone lacks a proper REST pose. Go to the Skeleton2D node and set one.");
} }
return warning; return warning;

3
scene/2d/skeleton_2d.h
View File

@@ -38,12 +38,13 @@ class Skeleton2D;
class Bone2D : public Node2D { class Bone2D : public Node2D {
GDCLASS(Bone2D, Node2D) GDCLASS(Bone2D, Node2D)
friend class Skeleton2D;
Bone2D *parent_bone; Bone2D *parent_bone;
Skeleton2D *skeleton; Skeleton2D *skeleton;
Transform2D rest; Transform2D rest;
float default_length; float default_length;
friend class Skeleton2D;
int skeleton_index; int skeleton_index;
protected: protected: