b63978438d
Tracking latest ghoul changes
2014-04-08 10:47:07 -04:00
148ff3ea50
Linked to latest Ghoul
2014-04-07 16:31:14 -04:00
2599268fd3
Merge branch 'develop' into OpenCLWrapper
...
Conflicts:
ext/ghoul
src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
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
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
88b0246506
Intermediate step when porting Flare
2014-03-25 13:21:03 -04:00
956a44ffcd
First OpenCL wrapper implementation
2014-03-24 10:22:35 -04:00
658ae13d96
Added flare to OpenSpace
2014-03-19 16:41:12 -04:00
14351ee3a9
linux fix
2014-03-14 16:58:32 -04:00
0118e1f786
Merge branch 'develop' into SceneGraphLoader
...
Conflicts:
ext/ghoul
src/openspaceengine.cpp
2014-03-13 11:44:28 -04:00
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
ca2773908d
Update .clang-format to use correct constructor behavior
...
Update used Ghoul version
2014-03-13 11:46:47 +01:00
925f7fbd0b
Add .clang-format for OpenSpace
...
Reference new Ghoul version
2014-03-12 22:02:35 +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
4e695a7ad3
New ghoul version with volumereader-class
2014-03-06 15:05:35 +00:00
cd9bd2871a
Merge branch 'OpenCL' into develop
...
Conflicts:
ext/ghoul
src/openspaceengine.cpp
2014-03-05 15:35:04 -05:00
ee1ed6fa29
Updated with latest ghoul OpenCLCapabilitiesComponent
2014-03-05 15:05:29 -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
87ae4639c7
Added support to Ghoul master
2014-03-03 15:23:04 -05: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
779bdbe5d2
Merged with develop
2014-02-28 23:16:35 +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
ee7d50598f
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-02-25 21:00:42 -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
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
fcc8254642
Fixes for mac
2014-02-20 15:44:57 -05:00
1bf4bf9410
Added release/debug support for mac/linux version
2014-02-20 12:26:42 -05:00
e6fe448576
Fixed linux issues by adding CMake find_package commands
2014-02-20 11:24:30 -05:00
728a713a23
Merge remote-tracking branch 'origin/bugfixes' into linux
2014-02-20 14:47:16 +00:00
1db9a50813
Added SGCT CMake Linux support
2014-02-20 09:35:35 -05:00
0fc6e82097
ghoul gcc fixes
2014-02-19 22:53:00 +00:00
c4763e4135
Fixed FindSGCT.cmake file and minor windows bug
2014-02-19 16:48:26 -05: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
1f645bc977
Cleaned up source files
...
added tinythread library (for SGCT)
Updated Ghoul version
2014-02-11 09:20:01 +01:00
3e8dd1c7f7
Update ghoul version
...
Add Ghoul CMake modules directory to CMAKE_MODULE_PATH
2014-01-29 21:26:32 +01:00
0905dc2473
update to latest Ghoul commit
2014-01-22 09:55:20 +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
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
7a8d9f7b3c
change Ghoul submodule version
2014-01-08 09:53:29 +01:00
7126ae4b8d
compile fixes in x64 builds
...
moved Lua dependency to Ghoul
2014-01-07 11:56:33 +01:00
a38cff0e38
replace Lua and SPICE source code with subrepositories
2014-01-06 10:25:56 +01:00
9885f52fd0
initial commit of transferred code from the old project
2014-01-04 18:24:33 +01:00
Jonas Strandstedt