Skip to content

Commit

Permalink
Unity Android & C# style updates
Browse files Browse the repository at this point in the history
Updates for Unity:
- Android support with OpenGL
- C# linting including formatting errors
  -  This brings our code style in line with C#'s standards, even though it unfortunately varies from our Dart and C++ one.

Note that the formatting (camel case) changes are breaking changes for anyone using the Rive package (we'll need to update the demos/examples repo).

Diffs=
231b35a41 Unity Android & C# style updates (#6517)

Co-authored-by: Luigi Rosso <[email protected]>
  • Loading branch information
luigi-rosso and luigi-rosso committed Jan 29, 2024
1 parent 3b7c90a commit e5e43ac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
da8d2d5f7f2bc943561676e8d0c282a8725fee15
231b35a4130d96ee9be540f51b82c0ef831bad91
13 changes: 7 additions & 6 deletions include/rive/layout.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ enum class Fit : unsigned char

class Alignment
{
private:
float m_X, m_Y;

public:
Alignment(float x, float y) : m_X(x), m_Y(y) {}
Alignment(float x, float y) : m_x(x), m_y(y) {}
Alignment() : m_x(0.0f), m_y(0.0f) {}

float x() const { return m_X; }
float y() const { return m_Y; }
float x() const { return m_x; }
float y() const { return m_y; }

static const Alignment topLeft;
static const Alignment topCenter;
Expand All @@ -33,6 +31,9 @@ class Alignment
static const Alignment bottomLeft;
static const Alignment bottomCenter;
static const Alignment bottomRight;

private:
float m_x, m_y;
};

} // namespace rive
Expand Down

0 comments on commit e5e43ac

Please sign in to comment.