Alexander Bock
d139dd2d22
Clean include guards in OpenSpace core
...
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock
c515bbfd0f
Redesign the ScriptScheduler to not copy scripts on return
...
Fix earth.mod file
2016-12-03 00:51:32 +01: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
Alexander Bock
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
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
03e7d18343
Start with the work on enabling the ScriptEngine to output an HTML output
2016-09-14 11:13:29 +02:00
Erik Broberg
87815ac179
Clean up ScriptScheduler and add doxygen comments
2016-09-13 17:35:45 -04:00
Erik Broberg
5e31638b92
Enable the global Lua state when loading scheduled scripts from file
2016-08-30 14:01:42 -04:00
Erik Broberg
0ee638f447
Enable clearing scheduled scripts
2016-08-30 12:26:10 -04:00
Erik Broberg
b74b01d294
Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua
2016-08-29 16:16:11 -04:00
Alexander Bock
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +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
d0f4ab6f60
Removing Jenkins warnings
2016-02-05 23:28:45 +01: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
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
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
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
17498c28c6
Minor cleanups
2015-06-05 01:45:15 +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
11c4757073
Merge branch 'develop' into plutoViz
2015-02-19 14:45:11 +01:00
Alexander Bock
27c5bcaa93
Fix bug where a script execution would stop completely if a property was not found
...
Added helper file to ease Lua script callback testing
Made errors in setPropertyValue and getPropertyValue functions not fatal
2015-02-19 14:43:29 +01:00
Joakim Kilby
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
Joakim Kilby
7c7b4f1f97
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Joakim Kilby
8f924f7696
added serialize, deserialize, post sync and pre sync functions for script engine
2015-02-17 11:58:03 +01:00
Alexander Bock
7286ba3ded
Added Autocompletion for the LuaConsole (TAB/Shift+TAB)
2015-02-17 00:43:11 +01:00
jonasstrandstedt
7b2b81ed54
Fix memory leaks and proper deinitialization
2014-12-11 10:13:10 +01:00
Jonas Strandstedt
a5e122b822
Improved the Lua documentation
...
- Lua documentation now needs a string giving the arguments list.
- When generating documentation first prints the command list and then prints
the documentation for each command.
- Supports fixed max line length (set to 80)
- Uses four blank spaces as padding (easily replacable)
2014-12-03 14:13:53 +01:00
Alexander Bock
b05c4cf30f
Add capabilities to write out documentation of all Lua functions on startup
2014-11-29 14:03:49 +01:00
Alexander Bock
86efb3573b
More work in preparing for lua-based keyboard controller
...
Modified ScriptManager to decouple adding libraries from registering libraries
Allowing ScriptManager to register libraries to other lua states as well
2014-10-14 00:08:26 +02:00
Alexander Bock
66722e83a6
Cleaned up script functionality in SceneGraph
...
Removed scriptfunctions.h and cpp as the functions have moved into other classes
2014-09-14 18:36:33 +02:00
Alexander Bock
f0dfd0fa04
Added documentation for Time class
2014-09-14 17:36:10 +02:00
Alexander Bock
9b2a04a8c4
More work on Time class
...
Fixed bool -> int conversion in SpiceManager
2014-09-14 15:51:46 +02:00
Alexander Bock
e7697a4ce0
Enable setting and getting property values from Lua scripts
2014-08-31 17:52:02 +02:00
Alexander Bock
79174d5b6c
Cleaned up scripts directory
...
Made scripts runnable at startup
Added printing functions and remapped default Lua printing
2014-08-29 13:04:20 +02:00
Alexander Bock
1782857c72
Bugfix accessing properties
2014-08-21 18:52:47 +02:00
Alexander Bock
5793498ddf
Added first version of ScriptEngine, allowing Lua script to set propety values
2014-08-21 18:44:42 +02:00
