Commit Graph

1978 Commits

Author SHA1 Message Date
Alexander Bock a53888cd26 Changes in clang-format
Applied formatting to some files
2014-05-03 18:23:16 +02:00
Alexander Bock 90931bb619 More Property work
Cleaning up Property classes
Added property owner
2014-05-03 17:58:04 +02:00
Alexander Bock ad938b311a Merge remote-tracking branch 'origin/kameleon' into properties 2014-05-03 12:01:47 +02:00
Hans-Christian Helltegen 1176ed99cd Merge branch 'kameleon' of openspace.itn.liu.se:/openspace into kameleon
Conflicts:
	src/rendering/renderablevolumeexpert.cpp
	src/scenegraph/scenegraph.cpp
2014-05-02 12:03:41 -04:00
Hans-Christian Helltegen a9e6291313 More trackball and camera work. Interaction is restricted to rotation around y 2014-05-02 11:59:23 -04:00
Alexander Bock 6c15bebfff Merge remote-tracking branch 'origin/kameleon' into properties 2014-05-02 16:59:50 +02:00
Alexander Bock 993ebe0692 Updated openspace-data version
Adapt to missing configurationmanager
2014-05-02 11:17:04 +02:00
Alexander Bock 10dcbb9dd8 Remove ConfigurationManager 2014-05-02 11:16:27 +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
Alexander Bock 47d93a3042 Merge branch 'develop' into properties 2014-04-29 16:47:25 +02:00
Jonas Strandstedt 23b921a426 Merge branch 'trackball' into kameleon
Conflicts:
	src/rendering/renderablevolumeexpert.cpp
2014-04-28 23:07:09 -04:00
Hans-Christian Helltegen a80c5d45d4 More trackball/camera work 2014-04-28 16:02:27 -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
Hans-Christian Helltegen ed93372c8b Started work on trackball-functionality in interactionhandler 2014-04-23 16:55:49 -04:00
Hans-Christian Helltegen 1de2d2fea1 Merge branch 'develop' into VolumeRaycasterAsRenderable
Conflicts:
	config/sgct/single.xml
	include/openspace/engine/openspaceengine.h
	include/openspace/flare/flare.h
	include/openspace/rendering/volumeraycastersinglepass.h
	src/engine/openspaceengine.cpp
	src/flare/flare.cpp
	src/rendering/volumeraycaster.cpp
2014-04-23 10:28:41 -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
Hans-Christian Helltegen b259c64655 Merge work and bugfixes 2014-04-14 11:40:53 -04:00
Hans-Christian Helltegen 909350faaa Develop merge 2014-04-11 15:45:53 -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 5963920953 Added support for configuration file
- BASE_PATH is set using the openspace.cfg file. The binary will look
upwards in the directory hierarchy until it is found.
- All other paths is defined in the configurationfile. Paths may be
absolute or relative using the ${BASE_PATH} token
- Moved SGCT configuration files to its own folder
- Updated tests to support new configuration loading

- TODO: Make the loading of configuration easier for the programmer.
2014-04-04 11:00:25 -04:00
Alexander Bock 47c3656b04 Apply changes in directory structure to properties 2014-04-03 11:21:11 -04:00
Jonas Strandstedt 79192280d8 Fixed BASE_PATH issues and SceneGraphNode tests
- Made the BASE_PATH variable relative to the binary, correctly set
using the CMake provided path to the project folder
- Fixed SceneGraphNode tests using std::string and Dictionary creation
using intermediate Dictionaries.
2014-04-01 16:50:10 -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