mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
113 Commits 85 Branches 47 Tags
47d93a3042d8415de1eb8dc683a796402b1e8434
Commit Graph

113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock 47d93a3042 Merge branch 'develop' into properties 2014-04-29 16:47:25 +02: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
Jonas Strandstedt a27e9a573a Merge branch 'develop' into OpenSpaceTests 2014-04-01 17:18:50 -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 143c7926c6 Removed flare ShaderProgram and Texture files 
- Removed the last references of ShaderProgram
- Removed the last references of Texture
 2014-03-28 16:43:24 -04:00
Jonas Strandstedt d548e34052 Removed the use of flare texture and shader classes 2014-03-28 16:24:36 -04:00
Jonas Strandstedt 97cb3ee05c Fixed Linux issues 
- Changed Flare internal texture classes to use ghoul
 2014-03-28 13:17:38 -04:00
Jonas Strandstedt 6d00b52240 A lot of intermediate changes 
- Compiles and runs on Linux and OS X
- Produces weird results on OS X
 2014-03-27 13:38:58 -04:00
Hans-Christian Helltegen 62f01683ca Single-pass raycaster work. Still doesnt work 2014-03-26 16:20:45 -04:00
Jonas Strandstedt 0974fbaeda Merge branch 'OpenCLWrapper' of openspace.itn.liu.se:/openspace into OpenCLWrapper 2014-03-25 13:22:25 -04:00
Jonas Strandstedt 88b0246506 Intermediate step when porting Flare 2014-03-25 13:21:03 -04:00
Jonas Strandstedt 513fe09772 Tracking updated Ghoul 2014-03-24 11:11:27 -04:00
Jonas Strandstedt 956a44ffcd First OpenCL wrapper implementation 2014-03-24 10:22:35 -04:00
Hans-Christian Helltegen b41219b404 Volumeraycaster now also extends renderable. Also has some interaction and cluster syncing now. 2014-03-21 15:23:59 -04:00
Hans-Christian Helltegen 8a76520295 Flare now extends renderable 2014-03-20 15:36:23 -04:00
Hans-Christian Helltegen 146044045c Fixed syncing issue 2014-03-20 12:43:27 -04:00
Hans-Christian Helltegen 53e3d0090c Cleanup in openspaceengine, added comments to volumeraycaster 2014-03-20 11:16:54 -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
Hans-Christian Helltegen 14351ee3a9 linux fix 2014-03-14 16:58:32 -04:00
Alexander Bock 76271186e2 Updated .clang-format file to use IndentWidth of 4 2014-03-13 22:24:09 +01:00
Jonas Strandstedt 0118e1f786 Merge branch 'develop' into SceneGraphLoader 
Conflicts:
	ext/ghoul
	src/openspaceengine.cpp
 2014-03-13 11:44:28 -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
Alexander Bock ca2773908d Update .clang-format to use correct constructor behavior 
Update used Ghoul version
 2014-03-13 11:46:47 +01:00
Alexander Bock 925f7fbd0b Add .clang-format for OpenSpace 
Reference new Ghoul version
 2014-03-12 22:02:35 +01:00
Alexander Bock 1019be8300 Merge branch 'develop' into properties 2014-03-08 00:40:14 +01:00
Alexander Bock 79753b17bd Add back CPUCapabilitiesComponent to SysCap 
Add OpenCL dependency to fix compiler error on Windows
 2014-03-08 00:39:49 +01:00
Alexander Bock b5b2e4eab7 Merge branch 'develop' into properties 2014-03-08 00:07:48 +01:00