Fix AMD driver bug (#3)

Author: moritz-h

resources/shaders/splinemesh.vert

@@ -5,7 +5,7 @@ struct SplineSegment {
     vec4 p1;
     vec4 t0;
     vec4 t1;
-    float length;
+    float len;
     float _padding1_;
     float _padding2_;
     float _padding3_;
@@ -66,14 +66,14 @@ void main() {
 
     // Determine spline segment
     int segmentIdx = instance.offset0;
-    while (splinePos > segments[segmentIdx].length && segmentIdx < instance.offset1 - 1) {
-        splinePos -= segments[segmentIdx].length;
+    while (splinePos > segments[segmentIdx].len && segmentIdx < instance.offset1 - 1) {
+        splinePos -= segments[segmentIdx].len;
         segmentIdx++;
     }
 
     const SplineSegment segment = segments[segmentIdx];
 
-    const float t = clamp(splinePos / segment.length, 0.0f, 1.0f);
+    const float t = clamp(splinePos / segment.len, 0.0f, 1.0f);
 
     // Bezier control points
     const vec3 b0 = segment.p0.xyz;

src/MapWindow/DataView/DataView.cpp

@@ -45,21 +45,21 @@ namespace {
         // Determine spline segments
         int segmentIdx0 = offset0;
         int segmentIdx1 = offset0;
-        while (t0 > splineSegments[segmentIdx0].length && segmentIdx0 < offset1 - 1) {
-            t0 -= splineSegments[segmentIdx0].length;
-            t1 -= splineSegments[segmentIdx1].length;
+        while (t0 > splineSegments[segmentIdx0].len && segmentIdx0 < offset1 - 1) {
+            t0 -= splineSegments[segmentIdx0].len;
+            t1 -= splineSegments[segmentIdx1].len;
             segmentIdx0++;
             segmentIdx1++;
         }
-        while (t1 > splineSegments[segmentIdx1].length && segmentIdx1 < offset1 - 1) {
-            t1 -= splineSegments[segmentIdx1].length;
+        while (t1 > splineSegments[segmentIdx1].len && segmentIdx1 < offset1 - 1) {
+            t1 -= splineSegments[segmentIdx1].len;
             segmentIdx1++;
         }
         const Satisfactory3DMap::SplineSegmentGpu& segment0 = splineSegments[segmentIdx0];
         const Satisfactory3DMap::SplineSegmentGpu& segment1 = splineSegments[segmentIdx1];
 
-        const float segmentT0 = std::clamp(t0 / segment0.length, 0.0f, 1.0f);
-        const float segmentT1 = std::clamp(t1 / segment1.length, 0.0f, 1.0f);
+        const float segmentT0 = std::clamp(t0 / segment0.len, 0.0f, 1.0f);
+        const float segmentT1 = std::clamp(t1 / segment1.len, 0.0f, 1.0f);
 
         glm::vec3 p0 = deCasteljau(segment0, segmentT0);
         glm::vec3 p1 = deCasteljau(segment1, segmentT1);

src/MapWindow/DataView/SplineData.cpp

@@ -116,7 +116,7 @@ Satisfactory3DMap::SplineData::SplineData(const Satisfactory3DMap::SaveActor& ac
         segment.p1 = glm::vec4(p1, 0.0f);
         segment.tangent0 = glm::vec4(t0, 0.0f);
         segment.tangent1 = glm::vec4(t1, 0.0f);
-        segment.length = length;
+        segment.len = length;
         splineSegments_.emplace_back(segment);
     }
 }

src/MapWindow/DataView/SplineData.h

@@ -13,7 +13,7 @@ namespace Satisfactory3DMap {
         glm::vec4 p1;
         glm::vec4 tangent0;
         glm::vec4 tangent1;
-        float length;
+        float len;
         float _padding_[3];
     };
     static_assert(sizeof(SplineSegmentGpu) == 5 * 4 * sizeof(float), "SplineSegmentGpu: Alignment issue!");