mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 03:49:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
150 Commits 85 Branches 48 Tags
ae88c0dd6da3bf3ce65669a001f1fb3ddd6741fe
Commit Graph

62 Commits

Author SHA1 Message Date
Alexander Bock 2bf71ad9b6 More cleanup 2014-05-04 14:16:53 +02:00
Alexander Bock cb6298b615 Cleanup of OpenSpaceEngine code 
Renamed openspace.cfg variables to conform with format in scene description
 2014-05-03 20:46:53 +02:00
Alexander Bock b40760af81 Merge branch 'kameleon' into properties 2014-05-03 12:06:54 +02:00
Alexander Bock b9f034215f Fix typo in OpenCL kernel 2014-05-03 12:06:40 +02:00
Alexander Bock 2442a041a8 Updated the Spice library 2014-05-02 17:00:11 +02:00
Alexander Bock 6c15bebfff Merge remote-tracking branch 'origin/kameleon' into properties 2014-05-02 16:59:50 +02:00
Alexander Bock 10dcbb9dd8 Remove ConfigurationManager 2014-05-02 11:16:27 +02:00
Alexander Bock 43e510fded Fixed for Win32 compatability 
Renamed OpenCL qualifiers due to conflict with "ERROR" macros
Removed boost::timer and boost::system dependencies
Added fixed for Windows path handling
 2014-05-02 10:48:16 +02:00
Alexander Bock 47d93a3042 Merge branch 'develop' into properties 2014-04-29 16:47:25 +02:00
Jonas Strandstedt e4c0b88742 More work on RenderableVolumeExpert 
- Added include directory support
- Added definitions support
- Added a volume helpers
- Fixed errors in kameleon wrapper
- Added ENLIL support in kameleonwrapper
 2014-04-28 15:38:40 -04:00
Hans-Christian Helltegen 950de28780 Forgot to add new ghoul version 2014-04-22 16:49:31 -04:00
Hans-Christian Helltegen ea8f7748ac Fixed some cl stuff in ghoul used in renderablevolumeexpert 2014-04-22 14:24:34 -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 b63978438d Tracking latest ghoul changes 2014-04-08 10:47:07 -04:00
Jonas Strandstedt 148ff3ea50 Linked to latest Ghoul 2014-04-07 16:31:14 -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
Alexander Bock 0f2585abdf Update used Ghoul version 2014-04-03 11:18:37 -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
Hans-Christian Helltegen 14351ee3a9 linux fix 2014-03-14 16:58:32 -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 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
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
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
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 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 fcc8254642 Fixes for mac 2014-02-20 15:44:57 -05: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 0fc6e82097 ghoul gcc fixes 2014-02-19 22:53:00 +00:00
HC Helltegen c4763e4135 Fixed FindSGCT.cmake file and minor windows bug 2014-02-19 16:48:26 -05:00
Jonas Strandstedt 470afe034b Fixed build and runtime errors and improved cross-platform compatibility 2014-02-19 10:17:32 -05:00