mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 21:41:35 +00:00
Code Issues Releases Wiki Activity

Reduce code duplication for finite number

Browse source
This commit is contained in:
elsid 2025-06-05 23:49:30 +02:00
parent 178f216317
commit 267ce1ec9b
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
4 changed files with 22 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwlua/animationbindings.cpp
View file

@ -100,7 +100,7 @@ namespace MWLua
sol::table initAnimationPackage(const Context& context) sol::table initAnimationPackage(const Context& context)
{ {
using FiniteFloat = Misc::FiniteFloat; using Misc::FiniteFloat;
auto view = context.sol(); auto view = context.sol();
auto mechanics = MWBase::Environment::get().getMechanicsManager(); auto mechanics = MWBase::Environment::get().getMechanicsManager();

2
apps/openmw/mwlua/camerabindings.cpp
View file

@ -16,7 +16,7 @@ namespace MWLua
sol::table initCameraPackage(sol::state_view lua) sol::table initCameraPackage(sol::state_view lua)
{ {
using FiniteFloat = Misc::FiniteFloat; using Misc::FiniteFloat;
MWRender::Camera* camera = MWBase::Environment::get().getWorld()->getCamera(); MWRender::Camera* camera = MWBase::Environment::get().getWorld()->getCamera();
MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager(); MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager();

2
apps/openmw/mwlua/worldbindings.cpp
View file

@ -57,7 +57,7 @@ namespace MWLua
static void addWorldTimeBindings(sol::table& api, const Context& context) static void addWorldTimeBindings(sol::table& api, const Context& context)
{ {
using FiniteFloat = Misc::FiniteFloat; using Misc::FiniteFloat;
MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager(); MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager();

59
components/misc/finitenumbers.hpp
View file

@ -5,69 +5,48 @@
#include <cmath> #include <cmath>
#include <stdexcept> #include <stdexcept>
#include <utility>
namespace Misc namespace Misc
{ {
struct FiniteDouble template <class T>
struct FiniteNumber
{ {
double mValue; T mValue;
FiniteDouble(double v)
FiniteNumber(T v)
{ {
if (!std::isfinite(v)) if (!std::isfinite(v))
throw std::invalid_argument("Value must be a finite number"); throw std::invalid_argument("Value must be a finite number");
mValue = v; mValue = v;
} }
operator double() const { return mValue; }
operator T() const { return mValue; }
}; };
struct FiniteFloat using FiniteDouble = FiniteNumber<double>;
{
float mValue; using FiniteFloat = FiniteNumber<float>;
FiniteFloat(float v)
{
if (!std::isfinite(v))
throw std::invalid_argument("Value must be a finite number");
mValue = v;
}
operator float() const { return mValue; }
};
} }
namespace sol namespace sol
{ {
using FiniteDouble = Misc::FiniteDouble; template <class Handler, class T>
using FiniteFloat = Misc::FiniteFloat;
template <typename Handler>
bool sol_lua_check( bool sol_lua_check(
sol::types<FiniteDouble>, lua_State* L, int index, Handler&& handler, sol::stack::record& tracking) types<Misc::FiniteNumber<T>>, lua_State* state, int index, Handler&& handler, stack::record& tracking)
{ {
bool success = sol::stack::check<double>(L, lua_absindex(L, index), handler); bool success = stack::check<T>(state, lua_absindex(state, index), std::forward<Handler>(handler));
tracking.use(1); tracking.use(1);
return success; return success;
} }
static FiniteDouble sol_lua_get(sol::types<FiniteDouble>, lua_State* L, int index, sol::stack::record& tracking) template <class T>
static Misc::FiniteNumber<T> sol_lua_get(
types<Misc::FiniteNumber<T>>, lua_State* state, int index, stack::record& tracking)
{ {
double val = sol::stack::get<double>(L, lua_absindex(L, index)); T value = stack::get<T>(state, lua_absindex(state, index));
tracking.use(1); tracking.use(1);
return FiniteDouble(val); return value;
}
template <typename Handler>
bool sol_lua_check(
sol::types<FiniteFloat>, lua_State* L, int index, Handler&& handler, sol::stack::record& tracking)
{
bool success = sol::stack::check<float>(L, lua_absindex(L, index), handler);
tracking.use(1);
return success;
}
static FiniteFloat sol_lua_get(sol::types<FiniteFloat>, lua_State* L, int index, sol::stack::record& tracking)
{
float val = sol::stack::get<float>(L, lua_absindex(L, index));
tracking.use(1);
return FiniteFloat(val);
} }
} }