Kollberg
|
b27399128c
|
Added possibility to go to now, without program freezing, and improved lifecycle with already downloaded field lines
|
2019-09-12 16:15:56 -04:00 |
|
Sovanny Huy
|
2b5aace213
|
Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream
|
2019-09-09 15:11:14 -04:00 |
|
Sovanny Huy
|
ae5707dae5
|
quick fix for demo magnetogram
|
2019-09-09 15:11:06 -04:00 |
|
Kollberg
|
eb53d41cc2
|
Added keycommands for wow-room demo
|
2019-09-09 09:01:34 -04:00 |
|
Kollberg
|
4ec00dc977
|
Merge branch 'thesis/2019/spaceweather-stream' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceweather-stream
|
2019-09-06 08:15:21 -04:00 |
|
Kollberg
|
3c35c8d246
|
Merged with master branch, date of master branch 4/9/2019
|
2019-09-06 08:14:55 -04:00 |
|
Sovanny Huy
|
58b93cda23
|
change polarity fl colors and add option (in comments) for white and gray texture
|
2019-09-04 15:48:02 -04:00 |
|
Sovanny Huy
|
7e5b0ca105
|
variablename
|
2019-09-04 14:35:42 -04:00 |
|
Sovanny Huy
|
067fca0ff1
|
suntexture manager now takes wsa and makes it black, blue and red
|
2019-09-04 14:34:54 -04:00 |
|
Sovanny Huy
|
d45c167b95
|
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
|
2019-08-28 16:37:25 -04:00 |
|
Sovanny Huy
|
19d99c6332
|
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
|
2019-08-28 16:29:43 -04:00 |
|
Jonathas Costa
|
ff2e6db26a
|
Merge branch 'master' into feature/FXAA
|
2019-08-22 16:03:14 -04:00 |
|
Alexander Bock
|
071d4af9dc
|
Remove warnings duplicating property initialization for renderabletrails
|
2019-08-22 16:09:54 +02:00 |
|
Alexander Bock
|
21d799dd29
|
Force an even number of vertices for the RenderableSpheres (closes #957)
|
2019-08-22 09:31:07 +02:00 |
|
Jonathas Costa
|
b51eb799a5
|
Clean up and re-nameing.
|
2019-08-21 11:25:38 -04:00 |
|
Alexander Bock
|
2806935c64
|
Merge pull request #943 from OpenSpace/feature/hdrOS
HDR Rendering Branch
|
2019-08-20 02:05:42 -06:00 |
|
Alexander Bock
|
67b736dd26
|
Merge branch 'master' into feature/FXAA
|
2019-08-19 17:54:14 +02:00 |
|
GPayne
|
c01e59635c
|
Restored ability to change trail colors in satellite asset files.
|
2019-08-15 08:51:18 -06:00 |
|
GPayne
|
b99389ae30
|
Fixed problem with satellite trails rendered at a time prior to TLE epoch. Also debris added shader files to CMake file for space module.
|
2019-08-14 16:07:14 -06:00 |
|
GPayne
|
ba07837865
|
Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes
|
2019-08-13 09:56:51 -06:00 |
|
Emil Axelsson
|
1cba7e1d88
|
Render trails last
|
2019-08-13 11:57:08 +02:00 |
|
Emil Axelsson
|
904811f60d
|
Small cleanup
|
2019-08-13 11:28:33 +02:00 |
|
Jonathas Costa
|
3a0b5f0c15
|
Changed rendering order back for orbits and other improvements.
|
2019-08-01 12:20:36 -04:00 |
|
Jonathas Costa
|
482631aa54
|
Fixed failed merging of master.
|
2019-07-31 15:05:52 -04:00 |
|
Jonathas Costa
|
67ba8a14dc
|
Fixed problems after merging master into this branch.
|
2019-07-22 17:52:30 -04:00 |
|
Jonathas Costa
|
a6b90991b2
|
Merging Master
|
2019-07-22 16:47:58 -04:00 |
|
Alexander Bock
|
8f112fa219
|
Compile and runtime fixes when running in Debug
Do not crash if ScreenSpaceLocalImage does not exist
Add ability to specify identifier/name when adding screenspace items in the UI
|
2019-07-22 14:14:12 +02:00 |
|
Emil Axelsson
|
9934fc03b9
|
Fix scaling issue with screenspace renderables (#939)
|
2019-07-19 11:09:04 +02:00 |
|
Alexander Bock
|
277aee5c0c
|
Make constructor of Time explicit
Module breaking change
|
2019-07-17 15:39:43 +02:00 |
|
Jonathas Costa
|
0f09c36aa2
|
Bring back changes for transparency and added new error protection for big components.
|
2019-07-15 10:31:08 -04:00 |
|
Sovanny Huy
|
8764ff9c0c
|
downloads initial dataset
|
2019-07-01 16:25:10 -04:00 |
|
Kollberg
|
561bcd4a0f
|
double jinx
|
2019-06-26 11:27:16 -04:00 |
|
Kollberg
|
3f3fb09d80
|
n00bs be trippin'
|
2019-06-26 11:20:12 -04:00 |
|
Kollberg
|
65a0c17a09
|
resolved conflicts
|
2019-06-26 09:02:43 -04:00 |
|
Kollberg
|
1dbb0b5b29
|
Added direction to fl-shader, to be able to have different directions in field lines
|
2019-06-26 08:58:20 -04:00 |
|
Sovanny Huy
|
d3bb858a41
|
create base for new class
|
2019-06-21 15:28:10 -04:00 |
|
Sovanny Huy
|
de55212c8d
|
fixed unordered map bug
|
2019-06-18 14:53:07 -04:00 |
|
Alexander Bock
|
d0c04cfc6b
|
Various code cleanup
|
2019-06-18 10:47:15 +02:00 |
|
Kollberg
|
bd9c8be95d
|
Introduced new member variable to suntexturemanager, that keeps the direction that the user of openspace is moving in
|
2019-06-11 09:47:36 -04:00 |
|
Kollberg
|
027fb1ae56
|
Solved merge conflicts
|
2019-06-07 16:14:44 -04:00 |
|
Kollberg
|
6d9c4db8e1
|
Added a check to only apply a texture once that timeframe has been passed
|
2019-06-07 16:01:18 -04:00 |
|
Sovanny Huy
|
5f547c0f1f
|
Some cleanup on SunTextureManager
|
2019-06-04 14:16:36 -04:00 |
|
Jonathas Costa
|
4b27cf7ac5
|
Fixed invalid OpenGL state.
|
2019-06-04 12:12:05 -04:00 |
|
Kollberg
|
bd7c45cf4e
|
Fixed merge conflicts
|
2019-06-03 16:25:47 -04:00 |
|
Kollberg
|
a54051faf9
|
Adds latest downloaded texture to texturesondisklist
|
2019-06-03 16:21:35 -04:00 |
|
Sovanny Huy
|
c195a02936
|
fitsfilreading in thread and sync dir simplification
|
2019-06-03 16:19:11 -04:00 |
|
Kollberg
|
24375d7918
|
Now modifies fits image slighlty to compensate for sun rotation, experimenting with uploading textures on separate thread
|
2019-06-03 13:43:18 -04:00 |
|
Kollberg
|
7a57278433
|
Solved merge conflicts
|
2019-05-31 14:49:39 -04:00 |
|
Kollberg
|
d12d192920
|
Temporal images are now fetched on separate threads, to not freeze the program while waiting for response
|
2019-05-31 14:46:53 -04:00 |
|
Sovanny Huy
|
ca596b34ea
|
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
|
2019-05-30 11:00:02 -04:00 |
|