Commit Graph

55 Commits

Author SHA1 Message Date
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
d249e9422e Fixed bug where ScriptEngine would complain about double-added libraries
Correct application of default keybinding
2015-02-25 17:57:25 +01:00
Alexander Bock
2d975234e7 Updated startup scripts 2015-02-25 00:04:45 +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
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
b6e0bd1043 Added interaction speed modifiers/inverters
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +01:00
Michal Marcinkowski
971381b150 fov lines, check. 2015-02-18 19:41:56 -05:00
Michal Marcinkowski
2e1f806056 Added comments to default startup script with recommended dt and times of observations 2015-02-11 18:55:07 -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
3928ff75fb testing issues with recentered projection (will fix in 24 h) 2015-01-26 12:44:44 -05:00
Michal Marcinkowski
1d5b051b65 Targeting fixes for pluto viz etc. 2015-01-23 17:54:32 -05:00
Michal Marcinkowski
4c53f763f0 Recentering at Pluto,
Todo - add NH with kernels.
2015-01-23 12:10:21 -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
Michal Marcinkowski
f37958c24f beginning to work on sequencing 2015-01-10 16:07:05 -05:00
Michal Marcinkowski
70569cba7f fixes to restore to stage prior purge 2014-12-15 16:24:04 -05:00
Michal Marcinkowski
70d24185de intermediate commit prior to merge 2014-12-12 11:52:31 -05:00
Michal Marcinkowski
1a9c726f58 intermediate commit before merge 2014-12-09 17:50:29 -05:00
Michal Marcinkowski
3e443fdead intermediary commit. 2014-12-08 14:48:38 -05:00
michal
a5c232eb88 Tidying up. 2014-11-28 14:41:59 -05:00
michal
83ed904f1d changes to projective texturing, some cleanup. 2014-11-28 13:49:18 -05:00
michal
845469b15d Merge branch 'develop' into solarsystem2
Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp
2014-11-26 13:42:36 -05:00
michal
c154141b8b minor changes, testing 2014-11-26 11:22:11 -05:00
michal
4c8814b237 Projective Texturing
Created test class based on renderableplanet & co.
Doing it this way carries some implications that need discussing.
2014-11-24 14:06:50 -05:00
Jonas Strandstedt
31c76f3e3c Added key binding from Lua possible
- Possible to add key bindings from Lua possible. This calls Lua scripts
  from key commands.

 - Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
michal
d6d7f1ffe7 intermediate commit. 2014-11-12 12:28:16 -05:00
michal
0803b1cacf Minor changes for targeting. 2014-11-10 13:00:04 -05:00
michal
2426d62677 Added target-switch method based on object visibility, will need refinement. 2014-11-05 19:26:11 -05:00
michal
3e934b4f8a Working Field of View Rendering.
TODO:
Optimization and stuff.
2014-11-04 18:12:52 -05:00
michal
f0b6b17554 semi-working fov. 2014-11-03 22:35:04 -05:00
michal
79b75aa572 field of view rendering. Intermediate commit.
Working on trying to get the fov-on-surface square to render.
2014-11-01 18:41:09 -04:00
michal
c5ddd8d00b time changes. working on creating references for stk people 2014-10-28 14:53:44 -04:00
michal
e31a0b70ab RenderableFov class.
Intersections with planet and instrument FOV boundary vectors / boresight seem to be correct with a margin of error. This could be either due to
precision issues experienced at greater distances, light-time or stellar aberration correction methods, planetary radius etc etc.
2014-10-27 21:35:59 -04:00
michal
51c8034fe9 boresight works. 2014-10-24 21:45:49 -04:00
michal
64ee84ede1 Fixed model oriantation
After 32 maya exports and about 600 different attempts of different rotations / scalings along each axis
I realised that the model is in fact correctly aligned and that what we are seing are precisional errors with the
stupid boresight-polygon-baton.

Nevertheless, out of all of those Im keeping some of the more cruicial test-objects (8 to be precise) for future reference,
these can be deleted at some point, I just really want to keep them for now, comfort blanket.
2014-10-21 12:49:39 -04:00
michal
54809c6376 Pluto geometry artefacts commit. 2014-10-20 18:29:55 -04:00
michal
50b4c1ec36 fixed renderabletrail class to suit for all different delta times, tropical orbits etc etc. lot of stuff to do with precision and set time intervals (pain in the ass). works clockwork.
changes to modules etc. will do more fixes soon. Incoming.
2014-10-20 16:00:38 -04:00
michal
099bcc2c9b changing renderabletrail class to work for planetocentric 2014-10-16 16:13:54 -04:00
michal
97df29706c small changes, return solarsystem to original state 2014-10-15 18:42:14 -04:00
michal
e31a93f21f Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2 2014-10-15 15:43:13 -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
Alexander Bock
c226e9b82f Cleaned up code
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
2014-10-11 13:40:52 +02: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
michal
1ed4b74d3e added renderablepath and made changes to renderabletrail 2014-10-08 16:15:37 -04:00
michal
acc8056455 added some new classes for ephemeris rendering.. 2014-10-06 15:30:13 -04:00
michal
59161e186c Renderableehpemeris still as it is, will be repurposed though.
Renderable trail now acts like planet ephemeris, not yet finished. Need to work on objectloader
2014-10-03 18:56:16 -04:00
michal
938c442dd6 got renderable ephemeris working for larger deltas, problems with leap years though 2014-10-02 11:00:43 -04:00
michal
22fd3acc59 small changes to to get everything working on my end / michal 2014-09-26 17:42:07 -04:00
Jonas Strandstedt
2d359fd48c Started working on modularizing PSC and ABuffer 2014-09-26 17:03:59 +02:00