Commit Graph

25 Commits

Author SHA1 Message Date
Alexander Bock
3520bd121e Renamed pss to PowerScaledScalar 2014-05-11 18:34:57 +02:00
Alexander Bock
40a2cb1068 Renamed psc to powerscaledcoordinate and pss to powerscaledscalar 2014-05-11 14:32:42 +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
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
636f5327aa Code cleanup regarding scenegraphnodes 2014-05-05 12:15:20 +02:00
Alexander Bock
56f22d79c3 Some work towards multi-pipe 2014-05-04 18:35:23 +02:00
Alexander Bock
e84c26aeb7 Renamed constants for dictionary keys
Created static creation method for Renderables
2014-05-04 16:18:35 +02:00
Alexander Bock
982ec8b87c Restructured SceneGraphNode code 2014-05-04 15:28:07 +02:00
Alexander Bock
2bf71ad9b6 More cleanup 2014-05-04 14:16:53 +02:00
Alexander Bock
cb6298b615 Cleanup of OpenSpaceEngine code
Renamed openspace.cfg variables to conform with format in scene description
2014-05-03 20:46:53 +02:00
Alexander Bock
ac38f73faa More property work
Add StringProperty
Add possibility for callbacks
Switch RenderablePlanet to use Properties
2014-05-03 19:53:12 +02:00
Alexander Bock
8d2e86447c Require renderables to derive from PropertyOwner and use dictionary-constructor 2014-05-03 18:44:39 +02:00
Alexander Bock
a53888cd26 Changes in clang-format
Applied formatting to some files
2014-05-03 18:23:16 +02:00
Alexander Bock
6c15bebfff Merge remote-tracking branch 'origin/kameleon' into properties 2014-05-02 16:59:50 +02:00
Alexander Bock
43e510fded Fixed for Win32 compatability
Renamed OpenCL qualifiers due to conflict with "ERROR" macros
Removed boost::timer and boost::system dependencies
Added fixed for Windows path handling
2014-05-02 10:48:16 +02:00
Jonas Strandstedt
a4a528375b Updated RenderableVolumeExpert to render properly
- Added hack in VolumeRaycasteBox for SGCT Left/Right clearing
- Fixed quad dimensions to depend on viewport size
- Updated RenderableVolumeExpert to render correctly
- Small changes to SceneGraph to make it easier to switch between volume
rendering and Earth
2014-05-01 14:17:48 -04:00
Jonas Strandstedt
e4c0b88742 More work on RenderableVolumeExpert
- Added include directory support
- Added definitions support
- Added a volume helpers
- Fixed errors in kameleon wrapper
- Added ENLIL support in kameleonwrapper
2014-04-28 15:38:40 -04:00
Jonas Strandstedt
59c92ca073 Merge branch 'develop' into kameleon
Conflicts:
	src/rendering/renderablevolume.cpp
	src/rendering/renderablevolumeexpert.cpp
2014-04-24 12:14:02 -04:00
Jonas Strandstedt
d84d48d15b Added working CDF data loading
- RenderableVolume can now load .raw and .cdf data to ghoul Texture
- KameleonWrapper included for easy interaction with Kameleon
- openspace-data updated with support for BATSRUS model
- CMakeLists.txt updated with settings to Kamelon library

- ext/kameleon not included due to Kameleon is currently being ported to
git. Waiting to add it as submodule to avoid duplication of files.
2014-04-24 10:32:01 -04:00
Jonas Strandstedt
ebcfadcf0e Imported Raycasterbox into RenderableVolumeExpert 2014-04-18 14:24:01 -04:00
Jonas Strandstedt
a6a5207a5d Moved from VolumeRaycaster to RenderableVolume
- Removed old classes and moved code to the Renderables
- RenderableVolume is now abstract with some helpful functions
- Added swapinterval=0 to sgct config for performance analysis
2014-04-18 09:58:44 -04:00
Jonas Strandstedt
30bda3fc97 Flare and Volumes in scenegraph
- Added new volumeraycaster classes
- Fixed many small warnings in OpenSpace
- Linked to updated Ghoul and Openspace-data

- TODO cleanup in volumeraycaster classes
- TODO Add an advanced volumeraycaster class to use during development
2014-04-14 16:41:57 -04:00
Jonas Strandstedt
2599268fd3 Merge branch 'develop' into OpenCLWrapper
Conflicts:
	ext/ghoul
	src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
Jonas Strandstedt
89eeae62d0 Restructuring for OpenSpace tests
- Moved all OpenSpace headers to separate include directory
- Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define
- Added CMake setting of BASE_DIR
- Added OpenSpace initial tests for SceneGraph and SceneGraphNodes
- Added OpenSpace initial tests for psc and pss
- Restructured OpenSpace so no GL functions are called in constructors
to make the classes testable

- Todo: Make the base dir possible to set through command line argument
and configuration file
2014-03-19 14:57:10 -04:00