Hans-Christian Helltegen
b4ebfc69ad
Added files and cmake for qt gui
2014-04-09 10:25:12 -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
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
Hans-Christian Helltegen
62f01683ca
Single-pass raycaster work. Still doesnt work
2014-03-26 16:20:45 -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
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
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
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
4e695a7ad3
New ghoul version with volumereader-class
2014-03-06 15:05:35 +00: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
ee1ed6fa29
Updated with latest ghoul OpenCLCapabilitiesComponent
2014-03-05 15:05:29 -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
ee7d50598f
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-02-25 21:00:42 -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
Alexander Bock
4a61e0f1d7
Modify FindSGCT.cmake file
...
- Change tabs to spaces
- enable automatic detection of highest SGCT version
- enable automatic detection of Visual Studio version
2014-02-24 20:56:30 +01:00
Jonas Strandstedt
5aab48f8bb
Merge branch 'develop' into linux
2014-02-21 09:45:31 -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
ea06505b0b
Merge branch 'linux' of openspace.itn.liu.se:/openspace into linux
2014-02-20 15:45:19 -05:00
Jonas Strandstedt
fcc8254642
Fixes for mac
2014-02-20 15:44:57 -05:00
Jonas Strandstedt
2775ca9a60
Fixes for mac
2014-02-20 15:39:03 -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
1bf4bf9410
Added release/debug support for mac/linux version
2014-02-20 12:26:42 -05:00
Jonas Strandstedt
e6fe448576
Fixed linux issues by adding CMake find_package commands
2014-02-20 11:24:30 -05:00
Hans-Christian Helltegen
728a713a23
Merge remote-tracking branch 'origin/bugfixes' into linux
2014-02-20 14:47:16 +00:00
Jonas Strandstedt
1db9a50813
Added SGCT CMake Linux support
2014-02-20 09:35:35 -05:00
Hans-Christian Helltegen
cde3d1da67
gcc fixes to ghoul
2014-02-19 22:55:21 +00:00
Hans-Christian Helltegen
0fc6e82097
ghoul gcc fixes
2014-02-19 22:53:00 +00:00
Alexander Bock
ab4b708eb6
change CREDITS file
2014-02-19 23:26:55 +01: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
