Commit Graph

265 Commits

Author SHA1 Message Date
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 fd0501d61c Defined default constructor for RenderData 2015-05-24 14:30:18 +02:00
Alexander Bock 98024ca29d Remove warnings 2015-05-24 00:09:52 +02:00
Alexander Bock 433d0ba3a6 Fixing CMake for Mac OS 2015-05-23 19:50:03 +02:00
Alexander Bock f2a7ea9630 Fixing compile warning 2015-05-23 01:39:23 +02:00
Alexander Bock ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +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 9e02d35d8a Fix spelling errors in method names 2015-05-19 01:13:53 +02:00
Alexander Bock 9366fd4b80 More clang fixes 2015-05-13 19:48:41 +02:00
Alexander Bock 41c1293cc4 Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx 2015-05-13 14:25:08 +02:00
Anton Arbring 481f247a23 Pre presentation mods
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
2015-05-12 23:23:29 -04:00
Alexander Bock 5027b32f9d Add RenderableCrawlingLine for REX instrument on New Horizons 2015-05-11 23:29:27 +02:00
Alexander Bock d508998b45 Merge branch 'develop' into feature/osx
Conflicts:
	ext/ghoul
2015-05-08 16:28:35 +02:00
Alexander Bock 1177e4e4cf Restructure parsers, send label parser information to GUI application 2015-05-07 18:26:23 +02:00
Alexander Bock b2fcbe4fb0 Adding final keyword 2015-05-07 17:30:36 +02:00
Alexander Bock e1c87a49ed Redesign parser 2015-05-05 21:43:46 +02:00
Alexander Bock e33c250bfc Fixing issue with linux 2015-05-05 17:33:48 +02:00
Alexander Bock 0d11e6e2f8 Fixing issue with linux 2015-05-05 17:23:41 +02:00
Alexander Bock 4b9c5a9de6 Linux compile fix with ImageSequencer2 2015-05-05 14:40:47 +02:00
Alexander Bock 0c655e98f2 Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui
Conflicts:
	src/rendering/renderengine.cpp
	src/util/imagesequencer2.cpp
2015-05-05 11:42:49 +02:00
Anton Arbring 17064a92d5 Modifying labelparser and imagesequencer2
For extension to handling other instruments than lorri
2015-05-04 19:40:08 -04:00
Anton Arbring a993dfb42f Storing frame-to-body relationship
Store frames for bodies in SpiceManager, still adding "IAU_" if
no frame is added for the body. Adding frames in renderableModel for
67p to get proper inertial frame.
2015-05-04 19:20:14 -04:00
Alexander Bock 4f8c1e4a14 Added methods to Hongkang parser that publish the results
More changes to the TImeline GUI
2015-05-02 22:24:03 +02:00
Alexander Bock b403513d63 Updated Spice version
More changes to make the application run
2015-04-28 15:07:58 +02:00
Anton Arbring d3bf8eb7f7 Merge branch 'timeadjustments' into NewHorizonsMerge
Conflicts:
	CMakeLists.txt
	include/openspace/rendering/model/modelgeometry.h
	include/openspace/rendering/model/wavefrontgeometry.h
	include/openspace/rendering/planets/renderableplanetprojection.h
	include/openspace/util/imagesequencer.h
	scripts/default_startup.lua
	src/abuffer/abuffer.cpp
	src/rendering/model/renderablemodel.cpp
	src/rendering/model/wavefrontgeometry.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/spiceephemeris.cpp
	src/util/imagesequencer.cpp
2015-04-23 22:51:55 -04:00
Michal Marcinkowski 7b9fc28f33 Merge branch 'timeadjustments' of openspace.itn.liu.se:/openspace into timeadjustments 2015-04-22 21:54:05 -04:00
Michal Marcinkowski 8becbbde41 Imagesequencer update:
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 21:53:28 -04:00
Anton Arbring 9226dd2d6b Setting show errors to false by default in Spicemanager
Removed debugging printouts
2015-04-22 21:43:54 -04:00
Alexander Bock 19417d87c8 Moved networking functions into their own engine class 2015-04-22 18:22:19 +02:00
Anton Arbring 163796cfdf Simplified error suppressing in Spicemanager 2015-04-21 15:50:40 -04:00
Anton Arbring 2b8b8c0416 Solving merge conflicts with develop 2015-04-18 16:10:05 -04:00
Anton Arbring 6cc21b3be7 Added image plane projection + shaders and dynamic ephemeris.
The plane projection is now hard coded to target until it can be
returned from imagesequencer. The dynamic ephemeris is not used for
this at the moment but will come in handy later on.
2015-04-17 22:09:35 -04:00
Anton Arbring 9893a6ee20 Added temp method to get latest image in old imagesequencer 2015-04-17 21:25:33 -04:00
Alexander Bock c01bb7834b Merge branch 'develop' into feature/scenegraphloader
Conflicts:
	src/abuffer/abuffer.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
2015-04-17 13:31:39 +02:00
Michal Marcinkowski de6fcf1583 completely new imagesequencer class - WIP 2015-04-16 11:57:23 -04:00
Alexander Bock 0180130464 Fix multiple dependencies in SceneGraphNodes 2015-04-13 21:52:23 +02:00
Anton Arbring b95b7d9bb8 Fixing Jenkins error in spicemanager.h, double namespace qualification 2015-04-10 18:52:20 -04:00
Anton Arbring 914b3896ad SPICE error handling, position/rotation estimation etc...
- When loading SPICE kernels, coverage for each body is stored.
- If the body does not have spk coverage a position is estimated.
- Added "pulsating" transparency levels for renderableModels with
  estimated position.
- Spice manager clean up, left a few unused methods but removed a lot of
  dead code.
- To support multiple missins being loaded, some errors are simply
  ignored in spicemanager, for better or worse.
- Added start time and stop time as dictionary keys for renderables.
- Made RenderableTrails only show the time between gaps.
- Added but out commented vesta coordinate system swich in renderengine.

NOTE: Renderables using spiceEphemeris will give errors if body keyword
is omitted in modfile (When checking SPK coverage in position update).
2015-04-09 17:35:30 -04:00
Michal Marcinkowski d124209281 new imagesequencer class - WIP.
Temporarily calling it "imagesequencer2"
2015-04-09 12:36:05 -04:00
Michal Marcinkowski cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Anton Arbring b79e6df763 Planets shape creation & fixed texture longitude
Instead of spheres, the planets are now created as triaxial ellipsoids
according to the corresponding radii values in the SPICE kernels (if such
values are available). Apart from being more scientifically accurate, the
planets are shaped as the intersection functions in SPICE expects.

The textures will now also be aligned in longitude as in reality (w.r.t.
UTC) when using a texture map ranging from -180 in the left end to +180 on the
right, with 0 longitude in the middle (such as Greenwich in Earth texture)
2015-03-20 19:59:26 -04:00
Alexander Bock 1a29ad6208 Merge branch 'develop' into plutoViz 2015-02-27 09:01:55 +01:00
Michal Marcinkowski 39e5f2aa28 Improvements to the ImageSequencer class.
- Now _properly_ switches instruments at the moment set instrument is activated
2015-02-26 15:50:37 -05:00
Alexander Bock bd382f9e8e Cleanup of WaveFrontGeometry 2015-02-25 23:39:20 +01:00
Alexander Bock e155e7ec9f Adding functionality to pause the simulation time
Removed retreatTime function and replaced by a call to -advanceTime
2015-02-25 17:50:34 +01:00
Alexander Bock 3155073f05 More changes to allow JupiterProjection and PlutoProjection in the same scene
Add a switch that allows Renderables to react to big changes in time (via openspace.time.setTime)
Allow the setting of the minimum pixel size of stars
2015-02-24 19:16:15 +01:00
Alexander Bock 43a3716afd Intermediate result to change viewpoint from Jupiter projection to Plutoprojection 2015-02-24 17:52:40 +01:00