Commit Graph

3646 Commits

Author SHA1 Message Date
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 15e65eed57 Add boost to OpenSpace CMakeLists
Added first version of Properties
2014-02-26 00:59:27 +01: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
HC Helltegen 1d15e8b2a6 Run-time bugfixes on windows 2014-02-18 16:26:54 -05:00
Alexander Bock d147ef3f46 Update ghoul version to include Dictionary 2014-02-18 01:13:20 +01: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 3e8dd1c7f7 Update ghoul version
Add Ghoul CMake modules directory to CMAKE_MODULE_PATH
2014-01-29 21:26:32 +01:00
Alexander Bock 0905dc2473 update to latest Ghoul commit 2014-01-22 09:55:20 +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
Alexander Bock 006bd56ae6 General changes
added OpenSpaceEngine
added ConfigurationManager
added query functions
removed GLEW-related Windows warning
added old external control classes
more restructuring
2014-01-09 19:19:01 +01:00
Alexander Bock ecd539ddf4 restructuring code 2014-01-08 11:56:18 +01:00
Alexander Bock 7a8d9f7b3c change Ghoul submodule version 2014-01-08 09:53:29 +01:00
Alexander Bock e1174cc5d5 enable switching between focus nodes 2014-01-08 09:53:05 +01:00
Alexander Bock 7126ae4b8d compile fixes in x64 builds
moved Lua dependency to Ghoul
2014-01-07 11:56:33 +01:00
Alexander Bock a38cff0e38 replace Lua and SPICE source code with subrepositories 2014-01-06 10:25:56 +01:00
Alexander Bock cae3eb157d Testing hooks 2014-01-05 04:45:43 +01:00
Alexander Bock f2e208a7bb add more configuration files 2014-01-05 04:02:03 +01:00
Alexander Bock 9885f52fd0 initial commit of transferred code from the old project 2014-01-04 18:24:33 +01:00
Alexander Bock 2bff81f684 Initial commit 2014-01-03 13:02:21 +01:00