Skip to content

Commit abf6ed7

Browse files
committed
Merge branch 'maths_for_bxdfs_hlsl' of https://github.com/Devsh-Graphics-Programming/Nabla into maths_for_bxdfs_hlsl
2 parents 6fecfa9 + 04f60ab commit abf6ed7

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

include/nbl/builtin/hlsl/math/functions.hlsl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ scalar_type_t<T> lpNorm(NBL_CONST_REF_ARG(T) v)
8484
template <typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
8585
vector<T, 3> reflect(vector<T, 3> I, vector<T, 3> N, T NdotI)
8686
{
87-
return N * 2.0 * NdotI - I;
87+
return N * 2.0f * NdotI - I;
8888
}
8989

9090
template <typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
@@ -217,29 +217,28 @@ struct refract
217217
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
218218
vector<T,3> refract(vector<T,3> I, vector<T,3> N, bool backside, T NdotI, T NdotI2, T rcpOrientedEta, T rcpOrientedEta2)
219219
{
220-
impl::refract r = impl::refract::create(I, N, backside, NdotI, NdotI2, rcpOrientedEta, rcpOrientedEta2);
220+
impl::refract<T> r = impl::refract<T>::create(I, N, backside, NdotI, NdotI2, rcpOrientedEta, rcpOrientedEta2);
221221
return r.doRefract();
222222
}
223223

224224
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
225225
vector<T,3> refract(vector<T,3> I, vector<T,3> N, T NdotI, T eta)
226226
{
227-
impl::refract r = impl::refract::create(I, N, NdotI, eta);
227+
impl::refract<T> r = impl::refract<T>::create(I, N, NdotI, eta);
228228
return r.doRefract();
229229
}
230230

231231
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
232232
vector<T,3> refract(vector<T,3> I, vector<T,3> N, T eta)
233233
{
234-
impl::refract r = impl::refract::create(I, N, eta);
234+
impl::refract<T> r = impl::refract<T>::create(I, N, eta);
235235
return r.doRefract();
236236
}
237237

238-
// I don't like exposing these next two
239238
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
240-
vector<T,3> reflectRefract_computeNdotT(bool backside, T NdotI2, T rcpOrientedEta2)
239+
T reflectRefract_computeNdotT(bool backside, T NdotI2, T rcpOrientedEta2)
241240
{
242-
impl::refract r;
241+
impl::refract<T> r;
243242
r.NdotI2 = NdotI2;
244243
r.rcpOrientedEta2 = rcpOrientedEta2;
245244
r.backside = backside;
@@ -249,20 +248,20 @@ vector<T,3> reflectRefract_computeNdotT(bool backside, T NdotI2, T rcpOrientedEt
249248
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
250249
vector<T,3> reflectRefract_impl(bool _refract, vector<T,3> _I, vector<T,3> _N, T _NdotI, T _NdotTorR, T _rcpOrientedEta)
251250
{
252-
return impl::refract::doReflectRefract(_refract, _I, _N, _NdotI, _NdotTorR, _rcpOrientedEta);
251+
return impl::refract<T>::doReflectRefract(_refract, _I, _N, _NdotI, _NdotTorR, _rcpOrientedEta);
253252
}
254253

255254
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
256255
vector<T,3> reflectRefract(bool _refract, vector<T,3> I, vector<T,3> N, bool backside, T NdotI, T NdotI2, T rcpOrientedEta, T rcpOrientedEta2)
257256
{
258-
impl::refract r = impl::refract::create(I, N, backside, NdotI, NdotI2, rcpOrientedEta, rcpOrientedEta2);
257+
impl::refract<T> r = impl::refract<T>::create(I, N, backside, NdotI, NdotI2, rcpOrientedEta, rcpOrientedEta2);
259258
return r.doReflectRefract(_refract);
260259
}
261260

262261
template<typename T NBL_FUNC_REQUIRES(is_scalar_v<T>)
263262
vector<T,3> reflectRefract(bool _refract, vector<T,3> I, vector<T,3> N, T NdotI, T eta)
264263
{
265-
impl::refract r = impl::refract::create(I, N, NdotI, eta);
264+
impl::refract<T> r = impl::refract<T>::create(I, N, NdotI, eta);
266265
return r.doReflectRefract(_refract);
267266
}
268267

0 commit comments

Comments
 (0)