[godot] Clean-up includes.

spine-godot/spine_godot/GodotSpineExtension.cpp

@@ -30,7 +30,6 @@
 #include "GodotSpineExtension.h"
 #include "core/os/memory.h"
 #include "core/os/file_access.h"
-
 #include <spine/SpineString.h>
 
 spine::SpineExtension *spine::getDefaultExtension() {

spine-godot/spine_godot/SpineAnimation.cpp

@@ -32,7 +32,6 @@
 #include "SpineEvent.h"
 #include "SpineTimeline.h"
 #include "SpineCommon.h"
-
 #include "core/method_bind_ext.gen.inc"
 
 void SpineAnimation::_bind_methods() {

spine-godot/spine_godot/SpineAtlasResource.cpp

@@ -27,11 +27,10 @@
  * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include "core/io/json.h"
-#include "scene/resources/texture.h"
-
 #include "SpineAtlasResource.h"
 #include "SpineRendererObject.h"
+#include "core/io/json.h"
+#include "scene/resources/texture.h"
 #include <spine/TextureLoader.h>
 
 class GodotSpineTextureLoader : public spine::TextureLoader {

spine-godot/spine_godot/SpineBone.h

@@ -30,10 +30,9 @@
 #ifndef GODOT_SPINEBONE_H
 #define GODOT_SPINEBONE_H
 
-#include <scene/2d/node_2d.h>
-#include <spine/spine.h>
-
 #include "SpineBoneData.h"
+#include <scene/2d/node_2d.h>
+#include <spine/Bone.h>
 
 class SpineSkeleton;
 class SpineSprite;

spine-godot/spine_godot/SpineBoneData.h

@@ -30,8 +30,8 @@
 #ifndef GODOT_SPINEBONEDATA_H
 #define GODOT_SPINEBONEDATA_H
 
-#include "core/reference.h"
 #include "SpineConstant.h"
+#include "core/reference.h"
 #include <spine/BoneData.h>
 
 class SpineBoneData : public Reference {

spine-godot/spine_godot/SpineCollisionShapeProxy.cpp

@@ -28,7 +28,6 @@
  *****************************************************************************/
 
 #include "SpineCollisionShapeProxy.h"
-
 #include "SpineSprite.h"
 
 void SpineCollisionShapeProxy::_bind_methods() {

spine-godot/spine_godot/SpineCollisionShapeProxy.h

@@ -31,7 +31,7 @@
 #define GODOT_SPINECOLLISIONSHAPEPROXY_H
 
 #include "scene/2d/collision_polygon_2d.h"
-#include <spine/spine.h>
+#include <spine/Slot.h>
 
 class SpineSprite;
 class SpineAnimationState;

spine-godot/spine_godot/SpineConstraintData.cpp

@@ -28,8 +28,8 @@
  *****************************************************************************/
 
 #include "SpineConstraintData.h"
-#include <spine/ConstraintData.h>
 #include "SpineCommon.h"
+#include <spine/ConstraintData.h>
 
 void SpineConstraintData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_constraint_name"), &SpineConstraintData::get_constraint_name);

spine-godot/spine_godot/SpineEditorPlugin.cpp

@@ -29,7 +29,6 @@
 
 #ifdef TOOLS_ENABLED
 #include "SpineEditorPlugin.h"
-
 #include "SpineAtlasResource.h"
 #include "SpineSkeletonFileResource.h"
 

spine-godot/spine_godot/SpineEditorPlugin.h

@@ -32,8 +32,8 @@
 #include "editor/editor_properties_array_dict.h"
 
 #ifdef TOOLS_ENABLED
-#include "editor/editor_node.h"
 #include "SpineSprite.h"
+#include "editor/editor_node.h"
 #include "editor/editor_properties.h"
 
 class SpineAtlasResourceImportPlugin : public EditorImportPlugin {

spine-godot/spine_godot/SpineSlot.h

@@ -32,11 +32,11 @@
 
 #include "SpineSlotData.h"
 #include "SpineAttachment.h"
+#include "SpineBone.h"
 
+// Breaks cyclic dependency.
 class SpineSkeleton;
 
-class SpineBone;
-
 class SpineSlot : public Reference {
 	GDCLASS(SpineSlot, Reference);
 

spine-godot/spine_godot/SpineSlotData.h

@@ -30,8 +30,8 @@
 #ifndef GODOT_SPINESLOTDATA_H
 #define GODOT_SPINESLOTDATA_H
 
-#include "core/object.h"
 #include "SpineBoneData.h"
+#include "core/object.h"
 #include <spine/SlotData.h>
 
 class SpineSlotData : public Reference {

spine-godot/spine_godot/SpineSprite.h

@@ -30,12 +30,11 @@
 #ifndef GODOT_SPINESPRITE_H
 #define GODOT_SPINESPRITE_H
 
-#include "scene/2d/node_2d.h"
-#include "scene/resources/texture.h"
-
 #include "SpineSkeleton.h"
 #include "SpineAnimationState.h"
+#include "scene/2d/node_2d.h"
 #include "scene/2d/mesh_instance_2d.h"
+#include "scene/resources/texture.h"
 
 class SpineSprite : public Node2D, public spine::AnimationStateListenerObject {
 	GDCLASS(SpineSprite, Node2D);

spine-godot/spine_godot/SpineTransformConstraint.h

@@ -32,6 +32,7 @@
 
 #include "SpineTransformConstraintData.h"
 #include "SpineBone.h"
+#include <spine/TransformConstraint.h>
 
 class SpineTransformConstraint : public Reference {
 	GDCLASS(SpineTransformConstraint, Reference);