Skip to content

Commit

Permalink
Merge #740
Browse files Browse the repository at this point in the history
740: Update glam requirement from 0.14.0 to 0.15.1 r=toasteater a=dependabot[bot]

Updates the requirements on [glam](https://github.com/bitshifter/glam-rs) to permit the latest version.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/bitshifter/glam-rs/blob/master/CHANGELOG.md">glam's changelog</a>.</em></p>
<blockquote>
<h2>[0.15.1] - 2021-05-14</h2>
<h3>Changed</h3>
<ul>
<li>Disable <code>const_assert_eq</code> size and alignment checks for SPIR-V targets.</li>
</ul>
<h2>[0.15.0] - 2021-05-14</h2>
<h3>Breaking changes</h3>
<ul>
<li>Removed <code>PartialOrd</code> and <code>Ord</code> trait implementations for all <code>glam</code> types.</li>
<li>Removed deprecated <code>zero()</code>, <code>one()</code>, <code>unit_x()</code>, <code>unit_y()</code>, <code>unit_z()</code>,
<code>unit_w()</code>, <code>identity()</code> and <code>Mat2::scale()</code> methods.</li>
<li>Remove problematic <code>Quat</code> <code>From</code> trait conversions which would allow creating
a non-uniform quaternion without necessarily realising, including from
<code>Vec4</code>, <code>(x, y, z, w)</code> and <code>[f32; 4]</code>.</li>
</ul>
<h3>Added</h3>
<ul>
<li>Added <code>EulerRot</code> enum for specifying Euler rotation order and
<code>Quat::from_euler()</code>, <code>Mat3::from_euler()</code> and <code>Mat4::from_euler()</code> which
support specifying a rotation order and angles of rotation.</li>
<li>Added <code>Quat::to_euler()</code> method for extracting Euler angles.</li>
<li>Added <code>Quat::from_vec4()</code> which is an explicit method for creating a
quaternion from a 4D vector. The method does not normalize the resulting
quaternion.</li>
<li>Added <code>Mat3A</code> type which uses <code>Vec3A</code> columns. It is 16 byte aligned and
contains internal padding but it generally faster than <code>Mat3</code> for most
operations if SIMD is available.</li>
<li>Added 3D affine transform types <code>Affine3A</code> and <code>DAffine3</code>. These are more
efficient than using <code>Mat4</code> and <code>DMat4</code> respectively when working with 3D
affine transforms.</li>
<li>Added 2D affine transform types <code>Affine2</code> and <code>DAffine2</code>. These are more
efficient than using <code>Mat3</code> and <code>DMat3</code> respectively when working with 2D
affine transforms.</li>
<li>Added <code>Quat::from_affine3</code> to create a quaternion from an affine transform
rotation.</li>
<li>Added explicit <code>to_array</code> method to vector types to better match the matrix
methods.</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Deprecated <code>Quat::from_rotation_ypr()</code>, <code>Mat3::from_rotation_ypr()</code> and
<code>Mat4::from_rotation_ypr()</code> in favor of new <code>from_euler()</code> methods.</li>
<li>Deprecated <code>Quat::from_rotation_mat3()</code> and <code>Quat::from_rotation_mat4()</code> in
favor of new <code>from_mat3</code> and <code>from_mat4</code> methods.</li>
<li>Deprecated <code>TransformSRT</code> and <code>TransformRT</code> which are under the
<code>transform-types</code> feature. These will be moved to a separate experimental
crate.</li>
<li>Updated <code>spriv-std</code> dependency version to <code>0.4.0-alpha7</code>.</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/bitshifter/glam-rs/commit/38f796972523723a4a0b20eae11678a3f6362bf6"><code>38f7969</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/bitshifter/glam-rs/issues/181">#181</a> from bitshifter/prepare-0.15.1</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/bb0de2a42e77ead0022cc03a1d607c1e4b0c6664"><code>bb0de2a</code></a> Prepare 0.15.1 release to fix SPIR-V targets.</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/95b410ef20e884bd42e6f589cab012ddbdf84969"><code>95b410e</code></a> Prepare for 0.15.0 release.</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/5145d22ee64237055c38966ac9595d4b0f4f8776"><code>5145d22</code></a> Documentation changes around new <code>Mat3A</code> and affine types (<a href="https://github-redirect.dependabot.com/bitshifter/glam-rs/issues/178">#178</a>)</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/c9b28a6f9b0b68ad90132af419c67a784dcdb710"><code>c9b28a6</code></a> Merge branch 'master' of github.com:bitshifter/glam-rs</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/76e07dbe0e5c88c2d888dc9fddbf22718471b2aa"><code>76e07db</code></a> Remove some unnecessary usage of <code>as_ref</code>.</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/c92a00df8bb2cfff2cd3fe91020f8044ce330969"><code>c92a00d</code></a> More CHANGELOG items.</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/978d5947a13fb73bc2c834984c4a3224ab36aa56"><code>978d594</code></a> Update CHANGELOG.</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/0c899419d573dc76097bd3ed8f5d6e3cdafc7bce"><code>0c89941</code></a> Undo more transform changes.</li>
<li><a href="https://github.com/bitshifter/glam-rs/commit/c8117389a29dd78951846b83a9bda45d88af9e20"><code>c811738</code></a> Missed some affine usage that was still on transform-types.</li>
<li>Additional commits viewable in <a href="https://github.com/bitshifter/glam-rs/compare/0.14.0...0.15.1">compare view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot[bot] committed May 17, 2021
2 parents a2090cc + b9d88d5 commit c219871
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion examples/scene_create/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ crate-type = ["cdylib"]

[dependencies]
gdnative = { path = "../../gdnative" }
glam = "0.14.0"
glam = "0.15.1"
2 changes: 1 addition & 1 deletion gdnative-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type_tag_fallback = []
gdnative-sys = { path = "../gdnative-sys", version = "0.9.3" }
libc = "0.2"
approx = "0.4.0"
glam = "0.14.0"
glam = "0.15.1"
indexmap = "1.6.0"
ahash = "0.7.0"
once_cell = "1.7.2"
Expand Down

0 comments on commit c219871

Please sign in to comment.