mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 04:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,304 Commits 99 Branches 46 Tags
542b9e11e60be44ffbf96e6f93e008cff002f8fb
Commit Graph

59 Commits

Author SHA1 Message Date
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
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
b46f40030b Untabify more files 2016-04-27 14:24:58 +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
df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +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
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
Joakim Kilby
ea2017e11c Introduced fadeIn and fadeOut functionality via scripting. 2015-02-20 16:54:30 +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
eb7fefb3c9 fixed Alex' bug!! 
Added string specialization to template functions for syncbuffer class
 2015-02-17 17:51:53 +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
Alexander Bock
2e11d247d2 Remove a crash where ScriptManager was deinitialized wrongly 2015-02-14 10:41:54 +01:00
Alexander Bock
5a7a518bad Remove cppcheck warnings 2014-12-16 21:54:53 +01:00
jonasstrandstedt
7b2b81ed54 Fix memory leaks and proper deinitialization 2014-12-11 10:13:10 +01:00
Alexander Bock
f201d4a622 Fix return-value-optimization errors 2014-12-09 19:39:16 +01:00
Alexander Bock
82c42cb97a General code cleanup 2014-12-09 18:36:23 +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
1e5c181cee Fix adding of multiple lua libraries with the same name by allowing them to be merged internally 2014-11-18 19:41:02 +01:00
Alexander Bock
6b40cb18fb Merge branch 'feature/interactionhandler' into develop 
Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
 2014-11-18 15:46:26 +01:00
Jonas Strandstedt
31c76f3e3c Added key binding from Lua possible 
- Possible to add key bindings from Lua possible. This calls Lua scripts
  from key commands.

 - Temporary fixed a small bug for volume rendering
 2014-11-17 17:02:40 +01:00
Jonas Strandstedt
f85e18dc18 OS X now doesn't crash for volumes 
- Fixed a few warnings
 2014-11-05 17:11:27 +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
4d756daaf6 Simplified error handling in Lua API 2014-09-27 15:25:35 +02:00
Alexander Bock
4cea480882 Added Lua function to access absolute Paths 2014-09-26 14:35:04 +02:00
Alexander Bock
dd629db53d More code cleanup, force inclusion of swizzling for GLM 2014-09-19 17:44:33 +02:00