mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 19:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Centralize the extraction of Lua values and fix bug when trying to extract the first parameter of a Lua parameter pack

Browse Source
This commit is contained in:
Alexander Bock
2023-03-07 01:56:17 +01:00
parent 14cf1d3962
commit 0831b00a77
75 changed files with 43 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/volume/transferfunctionproperty.cpp
+2 -3
View File
@@ -41,10 +41,9 @@ int TransferFunctionProperty::typeLua() const {
}
openspace::volume::TransferFunction
TransferFunctionProperty::fromLuaConversion(lua_State* state, bool& success) const
{
TransferFunctionProperty::fromLuaConversion(lua_State* state) const {
openspace::volume::TransferFunction tf;
success = tf.setEnvelopesFromLua(state);
tf.setEnvelopesFromLua(state);
return tf;
}
modules/volume/transferfunctionproperty.h
+1 -2
View File
@@ -41,8 +41,7 @@ public:
using TemplateProperty<volume::TransferFunction>::operator=;
protected:
volume::TransferFunction fromLuaConversion(lua_State* state,
bool& success) const override;
volume::TransferFunction fromLuaConversion(lua_State* state) const override;
void toLuaConversion(lua_State* state) const override;
std::string toStringConversion() const override;
};