Commit Graph

42 Commits

Author SHA1 Message Date
Alexander Bock bae8d0aa76 Making OpenSpaceTest application compile with API change
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +01:00
Alexander Bock c644f5adcb Updated ghoul version
Place window in default configuration file in the top left
2015-10-27 14:10:21 -05:00
Alexander Bock 410e0137eb Updated single_fisheye configuration file to use new SGCT format
Correctly set clear color for nonlinear projections
2015-10-05 00:36:09 +02:00
Alexander Bock 8f5ba101e4 Remove stereo setting from single.xml
Create TimelineView in a bundle on Mac
2015-05-14 12:15:51 +02:00
Michal Marcinkowski 0a1c0164ef Fixes to trails, fov and adding some keybindings 2015-05-04 20:15:34 -04:00
Alexander Bock 6a6114ab84 Fix single side-by-side stereo configuration file
Add __CONTEXT__ lines to last shader files
2015-04-07 00:08:53 +02:00
Alexander Bock 91195db6a0 Added reasonable size to the default single.xml
Added path tokens for spice kernels
2015-02-17 22:14:52 +01:00
Michal Marcinkowski fa0f26c9da In short, this is new:
- ImageSequencer class added, requires planetary data service files (not added to openspace-data, too large)
   : Given current time returns path to specific image in dataset for projection.
- Changes to RenderablePlanetProjection class to accomodate sequencing
- Fixed normal computation in reverse-mapping stage
- Rudimental target recognition (will prob. become part of separate class at some point - since both fov & proj classes do similar things)

Next up:
- Redo pluto mockup visualization & begin spreadsheet reader for instrument-switching.
2015-01-16 13:06:52 -05:00
Michal Marcinkowski f032b4e3b0 Merge branch 'develop' into solarsystem2
Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp
2014-12-15 13:23:30 -05:00
Michal Marcinkowski 70d24185de intermediate commit prior to merge 2014-12-12 11:52:31 -05:00
Alexander Bock ef30925a5b Make the default window completely show on default 2014-12-12 14:22:05 +01:00
michal a5c232eb88 Tidying up. 2014-11-28 14:41:59 -05:00
michal 4c8814b237 Projective Texturing
Created test class based on renderableplanet & co.
Doing it this way carries some implications that need discussing.
2014-11-24 14:06:50 -05:00
michal 79b75aa572 field of view rendering. Intermediate commit.
Working on trying to get the fov-on-surface square to render.
2014-11-01 18:41:09 -04:00
Alexander Bock 67f0fb3c08 Merge branch 'develop' into solarsystem2
Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
2014-10-06 22:22:30 +02:00
Jonas Strandstedt 3cad506b5b PowerScaling modifications
- Started working on PowerScaling with some initial changes
- Faking the stars by blending with the abuffer
- Changed texture filtering for planets, looks better in my opinion
2014-10-03 17:02:31 +02:00
michal 938c442dd6 got renderable ephemeris working for larger deltas, problems with leap years though 2014-10-02 11:00:43 -04:00
Jonas Strandstedt 2d359fd48c Started working on modularizing PSC and ABuffer 2014-09-26 17:03:59 +02:00
Alexander Bock 7fd3519d10 Make the single.xml SGCT file allow external commands 2014-09-17 01:11:12 +02:00
Jonas Strandstedt 3006c30486 Added video export mode 2014-07-28 15:53:14 -04:00
Jonas Strandstedt e99a98224c Working ABuffer
- Fixed the ABuffer rendering for intersecting volumes
- Added keyboard callback for toggling renderables
- Changed textures from ClampToBorder to ClampToEdge
- Fixed transferfunctions to clamp to edge instead of fade to black
2014-07-23 16:06:49 -04:00
Jonas Strandstedt 610d5d5427 Added variable stepsize for volumes
- When holding right mouse button the stepsize for volumes will be 1/5
- Added configuration files for ccmc lab
2014-07-01 10:01:54 -04:00
Jonas Strandstedt d5e6063670 Bugfixes
- Added support for volume caching
- Fixed bug when moving camera in the direction or the origin causing
position lock
- Fixed camera being to only being affected on SGCT_PRESS and
SGCT_REPEAT
2014-06-10 11:40:49 -04:00
Jonas Strandstedt c5c42f2d72 Fixed crash for secondary node
- Added SGCT config two_nodes.xml
2014-05-22 13:50:35 -04:00
Jonas Strandstedt 472869e1db Fix for Flare
- Fixed timestep error in Flare
- Added option to compile openspace with Flare only
2014-05-22 12:57:54 -04:00
Alexander Bock 5e758b16d1 Misc work
Added ext/kameleon to .gitignore
moved renderableplanet to a subfolder
2014-05-05 12:41:41 +02:00
Jonas Strandstedt a4a528375b Updated RenderableVolumeExpert to render properly
- Added hack in VolumeRaycasteBox for SGCT Left/Right clearing
- Fixed quad dimensions to depend on viewport size
- Updated RenderableVolumeExpert to render correctly
- Small changes to SceneGraph to make it easier to switch between volume
rendering and Earth
2014-05-01 14:17:48 -04:00
Hans-Christian Helltegen 1de2d2fea1 Merge branch 'develop' into VolumeRaycasterAsRenderable
Conflicts:
	config/sgct/single.xml
	include/openspace/engine/openspaceengine.h
	include/openspace/flare/flare.h
	include/openspace/rendering/volumeraycastersinglepass.h
	src/engine/openspaceengine.cpp
	src/flare/flare.cpp
	src/rendering/volumeraycaster.cpp
2014-04-23 10:28:41 -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
Hans-Christian Helltegen 909350faaa Develop merge 2014-04-11 15:45:53 -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
Jonas Strandstedt 5963920953 Added support for configuration file
- BASE_PATH is set using the openspace.cfg file. The binary will look
upwards in the directory hierarchy until it is found.
- All other paths is defined in the configurationfile. Paths may be
absolute or relative using the ${BASE_PATH} token
- Moved SGCT configuration files to its own folder
- Updated tests to support new configuration loading

- TODO: Make the loading of configuration easier for the programmer.
2014-04-04 11:00:25 -04:00
Hans-Christian Helltegen 81af618a3f Started work on an interface for external GUI. GUI sends json objects as strings which are parsed into a boost::property_tree 2014-04-03 17:00:57 -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 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
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 7126ae4b8d compile fixes in x64 builds
moved Lua dependency to Ghoul
2014-01-07 11:56:33 +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