Commit Graph

331 Commits

Author SHA1 Message Date
Alexander Bock fd4d6562ad First cleanup of RenderableTrails 2015-02-10 16:19:12 +01:00
Alexander Bock 338d8fb63b Cleaning up of stars shader 2015-02-10 16:18:46 +01:00
Alexander Bock bb8f7b91ec Final changes on RenderableStars 2015-02-10 08:55:26 +01:00
Alexander Bock a8a688398c More fixes on RenderableStars 2015-02-09 18:06:01 +01:00
Alexander Bock 7d6792eba0 Temporary increase in interaction speed until setting is implemented 2015-02-09 17:35:58 +01:00
Alexander Bock 3a18d0c763 More fixed for RenderableStars
Added screenshot button for F4
2015-02-09 08:35:06 +01:00
Michal Marcinkowski 238aa09381 Refinements to image sequencing class and other, adaptation to the pluto setup 2015-01-29 13:01:31 -05:00
Michal Marcinkowski 4c53f763f0 Recentering at Pluto,
Todo - add NH with kernels.
2015-01-23 12:10:21 -05:00
Alexander Bock 20de1169b5 First small fix with RenderableStars 2015-01-23 09:53:41 +01:00
Michal Marcinkowski 44e02465a1 Merge branch 'develop' into solarsystem2
Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp
2015-01-22 10:31:40 -05:00
Michal Marcinkowski a8e5b61272 Image sequencing improvements and optimization of projection.
Projection now occurs only at specified timestamps.
Todo:
projection class now dependent on image sequences, will have
to change that once we read specific instrument schedule.
2015-01-21 11:28:38 -05:00
Alexander Bock 8ebd2e4d71 More code cleanup of RenderableFieldlines 2015-01-21 15:13:16 +01:00
Alexander Bock f72d151c6c Initial changes to RenderableFieldlines 2015-01-21 00:42:33 +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 812a9a48be Normal computation in pre projection pass issue resolved. 2015-01-13 10:59:09 -05:00
Michal Marcinkowski f37958c24f beginning to work on sequencing 2015-01-10 16:07:05 -05:00
Michal Marcinkowski 4e2edf2b2f trying to fix orthogonal projection issue. 2015-01-04 12:21:38 -05:00
Michal Marcinkowski ca39f5aaf5 begin cleanup, making code more transparent 2014-12-30 17:07:57 -05:00
Michal Marcinkowski a6a34cf7dd projection GPU first results, pre-cleanup commit.
TODO:
- fixes so it reads mission specific modfile keywords (ie targets)
- speedup using one more pass (vertex map generated every something-frame)
- sequencing (timestamp check + load of separate images on-the-fly)
- pass in geometric data of target + target-texture switching (later)
2014-12-26 13:42:34 -05:00
Michal Marcinkowski ee306cf54c Added separate shader for write to texture, relies on blend logic. 2014-12-22 10:02:31 -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
Alexander Bock c3bb233d29 Moved shadercode of constellationbounds 2014-12-10 00:27:35 +01:00
Alexander Bock 6d4ac1fe49 Add a new include path to the base shader folder
Move the RenderableStars shaders into a separate folder
2014-12-10 00:22:41 +01:00
Michal Marcinkowski bd841c488c Merge branch 'develop' into solarsystem2
Conflicts:
	.gitignore
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/scenegraph/scenegraph.cpp
	src/util/factorymanager.cpp
2014-12-08 21:26:38 -05:00
Michal Marcinkowski 3e443fdead intermediary commit. 2014-12-08 14:48:38 -05:00
Alexander Bock afa2d4d6a9 More work on GUI elements
Create GUI for some Properties
2014-12-06 17:20:59 +01:00
Alexander Bock 4e4de3f40e Changing the hardcoded bv-color map to a transfer function based map 2014-12-05 22:58:14 +01:00
Alexander Bock 50076e4640 Fixing the flickering of the star rendering (#66) 2014-12-05 14:13:37 +01:00
Alexander Bock 2b79b85124 Started bugfix for renderable stars flickering bug 2014-12-05 11:56:43 +01:00
Alexander Bock 3f35b0a948 More optimizations for RenderableConstellationBounds 2014-12-04 18:37:15 +01:00
Alexander Bock 1a590f83e0 Initial commit of constallation bounds 2014-12-04 00:18:37 +01:00
Hans-Christian Helltegen 5b1b8694dc Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines 2014-12-01 16:40:01 +01:00
Hans-Christian Helltegen 834612469c Finalized the billboard rendering. Code cleanup 2014-12-01 16:27:30 +01:00
michal bd74acedd3 fixing stupid git mistake. 2014-11-28 17:15:13 -05:00
michal a5c232eb88 Tidying up. 2014-11-28 14:41:59 -05:00
Alexander Bock 20c96f00e8 More cleanup of RenderableStars, enable rendering of Speed variable 2014-11-28 15:57:14 +01:00
Alexander Bock 4de8071efe Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
Alexander Bock 82491bf89b More work on cleaning up / extending RenderableStars 2014-11-27 23:42:32 +01:00
Alexander Bock 43d542293a More work in progress on RenderableStars
- Made the shader a private object not instantiated by scenegraph
- Started enabling coloring by velocity
- Code cleanup
2014-11-27 03:08:40 +01:00
michal 845469b15d Merge branch 'develop' into solarsystem2
Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp
2014-11-26 13:42:36 -05:00
michal c154141b8b minor changes, testing 2014-11-26 11:22:11 -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
Hans-Christian Helltegen 337ce2dd92 Added support for rendering fieldlines as textured view-aligned billboards 2014-11-24 17:18:55 +01:00
Hans-Christian Helltegen 815fc3b348 Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader 2014-11-21 10:37:01 +01:00
Jonas Strandstedt 31c76f3e3c Added key binding from Lua possible
- Possible to add key bindings from Lua possible. This calls Lua scripts
  from key commands.

 - Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
Jonas Strandstedt 8d2503b68e Added support for pixelData for ABuffer
- ABufferFixed should work but it doesn't. But the interface works at
  least.
- ABufferFixed works for normal rendering
- Removed position for ABuffer, it should make rendering much faster.

Todo:
- Figure out why the fetching of pixelData for ABufferFixed gives wrong
  result.
2014-11-13 15:41:10 +01:00
michal d6d7f1ffe7 intermediate commit. 2014-11-12 12:28:16 -05:00
Jonas Strandstedt ba7a4a4a47 Added ABuffer visualizer
- First draft of the ABuffer visualizer renders a cube with all fragments
  from the single linked abuffer. Lua command to turn on is
  openspace.visualizeABuffer(true)
- Fixed LuaConsole to stop receiving input command after inputing command
- Fixed LuaConsole not to add command to history if it is identical to the
  most recent command.

 TODO:
 - Add support for dynamic and fixed abuffer
 - Scale the cube to match the window ratio
2014-11-12 16:54:40 +01:00
michal 0803b1cacf Minor changes for targeting. 2014-11-10 13:00:04 -05:00
Jonas Strandstedt 7e1396a8ae Added separete ProgressBar class 2014-11-07 14:48:03 +01:00