Commit Graph

548 Commits

Author SHA1 Message Date
Alexander Bock 443963a151 Finished cleanup of SpiceManager 2015-11-20 18:36:03 -05:00
Alexander Bock 2c84368b0b More cleaning of SpiceManager 2015-11-20 00:54:19 -05:00
Alexander Bock 16897bb8d4 Make the aberration correction specification for targetPosition in SpiceManager explicit by including a seprate class for it 2015-11-19 15:33:57 -05:00
Alexander Bock 11fec9387b More changes on the documentation and Exception handling in SpiceManager
Change some interfaces on SpiceManager
Removed target position return in powerscaled coordinates and only use glm::dvec4 instead as the Spice library does not have higher accuracy anyway
2015-11-19 13:40:44 -05:00
Alexander Bock 4f7ab5321f Cleanup RenderEngine to completely rely on Ghoul font rendering 2015-11-17 17:31:43 -05:00
Alexander Bock 2cf7dfb27d Changed RenderEngine to use Ghoul fontrendering instead of SGCT 2015-11-16 19:21:05 -05:00
Alexander Bock 177ec6d568 Apply new changes to Fontrendering 2015-11-11 00:32:30 -05:00
Alexander Bock c61d1cc861 Use correct window parameter for font rendering 2015-11-03 20:53:01 -05:00
Alexander Bock bbb622f555 Initial work on integrating fontrendering into ghoul 2015-11-02 21:40:45 -05:00
Alexander Bock 20861d68ad Changing WindowWrapper from pointer to reference 2015-10-26 15:10:15 -05:00
Alexander Bock f3fd055db8 Rename WindowHandler to WindowWrapper 2015-10-26 15:00:46 -05:00
Alexander Bock 77857975a4 Changing the RenderEngine to use the SGCT window wrapper 2015-10-26 11:44:16 -05:00
Alexander Bock 062817b7fb More work moving code to window wrapper
Removing capability to show SGCT rendering information
2015-10-26 11:20:48 -05:00
Alexander Bock f8f48acb98 Implementation of the windowhandler interface 2015-10-20 23:30:40 +02:00
Alexander Bock d4da374c23 Reenable colored font rendering 2015-10-08 22:59:36 +02:00
Alexander Bock 35e95b94e7 First version to update OpenSpace to the new SGCT version 2015-10-05 00:07:38 +02:00
Alexander Bock 995fff222b Increase the font size of the time printing 2015-07-13 01:15:56 +02:00
Alexander Bock 72ba616414 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
Alexander Bock 52146a79a6 Remove old script messages for changing the origin and the coordinate system
Adapt the onscreen-gui to use the new property mechanism
Adapt the Timeline GUI to use the new property mechanism
2015-07-07 18:52:09 +02:00
Alexander Bock 405aa70352 Refix Devil vs FreeImage
Fix the downloading detection of filenames in Launcher
2015-07-07 14:48:20 +02:00
Alexander Bock 174129be5e Merge commit '5c45815b9c509cbf98d1f3c7ad1e6035c4962a81' into feature/remote_redesign 2015-07-06 16:50:35 +02:00
Alexander Bock 1de7a76cde Making changing the coordinate system a property in InteractionHandler 2015-07-06 16:14:49 +02:00
Alexander Bock 5c45815b9c Prefer FreeImage to DevIL as DevIL has issues on Mac 2015-07-06 15:16:21 +02:00
Joakim Kilby a7a86c06b5 Merge branch 'develop' into feature/remote 2015-07-02 10:12:30 +02:00
Alexander Bock cc5e6074ad Rename imagesequencer2 to imagesequencer 2015-07-01 22:03:52 +02:00
Joakim Kilby 2188fc1809 Merge branch 'develop' into feature/remote
* develop: (72 commits)
  Disable blackout on startup
  Fixed path bug
  Remove the rendering method override
  Fix crash that happens when SpiceManager is deinitialized
  Adding convenient scripts for showing 67P and changing coordinate system to 67P
  Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
  Adding the possibility to project to arbitrary bodies model files
  Adding support for imageplanes for multiple instruments
  Fixing bug in model magnification
  Made destination optional in data specifications
  Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
  Remove setName function from OpenSpaceModule and move naming into constructor
  Always build libtorrent as a static library
  Set Launcher as default application Don't copy curl.dll on non-windows system
  Correct CURL cmake specification
  Add the FindCurl module from CMake into the support directory
  Fix method renaming error in volume module
  Updated data folder reference
  Make SpiceManager derive from Singleton
  Allow left-aligned and right-aligned messages in Launcher
  ...

Conflicts:
	modules/kameleon/CMakeLists.txt
	openspace.cfg
	src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +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 0d0c963bce Fixed path bug 2015-06-27 15:00:55 -04:00
Joakim Kilby 2529d4c4d6 added definitions of which scripts should be shared over parallel connection 2015-06-26 09:37:51 +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
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 7401b7d48b Enable FrameBuffer-based rendering on Windows 2015-06-18 15:42:41 +02:00
Alexander Bock 3fee6e8baf Added more logging text to detect errors 2015-06-10 19:03:06 +02:00
Alexander Bock 8de6d9db05 Moving global blackout factor into RenderEngine
Cleanup of Abuffer implementations
2015-06-05 14:25:35 +02:00
Alexander Bock 16e09e5802 Remove static code analysis warnings 2015-06-04 01:44:31 +02:00
Alexander Bock 8ad7702b75 Automatically detect which rendering method to use based on the available OpenGL version 2015-06-03 13:31:42 +02:00
Alexander Bock 37a54ab22b Move specification of RenderingMethod into renderengine 2015-05-28 20:44:12 +02:00
Alexander Bock 9d733eb613 Moving Kameleon into its own module
Moving fieldline rendering into its own module
2015-05-26 23:51:15 +02:00
Alexander Bock 98024ca29d Remove warnings 2015-05-24 00:09:52 +02:00
Alexander Bock ef58668b81 Making OpenSpace compile and run when the NewHorizons module is not loaded 2015-05-23 20:47:06 +02:00
Alexander Bock e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock fdead75cfa Remove move values from constants.h
Disable ghosting in ephemeris to remove dependency on imagesequencer
2015-05-20 17:42:47 +02:00
Alexander Bock 4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +02:00
Alexander Bock 2bb2b906ff Outsource Lua functions into their own inline files 2015-05-20 12:46:29 +02:00
Alexander Bock 154a949e8b Cleaning up more shaders 2015-05-20 11:28:51 +02:00