Merge branch 'cad_shaders_work' of github.com:Devsh-Graphics-Programming/Nabla into cad_shaders_work

Author: deprilula28

examples_tests

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _NBL_BUILTIN_HLSL_EQUATIONS_CUBIC_INCLUDED_
-#define _NBL_BUILTIN_HLSL_EQUATIONS_CUBIC_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_MATH_EQUATIONS_CUBIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_MATH_EQUATIONS_CUBIC_INCLUDED_
 
 // TODO: Later include from correct hlsl header
 #ifndef nbl_hlsl_FLT_EPSILON
@@ -23,6 +23,8 @@ namespace nbl
 {
 namespace hlsl
 {
+namespace math
+{
 namespace equations
 {
     //TODO: use numeric_limits<float_t>::PI
@@ -120,5 +122,6 @@ namespace equations
 }
 }
 }
+}
 
 #endif

include/nbl/builtin/hlsl/equations/cubic.hlsl renamed to include/nbl/builtin/hlsl/math/equations/cubic.hlsl

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _NBL_BUILTIN_HLSL_EQUATIONS_QUADRATIC_INCLUDED_
-#define _NBL_BUILTIN_HLSL_EQUATIONS_QUADRATIC_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_MATH_EQUATIONS_QUADRATIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_MATH_EQUATIONS_QUADRATIC_INCLUDED_
 
 // TODO: Later include from correct hlsl header
 #ifndef nbl_hlsl_FLT_EPSILON
@@ -29,6 +29,8 @@ namespace nbl
 {
 namespace hlsl
 {
+namespace math
+{
 namespace equations
 {
     template<typename float_t>
@@ -81,5 +83,6 @@ namespace equations
 }
 }
 }
+}
 
 #endif

include/nbl/builtin/hlsl/equations/quadratic.hlsl renamed to include/nbl/builtin/hlsl/math/equations/quadratic.hlsl

@@ -2,11 +2,11 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _NBL_BUILTIN_HLSL_EQUATIONS_QUARTIC_INCLUDED_
-#define _NBL_BUILTIN_HLSL_EQUATIONS_QUARTIC_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_MATH_EQUATIONS_QUARTIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_MATH_EQUATIONS_QUARTIC_INCLUDED_
 
-#include <nbl/builtin/hlsl/equations/quadratic.hlsl>
-#include <nbl/builtin/hlsl/equations/cubic.hlsl>
+#include <nbl/builtin/hlsl/math/equations/quadratic.hlsl>
+#include <nbl/builtin/hlsl/math/equations/cubic.hlsl>
 
 // TODO: Later include from correct hlsl header
 #ifndef nbl_hlsl_FLT_EPSILON
@@ -26,6 +26,8 @@ namespace nbl
 {
 namespace hlsl
 {
+namespace math
+{
 namespace equations
 {
     template<typename float_t>
@@ -77,15 +79,15 @@ namespace equations
 			{
 				/* no absolute term: y(y^3 + py + q) = 0 */
 
-				float3_t cubic = nbl::hlsl::equations::Cubic<float_t>::construct(1, 0, p, q).computeRoots();
+				float3_t cubic = Cubic<float_t>::construct(1, 0, p, q).computeRoots();
 				s[rootCount ++] = cubic[0];
 				s[rootCount ++] = cubic[1];
 				s[rootCount ++] = cubic[2];
 			}
 			else
 			{
 				/* solve the resolvent cubic ... */
-				float3_t cubic = nbl::hlsl::equations::Cubic<float_t>::construct(1, -1.0 / 2 * p, -r, 1.0 / 2 * r * p - 1.0 / 8 * q * q).computeRoots();
+				float3_t cubic = Cubic<float_t>::construct(1, -1.0 / 2 * p, -r, 1.0 / 2 * r * p - 1.0 / 8 * q * q).computeRoots();
 				/* ... and take the one real solution ... */
 				for (uint i = 0; i < 3; i ++)
 					if (!isnan(cubic[i]))
@@ -113,8 +115,8 @@ namespace equations
 				else
 					return s; // (empty)
 
-				float2_t quadric1 = nbl::hlsl::equations::Quadratic<float_t>::construct(1, q < 0 ? -v : v, z - u).computeRoots();
-				float2_t quadric2 = nbl::hlsl::equations::Quadratic<float_t>::construct(1, q < 0 ? v : -v, z + u).computeRoots();
+				float2_t quadric1 = Quadratic<float_t>::construct(1, q < 0 ? -v : v, z - u).computeRoots();
+				float2_t quadric2 = Quadratic<float_t>::construct(1, q < 0 ? v : -v, z + u).computeRoots();
 
 				for (uint i = 0; i < 2; i ++)
 					if (!isinf(quadric1[i]) && !isnan(quadric1[i]))
@@ -140,5 +142,6 @@ namespace equations
 }
 }
 }
+}
 
 #endif

include/nbl/builtin/hlsl/equations/quartic.hlsl renamed to include/nbl/builtin/hlsl/math/equations/quartic.hlsl

@@ -317,21 +317,36 @@ namespace shapes
             return ret;
         }
 
-        static Quadratic constructFromBezier(NBL_CONST_REF_ARG(QuadraticBezier<float_t>) curve)
+        static Quadratic constructFromBezier(float_t2 P0, float_t2 P1, float_t2 P2)
         {
-            const float_t2 A = curve.P0 - 2.0 * curve.P1 + curve.P2;
-            const float_t2 B = 2.0 * (curve.P1 - curve.P0);
-            const float_t2 C = curve.P0;
-            
+            const float_t2 A = P0 - 2.0 * P1 + P2;
+            const float_t2 B = 2.0 * (P1 - P0);
+            const float_t2 C = P0;
+
             Quadratic ret = { A, B, C };
             return ret;
         }
-        
-        float_t2 evaluate(float_t t)
+
+        static Quadratic constructFromBezier(NBL_CONST_REF_ARG(QuadraticBezier<float_t>) curve)
+        {
+            return constructFromBezier(curve.P0, curve.P1, curve.P2);
+        }
+
+        float_t2 evaluate(float_t t) NBL_CONST_MEMBER_FUNC
         {
             return t * (A * t + B) + C;
         }
-        
+
+        float_t2 derivative(float_t t) NBL_CONST_MEMBER_FUNC
+        {
+            return float_t(2.0) * A * t + B;
+        }
+
+        float_t2 secondDerivative(float_t t) NBL_CONST_MEMBER_FUNC
+        {
+            return float_t(2.0) * A;
+        }
+
         NBL_CONSTEXPR_STATIC_INLINE uint32_t MaxCandidates = 3u;
         using Candidates = vector<float_t, MaxCandidates>;
 

include/nbl/builtin/hlsl/shapes/beziers.hlsl

@@ -275,9 +275,9 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/shapes/ellipse.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/shapes/line.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/shapes/beziers.hlsl")
 
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/equations/quadratic.hlsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/equations/cubic.hlsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/equations/quartic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/equations/quadratic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/equations/cubic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/equations/quartic.hlsl")
 
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/algorithm.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/scanning_append.hlsl")