mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-10 21:49:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,766 Commits 83 Branches 46 Tags
c014d8b84d903b60afab2e68c3bbbc02c49f554e
Commit Graph

2715 Commits

Author SHA1 Message Date
Emil Axelsson
c014d8b84d Fix subscription bug introduced in code cleanup 2018-08-28 13:42:31 +02:00
Alexander Bock
ca6a5e03f6 Enable Spout on default on windows (closes #691) 2018-08-21 15:24:38 -06:00
Jonathas Costa
ac76151941 Let's stop copying objs. 2018-08-06 11:03:22 -04:00
Jonathas Costa
06119d0830 Merge branch 'master' into issue/675 2018-08-01 10:42:27 -04:00
Jonathas Costa
65658e9b46 Changes from code review. 2018-08-01 10:34:59 -04:00
Jonathas Costa
4e30d9c3b8 Fixed issue 675. 2018-07-31 14:50:10 -04:00
Alexander Bock
74fd38c260 Adapt to Ghoul change (use ghoul::to_string instead of std::to_string) 2018-07-20 13:56:15 -04:00
Alexander Bock
6c0264a0d9 Jenkins (#676) 
Jenkins fix
 2018-07-20 10:37:20 -04:00
Alexander Bock
f55828198f Adapt to UniformCache changes when updating uniform locations (closes #648) 2018-07-19 17:46:21 -04:00
Alexander Bock
0774348fc2 General cleanup 
Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
 2018-07-19 14:43:53 -04:00
Jonathas Costa
335beb8dd3 Removed commented code. 2018-07-19 11:51:28 -04:00
Alexander Bock
dbdc5dfd28 Fix setting of FixedRotation values through assets (closes #647) 2018-07-18 19:20:49 -04:00
Alexander Bock
9a928231be Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers 
Make specifying the line number in TLETranslation optional
 2018-07-18 18:22:18 -04:00
Alexander Bock
5dff0e1b36 Add warning when targets are not registered in the convert-table for image projections 2018-07-18 17:01:46 -04:00
Alexander Bock
54d1a506c3 Add rotation class that provides a constant rotation based on in-game time (closes #662) 
Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
 2018-07-18 15:28:24 -04:00
Alexander Bock
381dbf576d Display current delta time when interpolation is happening 2018-07-18 14:19:04 -04:00
Alexander Bock
e2e425657f Add button to invert delta time (closes #666 , the number of the beast) 2018-07-18 13:55:22 -04:00
Alexander Bock
001935a139 Add missing files in multiresvolume 2018-07-16 17:28:52 -04:00
Alexander Bock
1e97bae229 OpenGL logging 
Print warning if OpenGL logging is disabled but loglevel is too low
Fix format of printed functions

Closes 656
 2018-07-13 16:22:24 -04:00
Alexander Bock
d0f3e5507a Code cleanup 
Remove warnings from multiresvolume module
 2018-07-13 16:02:42 -04:00
Emil Axelsson
13edfb64b4 Fix shader path 2018-07-13 11:28:16 +02:00
Emil Axelsson
902e3e6dac Feature/time interpolation (#669) 
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
 2018-07-13 11:07:35 +02:00
Emil Axelsson
6007f1d70d Feature/model lighting (#670) 
* Fix NH texture and add lighting options
* Add missing comma
* Light sources: work in progress.
* Add light sources
* Remove unused values
* Add types to documentation
* Add light sources to various missions
* Code cleanup based on review
 2018-07-13 09:01:43 +02:00
Emil Axelsson
8a6dd14330 Fix issue #660 and provide percentage for http syncs (#671) 
Fix issue #660 and provide percentage for http syncs
 2018-07-13 08:51:18 +02:00
Alexander Bock
12c87969a7 Add BoolProperty to SpaceModule to control SpiceManager exception handling (closes #661) 
Add debugging indices to SceneGraphNodes
Rename ImGui indices debugging definition
 2018-07-12 17:48:34 -04:00
Emil Axelsson
d20bb6d634 Set maximum iterations for geodetic surface projection 2018-07-12 14:25:33 +02:00
Emil Axelsson
1b3df16c28 Feature/time frame (#642) 
* First implementation of time frames
* Add TimeFrameUnion. Only show solar system 1850-2150.
* Consider dependencies when determining whether time frame is active
* Code review fixes.
 2018-07-11 10:42:06 +02:00
Matthew Territo
c2b1a3fd42 Pop Message from queue after use to fix reference lifespan 2018-07-07 23:31:17 +02:00
GPayne
db28b3e2a9 Merged master into touch-user-study branch 2018-07-05 15:33:46 -06:00
GPayne
f84f5f5cc5 Deleted unecessary casting operation as part of PR review 2018-07-05 14:34:35 -06:00
Alexander Bock
8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -04:00
Jonathas Costa
3ffca283a5 Removed unsused code. 2018-07-05 14:14:13 -04:00
Alexander Bock
ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation 
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
 2018-07-05 12:00:32 -04:00
Alexander Bock
d86b78f2f5 Address PR comments 2018-07-05 09:47:35 -04:00
Emil Axelsson
a144a3ef36 Prevent leaking lua variables to global scope 2018-07-04 22:14:37 +02:00
Emil Axelsson
4fe4932d0e Fix bug with incorrect lighting for RenderableModels 2018-07-04 10:35:19 +02:00
Emil Axelsson
ec89a5a4f9 Fix bugs in volumetric rendering 2018-07-03 19:17:25 +02:00
Jonathas Costa
b2f680e6da Fixed texture leaking. (#635) 2018-07-02 14:41:02 -04:00
Alexander Bock
a701620c1d Change tully images to use PNGs instead 2018-06-29 14:29:09 -04:00
Alexander Bock
77e14edec3 Add DashboardItem to show the current camera location on a globe 2018-06-29 12:19:23 -04:00
Alexander Bock
99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -04:00
Alexander Bock
190952e4f5 Feature/jenkins fixes (#634) 
Jenkins compile fixes
 2018-06-26 16:53:22 -04:00
Alexander Bock
3e1a7e3769 Jenkins compile fix 2018-06-26 12:47:04 -04:00
Alexander Bock
1818304d19 Changes from std::string to const char* in PropertyInfo (#633) 2018-06-26 11:23:45 -04:00
Emil Axelsson
b37ef89e49 Disable libtorrent usage by default 2018-06-25 09:56:28 +02:00
Emil Axelsson
de71cfda78 Make it possible to scale planets (#631) 2018-06-25 09:30:20 +02:00
Alexander Bock
0f5fd2c4bc Feature/torrent removal (#630) 
* Remove torrent-based synchronization downloads
 * Add download URL to error message if HTTPSynchronization download fails
 * Add a grace factor to the distance conversion
 * Don't use scientific notation when displaying distances
 2018-06-23 22:20:03 -04:00
Alexander Bock
48b8ac7413 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-06-22 15:18:07 -04:00
Alexander Bock
27ef41d342 Fix crash with creating Scene Property list 2018-06-22 15:17:59 -04:00
Jonathas Costa
c4ceb8b96c Fixed RenderablePlane billboard orientation in dome. (#620) 2018-06-22 10:37:46 -04:00