Commit Graph

1357 Commits

Author SHA1 Message Date
Michal Marcinkowski
2a3f0bbcca Optimization quick-fix for projections:
- Using queue to distribute imagesequencer-returned images 1 image/ frame
- Imagesequencer no longer returns 'reversed' image-vector
2015-07-06 10:35:03 -04:00
Alexander Bock
5c45815b9c Prefer FreeImage to DevIL as DevIL has issues on Mac 2015-07-06 15:16:21 +02:00
Alexander Bock
0345cb2d28 Fix downloadmanager on Mac 2015-07-06 15:16:02 +02:00
Alexander Bock
f60dfac1cf Update OpenSpace version to 0.1.1 prerelease-6
Do not print the SGCT . waiting message
rename libtorrent.config to Launcher.config
2015-07-06 13:44:23 +02:00
Alexander Bock
a25b64c8b9 One more GCC fix 2015-07-05 17:01:47 +02:00
Alexander Bock
35cdfd4abe GCC compilation fix for Jenkins 2015-07-05 16:51:20 +02:00
Alexander Bock
03994b2758 Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name
Added documentation for getString/setString methods
2015-07-05 16:37:03 +02:00
Alexander Bock
75a64e770f Enable Properties to be set by strings 2015-07-05 16:23:48 +02:00
Alexander Bock
e66e815683 Add a button to the SyncWidget to allow it to be closed 2015-07-04 23:06:23 +02:00
Alexander Bock
d694b14ec2 Updated to new Ghoul version 2015-07-04 22:14:00 +02:00
Alexander Bock
df3688f04a Make multithreaded download a toggle 2015-07-04 22:03:54 +02:00
Alexander Bock
ccab7ec32c Correctly Set the CMAKE_PREFIX_PATH for Qt on Mac 2015-07-04 21:48:21 +02:00
Alexander Bock
c375f18dac Add commandline argument to OpenSpaceEngine to override scene file
Make scene file selectable in Launcher, using the configurationfile value as default
2015-07-04 21:21:27 +02:00
Alexander Bock
8fc343b57f Non-Windows compile fix 2015-07-04 20:34:32 +02:00
Alexander Bock
b8db167647 Include stylesheet in main file 2015-07-04 20:26:38 +02:00
Alexander Bock
1510aca448 Add stylesheets and general improvements 2015-07-04 13:22:03 +02:00
Alexander Bock
16ccd7550f Set the libtorrent settings correctly 2015-07-03 19:54:14 +02:00
Alexander Bock
af81447558 Store libtorrent dht settings between executions of Launcher 2015-07-03 19:26:04 +02:00
Alexander Bock
4e1d4d6820 Fix libtorrent CMakeLists to always enable DHT mode
Close torrents when SyncWidget is closed
2015-07-03 18:55:39 +02:00
Alexander Bock
2397a28d49 Set Launcher's information widget to readonly 2015-07-03 00:40:49 +02:00
Alexander Bock
aa507a905b Merge branch 'feature/timeline' into develop 2015-07-03 00:01:50 +02:00
Alexander Bock
304a328cde Let TimelineView handle multiple instances of Labelparser and HongkangParsers 2015-07-03 00:00:48 +02:00
Alexander Bock
e8ab67ca91 Merge branch 'develop' into feature/timeline 2015-07-02 22:13:44 +02:00
Alexander Bock
0e4dbbb1cc Some work on the Launcher 2015-07-02 15:53:25 +02:00
Alexander Bock
bae990babb Some work on making the TimelineGui work with the new hybrid parsers 2015-07-01 23:40:38 +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