Commit Graph

55 Commits

Author SHA1 Message Date
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
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
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
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
Jonas Strandstedt
88b0246506 Intermediate step when porting Flare 2014-03-25 13:21:03 -04:00
Jonas Strandstedt
956a44ffcd First OpenCL wrapper implementation 2014-03-24 10:22:35 -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
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
79753b17bd Add back CPUCapabilitiesComponent to SysCap
Add OpenCL dependency to fix compiler error on Windows
2014-03-08 00:39:49 +01: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
cd9bd2871a Merge branch 'OpenCL' into develop
Conflicts:
	ext/ghoul
	src/openspaceengine.cpp
2014-03-05 15:35:04 -05: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
Jonas Strandstedt
87ae4639c7 Added support to Ghoul master 2014-03-03 15:23:04 -05:00
Jonas Strandstedt
da07d1dd84 Added OpenCL branch
- Linked to ghoul OpenClCapabilitiesComponent branch
- Updated ../src/openspaceengine.cpp to use the
OpenCLCapabilitiesComponent
2014-03-03 12:32:56 -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
61a25977cd Updated openspaceengine.cpp to use updated ConfigurationManager
- Updated src/openspaceengine.cpp to utilize both lua configuration file
and lua configuration script
- Changed scripts/DefaultConfig.lua to be a lua configuration
- Renamned scripts/ExtraConfigScript.lua to be a lua configuration
script
2014-02-26 10:41:16 -05:00
Jonas Strandstedt
880bb377f6 Updated OpenSpace to use the updated Ghoul ConfigurationManager
- Removed unnecessary comments from CMakeLists
- Updated OpenSpace engine to load ConfigurationManager
- Added two basic lua configuration scripts
2014-02-25 20:56:35 -05:00
Hans-Christian Helltegen
180cfa501f Merge branch 'linux' of openspace.itn.liu.se:/openspace into linux 2014-02-20 20:49:45 +00:00
Hans-Christian Helltegen
1c70715524 Relative path to config on windows 2014-02-20 20:49:23 +00:00
Jonas Strandstedt
fcc8254642 Fixes for mac 2014-02-20 15:44:57 -05:00
Hans-Christian Helltegen
dadfc46218 Added openspace-data as submodule. Added OPENSPACE-DATA path variable 2014-02-20 18:21:48 +00:00
Jonas Strandstedt
e6fe448576 Fixed linux issues by adding CMake find_package commands 2014-02-20 11:24:30 -05:00
Hans-Christian Helltegen
ca046a22e4 Merge remote-tracking branch 'origin/bugfixes' into linux 2014-02-19 22:06:27 +00:00
HC Helltegen
c4763e4135 Fixed FindSGCT.cmake file and minor windows bug 2014-02-19 16:48:26 -05:00
Hans-Christian Helltegen
fdf69cf9fd Merging bugfixes with linux 2014-02-19 21:16:11 +00:00
Hans-Christian Helltegen
d44ba5191e Lots of gcc fixes 2014-02-19 21:07:09 +00:00
Jonas Strandstedt
470afe034b Fixed build and runtime errors and improved cross-platform compatibility 2014-02-19 10:17:32 -05:00
Jonas Strandstedt
d43b4a8ca5 Small bugfix for OS X 2014-02-18 18:33:20 -05:00
HC Helltegen
1d15e8b2a6 Run-time bugfixes on windows 2014-02-18 16:26:54 -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
b697b5a212 Changed Ghoul version
replaced all _SAFE logging macros with non-safe ones
2014-01-20 17:57:13 +01:00
Alexander Bock
dd02a73831 moved ConfigurationManager code to Ghoul
updated Ghoul library
2014-01-17 17:21:05 +01:00
Alexander Bock
b77f5a2535 added option for configuration script
added get/set method for boolean
2014-01-16 21:31:20 +01:00
Alexander Bock
bf25416045 more work on ConfigurationManger
added helper functions for different types
added template type specializations for getValue and setValue
2014-01-16 18:25:02 +01:00
Alexander Bock
7a4983f2c9 adapt to new Ghoul version (p vs absPath macro)
added configurationmanager script
2014-01-16 14:56:50 +01:00