Bugfix accessing properties

This commit is contained in:
Alexander Bock
2014-08-21 18:52:47 +02:00
parent 5793498ddf
commit 1782857c72
4 changed files with 14 additions and 10 deletions
@@ -29,8 +29,8 @@ struct lua_State;
// Properties
static int property_setValue(lua_State* L);
static int property_getValue(lua_State* L);
int property_setValue(lua_State* L);
//static int property_getValue(lua_State* L);
#endif // __SCRIPTFUNCTIONS_H__
+2 -3
View File
@@ -351,9 +351,8 @@ bool SceneGraph::registerScriptFunctions()
ScriptEngine::LuaLibrary l = {
"",
{
{ "setPropertyValue", &property_setValue},
{ "getPropertyValue", &property_getValue},
{ NULL, NULL }
{ "setPropertyValue", &property_setValue}
// { "getPropertyValue", &property_getValue},
}
};
return true;
+5
View File
@@ -309,6 +309,11 @@ void SceneGraphNode::setRenderable(Renderable* renderable)
update();
}
Renderable* SceneGraphNode::renderable()
{
return _renderable;
}
const Renderable* SceneGraphNode::renderable() const
{
return _renderable;
+5 -5
View File
@@ -32,7 +32,7 @@
using namespace openspace;
using namespace openspace::properties;
static int property_setValue(lua_State* L)
int property_setValue(lua_State* L)
{
const std::string _loggerCat = "property_setValue";
using ghoul::lua::luaTypeToString;
@@ -77,7 +77,7 @@ static int property_setValue(lua_State* L)
return 0;
}
static int property_getValue(lua_State* L)
{
}
//int property_getValue(lua_State* L)
//{
//
//}