GPayne
ab873cd699
Merge branch 'feature/satellitesgroupednodes' of https://github.com/OpenSpace/OpenSpace into feature/satellitesgroupednodes
2019-08-16 17:32:59 -06:00
GPayne
bb335d37b4
Fix for crashing when removing the final satellite asset
2019-08-16 17:22:50 -06:00
Gene Payne
b7d12bb6d4
Fixed indents
2019-08-15 16:17:46 -06:00
GPayne
7e6a9b71fa
Changed to standard position method for renderablesatellites
2019-08-15 16:13:41 -06:00
GPayne
e60c77b415
Added graceful exit and logging for case of missing or corrupt TLE file, and removed some commented-out code.
2019-08-15 10:21:57 -06: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
39f4dc33cb
Initial pass of merging satellite debris into master and switching satellites to use grouped scenegraphnodes.
2019-08-13 15:39:06 -06:00
GPayne
ba07837865
Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes
2019-08-13 09:56:51 -06:00
Elon
029e67797f
merging
2019-07-22 16:25:47 -06:00
Elon
46c22488d7
wrapping up thesis project 2019 space debris
2019-07-22 16:16:21 -06:00
Jonathan Fransson
a3b511c7a7
Final Merge
2019-07-19 10:12:02 -06:00
Jonathan Fransson
e3378bc615
Final Merge
2019-07-19 10:09:03 -06:00
Emil Axelsson
c97d5126ec
Feature/timeline translation ( #931 )
...
* Work on timeline translations
* Add Apollo 11 Descent data
* Ability to display negative altitudes
* Expose globe translation properties
* Added timeline rotation, and some scene updates.
* Cleaning up apollo_sites scene; fixing boulder 1 in place to adress heightmap issue
* Use quaternion slerp instaet of linear interpolation + Cleanup
* Change to old lem model while waiting for new version to be pushed to data repo
* Small fixes
2019-07-17 15:21:13 +02:00
Alexander Bock
e9fdd31c56
Feature/flying fixes ( #924 )
...
* Removing various warnings
* Fix the rendering of the touchbar on Mac
* More warnings
* Add ghoul deinitialize
* Update SGCT repository
2019-07-04 09:28:42 +02:00
Elon
3fbe042250
spherical grid now works
2019-06-18 09:54:20 -06:00
Alexander Bock
d0c04cfc6b
Various code cleanup
2019-06-18 10:47:15 +02:00
Elon
6f8095f15c
merge
2019-06-17 17:22:57 -06:00
Elon
907c0a3909
merging spherical grid
2019-06-17 17:16:14 -06:00
Jonathan Fransson
fa8100ee0b
Spherical representation working and general clean up
2019-06-17 17:11:39 -06:00
Jonathan Fransson
c8e297a5b9
debris performanslogging, fixed spherical coords and asset clean-up
2019-06-12 15:15:15 -06:00
Elon
7c2527a1e7
first start at using spherical grid with debris volume
2019-06-07 15:53:17 -06:00
Elon
3ae183b997
volume sequences can be made, and they will use a global min and max value
2019-06-04 16:44:14 -06:00
Elon
a043ae0c44
failed try small value before casting to float
2019-06-03 10:27:51 -06:00
Elon
e729c9e812
Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris
...
merge since release and rebase from master
2019-05-31 10:40:06 -06:00
Elon
793c25200c
a try to correct position error in orbits
2019-05-31 10:40:00 -06:00
ElonOlsson
68f04031da
merge after rebase
2019-05-31 09:58:44 -06:00
Elon
bd7ea04362
smooth movement, but position offset due to precision errors. Clean up in shaders
2019-05-30 11:06:25 -06:00
Elon
b9f20b7595
corrected datatype of timeOffset to make smooth movement in orbits
2019-05-30 11:06:24 -06:00
Elon
fe8f3115cc
positions now work, but pause at vertex
2019-05-30 11:05:43 -06:00
Jonathan Fransson
a555e9e4b2
orbit render modifications, unfinished
2019-05-30 11:05:12 -06:00
Elon
fb56f9a20b
-
2019-05-30 11:04:28 -06:00
Jonathan Fransson
23cc9accc6
1st version volume render finished, with multiple data sets
2019-05-30 11:03:33 -06:00
Elon
0ab6c48d18
old
2019-05-30 11:01:55 -06:00
Jonathan Fransson
7f00c0b62d
generate derbris volume task, not working properly
2019-05-30 11:00:44 -06:00
Elon
f00c1ab280
get index from position
2019-05-30 10:59:11 -06:00
Jonathan Fransson
06e79f16ed
merge
2019-05-30 10:58:28 -06:00
Elon
65cecbbfd6
started on mapping density of generated positions to cartesian grid cells
2019-05-30 10:57:38 -06:00
Jonathan Fransson
c513858355
merge
2019-05-30 10:57:38 -06:00
Elon
1c0a71fd4a
created getPositionBuffer function for debris volume task
2019-05-30 10:57:38 -06:00
Elon
c6fd47311a
+
2019-05-30 10:57:37 -06:00
Elon
a7bd263e53
removed old test
2019-05-30 10:56:38 -06:00
Elon
599fdd3d5c
line fade now works useing float for orbit and period
2019-05-30 10:54:22 -06:00
Elon
8503d4e59f
merging
2019-05-30 10:53:53 -06:00
Jonathan Fransson
fe5600e3c3
moved fade calculations to frag shader
2019-05-30 10:53:35 -06:00
Jonathan Fransson
d0c78b544a
merge
2019-05-30 10:53:35 -06:00
Emil Axelsson
b18895592f
Double to float in shaders. Fixes in asset handling of satellites.
2019-05-30 10:53:34 -06:00
ElonOlsson
d26700268f
-
2019-05-30 10:53:34 -06:00
Elon
7c793fd841
orbits are not rotating
2019-05-30 10:53:03 -06:00
Elon
03691705d9
-
2019-05-30 10:52:29 -06:00