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
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
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
=
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
93534d13bc
Fix error with preInitialization timestep being overwritten
2017-10-10 12:34:11 -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
Emil Axelsson
5ebd4d5327
Add missing file
2017-08-15 12:03:25 +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
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
Alexander Bock
a016fd96a6
Fix duplicate property name error
2017-08-14 15:24:41 -04: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
8a62e6e791
Add description to PropertyOwner
2017-08-01 17:05:52 -04:00
Alexander Bock
c04b379520
Enable the selection of constellation bounds through the mod file
2017-07-29 01:57:16 -04:00
Alexander Bock
ad5ca816a9
Move friction properties into common subowner
2017-07-29 01:33:22 -04:00
Alexander Bock
31377466ba
Remove return values from initialize and deinitialize functions
2017-07-28 17:51:25 -04:00
Alexander Bock
5ca44d4aa1
Allow RenderableGlobe to have a single radius
...
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -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
Alexander Bock
142f807586
Jenkins compile fix
2017-07-26 19:20:57 -04:00
Alexander Bock
14b4f5c1f0
Jenkins compile fix
2017-07-26 18:15:40 -04:00
Alexander Bock
0b30a9e244
Jenkins compile fix for Linux
2017-07-26 17:58:12 -04:00
Alexander Bock
59bccd040d
Cleanup changes
2017-07-26 17:29:57 -04:00
Alexander Bock
dc79a94142
Remove warnings
...
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock
1a475ef570
Started documenting properties
...
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
Alexander Bock
2e6465d888
Correctly order the Property::Visibility enum
2017-07-22 23:09:38 -04:00
Alexander Bock
04bac9293b
Encapsulate identifier, guiName, and description into a PropertyInfo struct
2017-07-22 17:36:03 -04:00
Alexander Bock
b584f0197e
Add description to Propertys
2017-07-21 16:31:58 -04:00
Alexander Bock
e661324002
Remove style guide errors
...
Add missing newline errors
2017-07-21 11:52:25 -04:00
Emil Axelsson
faa67d9a96
Merge branch 'feature/core-threadpool' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-07-21 11:35:34 +02:00
Emil Axelsson
1160831b66
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/core-threadpool
2017-07-21 11:25:42 +02:00
