ab52504ec8
Restructure asset files
2017-12-18 18:55:12 +01:00
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
75cf6dcf71
Asset work in progress
2017-12-15 13:21:10 +01:00
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
7e2d6bf3ab
Coding style adherence
2017-12-12 17:08:24 -05:00
a08c678bb0
Remove erraneous enabled OpenGL checking code
...
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
2152c3ee88
Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
...
# Conflicts:
# modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
c9aedb084b
Add Lua functions to query keyboard bindings and remove individual keybinds
...
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
2017-12-08 14:58:18 -05:00
b031245a19
Changed behaviou of max billboard sizes.
2017-12-08 13:03:36 -05:00
28fc1d08a7
Disabled OpenGL logging.
2017-12-05 11:02:12 -05:00
fb675dfeab
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-04 10:52:12 +01:00
a797c2b6db
Merged master into NewAtmosphere
2017-12-01 17:13:04 -05:00
8e0fde947d
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
...
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
cd1c695944
Improved RendedrablePlanesCloud rendering times.
2017-11-22 11:55:37 -05:00
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -05:00
67033c4583
Tentative fix for billbords alingment problems.
2017-11-15 17:35:00 -05:00
62c5506250
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-13 11:18:00 +01:00
9885c00beb
Performance improved atmosphere.
2017-11-07 15:57:25 -05:00
bc4e0e4af0
Refactor item overlap and add standoff distance
2017-11-06 11:02:58 -06:00
1f33359697
Cleanup and better configuration of resource syncs
2017-11-05 23:17:51 +01:00
dc9831b6a6
Add progress bar to the loading screen
...
Add configuration options to customize the loading screen
2017-11-05 14:49:46 -05:00
089cfe727f
Improved ATM perfomance (still working on it). Debugging billboards alingment (in progress).
2017-11-03 17:10:03 -04:00
735d6378d9
More work on loading screen
...
Multithreaded SceneGraphNode initialization
2017-11-03 14:06:51 -04:00
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02:00
50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
eaca6c7487
Add SceneLicense information to the Scene
...
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
637e74a9dc
Merged master into NewAtmosphere.
2017-10-19 14:23:06 -04:00
97f78a09df
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-19 10:27:34 +02:00
7377d63794
Clean up digitaluniverse data folder
...
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
d628c1a667
Merge branch 'master' into feature/DU
...
# Conflicts:
# data/scene/grids/grids.mod
# ext/sgct
2017-10-17 17:09:37 -04:00
a303bf3aa8
Fix for mission visualization
...
Change default monospaced font
2017-10-16 16:27:32 -04:00
2623912ec9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-16 11:07:24 +02:00
0ed72d6652
Merge branch 'master' into feature/DU
2017-10-04 09:36:37 -04:00
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
74f0da9033
Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders.
2017-09-22 08:12:45 -04:00
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
f4901fa4cf
Work on asset management
2017-09-18 18:13:20 +02:00
aaed6ab6d7
Work on asset loader and assets
2017-09-15 14:05:43 +02:00
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
f95411b1cc
Removed atmosphereerath scene, mod and data files.
2017-08-16 09:39:29 -04:00
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
5ca44d4aa1
Allow RenderableGlobe to have a single radius
...
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -04:00
20003d5b32
Merged master into NewAtmosphere.
2017-07-21 15:02:24 -04:00
e661324002
Remove style guide errors
...
Add missing newline errors
2017-07-21 11:52:25 -04:00
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
b0c65d416b
Merged master into NewAtmosphere.
2017-07-17 16:22:33 -04:00
0e9edaeb12
Fix byte order mark commits
...
Update Ghoul
2017-07-17 15:54:00 -04:00
4ecb98f06f
Feature/globe shading ( #363 )
...
* Perform Oren Nayar diffuse shading on globes.
* Remove unused propertyowner
* Enable accurate normals for globes
* Use property for accurate normals.
* Correctly calculate height when scale is changed.
* Auto update line endings to LF in main.cpp and openspaceengine.cpp
* Clean up and comment
* Convert shader indentation to spaces (Wooooops..).
* Line endings
* Line endings and small fixes
* Line endings
* Clean up
2017-07-14 16:33:03 +02:00
Emil Axelsson