Commit Graph

93 Commits

Author SHA1 Message Date
Jonas Strandstedt 3006c30486 Added video export mode 2014-07-28 15:53:14 -04:00
Jonas Strandstedt 258e62caa2 Cleaned up before beginning ABuffer dynamic impl.
- Added support for more keys in RenderableToggle
- Switched to Fixed ABuffer (needs to be fixed)
- Removed commented code
2014-07-24 16:12:37 -04:00
Jonas Strandstedt e99a98224c Working ABuffer
- Fixed the ABuffer rendering for intersecting volumes
- Added keyboard callback for toggling renderables
- Changed textures from ClampToBorder to ClampToEdge
- Fixed transferfunctions to clamp to edge instead of fade to black
2014-07-23 16:06:49 -04:00
Jonas Strandstedt ecf3a8539a Added missing file 2014-07-18 14:00:09 -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
Jonas Strandstedt 576710f1ef Added fixed ABuffer implementation 2014-07-08 13:29:15 -04:00
Hans-Christian Helltegen aff61620c8 Added functionality for getting the model barycenter in kameleonwrapper and moving the raycasting box by an offset. Also cleaned up renderablevolumegl a bit 2014-07-07 14:26:22 -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 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 83205d6de1 Volume raycasting jittering
- Added jitter to volume rendering, reducing artefacts
- Added tracking of more shader files to update the resolve shader
2014-06-25 15:10:05 -04:00
Jonas Strandstedt ec115030a4 Added ID for sampler 2014-06-24 15:29:31 -04:00
Jonas Strandstedt 633c95a44b Started work on Samplers having IDs 2014-06-24 14:45:08 -04:00
Jonas Strandstedt fe701ddc5a ABuffer uses sampler files
- RenderableVolumeGL provides a filepath to sampler
- ABuffer reloads all sampler files for each recompilation
- ABuffer has mostly private members
2014-06-24 11:31:06 -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
Jonas Strandstedt 6419f34b5a ABuffer working with small issues
- Pointing to bugfixed Ghoul
- Pointing to Ghoul with Linux file callback
- Fixed interaction distance control bug when moving to close
- Distance control with mouse wheel added
- Kameleonwrapper normalization based on histogram
- ABuffer seems to work with small issues
2014-06-18 10:34:40 -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
Jonas Strandstedt 3fcb851b0f Merge branch 'feature/fieldlines' into feature/ABuffer
Conflicts:
	src/rendering/renderablevolumegl.cpp
2014-06-05 15:10:29 -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
Jonas Strandstedt f4dad8dc1c Intermediate ABuffer
- Raycasting works
- TODO: Mix raycasting with fragment list
- TODO: Fix PowerScaling
2014-06-05 13:18:22 -04:00
Hans-Christian Helltegen 3373ffd10d Added renderablefieldlines class which renders fieldlines as geometry 2014-06-05 10:12:42 -04:00
Jonas Strandstedt 08a8e2f3bb Intermediate ABuffer commit 2014-06-03 16:50:47 -04:00
Hans-Christian Helltegen 67778209d2 Fieldline work. Fixed VolumeRenderableGL 2014-06-02 14:22:45 -04:00
Hans-Christian Helltegen 281104805c Is now a bi-directional fieldline tracer using Runge-Kutta 4th order instead of a forward-only tracer using Euler 2014-05-29 16:04:27 -04:00
Jonas Strandstedt 4379d27cbc Single Linked ABuffer implementation 2014-05-29 12:25:04 -04:00
Jonas Strandstedt 4269282718 Intermediate ABuffer work 2014-05-27 16:28:46 -04:00
Hans-Christian Helltegen 48f1b6aa5c Added basic fieldline implementation in kameleonwrapper 2014-05-23 16:20:11 -04:00
Jonas Strandstedt 472869e1db Fix for Flare
- Fixed timestep error in Flare
- Added option to compile openspace with Flare only
2014-05-22 12:57:54 -04:00
Hans-Christian Helltegen 29b4cffd78 Code cleaup 2014-05-21 16:24:47 -04:00
Hans-Christian Helltegen 2dab48b850 Updated kameleonwrapper to be able to load several variables into a RGB texture. Added support for 'Variables' tag in .mod scenegraph files which takes 3 variables as an array 2014-05-21 15:11:13 -04:00
Alexander Bock 2bfbdbb905 Added copy constructor to PowercaledCoordinate class 2014-05-13 22:05:34 +02:00
Alexander Bock 3520bd121e Renamed pss to PowerScaledScalar 2014-05-11 18:34:57 +02:00
Alexander Bock 37e5e63b70 Updated ghoul version; some code cleanup 2014-05-11 18:22:20 +02:00
Alexander Bock 9bc084bf81 More PowerscaledCoordinate cleanup 2014-05-11 15:59:48 +02:00
Alexander Bock 89142340d0 PowerscaledCoordinate cleanup 2014-05-11 15:01:55 +02:00
Alexander Bock 40a2cb1068 Renamed psc to powerscaledcoordinate and pss to powerscaledscalar 2014-05-11 14:32:42 +02:00
Alexander Bock 9bcb848e60 Updated ghoul version; more code cleanup 2014-05-10 15:17:10 +02:00
Alexander Bock 60fcb964d5 fix compile fixed in test file 2014-05-08 23:50:41 +02:00
Alexander Bock 6cfdd130bc Code cleanup of PowerScaledSphere 2014-05-06 18:19:53 +02:00
Alexander Bock d09a1e0b54 Misc work
More cleanup of RenderablePlanet
Added const modifier to pss method
Added faster travel method for interactionhandler
2014-05-05 18:04:53 +02:00
Alexander Bock a86d544812 Created classes for PlanetGeometry
Added SimpleSphereGeometry
Created infrastructure for added other geometries
2014-05-05 17:28:46 +02:00
Jonas Strandstedt d7eb868dde Static assert fix and minor changes 2014-05-05 11:12:11 -04:00
Alexander Bock 5e758b16d1 Misc work
Added ext/kameleon to .gitignore
moved renderableplanet to a subfolder
2014-05-05 12:41:41 +02:00
Alexander Bock 5769919ea6 Work on FactoryManager
Renamed factoryByType to factory
Store generic factories inside of FactoryManager
2014-05-05 12:37:18 +02:00