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

Feature/luaextensions (#232)

Browse Source 
* Add systemcapabilities bindings that make the functions of
GeneralSystemCapabilitiesComponent and OpenGLSystemCapabilitiesComponent
available in Lua scripts

* Windows compile fix

* Return OpenGL extensions as array in Lua
This commit is contained in:
Alexander Bock
2017-02-19 22:17:00 +01:00
committed by GitHub
parent 6d1f0c7029
commit b876c3553b
6 changed files with 419 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/scripting/scriptengine.h
View File

@@ -29,6 +29,7 @@
#include <openspace/util/syncdata.h>
#include <ghoul/lua/ghoul_lua.h>
#include <ghoul/lua/luastate.h>
#include <map>
#include <memory>
@@ -93,8 +94,9 @@ public:
//bool shouldScriptBeSent(const std::string &library, const std::string &function);
//void cacheScript(const std::string &library, const std::string &function, const std::string &script);
static std::string OpenSpaceLibraryName;
private:
bool registerLuaLibrary(lua_State* state, const LuaLibrary& library);
void addLibraryFunctions(lua_State* state, const LuaLibrary& library, bool replace);
@@ -103,7 +105,7 @@ private:
void addBaseLibrary();
void remapPrintFunction();
lua_State* _state = nullptr;
ghoul::lua::LuaState _state;
std::set<LuaLibrary> _registeredLibraries;
//sync variables

39
include/openspace/scripting/systemcapabilitiesbinding.h Normal file
View File

@@ -0,0 +1,39 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___SYSTEMCAPABLITIESBINDING___H__
#define __OPENSPACE_CORE___SYSTEMCAPABLITIESBINDING___H__
#include <openspace/scripting/lualibrary.h>
namespace openspace {
namespace scripting {
LuaLibrary generalSystemCapabilities();
LuaLibrary openglSystemCapabilities();
} // namespace scripting
} // namespace openspace
#endif // __OPENSPACE_CORE___SYSTEMCAPABLITIESBINDING___H__