Commit Graph

64 Commits

Author SHA1 Message Date
Lovisa Hassler 8b881ae89e renamed communicationlines asset file
renamed the communicationlines asset to signals fix
2018-11-13 12:42:20 -05:00
Lovisa Hassler dbe90fd94b cleanup and renaming some variables 2018-11-13 11:51:48 -05:00
Lovisa Hassler 0a0703aa82 fix merge conflict 2018-11-12 18:33:06 -05:00
Lovisa Hassler 5a49c66204 moved the color mapping to the asset files 2018-11-12 18:26:12 -05:00
Agnes Heppich c3d031e6a5 reduced data struct, clean up 2018-11-12 18:14:32 -05:00
Agnes Heppich 2bdb7fece9 clean up 2018-11-12 18:05:37 -05:00
Agnes Heppich 9aefc203a3 ra dec translation 2018-11-12 17:30:33 -05:00
Agnes Heppich 89e0b20cc4 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into
thesis/2018/dsn merge
2018-11-09 14:09:54 -05:00
Agnes Heppich 648e763abe rename dsnData 2018-11-09 14:09:24 -05:00
Lovisa Hassler 1f27da6778 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-09 12:30:19 -05:00
Lovisa Hassler aba04f7105 added ra dec to cartesian helper function in spicemanager 2018-11-09 12:30:01 -05:00
Agnes Heppich b5aa872b95 radec translation 2018-11-09 11:33:10 -05:00
Agnes Heppich 65350f7aa6 rename dsnManager to signalManager 2018-11-09 11:11:11 -05:00
Lovisa Hassler df58130597 added unbindGL(), also some cleanup 2018-11-08 15:52:11 -05:00
Lovisa Hassler cc18504392 got rid of sub class communicationlines, now all is handled in renderablesignals 2018-11-08 14:48:26 -05:00
Lovisa Hassler cebe111ee0 renamed renderablecommincationpackage to renderablesignals 2018-11-08 11:37:01 -05:00
Lovisa Hassler 2cf1dc3670 added new webgui to dsn.scene, new z buffer clculations in shader files 2018-11-07 18:33:30 -05:00
Agnes Heppich b50f86b330 estimated position from RA DEC and Range 2018-11-06 12:13:34 -05:00
Lovisa Hassler 51c8b437ac some comments and cleanup, renamed checkSignal to isSignalActive 2018-10-30 11:50:05 -04:00
Lovisa Hassler 8ba26af21e added DSS45 2018-10-30 11:47:40 -04:00
Agnes Heppich 6a91ed5606 added dss15 to renderablecommunicationpackage 2018-10-29 19:09:39 -04:00
Lovisa Hassler 0e8795b159 added check for getting a scenegraphnode for dish, error if it is not in asset file 2018-10-29 17:35:07 -04:00
Lovisa Hassler 64f88bcfa5 creating pushSignalDataToVertexArray function and clean up some comments 2018-10-29 16:33:25 -04:00
Lovisa Hassler 873e3f2c17 replace for loop with upper_bound binary search through filenames 2018-10-29 15:35:13 -04:00
Lovisa Hassler c681e2dd3e no longer using xml parser 2018-10-29 13:42:22 -04:00
Agnes Heppich a38530073b Seperated data into days, and load them depending on open space time 2018-10-29 12:11:16 -04:00
Agnes Heppich d8e8c2bd8b got rid of fillvertexarray function in dsnmanager 2018-10-26 15:15:24 -04:00
Agnes Heppich c67bd60c4b direction in data 2018-10-26 11:31:48 -04:00
Lovisa Hassler e22acad040 adding check for if spacecraft node is in Openspace, else todo estimate position 2018-10-25 11:53:54 -04:00
Agnes Heppich 3b2f5c4042 merge 2018-10-24 19:02:43 -04:00
Agnes Heppich 9a1e8d41ad test if time within signal range 2018-10-24 18:45:48 -04:00
Lovisa Hassler cc98d0064b added glAttribPointer for color values 2018-10-24 16:09:45 -04:00
Agnes Heppich cdece056b3 read data from json instead of dummy values 2018-10-24 10:54:27 -04:00
Lovisa Hassler 990a61a50b precision fix is now calculated through comparison with focus node 2018-10-23 15:31:53 -04:00
Agnes Heppich 2c47c92494 merge 2018-10-23 10:49:20 -04:00
Agnes Heppich efe2b5606d parse Json data 2018-10-23 10:43:56 -04:00
Lovisa Hassler 847a86d200 renaming and cleanup. Todo modelviewmatrix and color as vertex attributes 2018-10-19 17:49:43 -04:00
Lovisa Hassler 00558716f9 using different modeltransformations to counteract precision problem 2018-10-19 17:42:10 -04:00
Lovisa Hassler 705077efba high precision positioning of geocentric linesegment 2018-10-17 19:10:24 -04:00
Lovisa Hassler 1a2472996b rename function and cleanup 2018-10-16 14:17:24 -04:00
Lovisa Hassler 3467e9c946 site color properties slider works 2018-10-12 14:50:40 -04:00
Lovisa Hassler 8b6895b174 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-10-12 11:29:30 -04:00
Lovisa Hassler e8e7bfcabb adding color properties for the different sites 2018-10-12 11:28:27 -04:00
Agnes Heppich c80a1113b1 seperated function to fill vertex array 2018-10-12 11:23:56 -04:00
Agnes Heppich ac9ce26b99 choose if estimate spacecraft position or get spacecraft position from spice 2018-10-11 15:26:23 -04:00
Lovisa Hassler 0e070e1f20 Planet trails disabled at initialize 2018-10-11 12:28:11 -04:00
Lovisa Hassler 2b7f585583 reading in line render points from scenegraphnode position. Not highly accurate 2018-10-11 12:18:52 -04:00
Lovisa Hassler 6c25f98f1d first draft of calculating spacecraft pos from dsn now data 2018-10-09 17:18:30 -04:00
Agnes Heppich 6f4cb57ce6 merge 2018-10-03 11:24:48 -04:00
Agnes Heppich 5e8fadde02 seperated the data manager from the communicationlines file 2018-10-03 11:07:26 -04:00