mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 21:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,775 Commits 83 Branches 46 Tags
9e5a033cd26101612dddbd8e8caa180e84ddc2c5
Commit Graph

472 Commits

Author SHA1 Message Date
Alexander Bock
7f28adc386 Add additional trace information 
Prevent crash if console shader is missing
 2017-06-01 12:13:19 -04:00
Emil Axelsson
5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02: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
Emil Axelsson
1eee40887d Tweak animation and appearance of lua console + Remove some duplicate code 2017-05-17 21:21:51 +02:00
Alexander Bock
3d9375277b Adding LuaConsole to global property namespace 
Initial reworking of LuaConsole look and feel
 2017-05-14 12:47:10 -04:00
Alexander Bock
d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock
ddc9ef1bc5 Add abstract class to handle Handlebar-based documentation file generation 
Apply Documented class to the InteractionHandler
Update Ghoul
 2017-05-09 18:06:14 +01:00
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Alexander Bock
bf16c76add Feature/opengldebug (#290) 
* Add InLIstVerifier

* Initial implementation of OpenGL debug messages

* Moving functionality into Ghoul

* Compile fix

* Update Ghoul repository
Make use of the moved OpenGL debug functions

* Update Ghoul to fix GCC and Clang compiler errors

* Add unit test for IntListVerifier
 2017-04-18 14:29:23 -04:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Emil Axelsson
5589de995b Feature/domecasting (#288) 
* Improve dome casting feature. Add basic GUI for domecasting.

* Reenable remote scripting from Lua console. Add more settings and debug information for domecasting.

* Do not try to reconnect to parallel connection forever

* Fix interpolation bug for dome casting with globe browsing interaction mode

* Show parallel connection properties in correct GUI

* Fix bug for dome casting with globe browsing interaction mode. Add property for time tolerance.

* Update header file

* Clean up dome casting code

* Remove obsolete lua functions from ParallelConnection.
 2017-04-13 23:16:00 +02:00
Alexander Bock
76aed0578c Feature/virtualproperty (#286) 
* Add virtual property owner to OpenSpaceEngine

* Ability to add and remove virtual properties

* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene

* Delete virtual properties also in the OpenSpaceEngine dtor

* Make RenderablePlanet not crash if the nighttextures are not present

* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
 2017-04-13 14:38:28 -04:00
Emil Axelsson
6a851e11a3 Correct the order of initialization and scene loading 2017-04-05 17:40:00 +02:00
Emil Axelsson
a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
Emil Axelsson
f3931551bd Clean up scene loading 2017-03-16 17:06:33 +01:00
Emil Axelsson
b06864eefe Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-16 16:35:29 +01:00
Emil Axelsson
361f9face5 - Disable barrier when loading a scene. 
- Remove syncables before deinitializing openspaceengine
 2017-03-16 14:35:22 +01:00
Emil Axelsson
ca6348194e Clean up scene loading 2017-03-14 13:40:18 +01:00
Alexander Bock
bcf92804b6 Updating Ghoul repository 
Updating SGCT repository
Removing compiler warnings
 2017-03-10 09:32:16 -05:00
Emil Axelsson
92df9caf5a Clean up scene loading 2017-03-07 16:33:56 +01:00
Emil Axelsson
d92d001364 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-07 13:19:07 +01:00
Emil Axelsson
7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
 2017-03-07 10:57:50 +01:00
Alexander Bock
bb4fca593b Automatically register core classes on first access to DocumentationEngine 2017-03-06 15:06:54 -05:00
Alexander Bock
63af7e67f9 Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass (closes #260) 2017-03-03 18:39:35 -05:00
Emil Axelsson
d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume 
Conflicts:
	src/engine/openspaceengine.cpp
 2017-03-03 18:08:29 +01:00
Alexander Bock
fb67e805ac Various cleanup 
Add script that counts the number of includes
 2017-03-02 19:50:05 -05:00
Alexander Bock
1689dc4047 Move the PropertyOwner name specification into the constructor and adjust accordingly 2017-03-02 18:25:13 -05: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
d6b5bb753b - Some cleanup of LuaConsole 
- Moved dedicated Lua commands into a visible property
  - Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
  - Move and use documentation into the class
 2017-03-02 14:27:18 -05:00
Emil Axelsson
cb7e81cf3d Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner. 
Conflicts:
	modules/volume/CMakeLists.txt
	modules/volume/linearlrucache.h
	src/engine/openspaceengine.cpp
 2017-03-02 18:20:01 +01:00
Alexander Bock
6748305267 Some cleanup of ConfigurationManager 2017-03-01 11:30:54 -05:00
Alexander Bock
55f002ad6f Move the disabling of the rendering on the master into the RenderEngine 
instead of specifying it in the OpenSpaceEngine
 2017-03-01 10:39:29 -05:00
Alexander Bock
59c8ba6700 - Replace window name check with tag check for GUI code (closed #258) 
- Only show GUI, console, and screenlog on the GUI window
 2017-02-28 20:39:34 -05:00
Alexander Bock
8910aac834 - Replace window name check with tag check for GUI code (closing #258) 
- Only show GUI, console, and screenlog on the GUI window
 2017-02-28 20:38:58 -05:00
Alexander Bock
283c83e37c Removing code analysis warnings 
Start cleaning RenderEngine
 2017-02-26 23:45:39 -05:00
Alexander Bock
6704491fdc More cleanup in OpenSpaceEngine 2017-02-25 19:19:31 -05:00
Alexander Bock
bc75334eb4 Use exceptions instead of success return values for initialize and 
create methods
 2017-02-25 18:08:53 -05:00
Alexander Bock
6c4efc4eec Move OpenSpaceEngine::isMaster method into WindowWrapper class 2017-02-25 11:29:28 -05:00
Alexander Bock
5db26ad44b Windows compile fix when compiling without WMI support 2017-02-24 17:08:50 +01:00
Alexander Bock
965cf6bd9a Fix crash that occurs if there is an error in the SGCT configuration file 2017-02-22 15:31:59 -05:00
Alexander Bock
11fbff5fbc Reduce the dependency of libOpenSpace on modules 
- Enable module callbacks for OpenSpaceEngine
 - Add OpenSpaceModule function that returns a Lua library
 2017-02-16 16:43:34 -05:00
Alexander Bock
8167228d69 Add global try-catch block around main function 
Add additional LDEBUG and LTRACE for debugging
 2017-02-16 12:30:58 -05:00
Alexander Bock
729bffb0f9 Improve SpecificationError reporting 
Fix spelling error in ModuleEngine
 2017-02-14 18:11:20 -05: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
a6c422c38e Fix runtime error with moving classes from base to space module 
Add additional logging information to initialization
 2017-02-08 14:42:28 -05:00
Alexander Bock
5f98ec2ca9 Update Ghoul repository 
Make changes to accommodate the new Lua state class
 2017-02-07 17:02:43 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Emil Axelsson
4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Alexander Bock
aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59:22 +01:00
Emil Axelsson
4b688fd149 Move Rotation and Scale factories from base module to OpenSpace core 2016-12-14 14:27:12 +01:00