Skip to content

Commit

Permalink
added parameterblenders for vec4
Browse files Browse the repository at this point in the history
  • Loading branch information
lshoek committed Sep 15, 2022
1 parent ef86786 commit 2a75efd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
8 changes: 6 additions & 2 deletions modules/napparameter/src/parameterblender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::ParameterVec3Blender)
RTTI_CONSTRUCTOR(nap::Parameter&)
RTTI_END_CLASS

RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::ParameterVec4Blender)
RTTI_CONSTRUCTOR(nap::Parameter&)
RTTI_END_CLASS

RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::ParameterRGBAFloatBlender)
RTTI_CONSTRUCTOR(nap::Parameter&)
RTTI_END_CLASS
Expand Down Expand Up @@ -51,7 +55,7 @@ namespace nap
{ RTTI_OF(ParameterDouble), RTTI_OF(ParameterDoubleBlender) },
{ RTTI_OF(ParameterVec2), RTTI_OF(ParameterVec2Blender) },
{ RTTI_OF(ParameterVec3), RTTI_OF(ParameterVec3Blender) },
{ RTTI_OF(ParameterVec3), RTTI_OF(ParameterVec3Blender) },
{ RTTI_OF(ParameterVec4), RTTI_OF(ParameterVec4Blender) },
{ RTTI_OF(ParameterRGBAColorFloat), RTTI_OF(ParameterRGBAFloatBlender) },
{ RTTI_OF(ParameterRGBColorFloat), RTTI_OF(ParameterRGBFloatBlender) },
{ RTTI_OF(ParameterRGBAColor8), RTTI_OF(ParameterRGBA8Blender) },
Expand Down Expand Up @@ -191,4 +195,4 @@ namespace nap
RGBColor8 nval(lval.x, lval.y, lval.z);
getParameter<ParameterRGBColor8>().setValue(nval);
}
}
}
1 change: 1 addition & 0 deletions modules/napparameter/src/parameterblender.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ namespace nap
using ParameterDoubleBlender = ParameterBlender<ParameterDouble, double>;
using ParameterVec2Blender = ParameterBlender<ParameterVec2, glm::vec2>;
using ParameterVec3Blender = ParameterBlender<ParameterVec3, glm::vec3>;
using ParameterVec4Blender = ParameterBlender<ParameterVec4, glm::vec4>;
using ParameterRGBAFloatBlender = ParameterBlender<ParameterRGBAColorFloat, RGBAColorFloat>;
using ParameterRGBFloatBlender = ParameterBlender<ParameterRGBColorFloat, RGBColorFloat>;
using ParameterRGBA8Blender = ParameterBlender<ParameterRGBAColor8, RGBAColor8>;
Expand Down

0 comments on commit 2a75efd

Please sign in to comment.