Commit Graph

127 Commits

Author SHA1 Message Date
Alexander Bock
66722e83a6 Cleaned up script functionality in SceneGraph
Removed scriptfunctions.h and cpp as the functions have moved into other classes
2014-09-14 18:36:33 +02:00
Alexander Bock
3d62caae46 Added missing documentation 2014-09-14 17:40:19 +02:00
Alexander Bock
f0dfd0fa04 Added documentation for Time class 2014-09-14 17:36:10 +02:00
Alexander Bock
9b2a04a8c4 More work on Time class
Fixed bool -> int conversion in SpiceManager
2014-09-14 15:51:46 +02:00
Alexander Bock
3afa0ecaa1 Added support for scripting 2014-09-13 18:25:14 +02:00
Alexander Bock
b6246f6538 Renamed methods in SpiceManager
Started change of Time class
2014-09-13 18:02:39 +02:00
Alexander Bock
ce10dea96e Fixed compile errors, probably finished merge 2014-09-13 11:45:49 +02:00
Alexander Bock
954dbdce13 Merge branch 'origin/feature/ABuffer' into properties 2014-09-13 10:59:33 +02:00
Alexander Bock
d659c11365 Make StringProperty a specialization rather than a subclass of TemplateProperty 2014-09-12 16:59:29 +02:00
Alexander Bock
cdfde82522 Added documentation for the PropertyDelegate class 2014-09-07 17:45:53 +02:00
Alexander Bock
e5b61492e9 Fixed documentation in the inlined code of TemplateProperty as well 2014-09-07 17:20:04 +02:00
Alexander Bock
351c235312 Added documentation to TemplateProperty
Fixed bug where listeners were not notified
2014-09-07 17:11:12 +02:00
Alexander Bock
fb24f06e5a Added doxygen files and fixed documentation errors 2014-09-07 16:59:51 +02:00
Alexander Bock
659b4ff3b8 Added documentation to PropertyOwner 2014-09-07 15:54:17 +02:00
Alexander Bock
eb7d1aac06 Added documentation to Property class
Modified callback function mechanism to only allow one call back function to be present
2014-09-07 15:02:35 +02:00
Alexander Bock
cd29bbee70 Added more conversion tests 2014-09-03 13:14:25 +02:00
Alexander Bock
dcfcc00092 Fixed to-Lua and from-Lua functions for all properties
Corrected serialization of Vectorproperties into tables
2014-09-03 00:18:57 +02:00
Alexander Bock
bbf707db1c Implemented first Lua serialization tests
Fixed to-Lua and from-Lua functions for MatrixProperties
2014-09-02 23:58:06 +02:00
Alexander Bock
bc7dbf4678 Merge branch 'develop' into properties 2014-09-02 21:24:42 +02:00
Alexander Bock
5c664798cb Adapted OpenSpace header in favor of Ghoul header in test cases 2014-09-02 21:24:32 +02:00
Alexander Bock
9436f5efb0 Merge branch 'develop' into properties 2014-09-02 21:20:40 +02:00
Alexander Bock
ac80776a28 Cleanup test code; removed warnings mostly and reenabled scenegraph test 2014-09-02 21:20:10 +02:00
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
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
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
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