7d1e3f2d32
improve look and feel of factory docs
2016-09-27 17:38:52 +02:00
b308890027
improve look and feel for lua scripting docs
2016-09-27 16:52:27 +02:00
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
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
d3f7139f5e
Merge branch 'feature/globebrowsing' into syncing
...
Conflicts:
modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
openspace.cfg
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
2016-09-20 14:48:28 +02:00
dd304fee31
Make ScriptEngine implement Syncable interface
2016-09-16 15:40:29 -04:00
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
022bf46313
Outputting HTML for the LuaScripting
2016-09-16 11:16:08 +02:00
408280a533
Rearrange and rename constants in ConfigurationManager
...
Make use of constants in ConfigurationManager documentation
2016-09-15 17:58:31 +02:00
6df5f616bb
Change LogFactory and ScriptEngine to use html instead of HTML for even more consistency
2016-09-14 16:44:00 +02:00
a0efbfb190
ScriptEngine uses HTML instead of html for consistency
2016-09-14 16:40:03 +02:00
03e7d18343
Start with the work on enabling the ScriptEngine to output an HTML output
2016-09-14 11:13:29 +02:00
87815ac179
Clean up ScriptScheduler and add doxygen comments
2016-09-13 17:35:45 -04:00
41fafcb5df
begin refactor parallel connection
2016-09-08 18:04:06 +02:00
5e31638b92
Enable the global Lua state when loading scheduled scripts from file
2016-08-30 14:01:42 -04:00
0ee638f447
Enable clearing scheduled scripts
2016-08-30 12:26:10 -04:00
b74b01d294
Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua
2016-08-29 16:16:11 -04:00
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
3e20c6edd3
Correctly load and pop scripts
2016-07-08 10:49:18 +02:00
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
7189f85390
Removed LDEBUG logging per writeLog call
2016-06-16 17:22:24 +02:00
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
b46f40030b
Untabify more files
2016-04-27 14:24:58 +02:00
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
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
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
0895d6e6d0
Some cleanup of ScriptEngine
2015-12-16 17:23:17 -08:00
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
bb32699f70
commenting out older version of script sharing
2015-07-06 15:57:51 +02:00
0cd9e6b687
script execution is no longer bound by mutexes
2015-07-03 16:17:48 +02:00
6057019d20
added proper return value to cachedScripts function
2015-06-26 14:06:20 +02:00
8cc1498b57
made functions for script sharing public for now, temporary fix
2015-06-26 13:54:00 +02:00
42dbf6a6a1
moved script parsing for library/function names into a separate function
2015-06-26 10:42:35 +02:00
22af992078
removed a comment, changed name of script storing variable to something that makes more sense
2015-06-25 12:31:11 +02:00
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
77ecdcec74
removed call to sendScript from script engine.
...
Not all scripts should be synchronised
2015-06-24 18:00:55 +02:00
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
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
2bb2b906ff
Outsource Lua functions into their own inline files
2015-05-20 12:46:29 +02:00
d249e9422e
Fixed bug where ScriptEngine would complain about double-added libraries
...
Correct application of default keybinding
2015-02-25 17:57:25 +01:00
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
5046b7447e
Removed logging if a script is executed
...
More tweaking for RenderableStars
2015-02-20 21:37:48 +01:00
d520bdd8a1
scriptsync hotfix. all received scripts are now executed once received instead of one per frame.
2015-02-20 18:09:05 +01:00
ea2017e11c
Introduced fadeIn and fadeOut functionality via scripting.
2015-02-20 16:54:30 +01:00
417f5c8f6c
Fixed synchronization bug when master runs at a different FPS than slaves.
...
Scripts are now queued when received and then executed,
2015-02-19 10:02:07 +01:00
eb7fefb3c9
fixed Alex' bug!!
...
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +01:00
7c7b4f1f97
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
2015-02-17 14:41:02 +01:00
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Emil Axelsson