Commit Graph

78 Commits

Author SHA1 Message Date
Alexander Bock
994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Alexander Bock
bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Alexander Bock
2d5c292326 Fix the ScriptLog output 2017-05-12 14:03:57 -04:00
Alexander Bock
b660a84464 Code cleanup 2017-05-11 18:51:42 -04:00
Alexander Bock
5ebf2a4913 Rename Documented to DocumentationGenerator 2017-05-11 18:16:30 -04:00
Alexander Bock
d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Alexander Bock
9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04:00
Alexander Bock
d61bb20992 Some more work on RenderableFov
Make registerting path tokens through Lua scripts work
2017-03-13 09:52:06 -04:00
Alexander Bock
b876c3553b Feature/luaextensions (#232)
* 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
2017-02-19 22:17:00 +01:00
Alexander Bock
efe205c209 - Add initial tracing calls adapting to new Ghoul change of adding a
loglevel of ‘Trace’
- Adapt js and css files to show trace files in log
2017-02-14 18:10:28 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
Emil Axelsson
7d1e3f2d32 improve look and feel of factory docs 2016-09-27 17:38:52 +02:00
Emil Axelsson
b308890027 improve look and feel for lua scripting docs 2016-09-27 16:52:27 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Erik Broberg
dd304fee31 Make ScriptEngine implement Syncable interface 2016-09-16 15:40:29 -04:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Alexander Bock
022bf46313 Outputting HTML for the LuaScripting 2016-09-16 11:16:08 +02:00
Alexander Bock
408280a533 Rearrange and rename constants in ConfigurationManager
Make use of constants in ConfigurationManager documentation
2016-09-15 17:58:31 +02:00
Alexander Bock
6df5f616bb Change LogFactory and ScriptEngine to use html instead of HTML for even more consistency 2016-09-14 16:44:00 +02:00
Alexander Bock
a0efbfb190 ScriptEngine uses HTML instead of html for consistency 2016-09-14 16:40:03 +02:00
Alexander Bock
03e7d18343 Start with the work on enabling the ScriptEngine to output an HTML output 2016-09-14 11:13:29 +02:00
Emil Axelsson
41fafcb5df begin refactor parallel connection 2016-09-08 18:04:06 +02:00
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock
3e20c6edd3 Correctly load and pop scripts 2016-07-08 10:49:18 +02:00
Alexander Bock
20d0fb8474 Fix error in Dictionary construction for ScreenSpaceRenderable
Do not access the std::future for cases where a download is not necessary
2016-07-03 14:34:17 +02:00
Matthew Territo
7189f85390 Removed LDEBUG logging per writeLog call 2016-06-16 17:22:24 +02:00
Matthew Territo
5925bd9c63 Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp 2016-06-16 17:03:48 +02:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
ef2981f535 Enable global variables for module Lua scripts (closing #172)
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock
0895d6e6d0 Some cleanup of ScriptEngine 2015-12-16 17:23:17 -08:00
Alexander Bock
e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Joakim Kilby
bb32699f70 commenting out older version of script sharing 2015-07-06 15:57:51 +02:00
Joakim Kilby
0cd9e6b687 script execution is no longer bound by mutexes 2015-07-03 16:17:48 +02:00
Joakim Kilby
6057019d20 added proper return value to cachedScripts function 2015-06-26 14:06:20 +02:00
Joakim Kilby
8cc1498b57 made functions for script sharing public for now, temporary fix 2015-06-26 13:54:00 +02:00
Joakim Kilby
42dbf6a6a1 moved script parsing for library/function names into a separate function 2015-06-26 10:42:35 +02:00
Joakim Kilby
22af992078 removed a comment, changed name of script storing variable to something that makes more sense 2015-06-25 12:31:11 +02:00
Joakim Kilby
7fa460e9dc changed definition of Lua function slightly to incorporate a boolean defining if the script should be shared or not.
added a constructor with the sharing variable as default to zero so every script doesn't have to be changed.
added functionality in runScript function to check if a script should be shared and if so send it.
2015-06-24 19:41:59 +02:00
Joakim Kilby
77ecdcec74 removed call to sendScript from script engine.
Not all scripts should be synchronised
2015-06-24 18:00:55 +02:00
Joakim Kilby
9a74bd60b7 renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Joakim Kilby
fabbd3c1e8 added a vector containing all executed scripts for this session and method to get it.
added a call to sending of scripts via parallel connection as soon as they are executed.
2015-06-23 09:34:34 +02:00
Alexander Bock
2bb2b906ff Outsource Lua functions into their own inline files 2015-05-20 12:46:29 +02:00
Alexander Bock
d249e9422e Fixed bug where ScriptEngine would complain about double-added libraries
Correct application of default keybinding
2015-02-25 17:57:25 +01:00
Alexander Bock
c571450dc2 Updated module loading to use a common lua state that has openspace lua functions (closing #100) 2015-02-24 14:29:00 +01:00
Alexander Bock
5046b7447e Removed logging if a script is executed
More tweaking for RenderableStars
2015-02-20 21:37:48 +01:00
Joakim Kilby
d520bdd8a1 scriptsync hotfix. all received scripts are now executed once received instead of one per frame. 2015-02-20 18:09:05 +01:00