Emil Axelsson
62c5506250
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-13 11:18:00 +01:00
Emil Axelsson
2fa42859cd
Decentralize resource synchronization. Remove notion of SynchronizationJob.
2017-11-12 19:09:16 +01: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
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
Alexander Bock
aa20c677dd
Move onscreen rendering into SGCT's render2D function ( closes #181 )
...
Same fix makes GUI windows work again (closes #412 )
2017-11-09 18:12:13 -05:00
Alexander Bock
acdfefe46d
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock
6ecb180ac0
Some more work on rendering loading screen information
2017-11-04 11:12:22 -04:00
Alexander Bock
735d6378d9
More work on loading screen
...
Multithreaded SceneGraphNode initialization
2017-11-03 14:06:51 -04:00
Emil Axelsson
fba556b11f
Always create a camera
2017-10-31 10:55:20 +01:00
Emil Axelsson
f9ec20812d
Introduce AssetManager
2017-10-27 10:57:39 +02:00
Emil Axelsson
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02:00
Alexander Bock
9b6028028a
Clean up RenderEngine
2017-10-24 03:16:29 -07:00
Alexander Bock
269dda8aff
Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
2017-10-24 01:33:53 -07:00
Emil Axelsson
6d8ec8a7c6
Compile fix for clang
2017-10-22 20:54:55 +02:00
Emil Axelsson
9e5a033cd2
Use shared pointers for assets
2017-10-19 15:48:07 +02:00
Emil Axelsson
18c50afeb5
Work on data management. Add some tests
2017-10-13 16:56:53 +02:00
Emil Axelsson
aaed6ab6d7
Work on asset loader and assets
2017-09-15 14:05:43 +02:00
Emil Axelsson
af8bec1441
Prepare for data sync
2017-09-14 20:16:51 +02:00
Emil Axelsson
4cdae984e9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-09-11 11:52:31 +02:00
Alexander Bock
c3825cc81e
Only display commit hash text overlay if there is information available
...
Add version and commit information into a global property
2017-08-31 11:37:22 -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
Emil Axelsson
5ced910f79
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
include/openspace/scene/scenegraphnode.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/interaction/interactionmode.cpp
2017-07-18 10:54:41 +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
Kalle Bladin
2e4f31ded8
Interaction Updates ( #353 )
...
* Interaction speed is not dependent on framerate
* Split up interaction code in files and perform smooth interpolation when changing focus
* Abstract interaction code in to functions.
* Interpolation time is dependent on angle to focus node.
* Use correct delta time when interpolating
* Fix bug regarding decomposition of camera rotation.
* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.
* Do not always rotate with object. Depending on distance
* Remove interaction depth below ellipsoid. Now able to interact without renderable
* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight
* Remove GlobeBrowsingInteractionMode
* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.
* Move properties from interaction handler to orbital navigator
* Use smooth step for follow rotation interpolator
* Rename KeyframeInteractionMode to KeyframeNavigator
* Rename files
* Clean up.
* Separate mousestate from orbitalnavigator
* Clean up
* Split keybindingmanager from interactionhandler interactionhandler
* Rename interactionhandler to navigationhandler
* Rename files
* Clean up
* Take back usage of gotochunk and gotogeo
* Rename lua library navigation
* Move functionality from navigationhandler to keyframenavigator
* Update scripts for navigation
* Comment code
* Clean up
* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.
* Update jenkins file to remove build folder before building.
* Fix error in jenkins script
* Update jenkins file
* Update jenkins file
* Revert jenkins file
* I hope this makes Jenkins happy.
* Line endings God damnit
* Line endings
* Clean up
* Fix compilation issue
* Take back default scene.
* Fix indentation
* Move functions goToGeo and goToChunk to GlobeBrowsingModule.
* Include algorithm for std::find
* Remove auto and other clean up
2017-07-14 17:17:17 +02:00
Alexander Bock
6d0c80cc91
Change the mouse scroll callback to accept two dimensional arguments
2017-07-11 14:35:39 -04:00
Emil Axelsson
f091444972
Make it possible to toggle asset dependencies in the gui
2017-07-11 17:02:21 +02:00
Emil Axelsson
0fe71b5c2e
Move more scene loading logic to assets
2017-07-07 18:13:00 +02:00
Emil Axelsson
ee36a97762
Improve asset lua interface. Simplify scene loading.
2017-07-06 16:40:35 +02:00
Emil Axelsson
5c67189c8d
Add possibility to check if OsEng is instantiated
2017-06-01 14:09:06 +02: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
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
a108ee1f8a
Fix requests from code review
2017-04-04 14:25:39 +02:00
Emil Axelsson
ca6348194e
Clean up scene loading
2017-03-14 13:40:18 +01:00
Emil Axelsson
92df9caf5a
Clean up scene loading
2017-03-07 16:33:56 +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
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
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
fe47845703
Windows compile fix
2017-02-16 23:13:38 +01: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
6d9dc2bfeb
Fixed include guards
...
Removed unused writeToTexture file
2017-02-09 19:12:21 -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
d139dd2d22
Clean include guards in OpenSpace core
...
Remove unused files
2016-12-09 13:54:22 +01:00
Emil Axelsson
b448b0ec5e
Move all network namespace members into the openspace namespace
2016-09-30 14:13:36 +02:00
Emil Axelsson
0230acb005
Merge branch 'feature/parallelconnection' into develop
...
Conflicts:
src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
Emil Axelsson
15e83394c3
improve look and feel of the html documentation
2016-09-27 14:45:26 +02:00
