Emil Axelsson
8059fb05e9
More work on asset management
2017-10-27 16:43:04 +02:00
Emil Axelsson
a9c74977fd
Work on asset management
2017-10-27 14:42:45 +02: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
a1b2695765
Add Lua method to check whether a scenegraphnode is present in the scene
...
Make use of the function to guard mark_interesting_nodes against a nonexisting scenegraph node
2017-10-24 03:41:02 -07:00
Alexander Bock
9b6028028a
Clean up RenderEngine
2017-10-24 03:16:29 -07:00
Alexander Bock
5a9ebe552b
Add the ability to remove Tags
2017-10-24 01:47:14 -07:00
Alexander Bock
269dda8aff
Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
2017-10-24 01:33:53 -07:00
Alexander Bock
eaca6c7487
Add SceneLicense information to the Scene
...
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
Alexander Bock
97445f4f9f
Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts
2017-10-23 14:43:25 -07:00
Emil Axelsson
6d8ec8a7c6
Compile fix for clang
2017-10-22 20:54:55 +02:00
Alexander Bock
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
Alexander Bock
b26db7548b
Allow setting the default enabled state for renderables
2017-10-19 23:20:43 -04:00
Emil Axelsson
9e5a033cd2
Use shared pointers for assets
2017-10-19 15:48:07 +02:00
Emil Axelsson
27dea20520
Work on asset loading
2017-10-19 13:24:21 +02:00
Emil Axelsson
97f78a09df
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-19 10:27:34 +02:00
Alexander Bock
5a3bec253f
Merge branch 'master' into feature/DU
2017-10-18 18:51:51 -04:00
Alexander Bock
b3baf72f49
Correctly align shutdown information
2017-10-18 10:18:03 -04:00
Alexander Bock
7377d63794
Clean up digitaluniverse data folder
...
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
Alexander Bock
d628c1a667
Merge branch 'master' into feature/DU
...
# Conflicts:
# data/scene/grids/grids.mod
# ext/sgct
2017-10-17 17:09:37 -04:00
Emil Axelsson
81298f10be
Work on asset synchronization and initialization
2017-10-16 19:08:22 +02:00
Alexander Bock
7520edab83
Added first version of mission visualization
2017-10-16 10:23:00 -04:00
Emil Axelsson
2623912ec9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-16 11:07:24 +02:00
Alexander Bock
bb5f4d4381
Rename GuiGrouping to GuiPath
...
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
Emil Axelsson
18c50afeb5
Work on data management. Add some tests
2017-10-13 16:56:53 +02:00
Alexander Bock
ebd506975c
Added initial scenegraph node grouping support
2017-10-13 00:17:28 -04:00
=
6ebfb92a8d
Work on asset loading
2017-10-12 19:00:51 +02:00
Alexander Bock
327779d88f
Implemented Space/Time ImGui widget
2017-10-11 15:58:41 -04:00
=
6f3cc8f6a5
Work on asset loading
2017-10-11 17:06:51 +02:00
Alexander Bock
aa969795cc
Factor ScreenSpaceImage into separate classes for local loading and online download ( closes #296 )
2017-10-10 14:16:55 -04:00
Alexander Bock
fe8e893b81
Restore the current working directory if there is an error in the scene loading ( closes #342 )
2017-10-10 11:45:40 -04:00
Emil Axelsson
c0b9e1d1a7
Clean up code
2017-10-10 16:43:12 +02:00
Jonathas Costa
0ed72d6652
Merge branch 'master' into feature/DU
2017-10-04 09:36:37 -04:00
Jonathas Costa
600536e7f8
Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix.
2017-10-04 09:23:49 -04:00
Emil Axelsson
6b82df68dd
Pr/core threadpool ( #401 )
...
Move GlobeBrowsing thread pool to OpenSpace core
2017-09-22 13:22:03 +02:00
Emil Axelsson
ea5382c028
Volume conversion and rendering ( #350 )
...
Add volume rendering features
- Improve task runner
- Improve reading from CDF files
- Basic time varying volume rendering
- Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
Emil Axelsson
b6bee846a2
Work on data management
2017-09-21 16:29:21 +02:00
Emil Axelsson
f4901fa4cf
Work on asset management
2017-09-18 18:13:20 +02:00
Emil Axelsson
8a30251fcb
Work on asset management
2017-09-18 12:56:55 +02:00
Emil Axelsson
aaed6ab6d7
Work on asset loader and assets
2017-09-15 14:05:43 +02:00
Emil Axelsson
bf45937619
Compile fix in asset and assetloader
2017-09-15 11:13:46 +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
Alexander Bock
0ceab49df7
Update gitignore to include Mars texture
...
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395 )
2017-08-30 14:56:02 -04:00
Alexander Bock
222bbe22ab
Feature/gb gui ( #390 )
...
Implemented new GUI component to handle WMS servers
* Add Lua scripts to support adding GIBS datasets (closes #222 )
* Add Lua function to load WMS servers from a predefined file
* Workaround for Visual Studio 15.3 compile fix in Windows headers
* Initial support for parsing GetCapabilities file and automatically add layers
* Add a Trigger property to remove a layer
* Support default servers
* Add default file
* Move WMS server code from GUI component into GlobeBrowsingModule
* Add Lua scripts for loading and removing WMS servers
Automatically load default servers on startup
* Reset tile provider before removing a layer tolimit the crash risk
Add "From focus" button to switch globebrowsing gui to the same node as the focus
* Remove warnings
Remove compile error with nonexisting GDALOpenEx function
2017-08-19 20:23:08 -04: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
Emil Axelsson
6c36fa7bfd
Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
include/openspace/util/concurrentjobmanager.h
include/openspace/util/concurrentjobmanager.inl
include/openspace/util/concurrentqueue.h
include/openspace/util/concurrentqueue.inl
include/openspace/util/threadpool.h
modules/globebrowsing/tile/tileloadjob.h
modules/sync/syncmodule.cpp
src/util/threadpool.cpp
2017-08-15 11:34:54 +02:00
Emil Axelsson
eed7041f1c
Compile fixes after merge
2017-08-15 11:25:52 +02:00
Alexander Bock
a016fd96a6
Fix duplicate property name error
2017-08-14 15:24:41 -04:00
