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
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
Alexander Bock
82c42cb97a
General code cleanup
2014-12-09 18:36:23 +01:00
Hans-Christian Helltegen
fd614efb71
Merge fix
2014-12-02 09:19:34 +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
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
Hans-Christian Helltegen
337ce2dd92
Added support for rendering fieldlines as textured view-aligned billboards
2014-11-24 17:18:55 +01:00
Hans-Christian Helltegen
815fc3b348
Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader
2014-11-21 10:37:01 +01:00
Jonas Strandstedt
7e1396a8ae
Added separete ProgressBar class
2014-11-07 14:48:03 +01:00
Jonas Strandstedt
f85e18dc18
OS X now doesn't crash for volumes
...
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
Jonas Strandstedt
e4a8e87098
Using new ghoul ProgramObject functionality
...
- Fixed risk of memory leak in SceneGraph (deleting shaders)
2014-10-01 15:30:39 +02:00
Alexander Bock
f3fb8cd95e
Apply getValueSafe/getValue change of Dictionary to the codebase
2014-09-27 19:23:24 +02:00
Jonas Strandstedt
5427dbdeb2
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefieldlines.cpp
src/rendering/renderablevolumegl.cpp
src/rendering/stars/renderablestars.cpp
2014-09-26 17:17:18 +02:00
Jonas Strandstedt
2d359fd48c
Started working on modularizing PSC and ABuffer
2014-09-26 17:03:59 +02:00
Alexander Bock
7359adf400
Replaced RuntimeData with separate, temporary structs that are passed around
2014-09-26 13:29:01 +02:00
Jonas Strandstedt
8042111ffe
Merge branch 'develop' into spicesolarsystem
...
Conflicts:
include/openspace/rendering/renderable.h
include/openspace/rendering/renderablevolumecl.h
include/openspace/rendering/renderablevolumeexpert.h
include/openspace/rendering/renderablevolumegl.h
include/openspace/rendering/renderengine.h
include/openspace/scenegraph/ephemeris.h
include/openspace/scenegraph/scenegraph.h
include/openspace/scenegraph/spiceephemeris.h
include/openspace/scenegraph/staticephemeris.h
include/openspace/util/constants.h
include/openspace/util/time.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablevolumecl.cpp
src/rendering/renderablevolumeexpert.cpp
src/rendering/renderablevolumegl.cpp
src/rendering/renderengine.cpp
src/rendering/stars/renderablestars.cpp
src/scenegraph/spiceephemeris.cpp
src/scenegraph/staticephemeris.cpp
src/util/factorymanager.cpp
src/util/spicemanager.cpp
src/util/time.cpp
2014-09-25 13:54:42 +02:00
Alexander Bock
51be4b1788
Make use of new Dictionary::getValueSafe method
...
Clean up code in various places
2014-09-19 00:29:36 +02:00
Hans-Christian Helltegen
033880080f
Added Ashers seedpoints
2014-07-29 09:39:08 -04:00
Jonas Strandstedt
da37528619
Merge branch 'feature/fieldlines' into feature/ABuffer
...
Conflicts:
src/rendering/renderablevolumegl.cpp
2014-07-18 13:51:07 -04:00
Jonas Strandstedt
114af3fb5b
Added an OpenSpace ShaderCreator
...
- Global shader settings can now be added.
- ShaderCreator builds the shader and stores a generated shader file
with all included source.
- Small TransferFunction bugfix
2014-07-10 15:22:57 -04:00
Hans-Christian Helltegen
1996acf997
Fieldline and seedpoint color now in RGBA instead of RGB
2014-07-03 14:42:43 -04:00
Hans-Christian Helltegen
4dca06e776
Fixed alignment of data in kameleonwrapper. This version is installed in the CCMC-lab
2014-07-01 09:53:10 -04:00
Hans-Christian Helltegen
71ea2e0564
Merged with feature/ABuffer
2014-06-27 15:49:49 -04:00
Hans-Christian Helltegen
24d38d0296
Implemented tracing for Lorentz force trajectories
2014-06-27 15:18:34 -04:00
Jonas Strandstedt
d378428dc4
Crude PowerScale implementations
...
- Added PowerScaling to RenderableVolumeGL and RenderableFieldlines
- Removed the use of volumeraycasterbox since it used FBO and textures
which was not used anymore.
- Added a simple box implementation to RenderableVolumeGL that can have
PowerScaled vertex positions
TODO: The #include command needs to be extended in some way since the
FieldLines passthrough shader can't access the PowerScaled includes in a
good way.
2014-06-26 15:25:49 -04:00
Jonas Strandstedt
3fe447274f
Added intermediate ABuffer class to handle shader
...
- Refactored a lot of stuff
2014-06-23 16:59:19 -04:00
Jonas Strandstedt
d81ef36d4f
Merge branch 'feature/fieldlines' into feature/ABuffer
...
Conflicts:
src/rendering/renderablefieldlines.cpp
src/rendering/renderablevolume.cpp
2014-06-18 11:11:39 -04:00
Hans-Christian Helltegen
56c5c259fb
Added support for multiple fieldlines in a single module. Stepsize is now adaptive based on the local grid size in the model
2014-06-16 11:39:10 -04:00
Hans-Christian Helltegen
6f40de5f37
Added classification of fieldlines (closed, open from north, open from south, solar wind) and coloring after classification
2014-06-10 16:59:47 -04:00
Jonas Strandstedt
d5e6063670
Bugfixes
...
- Added support for volume caching
- Fixed bug when moving camera in the direction or the origin causing
position lock
- Fixed camera being to only being affected on SGCT_PRESS and
SGCT_REPEAT
2014-06-10 11:40:49 -04:00
Hans-Christian Helltegen
08f2498e8a
Fieldlines are now created with seedpoints from mod-file. Stepsize can be specified in mod-file aswell
2014-06-06 12:18:45 -04:00
Hans-Christian Helltegen
f3f9a5aa15
Renderablefieldliens now properly read hints from .mod file
2014-06-05 16:45:24 -04:00
Hans-Christian Helltegen
4a08f10d66
You can now specify seedpoints in the mod-file for fieldlines
2014-06-05 13:26:10 -04:00
Hans-Christian Helltegen
3373ffd10d
Added renderablefieldlines class which renders fieldlines as geometry
2014-06-05 10:12:42 -04:00
