Michal Marcinkowski
4c53f763f0
Recentering at Pluto,
...
Todo - add NH with kernels.
2015-01-23 12:10:21 -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
Alexander Bock
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
Alexander Bock
d6a02140ea
More RenderableFieldlines code cleanup
2015-01-21 01:44:56 +01:00
Alexander Bock
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +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
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
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
Alexander Bock
5a7a518bad
Remove cppcheck warnings
2014-12-16 21:54:53 +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
Michal Marcinkowski
f032b4e3b0
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
include/openspace/rendering/renderablefov.h
src/CMakeLists.txt
src/rendering/model/renderablemodel.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/factorymanager.cpp
2014-12-15 13:23:30 -05:00
Michal Marcinkowski
70d24185de
intermediate commit prior to merge
2014-12-12 11:52:31 -05:00
Jonas Strandstedt
93a34fa985
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-12-12 11:00:26 +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
Alexander Bock
e70b663dc3
Add log.html to the list of ignored files
...
Enable capability to disable on-screen info text
2014-12-11 18:09:19 +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
Jonas Strandstedt
dc21196f70
Removed RenderableEphemeris
2014-12-11 16:45:02 +01:00
jonasstrandstedt
7b2b81ed54
Fix memory leaks and proper deinitialization
2014-12-11 10:13:10 +01:00
jonasstrandstedt
81caf96d72
Started working on Renderables
...
- Making sure isReady is properly set
- Making sure initialization is done correctly
- Making sure deinitialization is done correctly
2014-12-10 19:43:38 +01:00
Michal Marcinkowski
6ef0181148
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/spicemanager.h
2014-12-09 18:04:38 -05:00
Alexander Bock
01e71f2fc0
More work on performance measuring in imgui
2014-12-09 15:49:54 +01: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
Alexander Bock
90eac194dc
Initial work on performance measuring
2014-12-09 01:41:42 +01:00
Alexander Bock
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
Alexander Bock
5497f25725
Added the selection property to the RenderableConstellationBounds
2014-12-04 23:05:51 +01:00
Alexander Bock
fe9db28310
Finished with current version of ConstellationBounds
2014-12-04 19:12:31 +01:00
Alexander Bock
3f35b0a948
More optimizations for RenderableConstellationBounds
2014-12-04 18:37:15 +01:00
Alexander Bock
38b1c00d3d
Fix RenderableConstellationBounds name
...
Make rendering more efficient
2014-12-04 18:05:13 +01:00
Alexander Bock
5d168c18e5
First working version
2014-12-04 00:55:25 +01:00
Alexander Bock
1a590f83e0
Initial commit of constallation bounds
2014-12-04 00:18:37 +01:00
Jonas Strandstedt
f7b2bc12e0
Added billboard support for RenderablePlane
2014-12-03 14:48:50 +01:00
Hans-Christian Helltegen
5b1b8694dc
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines
2014-12-01 16:40:01 +01:00
Hans-Christian Helltegen
834612469c
Finalized the billboard rendering. Code cleanup
2014-12-01 16:27:30 +01: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
Alexander Bock
20c96f00e8
More cleanup of RenderableStars, enable rendering of Speed variable
2014-11-28 15:57:14 +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
Alexander Bock
43d542293a
More work in progress on RenderableStars
...
- Made the shader a private object not instantiated by scenegraph
- Started enabling coloring by velocity
- Code cleanup
2014-11-27 03:08:40 +01:00
Alexander Bock
e8de5edb45
Have RenderableStars cache the full Speck file
...
Enable basic slicing of the data
2014-11-27 02:26:43 +01: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
Alexander Bock
fc1dcfabc8
Some more changes to the RenderableStars class
2014-11-26 16:36:02 +01:00
