Heretek-AI/GDevelop
1
0
Fork 0
mirror of https://github.com/Heretek-AI/GDevelop.git synced 2026-07-25 04:15:49 -04:00
Code Issues 2 Packages Projects Releases 2 Wiki Activity

Still trying to fix Travis CI

Browse Source
This commit is contained in:
Lizard-13
2018-03-30 23:25:11 -03:00
parent 1c5364f917
commit 50746b3c75
2 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extensions/SkeletonObject/SkeletonObject.cpp
+32 -23
View File
@@ -22,9 +22,12 @@ This project is released under the MIT License.
#include <iostream>
#if defined(GD_IDE_ONLY) && !defined(GD_NO_WX_GUI)
#if defined(GD_IDE_ONLY)
#if !defined(GD_NO_WX_GUI)
#include <wx/bitmap.h>
#include <wx/filename.h>
#endif
sf::Texture SkeletonObject::edittimeIconImage;
sf::Sprite SkeletonObject::edittimeIcon;
@@ -33,13 +36,34 @@ sf::Sprite SkeletonObject::edittimeIcon;
SkeletonObject::SkeletonObject(gd::String name_) :
Object(name_)
{
#if !defined(GD_NO_WX_GUI)
#if defined(GD_IDE_ONLY)
originalSize = sf::Vector2f(32.0f, 32.0f),
originOffset = sf::Vector2f(16.0f, 16.0f),
sizeDirty = true;
#endif
}
void SkeletonObject::DoUnserializeFrom(gd::Project & project, const gd::SerializerElement & element)
{
skeletalDataFilename = element.GetStringAttribute("skeletalDataFilename");
rootArmatureName = element.GetStringAttribute("rootArmatureName");
textureDataFilename = element.GetStringAttribute("textureDataFilename");
textureName = element.GetStringAttribute("textureName");
apiName = element.GetStringAttribute("apiName");
debugPolygons = element.GetBoolAttribute("debugPolygons", false);
}
#if defined(GD_IDE_ONLY)
void SkeletonObject::DoSerializeTo(gd::SerializerElement & element) const
{
element.SetAttribute("skeletalDataFilename", skeletalDataFilename);
element.SetAttribute("rootArmatureName", rootArmatureName);
element.SetAttribute("textureDataFilename", textureDataFilename);
element.SetAttribute("textureName", textureName);
element.SetAttribute("apiName", apiName);
element.SetAttribute("debugPolygons", debugPolygons);
}
std::map<gd::String, gd::PropertyDescriptor> SkeletonObject::GetProperties(gd::Project & project) const
{
std::map<gd::String, gd::PropertyDescriptor> properties;
@@ -74,43 +98,26 @@ bool SkeletonObject::UpdateProperty(const gd::String & name, const gd::String &
return true;
}
void SkeletonObject::DoUnserializeFrom(gd::Project & project, const gd::SerializerElement & element)
{
skeletalDataFilename = element.GetStringAttribute("skeletalDataFilename");
rootArmatureName = element.GetStringAttribute("rootArmatureName");
textureDataFilename = element.GetStringAttribute("textureDataFilename");
textureName = element.GetStringAttribute("textureName");
apiName = element.GetStringAttribute("apiName");
debugPolygons = element.GetBoolAttribute("debugPolygons", false);
}
void SkeletonObject::DoSerializeTo(gd::SerializerElement & element) const
{
element.SetAttribute("skeletalDataFilename", skeletalDataFilename);
element.SetAttribute("rootArmatureName", rootArmatureName);
element.SetAttribute("textureDataFilename", textureDataFilename);
element.SetAttribute("textureName", textureName);
element.SetAttribute("apiName", apiName);
element.SetAttribute("debugPolygons", debugPolygons);
}
#if !defined(GD_NO_WX_GUI)
void SkeletonObject::LoadEdittimeIcon()
{
edittimeIconImage.loadFromFile("JsPlatform/Extensions/skeletonicon.png");
edittimeIcon.setTexture(edittimeIconImage);
}
#if !defined(GD_NO_WX_GUI)
bool SkeletonObject::GenerateThumbnail(const gd::Project & project, wxBitmap & thumbnail) const
{
thumbnail = wxBitmap("JsPlatform/Extensions/skeletonicon24.png", wxBITMAP_TYPE_ANY);
return true;
}
#endif
void SkeletonObject::DrawInitialInstance(gd::InitialInstance & instance, sf::RenderTarget & renderTarget, gd::Project & project, gd::Layout & layout)
{
#if !defined(GD_NO_WX_GUI)
if(sizeDirty) UpdateSize(project);
#endif
edittimeIcon.setPosition(instance.GetX() - originalSize.x/2.0f, instance.GetY() - originalSize.y/2.0f);
renderTarget.draw(edittimeIcon);
@@ -121,6 +128,7 @@ sf::Vector2f SkeletonObject::GetInitialInstanceOrigin(gd::InitialInstance & inst
return originOffset;
}
#if !defined(GD_NO_WX_GUI)
void SkeletonObject::UpdateSize(gd::Project & project)
{
sizeDirty = false;
@@ -135,6 +143,7 @@ void SkeletonObject::UpdateSize(gd::Project & project)
// gd::SerializerElement element = gd::Serializer::FromJSON(fileContent);
}
#endif
#endif
gd::Object * CreateSkeletonObject(gd::String name)
{