1019be8300
Merge branch 'develop' into properties
2014-03-08 00:40:14 +01:00
79753b17bd
Add back CPUCapabilitiesComponent to SysCap
...
Add OpenCL dependency to fix compiler error on Windows
2014-03-08 00:39:49 +01:00
b5b2e4eab7
Merge branch 'develop' into properties
2014-03-08 00:07:48 +01:00
9ed82165f0
Moved volume reader to its own class. Seperated singlepass and twopass raycasters
2014-03-05 21:32:39 +00:00
cd9bd2871a
Merge branch 'OpenCL' into develop
...
Conflicts:
ext/ghoul
src/openspaceengine.cpp
2014-03-05 15:35:04 -05:00
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
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
ede1a9b2eb
More work on Properties
...
Add BoolProperty
Add vector properties (glm::XvecY)
Add matrix properties (glm::XmatYxZ)
2014-03-04 01:03:46 +01:00
1f44e49f05
More work on Properties
...
Implement scalar properties with PropertyDelegate methods
2014-03-04 00:10:00 +01:00
09918ca730
Windows fix
2014-03-03 15:47:00 -05:00
87ae4639c7
Added support to Ghoul master
2014-03-03 15:23:04 -05:00
fa4e737b92
More work on Property mechanism
...
Implemented PropertyDelegate methods for default values
2014-03-03 20:18:45 +01:00
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
17c193a497
More work on properties
...
Make concrete subclasses of NumericalProperty unnecessary
Implement PropertyDelegate for classname method
2014-03-03 18:01:32 +01:00
5bed6d49ba
Merge branch 'develop' into properties
2014-03-03 14:46:32 +01:00
779bdbe5d2
Merged with develop
2014-02-28 23:16:35 +00:00
986c7a764f
Improved twopass raycaster. Started working on singlepassraycaster
2014-02-28 21:41:56 +00:00
53140a1fcd
Poor mans ray-casting works, added a function for reading .raw files
2014-02-27 23:26:32 +00:00
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
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
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
15e65eed57
Add boost to OpenSpace CMakeLists
...
Added first version of Properties
2014-02-26 00:59:27 +01:00
180cfa501f
Merge branch 'linux' of openspace.itn.liu.se:/openspace into linux
2014-02-20 20:49:45 +00:00
1c70715524
Relative path to config on windows
2014-02-20 20:49:23 +00:00
fcc8254642
Fixes for mac
2014-02-20 15:44:57 -05:00
dadfc46218
Added openspace-data as submodule. Added OPENSPACE-DATA path variable
2014-02-20 18:21:48 +00:00
e6fe448576
Fixed linux issues by adding CMake find_package commands
2014-02-20 11:24:30 -05:00
ca046a22e4
Merge remote-tracking branch 'origin/bugfixes' into linux
2014-02-19 22:06:27 +00:00
c4763e4135
Fixed FindSGCT.cmake file and minor windows bug
2014-02-19 16:48:26 -05:00
fdf69cf9fd
Merging bugfixes with linux
2014-02-19 21:16:11 +00:00
d44ba5191e
Lots of gcc fixes
2014-02-19 21:07:09 +00:00
470afe034b
Fixed build and runtime errors and improved cross-platform compatibility
2014-02-19 10:17:32 -05:00
d43b4a8ca5
Small bugfix for OS X
2014-02-18 18:33:20 -05:00
1d15e8b2a6
Run-time bugfixes on windows
2014-02-18 16:26:54 -05:00
1f645bc977
Cleaned up source files
...
added tinythread library (for SGCT)
Updated Ghoul version
2014-02-11 09:20:01 +01:00
b697b5a212
Changed Ghoul version
...
replaced all _SAFE logging macros with non-safe ones
2014-01-20 17:57:13 +01:00
dd02a73831
moved ConfigurationManager code to Ghoul
...
updated Ghoul library
2014-01-17 17:21:05 +01:00
b77f5a2535
added option for configuration script
...
added get/set method for boolean
2014-01-16 21:31:20 +01:00
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
7a4983f2c9
adapt to new Ghoul version (p vs absPath macro)
...
added configurationmanager script
2014-01-16 14:56:50 +01:00
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
ecd539ddf4
restructuring code
2014-01-08 11:56:18 +01:00
e1174cc5d5
enable switching between focus nodes
2014-01-08 09:53:05 +01:00
7126ae4b8d
compile fixes in x64 builds
...
moved Lua dependency to Ghoul
2014-01-07 11:56:33 +01:00
9885f52fd0
initial commit of transferred code from the old project
2014-01-04 18:24:33 +01:00
Alexander Bock