Update to 1.10.6
Resolves: #1951133
(cherry picked from Fedora commit 3b7e05f66c)
This commit is contained in:
Kalev Lember
parent
e310446b8c
commit
1db14e5869
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
||||
/graphene-1.10.0.tar.xz
|
||||
/graphene-1.10.2.tar.xz
|
||||
/graphene-1.10.4.tar.xz
|
||||
/graphene-1.10.6.tar.xz
|
||||
|
||||
@ -1,157 +0,0 @@
|
||||
From 1ec2948405695745b091587de914db9d9dd51817 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 23 Mar 2021 08:24:47 +0100
|
||||
Subject: [PATCH] ray: Nudge ray direction of axis when intersecting
|
||||
|
||||
The formula used to calculate the inverse of the direction vector
|
||||
doesn't handle the direction vector aligning with an axis. Depending on
|
||||
the SIMD (or not SIMD) implementation used, a axis aligned vector would
|
||||
either remain the same, or e.g. end up with NaN components messing up
|
||||
any future calculations.
|
||||
|
||||
Fixing the math to handle this is non-trivial, so for now work around
|
||||
this by nudging the direction vector slightly off axis so that it has a
|
||||
better hand of hitting the right box even when the direction is axis
|
||||
aligned.
|
||||
|
||||
Closes: #214
|
||||
---
|
||||
src/graphene-ray.c | 26 +++++++++++++++++-
|
||||
tests/ray.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 92 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/graphene-ray.c b/src/graphene-ray.c
|
||||
index 8839b03..66c3393 100644
|
||||
--- a/src/graphene-ray.c
|
||||
+++ b/src/graphene-ray.c
|
||||
@@ -467,6 +467,22 @@ graphene_ray_intersects_sphere (const graphene_ray_t *r,
|
||||
return graphene_ray_intersect_sphere (r, s, NULL) != GRAPHENE_RAY_INTERSECTION_KIND_NONE;
|
||||
}
|
||||
|
||||
+static inline float
|
||||
+nudge_off_axis (float v)
|
||||
+{
|
||||
+ if (graphene_approx_val (v, 0.f))
|
||||
+ {
|
||||
+ if (v < 0.f)
|
||||
+ return -2 * FLT_EPSILON;
|
||||
+ else
|
||||
+ return 2 * FLT_EPSILON;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ return v;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* graphene_ray_intersect_box:
|
||||
* @r: a #graphene_ray_t
|
||||
@@ -485,10 +501,18 @@ graphene_ray_intersect_box (const graphene_ray_t *r,
|
||||
const graphene_box_t *b,
|
||||
float *t_out)
|
||||
{
|
||||
+ graphene_vec3_t safe_direction;
|
||||
graphene_vec3_t inv_dir;
|
||||
+ float d[3];
|
||||
+
|
||||
+ graphene_vec3_to_float (&r->direction, d);
|
||||
+ graphene_vec3_init (&safe_direction,
|
||||
+ nudge_off_axis (d[0]),
|
||||
+ nudge_off_axis (d[1]),
|
||||
+ nudge_off_axis (d[2]));
|
||||
|
||||
/* FIXME: Needs a graphene_vec3_reciprocal() */
|
||||
- inv_dir.value = graphene_simd4f_reciprocal (r->direction.value);
|
||||
+ inv_dir.value = graphene_simd4f_reciprocal (safe_direction.value);
|
||||
|
||||
graphene_vec3_t inv_min;
|
||||
graphene_vec3_subtract (&(b->min), &r->origin, &inv_min);
|
||||
diff --git a/tests/ray.c b/tests/ray.c
|
||||
index 01f372c..afe14cb 100644
|
||||
--- a/tests/ray.c
|
||||
+++ b/tests/ray.c
|
||||
@@ -166,6 +166,72 @@ ray_intersect_triangle (void)
|
||||
NULL);
|
||||
}
|
||||
|
||||
+static void
|
||||
+ray_intersects_box (void)
|
||||
+{
|
||||
+ graphene_point3d_t min;
|
||||
+ graphene_point3d_t max;
|
||||
+ graphene_point3d_t origin;
|
||||
+ graphene_vec3_t direction;
|
||||
+ graphene_box_t box;
|
||||
+ graphene_ray_t ray;
|
||||
+
|
||||
+ /* Off center box */
|
||||
+
|
||||
+ graphene_point3d_init (&min, 41.843132f, 27.356903f, -50.368336f);
|
||||
+ graphene_point3d_init (&max, 51.698078f, 29.080172f, -50.368336f);
|
||||
+ graphene_box_init (&box, &min, &max);
|
||||
+
|
||||
+ /* Ray from (0, 0, 0) along an axis *NOT* hitting the above box
|
||||
+ */
|
||||
+
|
||||
+ graphene_point3d_init (&origin, 0, 0, 0);
|
||||
+ graphene_vec3_init (&direction, 0, 0.495176f, -0.868793f);
|
||||
+ graphene_ray_init (&ray, &origin, &direction);
|
||||
+
|
||||
+ mutest_expect ("intersection kind should be NONE",
|
||||
+ mutest_int_value (graphene_ray_intersects_box (&ray, &box)),
|
||||
+ mutest_to_be_false,
|
||||
+ NULL);
|
||||
+
|
||||
+ /* Nudged variant of the above ray */
|
||||
+
|
||||
+ graphene_vec3_init (&direction, 0 + 0.0001f, 0.495176f, -0.868793f);
|
||||
+ graphene_ray_init (&ray, &origin, &direction);
|
||||
+
|
||||
+ mutest_expect ("intersection kind should still be NONE",
|
||||
+ mutest_int_value (graphene_ray_intersects_box (&ray, &box)),
|
||||
+ mutest_to_be_false,
|
||||
+ NULL);
|
||||
+
|
||||
+ /* Centered box */
|
||||
+
|
||||
+ graphene_point3d_init (&min, -5.654480f, 27.356903f, -50.368336f);
|
||||
+ graphene_point3d_init (&max, 5.654475f, 29.080172f, -50.368336f);
|
||||
+ graphene_box_init (&box, &min, &max);
|
||||
+
|
||||
+ /* Ray from (0, 0, 0) along the axis hitting the above box */
|
||||
+
|
||||
+ graphene_point3d_init (&origin, 0, 0, 0);
|
||||
+ graphene_vec3_init (&direction, 0, 0.495176f, -0.868793f);
|
||||
+ graphene_ray_init (&ray, &origin, &direction);
|
||||
+
|
||||
+ mutest_expect ("intersection kind should be ENTER",
|
||||
+ mutest_int_value (graphene_ray_intersects_box (&ray, &box)),
|
||||
+ mutest_to_be_true,
|
||||
+ NULL);
|
||||
+
|
||||
+ /* Nudged variant of the above ray */
|
||||
+
|
||||
+ graphene_vec3_init (&direction, 2 * FLT_EPSILON, 0.495176f, -0.868793f);
|
||||
+ graphene_ray_init (&ray, &origin, &direction);
|
||||
+
|
||||
+ mutest_expect ("intersection kind should still be ENTER",
|
||||
+ mutest_int_value (graphene_ray_intersects_box (&ray, &box)),
|
||||
+ mutest_to_be_true,
|
||||
+ NULL);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
ray_suite (void)
|
||||
{
|
||||
@@ -175,6 +241,7 @@ ray_suite (void)
|
||||
mutest_it ("can compute the closest point to a point on the ray", ray_closest_point_to_point);
|
||||
mutest_it ("can be transformed", ray_matrix_transform);
|
||||
mutest_it ("can intersect triangles", ray_intersect_triangle);
|
||||
+ mutest_it ("can intersect on axis", ray_intersects_box);
|
||||
}
|
||||
|
||||
MUTEST_MAIN (
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,15 +1,12 @@
|
||||
Name: graphene
|
||||
Version: 1.10.4
|
||||
Release: 5%{?dist}
|
||||
Version: 1.10.6
|
||||
Release: 1%{?dist}
|
||||
Summary: Thin layer of types for graphic libraries
|
||||
|
||||
License: MIT
|
||||
URL: https://github.com/ebassi/graphene
|
||||
Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||
|
||||
# Fix ray intersection bug causing picking errors in mutter (#1956294)
|
||||
Patch1: 0001-ray-Nudge-ray-direction-of-axis-when-intersecting.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gobject-introspection-devel >= 1.68.0-3.el9
|
||||
BuildRequires: gtk-doc
|
||||
@ -76,6 +73,9 @@ the functionality of the installed %{name} package.
|
||||
%{_datadir}/installed-tests/
|
||||
|
||||
%changelog
|
||||
* Fri May 07 2021 Kalev Lember <klember@redhat.com> - 1.10.6-1
|
||||
- Update to 1.10.6
|
||||
|
||||
* Mon May 03 2021 Jonas Ådahl <jadahl@redhat.com> - 1.10.4-5
|
||||
- Fix ray intersection bug causing picking errors in mutter
|
||||
Resolves: #1956294
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (graphene-1.10.4.tar.xz) = 05afb919055df12a9fd9ce97c24b4e80eb25ed0f8fe7ddfe9198fe695291de611d74e50a40cf6770ed94091765b69918983ab692f111a198ed95b0756d636456
|
||||
SHA512 (graphene-1.10.6.tar.xz) = 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
|
||||
|
||||
Loading…
Reference in New Issue
Block a user