6047 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	f175b4a11a	Minor cleanup in the shader, the direction variable is still there	2019-06-26 09:07:27 -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	8654ff09ab	added more assets for demo ... and commented out experimental download function	2019-06-25 10:34:54 -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
Sovanny Huy	f4b35ea36b	added wsa to model in fieldlinesequence	2019-06-18 10:31:55 -04:00
Sovanny Huy	df98dd5bf2	Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream	2019-06-11 09:48:15 -04:00
Sovanny Huy	2f1c9253f7	addadditional set of fieldliens for demo	2019-06-11 09:48:01 -04: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	dc07d7b7c3	WSA fieldlines first test ... don't forget to add json files	2019-06-05 16:59:01 -04:00
Sovanny Huy	5f547c0f1f	Some cleanup on SunTextureManager	2019-06-04 14:16:36 -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
Kollberg	91df0d409a	Somewhat functioning temporal browsing, to add: backwardsbrowsing and multithreading	2019-05-29 16:14:19 -04:00
Kollberg	cdf6b25fba	Solving merge conflicts	2019-05-29 13:58:14 -04:00
Kollberg	07558b872a	CheckFilesInDirectory now populates member variable with only filename +extension	2019-05-29 13:52:30 -04:00
Sovanny Huy	f16bbf9707	implemented texture queue	2019-05-29 11:36:23 -04:00
Sovanny Huy	e0000fccbf	change to vector	2019-05-28 15:33:09 -04:00
Sovanny Huy	23ee6c3c40	update texture based on set time	2019-05-28 14:28:36 -04:00
Sovanny Huy	7dfdee2141	downloading and uploading textures ... using new endpoints	2019-05-28 13:32:04 -04:00
Sovanny Huy	d0e96672bb	some new functions	2019-05-28 11:03:42 -04:00
Sovanny Huy	950df71c73	put changes in new class	2019-05-24 14:18:42 -04:00
Sovanny Huy	e2dbbe6ccd	swapped sun to renderablesphere	2019-05-23 15:34:10 -04:00
Sovanny Huy	8ba797eba6	Merge remote-tracking branch 'origin/master' into thesis/2019/spaceweather-stream	2019-05-20 16:22:05 -04:00
Alexander Bock	d335ec0622	Add missing base.scene	2019-05-20 14:14:39 -06:00
Sovanny Huy	7d778f95fe	update	2019-05-20 16:04:42 -04:00
Sovanny Huy	732a1ed1e3	update sgct	2019-05-20 15:59:43 -04:00
Sovanny Huy	a068db70f5	update ghoul?	2019-05-20 15:50:49 -04:00
Sovanny Huy	264435b1d1	Merge remote-tracking branch 'origin/master' into thesis/2019/spaceweather-stream	2019-05-20 15:29:33 -04:00
Alexander Bock	a94c5de8ca	Fix the messenger scene	2019-05-20 11:29:03 -06:00
Alexander Bock	3a687b5c57	Cleanup of scene files by introducing a new base.scene from which all others derive ... Add asset.filePath to the warning when trying to register an empty list Correctly add HyperionTrail	2019-05-20 11:03:55 -06:00
Sovanny Huy	c9ea4c25f2	Merge remote-tracking branch 'origin/master' into thesis/2019/spaceweather-stream	2019-05-20 12:02:56 -04:00
Sovanny Huy	71f8d84149	download with thread	2019-05-20 11:51:27 -04:00
Emil Axelsson	43332d88eb	Update webgui	2019-05-20 13:54:54 +02:00
Alexander Bock	508e3f191d	Fix h key to correctly toggl all trail visibilities	2019-05-19 13:50:43 -06:00
Alexander Bock	314a52f837	Update Version number	2019-05-19 09:59:57 -06:00
Emil Axelsson	4afed908a1	Fix warnings	2019-05-19 17:50:42 +02:00
Emil Axelsson	673c31cfc7	Update webgui	2019-05-19 17:32:23 +02:00
Micah Acinapura	8ae5016556	dont add labelproperty for globes with no labels;	2019-05-19 10:38:27 -04:00
Emil Axelsson	58153ebe91	Fix misspelled barycentric trail names	2019-05-19 09:39:36 +02:00