 Alexander Bock
|
5f391de33c
|
Fix crash when adding layers through globebrowsing interface due to missing initialization
Fix crash that would happen if the resetting of the tile layer would throw an exception
|
2017-11-09 12:01:35 -05:00 |
|
|
Alexander Bock
|
88cf7926ae
|
Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
# modules/galaxy/rendering/renderablegalaxy.cpp
|
2017-11-09 10:51:56 -05:00 |
|
|
Alexander Bock
|
ca7053d8f2
|
Fix bug with layer support for height maps
|
2017-11-09 10:20:33 -05:00 |
|
|
Alexander Bock
|
8866a13ff6
|
More coding style fixes
|
2017-11-08 21:36:06 -06: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
|
44806687bf
|
Fix bug with applying colormap in RenderableBillboardsCloud
|
2017-11-08 12:21:15 -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
|
80f5706049
|
Remove warnings on Clang
|
2017-11-07 09:19:45 -06:00 |
|
|
Alexander Bock
|
b886925616
|
Move OpenGL in globebrowsing from constructors into initialization functions
Place entire scene loading into separate thread
|
2017-11-03 16:25:06 -04:00 |
|
|
Alexander Bock
|
78e3320cde
|
Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
|
2017-11-02 14:27:35 -04:00 |
|
|
Alexander Bock
|
ca69408366
|
Enable minimum picking distance in NDC
|
2017-11-02 12:05:09 -04:00 |
|
|
Alexander Bock
|
1c2622248c
|
Remove unused shaders
|
2017-10-24 03:35:41 -07:00 |
|
|
Alexander Bock
|
10bcd9a3d3
|
Add display for current time and ability to return to today to the space/time component
|
2017-10-24 02:53:51 -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 |
|
|
Alexander Bock
|
c204a1e9f0
|
Make RenderableConstellationBounds not crash if the file is missing
|
2017-10-21 10:27:14 -04:00 |
|
|
Alexander Bock
|
e80730e9bf
|
Fix a variety of warnings
|
2017-10-21 10:10:40 -04:00 |
|
|
Alexander Bock
|
008896bdd7
|
Only add color layers and height layers through info files if they exist
|
2017-10-20 17:01:44 -04:00 |
|
|
Alexander Bock
|
4dacba868b
|
Fix featured property display
Set correct blend mode for Themis on Mars
|
2017-10-19 22:52:25 -04:00 |
|
|
Alexander Bock
|
78aa164ccf
|
Reset moon.mod
|
2017-10-19 15:14:04 -04:00 |
|
|
Alexander Bock
|
2e7da84dbf
|
Some minor ImGUI color changes
|
2017-10-18 19:30:32 -04:00 |
|
|
Alexander Bock
|
40f52c54b0
|
Turn DU into a default module
|
2017-10-18 10:00:41 -04:00 |
|
|
Alexander Bock
|
1c61f56043
|
Various Mac related fixes
|
2017-10-18 09:58:12 -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
|
791a3c5e20
|
Fix indentation
|
2017-10-17 18:56:08 -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 |
|
|
Alexander Bock
|
f8754115eb
|
Various cleanup
|
2017-10-16 17:11:28 -04:00 |
|
|
Alexander Bock
|
a303bf3aa8
|
Fix for mission visualization
Change default monospaced font
|
2017-10-16 16:27:32 -04:00 |
|
|
Alexander Bock
|
7520edab83
|
Added first version of mission visualization
|
2017-10-16 10:23:00 -04:00 |
|
|
Alexander Bock
|
cf01749e83
|
Simplify property tree if a tree node only has a single child and no scenegraph nodes
|
2017-10-13 19:32:54 -04: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 |
|
|
Alexander Bock
|
ebd506975c
|
Added initial scenegraph node grouping support
|
2017-10-13 00:17:28 -04:00 |
|
|
Jonathas Costa
|
27e6043857
|
Removed unused code.
|
2017-10-12 22:06:42 -04:00 |
|
|
Jonathas Costa
|
d545042b9c
|
Updated fade-out of Milkyway.
|
2017-10-12 22:05:48 -04:00 |
|
|
Jonathas Costa
|
41bcfd91d7
|
Enabled caching for billboard clouds and removed debugging code.
|
2017-10-12 15:46:56 -04:00 |
|
|
Alexander Bock
|
f1fd2b1960
|
Add window to show featured scenegraph nodes
|
2017-10-12 12:13:55 -04:00 |
|
|
Jonathas Costa
|
75783a5352
|
Fixing cache system for DU files.
|
2017-10-11 18:20:38 -04:00 |
|
|
Jonathas Costa
|
7ff8064ef2
|
Improved grid rendering for DU meshes.
|
2017-10-11 17:02:39 -04:00 |
|
|
Alexander Bock
|
327779d88f
|
Implemented Space/Time ImGui widget
|
2017-10-11 15:58:41 -04:00 |
|
|
Jonathas Costa
|
a5243cf4d1
|
Added luminosity/size and slum controls by datavar in plane clouds.
|
2017-10-11 14:51:26 -04:00 |
|
|
Alexander Bock
|
d97cfbe829
|
Change ImGUI look and feel
Add Arimo font to be used in UI
|
2017-10-11 10:54:19 -04:00 |
|
|
Alexander Bock
|
5ccc200258
|
Fix loading of RGB screenspace images
|
2017-10-11 09:13:20 -04:00 |
|
|
Alexander Bock
|
06550ea42f
|
Add support for OpenGL 4.6
Compile fix in rawvolumewriter
|
2017-10-11 09:05:10 -04:00 |
|
|
Jonathas Costa
|
07cdbb6d59
|
Added Milkyway transition.
|
2017-10-10 17:42:31 -04:00 |
|
|
Jonathas Costa
|
d67a89a6ed
|
Fixed alignment problem in AMNH dome. Added dedbug code for testing the fix on the dome.
|
2017-10-10 15:24:50 -04: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
|
45d5676177
|
Minor compile fixes
|
2017-10-10 11:27:29 -04:00 |
|
|
Jonathas Costa
|
ce0742668a
|
Fixed bug in Tully galaxies rendering.
|
2017-10-09 13:44:38 -04:00 |
|
|
Jonathas Costa
|
624d632765
|
Fixed scale for Tully galaxies textures.
|
2017-10-09 11:59:20 -04:00 |
|
|
Jonathas Costa
|
f1135afdea
|
Fixed bug in DU mesh rendering.
|
2017-10-09 11:32:19 -04:00 |
|
|
Jonathas Costa
|
00757ec692
|
Added missing files. Fixed color in renderable du meshes.
|
2017-10-09 08:38:21 -04:00 |
|