Alexander Bock
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
Emil Axelsson
19812af629
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-11 19:10:42 +01:00
Alexander Bock
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
Emil Axelsson
cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01:00
Alexander Bock
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
e201dec907
Start work on TorrentSynchronization
2017-11-06 19:07:52 +01:00
Emil Axelsson
2426545a05
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/sceneloader.cpp
tests/test_concurrentjobmanager.inl
tests/test_concurrentqueue.inl
tests/test_sceneloader.inl
2017-08-15 11:43:18 +02:00
Alexander Bock
c275b2f833
Feature/cmake cleanup ( #381 )
...
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31 )
* Cleaning up CMake files
* Restructure application specification
* Add parameter for library mode to all modules
* Add functions to handle global variable state
* Misc/remove warnings (#383 )
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Emil Axelsson
cb7319d5f2
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
data/scene/default.scene
modules/sync/syncmodule.h
openspace.cfg
src/engine/openspaceengine.cpp
src/scene/scene.cpp
src/scene/scene_doc.inl
src/scene/scenegraphnode.cpp
src/scene/scenegraphnode_doc.inl
src/scene/sceneloader.cpp
src/scripting/scriptengine.cpp
2017-08-14 11:17:25 +02:00
Alexander Bock
0e9edaeb12
Fix byte order mark commits
...
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
4dba552fd1
Started switching OpenSpace projects to nested namespaces
...
Various cleanups
2017-07-15 20:01:55 -04:00
Emil Axelsson
351a246f3a
Add support for c closures in lua
2017-07-06 22:30:57 +02:00
Emil Axelsson
ee36a97762
Improve asset lua interface. Simplify scene loading.
2017-07-06 16:40:35 +02:00
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
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
fbea8389c8
- Add check in style guide that prevents ‘using namespace’ in header files
...
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
2017-03-01 21:02:33 -05:00
Alexander Bock
4e52f27f9e
Remove Dictionary include with forward declarations
2017-03-01 19:20:00 -05:00
Alexander Bock
8fd60ce8e6
- Remove documentation.h include and replace with forward declaration
...
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05: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
70020e3de7
- Add style check for correct use of components and subcomponents in
...
include guards
- Disallow use of lower case characters in include guards
- Fix wrong components and subcomponents
2017-02-10 14:46:51 -05:00
Alexander Bock
23ea86949f
Updated check_style_guide to test for include guards and copyright
...
notices
- Fix include guards
- Fix copyright header indentation
- Update copyright years
2017-02-09 23:55:39 -05:00
Alexander Bock
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
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
