mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
140 Commits 84 Branches 48 Tags
982ec8b87cacbbf68f1debb97f231d8adf765b98
Commit Graph

140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonas Strandstedt a27e9a573a Merge branch 'develop' into OpenSpaceTests 2014-04-01 17:18:50 -04:00
Jonas Strandstedt 79192280d8 Fixed BASE_PATH issues and SceneGraphNode tests 
- Made the BASE_PATH variable relative to the binary, correctly set
using the CMake provided path to the project folder
- Fixed SceneGraphNode tests using std::string and Dictionary creation
using intermediate Dictionaries.
 2014-04-01 16:50:10 -04:00
Jonas Strandstedt 143c7926c6 Removed flare ShaderProgram and Texture files 
- Removed the last references of ShaderProgram
- Removed the last references of Texture
 2014-03-28 16:43:24 -04:00
Jonas Strandstedt d548e34052 Removed the use of flare texture and shader classes 2014-03-28 16:24:36 -04:00
Jonas Strandstedt 97cb3ee05c Fixed Linux issues 
- Changed Flare internal texture classes to use ghoul
 2014-03-28 13:17:38 -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
Hans-Christian Helltegen 62f01683ca Single-pass raycaster work. Still doesnt work 2014-03-26 16:20:45 -04:00
Jonas Strandstedt 0974fbaeda Merge branch 'OpenCLWrapper' of openspace.itn.liu.se:/openspace into OpenCLWrapper 2014-03-25 13:22:25 -04:00
Jonas Strandstedt 88b0246506 Intermediate step when porting Flare 2014-03-25 13:21:03 -04:00
Jonas Strandstedt 513fe09772 Tracking updated Ghoul 2014-03-24 11:11:27 -04:00
Jonas Strandstedt 956a44ffcd First OpenCL wrapper implementation 2014-03-24 10:22:35 -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
Jonas Strandstedt 89eeae62d0 Restructuring for OpenSpace tests 
- Moved all OpenSpace headers to separate include directory
- Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define
- Added CMake setting of BASE_DIR
- Added OpenSpace initial tests for SceneGraph and SceneGraphNodes
- Added OpenSpace initial tests for psc and pss
- Restructured OpenSpace so no GL functions are called in constructors
to make the classes testable

- Todo: Make the base dir possible to set through command line argument
and configuration file
 2014-03-19 14:57:10 -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
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 1019be8300 Merge branch 'develop' into properties 2014-03-08 00:40:14 +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
Alexander Bock b5b2e4eab7 Merge branch 'develop' into properties 2014-03-08 00:07:48 +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
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
Alexander Bock 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
Alexander Bock 1f44e49f05 More work on Properties 
Implement scalar properties with PropertyDelegate methods
 2014-03-04 00:10:00 +01: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
Alexander Bock fa4e737b92 More work on Property mechanism 
Implemented PropertyDelegate methods for default values
 2014-03-03 20:18:45 +01: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
Alexander Bock 17c193a497 More work on properties 
Make concrete subclasses of NumericalProperty unnecessary
Implement PropertyDelegate for classname method
 2014-03-03 18:01:32 +01:00
Alexander Bock 5bed6d49ba Merge branch 'develop' into properties 2014-03-03 14:46:32 +01: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 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