Commit Graph

211 Commits

Author SHA1 Message Date
Alexander Bock be3f727706 Apply to-Lua and from-Lua functionality to TemplateProperty as well 2014-09-02 20:59:29 +02:00
Alexander Bock e7697a4ce0 Enable setting and getting property values from Lua scripts 2014-08-31 17:52:02 +02:00
Alexander Bock 5add1682d3 More work on properties
Added notify method to templateproperty's set method
Fixed names of subpropertyowners
2014-08-31 16:08:19 +02:00
michal 7bd44efc8e code optimization, cleanup. 2014-08-30 21:33:30 -04:00
michal 7e078352d0 Fixes to shader pipeline.
- Added second shader for points only
- VBO interleaved array passed to both shaders
- passthrough in geom. shader works
- reading of additional scalar data from speck files.

TODO: calibrate scale and apparent brightnesses
2014-08-30 16:40:44 -04:00
Alexander Bock 9671921331 More work towards a unified interface for accessing properties 2014-08-30 10:01:11 +02:00
Alexander Bock 79174d5b6c Cleaned up scripts directory
Made scripts runnable at startup
Added printing functions and remapped default Lua printing
2014-08-29 13:04:20 +02:00
michal b1851e5313 Added geometry shader for halos and separate shader for points. Parsecs->m conversion works and added test-data to datafolder. 2014-08-28 23:04:27 -04:00
michal 8f3bcdeb54 WIP3: problems with texture coordinates, needs fix. 2014-08-26 19:26:09 -04:00
michal 013d4c5bb6 WIP: intermediary commit, will attempt to run HC's code on this machine. 2014-08-25 17:37:23 -04:00
Alexander Bock 1782857c72 Bugfix accessing properties 2014-08-21 18:52:47 +02:00
Alexander Bock 5793498ddf Added first version of ScriptEngine, allowing Lua script to set propety values 2014-08-21 18:44:42 +02:00
michal d75171c69b Added new class renderablestars.cpp for rendering starfields.
As for now only reads and stores *.speck file data.

TODO:
1. write cache mechaninsm (load avg ~15 sec)
2. fix render function.
3. add textures.
2014-08-20 11:29:31 -04:00
Alexander Bock 26a7fbe47e Code cleanup of Ephemeris classes and SceneGraph 2014-08-20 16:55:07 +02:00
Alexander Bock 3a0d15c933 Make use of CommandlineParser to parse configuration file for OpenSpaceEngine; make error handing of SPICE code more reliable 2014-08-20 15:57:50 +02:00
Alexander Bock 61f2f51cb0 Compile fixes of SpiceManager for Mac 2014-08-19 12:14:34 +02:00
Michal Marcinkowski aba319cbba Added SPICE C++ wrapper library with google tests and kernels
At this moment only the (by NAIF considered) most cruicial
c_spice API's have been covered, such as getting state vectors
from one reference frame to another, simple time conversions,
load/unload of single and multiple kernels etc. All of which as
described in:

http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/info/mostused.html

Also added linker flag to except the LIBCMTD.lib as it caused conflicts
on Windows.
2014-08-04 20:43:23 +02:00
Jonas Strandstedt 3006c30486 Added video export mode 2014-07-28 15:53:14 -04:00
Michal Marcinkowski 69fc0e19e2 Added SpiceManager and enabled $(BASE_PATH) setting from calibration file 2014-07-28 14:36:25 +02: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