mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 22:39:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
140 Commits 87 Branches 46 Tags
982ec8b87cacbbf68f1debb97f231d8adf765b98
Commit Graph

140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Hans-Christian Helltegen
503e8e76bb Ghoul fix 2014-04-14 12:04:09 -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
Hans-Christian Helltegen
b4ebfc69ad Added files and cmake for qt gui 2014-04-09 10:25:12 -04:00
Jonas Strandstedt
b63978438d Tracking latest ghoul changes 2014-04-08 10:47:07 -04:00
Jonas Strandstedt
148ff3ea50 Linked to latest Ghoul 2014-04-07 16:31:14 -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
b47ae90919 Updated OpenSpace to be self contained 
- Added openspace.cfg that sets runtime variables
- Added relatively small tsp file to openspace-data
- Removed unused TextureAtlas
 2014-04-07 09:58:14 -04:00
Hans-Christian Helltegen
4985feb309 Improved the interface. Added recursive traversal of the property. The interface is now created in main.cpp and owns a pointer to the openspacenengine so that the callback chain is GUI -> Interface -> Engine 2014-04-04 16:13:08 -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
Hans-Christian Helltegen
81af618a3f Started work on an interface for external GUI. GUI sends json objects as strings which are parsed into a boost::property_tree 2014-04-03 17:00:57 -04:00
Alexander Bock
47c3656b04 Apply changes in directory structure to properties 2014-04-03 11:21:11 -04:00
Alexander Bock
0f2585abdf Update used Ghoul version 2014-04-03 11:18:37 -04:00
Alexander Bock
657a160f78 Merge branch 'develop' into properties 2014-04-03 08:30:45 -04:00