Commit Graph

3445 Commits

Author SHA1 Message Date
Christian Adamsson 321df50128 improvements with datahandling and rendering
Can now store every state in vectors and update smoothly both with filtering and colouring.
2020-06-17 15:10:32 +02:00
Christian Adamsson 18289d0dfd Loading in states into ram memory, skipping x amount of nodes
Added functionality for loading in state and nodes. Also changed coloring and filtering a bit.
2020-06-16 17:03:40 +02:00
Christian Adamsson 2eb3ad83a5 Small update for testing with Emilie 2020-06-16 09:28:44 +02:00
Christian Adamsson 575003f794 Specific streams, different vertex color mode, correct representation 2020-06-16 00:46:01 +02:00
Emilie 25cac26eb1 Fixed loading issue with buffers 2020-06-15 11:47:53 +02:00
Emilie 01d7f7ade4 Added property for color mode + swapping theta and phi value 2020-06-15 09:39:10 +02:00
Emilie 4c0970436e Added functions to be able to filter nodes 2020-06-10 13:40:18 +02:00
Christian Adamsson fa5effec72 Created functionality for updating depending on time 2020-06-09 15:35:20 +02:00
Emilie 0c7ac24081 Added functions for flux value threshold 2020-06-09 15:25:17 +02:00
Christian Adamsson afc95a248c Added nodesize property to scale nodes 2020-06-08 17:22:52 +02:00
Emilie c33adb33ab Drawing points instead of strips 2020-06-08 16:40:48 +02:00
Christian Adamsson 84ba046cdf Tried with float vs double conversion, positionof render still not fixed 2020-06-05 16:41:53 +02:00
Christian Adamsson 388060dccf Can now do multiarraydraw and coupled with gui, not correct position 2020-06-05 16:02:01 +02:00
Christian Adamsson 67774cb3f3 Changed Node handling and conversion to meter in cartesian coordinates. 2020-06-04 16:20:36 +02:00
Emilie b68a0af86e Added shader files 2020-05-21 09:34:01 +02:00
Emilie 47892926bd Added SceneGraphNode and functions to extract information from json-files 2020-05-20 17:25:01 +02:00
Emilie f7c6d9c544 Added more functions and basic structure for renderable class 2020-05-18 16:56:42 +02:00
Christian Adamsson cb40a5a15a first commit for our thesis branch 2020-05-15 17:22:21 +02:00
Elon Olsson b72e678ff9 small fixes for PR 2020-05-07 14:57:01 -04:00
Elon Olsson f231cb024a toggle different textures with hotkey i 2020-05-06 16:40:04 -04:00
Elon Olsson 194d8232bf magnetogram, fieldlines with line width, and volume from thesis/2018/mas-model 2020-05-04 17:11:59 -04:00
GPayne fe0cce1e24 Fix for leap year that can affect asteroids only 2020-04-20 11:23:50 -06:00
GPayne fbd5d3490a Leap year time fix for satellite tracking 2020-04-19 23:47:30 -06:00
Alexander Bock 5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock 660533e840 Merge pull request #1123 from OpenSpace/feature/asteroids
Feature/asteroids
2020-04-14 15:01:35 +02:00
Alexander Bock 4f14e8476b Some code cleanup 2020-04-14 15:00:37 +02:00
Alexander Bock 84d3878be3 Ignore uniform warnings for cases when disabling the night layers on Earth (closes #1136) 2020-04-14 13:19:19 +02:00
GPayne 29d68897d6 Added to satellites: group selection feature, segments fix 2020-04-13 16:43:27 -06:00
GPayne b5114bd4fd Finalized segments algorithm and added object selection 2020-04-13 00:56:12 -06:00
Alexander Bock ba9012f5a9 Some cleanup of the code 2020-04-10 18:18:54 +02:00
Alexander Bock 1df557d2eb Small code cleanup 2020-04-10 17:46:59 +02:00
GPayne a95d01d781 Implemented num orbital trail segments proportional to eccentricity 2020-04-09 13:33:30 -06:00
Alexander Bock 5e37cb5ac3 Some coding style cleanup 2020-03-28 20:45:14 +01:00
Alexander Bock b2c7529ddf Amend previous commit 2020-03-28 20:42:19 +01:00
Alexander Bock 66716a36a7 Merge branch 'master' into feature/imgui-touchhandling
# Conflicts:
#	modules/touch/src/touchinteraction.cpp
2020-03-28 20:41:47 +01:00
Alexander Bock c6d3a181b7 Merge pull request #1115 from OpenSpace/feature/continuous-pinch
Feature/continuous pinch
2020-03-28 20:34:33 +01:00
Alexander Bock 5209de5484 Some coding style fixes 2020-03-28 20:32:53 +01:00
Mikael Pettersson fa5bbc5a44 Added keymodifiers to touch event handling 2020-03-25 09:52:16 +01:00
Mikael Pettersson 3210dfd315 Made these changes only apply on Win32 builds 2020-03-25 09:52:16 +01:00
Mikael Pettersson c9b5ffd021 Changed webbrowser to use cef touch events
rather than injected mouse events.
2020-03-25 09:52:16 +01:00
GPayne cf7fcd9f03 Deleted UpperLimitInfo from satellites because only smallbody uses it 2020-03-24 17:20:49 -06:00
GPayne 4cfd51a268 Merged with master to prepare for pull request 2020-03-20 17:56:10 -06:00
GPayne bdf859cd3c Modified sbdb file read to handle line errors while keeping other data lines 2020-03-20 17:27:39 -06:00
liuloppan 4753d562f1 Merge pull request #1109 from OpenSpace/feature/custom-distance-labels
Added a way to customize renderable distance labels unit
2020-03-12 10:29:55 -04:00
Mikael Pettersson c9e35cbee4 Changed back from windows API calls to stl calls for timings
Should be the same under-the-hood but produces more
consistent code
2020-03-12 15:12:29 +01:00
GPayne d347733234 Fixed documentation errors to finish consolidating satellite/sbdb code 2020-03-11 10:09:23 -06:00
Mikael Pettersson fb7036c497 Made imgui handle touch input as the webgui does
Also removed imgui-handling code in touchinteraction
2020-03-11 13:23:46 +01:00
GPayne 88a5dfe6b2 Resolved build errors from combining satellites & SBDB renderables 2020-03-10 14:13:17 -06:00
Mikael Pettersson 0808ebb1b4 Added documentation for the pinchzoomfactor property 2020-03-10 18:34:11 +01:00