Commit Graph

38 Commits

Author SHA1 Message Date
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
Alexander Bock
080390359f Fixing a bug where RenderableFoV would not appear on slave nodes 2015-02-27 15:11:47 +01: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
b3c4cc7a34 Make the line width of renderablefov changeable 2015-02-25 11:53:20 +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
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
Michal Marcinkowski
85e13f7738 Added:
New obj mod file with separate obj-loads
Imagesequencer - active instrument slightly improved
Printout of active instrument
Ortho-square dissapears when not needed
2015-02-24 00:03:00 -05:00
Michal Marcinkowski
aae0516acd small change so that ortho-plane dissappears when not needed 2015-02-23 22:53:40 -05: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
Michal Marcinkowski
770ee9212f adding changes for rudimental target switching, needs work. 2015-02-23 09:56:29 -05:00
Michal Marcinkowski
d875e01e25 attempting to fix jenkins error 2015-02-19 11:51:14 -05:00
Joakim Kilby
f14f288f19 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
2015-02-19 10:07:38 +01:00
Joakim Kilby
d913132852 Changes to pointer usage in these files. 2015-02-19 10:02:55 +01:00
Michal Marcinkowski
971381b150 fov lines, check. 2015-02-18 19:41:56 -05: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
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Alexander Bock
862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01: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
b2c793a6b7 small fix 2015-01-23 18:49:24 -05:00
Michal Marcinkowski
1d5b051b65 Targeting fixes for pluto viz etc. 2015-01-23 17:54:32 -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
ca39f5aaf5 begin cleanup, making code more transparent 2014-12-30 17:07:57 -05:00
Jonas Strandstedt
b81133e381 Removes most of Visual Studio warnings 2014-12-16 19:09:32 +01:00
Michal Marcinkowski
70569cba7f fixes to restore to stage prior purge 2014-12-15 16:24:04 -05:00
Alexander Bock
734ce03d72 Changed the deinitialization of renderable from the destructorto the scenegraphnode 2014-12-15 20:51:00 +01:00
Jonas Strandstedt
37a59f3f09 Removed assertions from renderable constructors
- Removed assertions from RenderableFieldlines constructor
- Removed assertions from RenderableFov constructor, the variables wasn't
  even used.
- Removed assertions from RenderablePath constructor
- Fixed missing delete[] is RenderableSphericalGrid
- Removed assertions from RenderableTrail constructor, added glDelete*
  functions
- Removed assertions from RenderablevolumeGL constructor
2014-12-12 10:59:28 +01:00
Jonas Strandstedt
9e61d3ac94 Fixes for RenderableFov 2014-12-11 17:16:41 +01:00
Jonas Strandstedt
da4fa44c03 Continued work on memory leaks and proper isReady usage 2014-12-11 16:48:49 +01:00
jonasstrandstedt
01361307f6 Update ghoul reference
- Added destructor to OpenSpaceEngine to deallocate SyncBuffer
- Changed texture reading to avoid memory leak
2014-12-10 20:57:41 +01:00
Alexander Bock
d3e16a0437 Apply changes to texture reading 2014-12-05 21:01:54 +01:00
Alexander Bock
4de8071efe Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
Jonas Strandstedt
4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt
20137613a8 Fixed Visual Studio assert error
- Visual studio optimized away the assert expression causing the getvalue
  statement not to be called
2014-10-27 18:01:46 +01:00
michal
51c8034fe9 boresight works. 2014-10-24 21:45:49 -04:00
michal
3a8b2ac4a2 smallchanges 2014-10-22 15:19:15 -04:00
michal
ae48d76c60 merged openspace-data and reset time parameters to around jupiters little red dot observation (we want to focus on that for now) 2014-10-15 15:42:56 -04:00
michal
3bb9912356 latest changes involve adding an unfinished class called "renderable fov"- ignore that one.
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
2014-10-11 01:43:31 -04:00