Commit Graph

6949 Commits

Author SHA1 Message Date
Christian Adamsson bdde3c9a1e Binary cache files basic structure implemented not working right now 2020-06-23 14:56:33 +02:00
Christian Adamsson e355eb07d5 Created basic structure for writing and loading in binary cached files 2020-06-22 18:38:08 +02:00
Emilie 5d7deb47ac Merge remote-tracking branch 'origin/thesis/2020/radiation' into thesis/2020/radiation 2020-06-22 18:36:00 +02:00
Emilie 1d3383a19b Fixed issue with glPointSize to only influence streams. Also added the ability to change the sizes of the nodes depending on the flux value with regards to a threshold. 2020-06-22 18:35:42 +02:00
Emilie e5e7d86229 Fixed issue with glPointSize to only influence streams by moving it to the vertex shader. Also added the ability to change the sizes of the nodes depending on the flux value with regards to a threshold. 2020-06-22 18:34:28 +02:00
Christian Adamsson 106a1e4e8e Implemented Skipping vertexes by Nodeindex, uniform, by radius and flux 2020-06-22 16:59:36 +02:00
Emilie 2063664426 Added property and functions to change alpha value depending on flux 2020-06-22 16:39:26 +02:00
Christian Adamsson 21403780c9 Setting default values 2020-06-18 15:30:23 +02:00
Emilie 8c72f5bb28 Added color table range and possibility to filter by z-axis 2020-06-18 15:21:50 +02:00
Christian Adamsson d0ac7574e6 Changed property names 2020-06-18 15:02:57 +02:00
Christian Adamsson 35e0b5967a Added flux scaling method in gui and shader 2020-06-18 11:52:25 +02:00
Emilie 07c44c57a6 Normalize flux value and changed color table 2020-06-17 16:52:53 +02:00
Emilie dbce010979 Auto stash before merge of "thesis/2020/radiation" and "origin/thesis/2020/radiation"
Added functions + lookup table for when coloring with flux values
2020-06-17 16:18:58 +02:00
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
Emilie cd84f188bf Solved scaling issue 2020-06-08 16:04:03 +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 501e980ff7 Cloned sgct from master 2020-05-20 17:26:26 +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 b2ca7ba957 trying to resolve sgct issues localy 2020-05-13 10:18:26 -04:00
Elon Olsson 534427a47f . 2020-05-13 10:17:13 -04:00
Elon Olsson b72e678ff9 small fixes for PR 2020-05-07 14:57:01 -04:00
Elon Olsson 542ce6d0b5 merging master to feature/mas-model 2020-05-06 17:00:11 -04:00
Elon Olsson f231cb024a toggle different textures with hotkey i 2020-05-06 16:40:04 -04:00
Elon Olsson e0e487d3ea thesis/2018 mas-model integrated to master 2020-05-04 17:13:51 -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 1b60ab1038 Fix for issue #1144 requires satellites vs request 2020-05-04 15:02:08 -06:00
Alexander Bock 498d125547 Merge pull request #1146 from OpenSpace/feature/sgct
Merging the changes to make the new SGCT version the default one
2020-05-04 10:48:48 +02:00
Gene Payne 3294c53013 Increased starting distance from earth for better content view 2020-04-28 08:11:27 -06:00
Alexander Bock 0fcd71be71 Add the ability to invert mouse buttons for OrbitalNavigator (closes #697) 2020-04-27 15:08:01 +02:00
Alexander Bock 822de97f02 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-04-24 11:16:42 +02:00
Alexander Bock d50dd47c72 Add per-scene cache directories to the gitignore (closes # 1140) 2020-04-24 11:16:20 +02:00
Alexander Bock d305265c1f Merge pull request #1139 from OpenSpace/issue/1122
Leap year fix for epoch used in both satellites and small solar system bodies. Closes #1122.
2020-04-24 11:09:36 +02:00
Alexander Bock 9ea5c0d66f Update SGCT repository 2020-04-24 11:07:18 +02: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