Release 0.08

master
Kasi 2018-03-09 20:10:43 +00:00
parent 5e71fc1b1b
commit 1c8422481d
6 changed files with 25 additions and 11 deletions

View File

@ -29,7 +29,7 @@ class Character : public Renderable
std::vector<std::int32_t> GetPathY() const; std::vector<std::int32_t> GetPathY() const;
std::int32_t GetPoseAnimationFrame() const; std::int32_t GetPoseAnimationFrame() const;
std::int32_t GetPoseAnimationID() const; std::int32_t GetPoseAnimationID() const;
std::int32_t GetSubPoseAnimation() const; std::int32_t GetSubPoseAnimationID() const;
std::int32_t GetX() const; std::int32_t GetX() const;
std::int32_t GetY() const; std::int32_t GetY() const;

View File

@ -12,6 +12,8 @@ std::uint64_t CurrentTimeMillis();
std::uint64_t CurrentTimeNanos(); std::uint64_t CurrentTimeNanos();
bool WaitFunc(std::uint32_t Duration, std::uint32_t Step, std::function<bool()> Func); bool WaitFunc(std::uint32_t Duration, std::uint32_t Step, std::function<bool()> Func);
bool WaitFunc(std::uint32_t Duration, std::uint32_t Step, std::function<bool()> Func, bool Result); bool WaitFunc(std::uint32_t Duration, std::uint32_t Step, std::function<bool()> Func, bool Result);
std::string MillisToHumanShort(std::int64_t Millseconds); // HH:MM:SS
std::string MillisToHumanLong(std::int64_t Millseconds); // Hours, Minutes, Seconds
/** @} */ /** @} */

View File

@ -13,13 +13,12 @@ class Minimap
public: public:
static Point GetMiddle(); static Point GetMiddle();
static Tile GetPosition(); static Tile GetPosition();
static Tile GetDestination();
static std::int32_t GetPlane(); static std::int32_t GetPlane();
static std::int32_t GetPositionX(); static std::int32_t GetPositionX();
static std::int32_t GetPositionY(); static std::int32_t GetPositionY();
static Tile GetDestination();
static std::int32_t GetDestinationX(); static std::int32_t GetDestinationX();
static std::int32_t GetDestinationY(); static std::int32_t GetDestinationY();

View File

@ -5,6 +5,7 @@
#include "../../Core/Classes/DecorativeObject.hpp" #include "../../Core/Classes/DecorativeObject.hpp"
#include "../../Core/Classes/GroundObject.hpp" #include "../../Core/Classes/GroundObject.hpp"
#include "../../Core/Classes/WallObject.hpp" #include "../../Core/Classes/WallObject.hpp"
#include "../../Core/Classes/ObjectInfo.hpp"
#include "../../Core/Types/Tile.hpp" #include "../../Core/Types/Tile.hpp"
#include "../../Core/Types/Convex.hpp" #include "../../Core/Types/Convex.hpp"
#include <functional> #include <functional>
@ -21,10 +22,10 @@ class SceneObjects
typedef enum OBJECT_TYPE typedef enum OBJECT_TYPE
{ {
GAME_OBJECT = (1 << 1), GAME_OBJECT = (1 << 1),
DECORATIVE_OBJECT = (1 << 2), DECORATIVE_OBJECT = (1 << 2),
GROUND_OBJECT = (1 << 3), GROUND_OBJECT = (1 << 3),
WALL_OBJECT = (1 << 4), WALL_OBJECT = (1 << 4),
ALL = (GAME_OBJECT | DECORATIVE_OBJECT | GROUND_OBJECT | WALL_OBJECT) ALL = (GAME_OBJECT | DECORATIVE_OBJECT | GROUND_OBJECT | WALL_OBJECT)
} OBJECT_TYPE; } OBJECT_TYPE;
@ -51,6 +52,12 @@ class SceneObjects
static GroundObject Get(const std::function<bool (GroundObject&)>& Filter); static GroundObject Get(const std::function<bool (GroundObject&)>& Filter);
static WallObject Get(const std::function<bool (WallObject&)>& Filter); static WallObject Get(const std::function<bool (WallObject&)>& Filter);
static ObjectInfo GetInfoOf(const Object& O);
static ObjectInfo GetInfoOf(const GameObject& G);
static ObjectInfo GetInfoOf(const DecorativeObject& D);
static ObjectInfo GetInfoOf(const GroundObject& G);
static ObjectInfo GetInfoOf(const WallObject& W);
static Tile GetTileOf(const GameObject& G); static Tile GetTileOf(const GameObject& G);
static Tile GetTileOf(const DecorativeObject& D); static Tile GetTileOf(const DecorativeObject& D);
static Tile GetTileOf(const GroundObject& G); static Tile GetTileOf(const GroundObject& G);

View File

@ -19,7 +19,7 @@ class Widgets
* bool InventoryHidden = Widgets::IsHidden(Inventory); * bool InventoryHidden = Widgets::IsHidden(Inventory);
* @endcode * @endcode
*/ */
static bool IsHidden(Widget W); static bool IsHidden(const Widget& W);
/** /**
* @brief Returns the Box of the passed Widget * @brief Returns the Box of the passed Widget
* @code * @code
@ -27,7 +27,7 @@ class Widgets
* Box BankInventoryBox = Widgets::GetBox(BankInventory); * Box BankInventoryBox = Widgets::GetBox(BankInventory);
* @endcode * @endcode
*/ */
static Box GetBox(Widget W); static Box GetBox(const Widget& W);
/** /**
* @brief Returns the absolute X of the passed Widget * @brief Returns the absolute X of the passed Widget
* @code * @code
@ -35,7 +35,7 @@ class Widgets
* std::int32_t BankInventoryX = Widgets::GetX(BankInventory); * std::int32_t BankInventoryX = Widgets::GetX(BankInventory);
* @endcode * @endcode
*/ */
static std::int32_t GetX(Widget W); static std::int32_t GetX(const Widget& W);
/** /**
* @brief Returns the absolute Y of the passed Widget * @brief Returns the absolute Y of the passed Widget
* @code * @code
@ -43,7 +43,13 @@ class Widgets
* std::int32_t BankInventoryY = Widgets::GetX(BankInventory); * std::int32_t BankInventoryY = Widgets::GetX(BankInventory);
* @endcode * @endcode
*/ */
static std::int32_t GetY(Widget W); static std::int32_t GetY(const Widget& W);
/**
* @brief (Temp) Returns the ItemIDs of the passed Widget
* @note Temporary function, this should be used over Widget.GetItemIDs()
*/
static std::vector<std::int32_t> GetItemIDs(const Widget& W);
/** /**
* @brief Returns a vector of All Loaded Widgets * @brief Returns a vector of All Loaded Widgets

Binary file not shown.