Commit Graph

159 Commits

Author SHA1 Message Date
Alexander Bock 6cfdd130bc Code cleanup of PowerScaledSphere 2014-05-06 18:19:53 +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 44a8f6dfda Cleanup of RenderablePlanet 2014-05-05 17:39:45 +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
Jonas Strandstedt d7eb868dde Static assert fix and minor changes 2014-05-05 11:12:11 -04:00
Jonas Strandstedt c6a2ebc671 Pointed to updated ghoul 2014-05-05 09:42:07 -04: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 5769919ea6 Work on FactoryManager
Renamed factoryByType to factory
Store generic factories inside of FactoryManager
2014-05-05 12:37:18 +02:00
Alexander Bock 636f5327aa Code cleanup regarding scenegraphnodes 2014-05-05 12:15:20 +02:00
Joakim Kilby ae88c0dd6d Deleting constantephemeris.cpp 2014-05-05 10:47:44 +02:00
Alexander Bock a7fba6363f Added missing ephemerides files 2014-05-05 08:15:27 +02:00
Alexander Bock 283a55f4de Included commented out version of new camera class
adapted RenderableVolume to use ModulePath
2014-05-05 00:04:00 +02:00
Alexander Bock 56f22d79c3 Some work towards multi-pipe 2014-05-04 18:35:23 +02:00
Alexander Bock 8a7bcc0036 Cleanup of Camera class 2014-05-04 17:06:35 +02:00
Alexander Bock 7f7e25fd8b More work on ephemerides 2014-05-04 16:50:20 +02:00
Alexander Bock 794a88060f Rename "PositionInformation" to "Ephemeris" 2014-05-04 16:31:36 +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 fc291bfed0 Rename 'Position' to 'Ephemeris' for SceneGraphNodes 2014-05-04 15:44:25 +02:00
Alexander Bock ba0580feae Move dictionary/configuration key constants into their own file 2014-05-04 15:41:40 +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 90931bb619 More Property work
Cleaning up Property classes
Added property owner
2014-05-03 17:58:04 +02:00
Alexander Bock b40760af81 Merge branch 'kameleon' into properties 2014-05-03 12:06:54 +02:00
Alexander Bock b9f034215f Fix typo in OpenCL kernel 2014-05-03 12:06:40 +02:00
Alexander Bock ad938b311a Merge remote-tracking branch 'origin/kameleon' into properties 2014-05-03 12:01:47 +02:00
Jonas Strandstedt bf2ae10485 Fix for OS X 2014-05-03 00:38:05 -04:00
Jonas Strandstedt 016a6700f1 Linux fixes 2014-05-02 14:51:18 -04: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 2442a041a8 Updated the Spice library 2014-05-02 17:00:11 +02: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
Jonas Strandstedt 6878dfc219 Added latest openspace-data 2014-04-28 16:15:16 -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
Hans-Christian Helltegen 950de28780 Forgot to add new ghoul version 2014-04-22 16:49:31 -04:00
Hans-Christian Helltegen e027179f57 OpenCL fix in ghoul 2014-04-22 16:45:37 -04:00