Commit Graph

1333 Commits

Author SHA1 Message Date
Alexander Bock 0e4dbbb1cc Some work on the Launcher 2015-07-02 15:53:25 +02:00
Alexander Bock cc5e6074ad Rename imagesequencer2 to imagesequencer 2015-07-01 22:03:52 +02:00
Alexander Bock 40c42ff772 Fix the scaling of renderablemodel by making the magnification a floatproperty 2015-07-01 17:56:51 +02:00
Alexander Bock 8f88ead113 Remove crashing error from imagesequencer2 2015-07-01 17:55:41 +02:00
Alexander Bock c205c720c6 Removal of the old imagesequencer 2015-07-01 17:55:26 +02:00
Alexander Bock 84ba9b1503 Set correct default scene file 2015-07-01 17:55:06 +02:00
Alexander Bock 86fc74770b Fixing issues that occurred with newer nVidia drivers and ABuffer rendering 2015-07-01 16:17:51 +02:00
Michal Marcinkowski cafd89e9fa Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	scripts/default_startup.lua
2015-06-29 16:40:09 -04:00
Michal Marcinkowski d102a16a82 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
modules/newhorizons/rendering/renderableplanetprojection.cpp
	modules/newhorizons/util/hongkangparser.cpp
	modules/newhorizons/util/hongkangparser.h
	modules/newhorizons/util/imagesequencer2.cpp
	modules/newhorizons/util/labelparser.cpp
	modules/newhorizons/util/labelparser.h
2015-06-29 16:39:09 -04:00
Alexander Bock 4abb7f210b Disable blackout on startup 2015-06-29 16:18:17 +02:00
Anton Arbring 4231f485d8 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-06-27 15:01:16 -04:00
Anton Arbring 0d0c963bce Fixed path bug 2015-06-27 15:00:55 -04:00
Alexander Bock 7bf24ec74e Remove the rendering method override 2015-06-26 23:31:51 +02:00
Anton Arbring 9afc4b73ac Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-06-26 16:51:20 -04:00
Alexander Bock 2bde14b728 Fix crash that happens when SpiceManager is deinitialized 2015-06-26 19:20:56 +02:00
Anton Arbring bbca384a9c Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-06-25 20:29:27 -04:00
Anton Arbring 8fbd027a1e Adding convenient scripts for showing 67P and changing coordinate system to 67P 2015-06-25 20:28:36 -04:00
Michal Marcinkowski e0ea622989 Adding hybrid read method for Pluto
Cleanups + logical changes to parsing and sequencing
2015-06-25 20:19:08 -04:00
Anton Arbring 927cfc2766 Adding the possibility to project to arbitrary bodies model files
Class RenderableModelProjection, using the geometry position and texture
coordinate data instead of reverse engineering the geometry in shader.

Adding the shaders used to project and the modified model shader.
Adding the new Renderable class to newHorizons module and CMakelist
2015-06-25 20:12:37 -04:00
Anton Arbring 901ed6053e Adding support for imageplanes for multiple instruments 2015-06-25 20:08:35 -04:00
Anton Arbring 4e72e248c3 Fixing bug in model magnification 2015-06-25 20:07:21 -04:00
Alexander Bock d60846a3ec Made destination optional in data specifications 2015-06-23 00:36:31 +02:00
Alexander Bock 5227ce2213 Renamed OpenSpaceModule's initialize method to create
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Alexander Bock 978b535a2f Remove setName function from OpenSpaceModule and move naming into constructor 2015-06-22 22:57:15 +02:00
Alexander Bock 9ed5ee4469 Always build libtorrent as a static library 2015-06-22 21:59:12 +02:00
Alexander Bock febb9f87ee Set Launcher as default application
Don't copy curl.dll on non-windows system
2015-06-22 18:45:12 +02:00
Alexander Bock 249081c556 Correct CURL cmake specification 2015-06-22 18:34:38 +02:00
Alexander Bock 4fbf08b6b8 Add the FindCurl module from CMake into the support directory 2015-06-22 18:29:51 +02:00
Alexander Bock 4ae8211508 Fix method renaming error in volume module 2015-06-22 18:14:33 +02:00
Alexander Bock 6b301d96eb Updated data folder reference 2015-06-22 16:52:12 +02:00
Alexander Bock 930d07fb6d Merge branch 'feature/downloadmanager' into develop 2015-06-22 16:50:46 +02:00
Alexander Bock 1906c525e3 Make SpiceManager derive from Singleton 2015-06-22 16:01:23 +02:00
Alexander Bock 89923f0650 Allow left-aligned and right-aligned messages in Launcher 2015-06-22 15:39:37 +02:00
Alexander Bock 2afd193a95 Set thread priority on Windows to not have the Launcher stall the system 2015-06-22 15:30:54 +02:00
Alexander Bock 072a6d3cc1 Fixes to prevent crashes when data is not available 2015-06-22 14:44:31 +02:00
Alexander Bock 943ab69c69 Fix CMakeLists files for TimelineView and Launcher to fix crosstalk 2015-06-22 14:43:55 +02:00
Alexander Bock df1da946cf Merge remote-tracking branch 'origin/feature/abuffer' into feature/downloadmanager
Conflicts:
	include/openspace/abuffer/abufferframebuffer.h
	src/abuffer/abuffer.cpp
2015-06-22 13:43:57 +02:00
Alexander Bock 2e945457ea Merge branch 'develop' into feature/downloadmanager 2015-06-22 13:39:54 +02:00
Anton Arbring c7a3048dda Fix Jenkins error and minor cleanup 2015-06-21 20:23:40 -04:00
Anton Arbring ad55309b0e Cleaning up my own mess 2015-06-21 20:13:44 -04:00
Anton Arbring 6f72010725 Changes to facilitate model projection, also added posibility to define model exaggeration per obj 2015-06-21 20:11:19 -04:00
Anton Arbring e5d6bef5c9 Changed how translations are found to avoid crash with broken lbl files 2015-06-21 20:05:25 -04:00
Anton Arbring 083f2948e9 Fixed FoV crash when the input is incorrect 2015-06-21 20:03:47 -04:00
Anton Arbring 5e0756fa05 Fixed trail start/stop time bug 2015-06-21 20:01:44 -04:00
Anton Arbring 45f1104814 Some cleanup in planeprojection 2015-06-21 19:59:15 -04:00
Alexander Bock 77e668a1b6 Correctly handle path tokens in download destinations 2015-06-19 00:19:31 +02:00
Alexander Bock cc76be6602 Update infowidgets in Launcher based on FileFutures and torrent_handles 2015-06-18 23:45:08 +02:00
Alexander Bock 4d6663f824 Add a time-remaining counter to Launcher 2015-06-18 22:46:24 +02:00
Alexander Bock 0becba370c Remove qDebug with Ghoul Logmanager in Launcher 2015-06-18 17:27:45 +02:00
Alexander Bock 7628e30e5f Enable to start OpenSpace from Launcher as a detached process 2015-06-18 17:06:48 +02:00