mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-16 18:40:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,451 Commits 83 Branches 46 Tags
bc875a540f1071fa2aced9498d9c666e09027913
Commit Graph

126 Commits

Author SHA1 Message Date
Alexander Bock
6d76080370 Simplify script precondition argument checks 2018-02-15 17:56:12 -05:00
Emil Axelsson
a85eddff4e Clean up lua stack and weak pointers 2018-02-09 16:44:34 +01:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
cc178d03f3 Remove clang warnings 
Update SGCT repository
 2017-12-29 19:47:33 +01:00
Alexander Bock
59916bc0c1 Renaming path tokens 
- ${BASE_PATH} -> ${BASE}
  - ${OPENSPACE_DATA} -> ${DATA}
  - Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
 2017-12-26 20:49:17 +01:00
Emil Axelsson
d40d2abc9a Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-19 12:56:12 +01:00
Alexander Bock
966df322cf Added additional absPath where necessary 2017-12-18 14:47:58 -05:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Alexander Bock
23a446cb2c Update Ghoul repository 
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
 2017-12-13 21:55:29 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock
bce8e71d9b Another fix for StringListProperty 
Do not crash if included script file does not provide a documentation key
 2017-12-08 13:49:11 -05: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
18c50afeb5 Work on data management. Add some tests 2017-10-13 16:56:53 +02: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
eaf0d70a79 Fix JSON error in documentation 2017-07-31 16:57:07 -04:00
Alexander Bock
e4ef40ad72 Add functions to recursively parse and add color layers described in .info files 2017-07-31 16:50:21 -04:00
Alexander Bock
35a41d3283 Remove Exhaustive parameter for documentation 2017-07-27 14:46:46 -04:00
Alexander Bock
19f8e30813 Change RenderableModel "Rotation.ModelTransform" to "ModelTransform" 
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
 2017-07-27 00:22:17 -04:00
Matthew Territo
40599081d9 Minor spelling, grammar, & comment cleanup 2017-07-19 23:34:48 -06: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
Alexander Bock
ec6641038d Make use of C++17 features in LuaConsole and filesystem walking 2017-07-15 14:37:00 -04:00
Alexander Bock
6f524f4a67 Add centralized escaping of JSON strings 
Enable correct escaping of " character thus removing the need to outlaw "s in comments
 2017-07-14 16:58:18 -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
ea8442d996 Enable networked specifications for ScreenSpaceImages 2017-06-03 13:38:02 -04: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
bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Emil Axelsson
752081d31b feature/time-refactor (#294) 
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
 2017-05-22 14:01:08 +02: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
c12bd7182b Some cleanup of ModuleEngine 
Some cleanup of SettingsEngine
Some cleanup of SyncEngine
 2017-03-02 17:24:44 -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
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
Alexander Bock
aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59: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
0230acb005 Merge branch 'feature/parallelconnection' into develop 
Conflicts:
	src/interaction/interactionhandler.cpp
 2016-09-30 11:01:37 +02:00