Commit Graph

177 Commits

Author SHA1 Message Date
Alexander Bock
b403513d63 Updated Spice version
More changes to make the application run
2015-04-28 15:07:58 +02: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
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
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
Alexander Bock
84f8ce961b Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node 2015-02-24 13:42:47 +01:00
Alexander Bock
45e4dad29d Implement reference counting for SPICE kernels to shield SPICE from loading kernels multiple times
Passing result of surface intercept method by parameter and returning success status
2015-02-24 10:29:29 +01:00
Alexander Bock
45c148b2c8 Added error checking codes to SpiceManager
Changed method to return instrument visibility by reference and used return value for errors
2015-02-23 21:36:37 +01:00
Alexander Bock
7f6d894866 Fixed more gcc and Cppcheck warnings 2015-02-23 20:07:57 +01:00
Alexander Bock
f59c9819c4 Fixing gcc warnings 2015-02-23 19:35:47 +01:00
Alexander Bock
fb2c99b5ed Removed cppcheck warnings
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Alexander Bock
78ab23602f Moved tinyobjloader from util into submodule of Ghoul 2015-02-23 18:08:28 +01:00
Alexander Bock
957495d46f Merge remote-tracking branch 'origin/plutoViz' into develop 2015-02-23 16:13:00 +01:00
Michal Marcinkowski
175874adc7 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
Conflicts:
	src/rendering/model/wavefrontgeometry.cpp
2015-02-23 09:57:26 -05:00
Michal Marcinkowski
770ee9212f adding changes for rudimental target switching, needs work. 2015-02-23 09:56:29 -05:00
Alexander Bock
3ba9cbdb96 Linux compile fix 2015-02-23 14:18:21 +01:00
Alexander Bock
a7bd6319db Adding 'property' prefix to subowner methods in PropertyOwner
Added function for writing documentation of properties
2015-02-22 22:05:25 +01:00
Michal Marcinkowski
cc65ce1167 changing obj loader to tinyobj 2015-02-22 13:10:47 -05:00
Alexander Bock
f00158969c Cleanup of ImageSequencer
Added caching to playbook loading
Increased performance of playbook loading
Added default placeholder image
2015-02-19 16:21:28 +01:00
Joakim Kilby
3d04af03a3 Merge branch 'develop' into plutoViz
Conflicts:
	include/openspace/rendering/planets/simplespheregeometry.h
	include/openspace/util/powerscaledsphere.h
	openspace.cfg
	shaders/pscstandard_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
2015-02-18 15:52:35 +01:00
Joakim Kilby
ba53cf0e1f added <stdint> include to fix compilation issue with int32_t datatype 2015-02-18 10:49:54 +01:00
Alexander Bock
e99148937d Bugfixing a crash due to wrong decoding 2015-02-17 21:01:55 +01:00
Alexander Bock
d439157d4f Linux compile fix with template specialization 2015-02-17 20:51:25 +01:00
Alexander Bock
a0fc77a893 Enable the ability to run setting scripts that are executed after the scene has been loaded 2015-02-17 20:10:50 +01:00
Joakim Kilby
eb7fefb3c9 fixed Alex' bug!!
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +01:00
Joakim Kilby
7c7b4f1f97 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome 2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Joakim Kilby
5b3742961e added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position) 2015-02-17 13:29:45 +01:00
Joakim Kilby
aa66bdeaa4 added synced versions of shared variables and modified set/get methods to adress the right versions of variables 2015-02-17 11:58:57 +01:00
Joakim Kilby
1cfabe6a2d Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT 2015-02-17 08:25:09 +01:00
Joakim Kilby
52e51b76bf added initializedata struct
It is so far empty but will be used later on for initialization
2015-02-17 08:19:07 +01:00
Alexander Bock
69e0213e79 Added ability to disable shading for RenderablePlanet renderables 2015-02-16 19:23:23 +01:00
Joakim Kilby
a3ff828e91 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
Conflicts:
	src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock
55f7b0fc03 Move 'keys' file from interaction to util 2015-02-15 17:55:44 +01:00
Joakim Kilby
c6b358488b changed sync variables for camera and time classes.
added a boolean _timeJumped which is synced and set to true whenever setTime is called.
(Note this is never set to false afterwards unless a call is made to setTimeJumped( bool ) with value false)
2015-02-13 11:02:35 +01:00
Joakim Kilby
2b83c19baa commit to be able to merge 2015-02-12 14:58:40 +01:00
Joakim Kilby
a8abfa74bd Added proper synchronization for mouse controller and camera.
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Joakim Kilby
47ed14b8d6 Added serialize / deserialize functions for camera.
Added proper mutex protected shared versions of synced variables for camera class.
Added a post sync function for camera class  (and a call to it in render engine post sync function)
2015-02-09 14:50:56 +01:00
Michal Marcinkowski
4dba4f4cee minor changes / updates 2015-01-29 19:57:45 -05:00
Michal Marcinkowski
238aa09381 Refinements to image sequencing class and other, adaptation to the pluto setup 2015-01-29 13:01:31 -05:00
Michal Marcinkowski
44e02465a1 Merge branch 'develop' into solarsystem2
Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp
2015-01-22 10:31:40 -05:00
Michal Marcinkowski
a8e5b61272 Image sequencing improvements and optimization of projection.
Projection now occurs only at specified timestamps.
Todo:
projection class now dependent on image sequences, will have
to change that once we read specific instrument schedule.
2015-01-21 11:28:38 -05:00
Michal Marcinkowski
fa0f26c9da In short, this is new:
- ImageSequencer class added, requires planetary data service files (not added to openspace-data, too large)
   : Given current time returns path to specific image in dataset for projection.
- Changes to RenderablePlanetProjection class to accomodate sequencing
- Fixed normal computation in reverse-mapping stage
- Rudimental target recognition (will prob. become part of separate class at some point - since both fov & proj classes do similar things)

Next up:
- Redo pluto mockup visualization & begin spreadsheet reader for instrument-switching.
2015-01-16 13:06:52 -05:00