Commit Graph

30 Commits

Author SHA1 Message Date
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
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
e027179f57 OpenCL fix in ghoul 2014-04-22 16:45:37 -04:00
Hans-Christian Helltegen
ea8f7748ac Fixed some cl stuff in ghoul used in renderablevolumeexpert 2014-04-22 14:24:34 -04:00
Jonas Strandstedt
199bb52d5d Added txt based transferfunction 2014-04-21 09:56:48 -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
Hans-Christian Helltegen
658ae13d96 Added flare to OpenSpace 2014-03-19 16:41:12 -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
Hans-Christian Helltegen
3837d9c9a1 Moved flare files into opensapce 2014-03-18 10:06:13 -04:00
Jonas Strandstedt
b1eab2cf03 Finalized first draft for the SceneGraph
- Refactored several files
- Implemented PositionInformation subclasses
- Added standard shaders in the shader directory
- Removed SceneGraphLoader, now integrated in the SceneGraph

- TODO: Further testing and improvements to the PowerScale coordinate
system
2014-03-13 11:21:30 -04:00
Hans-Christian Helltegen
9ed82165f0 Moved volume reader to its own class. Seperated singlepass and twopass raycasters 2014-03-05 21:32:39 +00:00
Jonas Strandstedt
9833c3c8d4 Added FactoryManager and edited SceneGraph loading
- Added FactoryManager singleton to hold all factories
- Added PositionInformation and subclasses
- Changed API for Renderables
- Todo: Add loading of Renderables and PositionInformation
2014-03-05 12:16:06 -05:00
Jonas Strandstedt
de8be04754 Initial new SceneGraph structure
- Has support for SceneGraph loading using lua and ghoul dictionary
- SceneGraphNode can be initialized using ghoul::Dictionary
- Todo: PositionInformation classes
- Todo: TemplateFactory singleton
2014-03-04 16:50:39 -05:00
HC Helltegen
09918ca730 Windows fix 2014-03-03 15:47:00 -05:00
Hans-Christian Helltegen
779bdbe5d2 Merged with develop 2014-02-28 23:16:35 +00:00
Hans-Christian Helltegen
986c7a764f Improved twopass raycaster. Started working on singlepassraycaster 2014-02-28 21:41:56 +00:00
Hans-Christian Helltegen
53140a1fcd Poor mans ray-casting works, added a function for reading .raw files 2014-02-27 23:26:32 +00:00
Hans-Christian Helltegen
cb2cb177b3 Added a class for volume ray-casting and FBO class to ghoul. Also added a (probably tempoary) shader map to root dir with some shaders. Updated .gitignore for some common files 2014-02-26 23:38:33 +00:00
Jonas Strandstedt
470afe034b Fixed build and runtime errors and improved cross-platform compatibility 2014-02-19 10:17:32 -05:00
Alexander Bock
1f645bc977 Cleaned up source files
added tinythread library (for SGCT)
Updated Ghoul version
2014-02-11 09:20:01 +01:00
Alexander Bock
006bd56ae6 General changes
added OpenSpaceEngine
added ConfigurationManager
added query functions
removed GLEW-related Windows warning
added old external control classes
more restructuring
2014-01-09 19:19:01 +01:00