UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fix compilation errors on Clang.

Browse Source
This commit is contained in:
Mario Zechner 2022-04-12 20:43:42 +02:00
parent 0dde81eaea
commit 0bd1fe7aac
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-godot/spine_godot/SpineAnimation.h
View File

@ -32,7 +32,7 @@
#include "SpineConstant.h" #include "SpineConstant.h"
#include "core/reference.h" #include "core/reference.h"
#include <spine/spine.h> #include <spine/Animation.h>
class SpineEvent; class SpineEvent;
class SpineSkeleton; class SpineSkeleton;

6
spine-godot/spine_godot/SpineAtlasResource.cpp
View File

@ -70,8 +70,8 @@ public:
if (error != OK) { if (error != OK) {
ERR_PRINT(vformat("Can't load texture: \"%s\"", String(path.buffer()))); ERR_PRINT(vformat("Can't load texture: \"%s\"", String(path.buffer())));
auto renderer_object = memnew(SpineRendererObject); auto renderer_object = memnew(SpineRendererObject);
renderer_object->texture = nullptr; renderer_object->texture = Ref<Texture>(nullptr);
renderer_object->normal_map = nullptr; renderer_object->normal_map = Ref<Texture>(nullptr);
page.setRendererObject((void *) renderer_object); page.setRendererObject((void *) renderer_object);
return; return;
} }
@ -79,7 +79,7 @@ public:
textures->append(texture); textures->append(texture);
auto renderer_object = memnew(SpineRendererObject); auto renderer_object = memnew(SpineRendererObject);
renderer_object->texture = texture; renderer_object->texture = texture;
renderer_object->normal_map = nullptr; renderer_object->normal_map = Ref<Texture>(nullptr);
String temp_path = fixed_path; String temp_path = fixed_path;
String new_path = vformat("%s/%s_%s", temp_path.get_base_dir(), normal_map_prefix, temp_path.get_file()); String new_path = vformat("%s/%s_%s", temp_path.get_base_dir(), normal_map_prefix, temp_path.get_file());

5
spine-godot/spine_godot/SpineAtlasResource.h
View File

@ -30,14 +30,11 @@
#ifndef GODOT_SPINEATLASRESOURCE_H #ifndef GODOT_SPINEATLASRESOURCE_H
#define GODOT_SPINEATLASRESOURCE_H #define GODOT_SPINEATLASRESOURCE_H
#include <spine/Atlas.h>
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/io/resource_saver.h" #include "core/io/resource_saver.h"
#include "core/io/image_loader.h" #include "core/io/image_loader.h"
#include <spine/Atlas.h>
class spine::Atlas;
class GodotSpineTextureLoader; class GodotSpineTextureLoader;
class SpineAtlasResource : public Resource { class SpineAtlasResource : public Resource {

2
spine-godot/spine_godot/SpineEvent.h
View File

@ -31,6 +31,8 @@
#define GODOT_SPINEEVENT_H #define GODOT_SPINEEVENT_H
#include "SpineEventData.h" #include "SpineEventData.h"
#include "core/reference.h"
#include <spine/Event.h>
class SpineEvent : public Reference { class SpineEvent : public Reference {
GDCLASS(SpineEvent, Reference) GDCLASS(SpineEvent, Reference)

1
spine-godot/spine_godot/SpineIkConstraint.h
View File

@ -31,6 +31,7 @@
#define GODOT_SPINEIKCONSTRAINT_H #define GODOT_SPINEIKCONSTRAINT_H
#include "SpineIkConstraintData.h" #include "SpineIkConstraintData.h"
#include <spine/IkConstraint.h>
class SpineBone; class SpineBone;