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
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
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
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
ee306cf54c
Added separate shader for write to texture, relies on blend logic.
2014-12-22 10:02:31 -05:00
Michal Marcinkowski
b14ff04f76
wip - piping projection-to-texture to GPU.
2014-12-18 12:00:27 -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
fd014cd519
minor changes, intermediate commit / restore point
2014-12-09 14:09:24 -05:00
Michal Marcinkowski
bd841c488c
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
2014-12-08 21:26:38 -05:00
Michal Marcinkowski
3e443fdead
intermediary commit.
2014-12-08 14:48:38 -05:00
michal
cbbbd6a263
Intermediate commit / restore point.
...
Will focus on doing mockup for carters presentation.
2014-12-01 16:14:16 -05:00
michal
bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -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
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
michal
484dfefbee
Adding temporary testing class based on renderablePlanet for testing projective texturing.
...
Note: This class will most probably be removed at some point, carry on.
2014-11-13 15:00:45 -05:00
