Commit Graph

737 Commits

Author SHA1 Message Date
Alexander Bock
91195db6a0 Added reasonable size to the default single.xml
Added path tokens for spice kernels
2015-02-17 22:14:52 +01: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
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
3928ff75fb testing issues with recentered projection (will fix in 24 h) 2015-01-26 12:44:44 -05:00
Michal Marcinkowski
425303f1d2 renderable trail fixes 2015-01-24 14:08:51 -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
4c53f763f0 Recentering at Pluto,
Todo - add NH with kernels.
2015-01-23 12:10:21 -05:00
Michal Marcinkowski
cf2049e4c4 begin recenter at pluto 2015-01-22 11:27:00 -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
e48be5bb92 SpiceManager issue fix 2015-01-21 15:50:59 -05:00
Michal Marcinkowski
796d255c6f data commit 2015-01-21 12:50:37 -05:00
Michal Marcinkowski
a2a12735f9 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-01-21 12:03:33 -05:00
Michal Marcinkowski
83976a7c8d intermediate commit (ghoul) 2015-01-21 12:03:18 -05:00
Michal Marcinkowski
63c63cbc75 minor changes prior to merge 2015-01-21 12:01:14 -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
Alexander Bock
9350172c5a Updated Openspace-data 2015-01-21 15:43:07 +01:00
Alexander Bock
8ebd2e4d71 More code cleanup of RenderableFieldlines 2015-01-21 15:13:16 +01:00
Alexander Bock
f752221772 Added Vec4Property to imgui 2015-01-21 15:12:54 +01:00
Alexander Bock
d6a02140ea More RenderableFieldlines code cleanup 2015-01-21 01:44:56 +01:00
Alexander Bock
1a66df3336 More RenderableFieldlines code cleanup 2015-01-21 00:54:02 +01:00
Alexander Bock
f72d151c6c Initial changes to RenderableFieldlines 2015-01-21 00:42:33 +01:00
Alexander Bock
4a44905f48 Add additional check for GUI shader compilation 2015-01-21 00:41:18 +01:00
Alexander Bock
8b26d6abf6 Add include to please Jenkins 2015-01-20 22:05:16 +01:00
Alexander Bock
32b2c4942f Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-01-20 21:54:34 +01:00
Alexander Bock
ec8c5b7132 Revert automatic gui compilation 2015-01-20 21:54:08 +01:00
Alexander Bock
16518dbc96 Allow renderablefieldlines to load a passed file instead of requiring loading through Lua 2015-01-20 21:32:46 +01: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
Joakim Kilby
4b40e88843 Activated imgui compilation on default 2015-01-14 14:39:55 +01:00
Michal Marcinkowski
3c2110e7e3 minor updates 2015-01-13 16:04:12 -05:00
Michal Marcinkowski
812a9a48be Normal computation in pre projection pass issue resolved. 2015-01-13 10:59:09 -05:00
Michal Marcinkowski
f37958c24f beginning to work on sequencing 2015-01-10 16:07:05 -05:00
jonasstrandstedt
6b164f0b36 Added camera offset support 2015-01-06 12:43:16 +01:00
Michal Marcinkowski
4e2edf2b2f trying to fix orthogonal projection issue. 2015-01-04 12:21:38 -05:00
Michal Marcinkowski
ca39f5aaf5 begin cleanup, making code more transparent 2014-12-30 17:07:57 -05:00
Michal Marcinkowski
a6a34cf7dd projection GPU first results, pre-cleanup commit.
TODO:
- fixes so it reads mission specific modfile keywords (ie targets)
- speedup using one more pass (vertex map generated every something-frame)
- sequencing (timestamp check + load of separate images on-the-fly)
- pass in geometric data of target + target-texture switching (later)
2014-12-26 13:42:34 -05:00
Michal Marcinkowski
25ca99799b Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2 2014-12-22 10:03:10 -05:00
Michal Marcinkowski
ee306cf54c Added separate shader for write to texture, relies on blend logic. 2014-12-22 10:02:31 -05:00
Alexander Bock
b131aa5745 Move the Ghoul repository to GitHub 2014-12-20 00:28:18 +01:00
Alexander Bock
6adb5f8994 Merge branch 'git-ghoul' into develop 2014-12-20 00:24:49 +01:00
Alexander Bock
b2c216c2b6 New module file 2014-12-20 00:15:02 +01:00
Michal Marcinkowski
b14ff04f76 wip - piping projection-to-texture to GPU. 2014-12-18 12:00:27 -05:00
Alexander Bock
55a3c43db4 Move imgui file to its own folder 2014-12-18 17:21:20 +01:00
Alexander Bock
e45813dd91 Add stepping value into Property description 2014-12-18 13:46:18 +01:00
Alexander Bock
7cd1374cdb Added description for OptionProperty 2014-12-17 18:52:01 +01:00
Alexander Bock
6336ee998a Added description for SelectionProperty 2014-12-17 18:47:30 +01:00
Alexander Bock
7181a8f9da Remove test code 2014-12-17 18:19:06 +01:00
Alexander Bock
618f3ab930 Add description for numerical properties 2014-12-17 18:18:34 +01:00
Alexander Bock
72adb770f7 Set the correct default values for MatrixProperties 2014-12-17 18:18:12 +01:00