Commit Graph

267 Commits

Author SHA1 Message Date
michal 83ed904f1d changes to projective texturing, some cleanup. 2014-11-28 13:49:18 -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 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
Alexander Bock e8de5edb45 Have RenderableStars cache the full Speck file
Enable basic slicing of the data
2014-11-27 02:26:43 +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
Alexander Bock fc1dcfabc8 Some more changes to the RenderableStars class 2014-11-26 16:36:02 +01:00
Alexander Bock b4f6070642 Started cleanup of RenderableStars class 2014-11-25 19:15:59 +01: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
michal 484dfefbee Adding temporary testing class based on renderablePlanet for testing projective texturing.
Note: This class will most probably be removed at some point, carry on.
2014-11-13 15:00:45 -05:00
michal 5d1b0c694a some cleanup. 2014-11-13 11:35:17 -05: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
Jonas Strandstedt 46959b4801 Cleanup for KameleonWrapper
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
michal 0803b1cacf Minor changes for targeting. 2014-11-10 13:00:04 -05:00
michal 2426d62677 Added target-switch method based on object visibility, will need refinement. 2014-11-05 19:26:11 -05:00
Jonas Strandstedt f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
michal 3e934b4f8a Working Field of View Rendering.
TODO:
Optimization and stuff.
2014-11-04 18:12:52 -05:00
michal f0b6b17554 semi-working fov. 2014-11-03 22:35:04 -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
michal e31a0b70ab RenderableFov class.
Intersections with planet and instrument FOV boundary vectors / boresight seem to be correct with a margin of error. This could be either due to
precision issues experienced at greater distances, light-time or stellar aberration correction methods, planetary radius etc etc.
2014-10-27 21:35:59 -04:00
Jonas Strandstedt 15db56ff33 Removed unused file 2014-10-27 19:10:09 +01:00
Jonas Strandstedt 4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
michal d3ea503454 Fixes to the modelloader class 2014-10-23 20:11:49 -04:00
michal ecfc4ad79a reshaping the modelloader class to suit the overall design of openspace 2014-10-23 18:49:15 -04:00
michal 08a97d9e68 Merge branch 'develop' into solarsystem2
Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp
2014-10-23 11:45:24 -04:00
Jonas Strandstedt 5e410c6816 Removed unused files 2014-10-23 14:35:04 +02:00
Jonas Strandstedt a7da4d84cc Added SyncBuffer class
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
jonasstrandstedt 490fbc4869 Linux fix 2014-10-21 21:44:29 +02:00
Jonas Strandstedt db141e8e86 Merge branch 'develop' into bug/abuffershadersupdater
Conflicts:
	ext/ghoul
	openspace.cfg
	src/abuffer/abuffer.cpp
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
2014-10-21 14:54:48 +02:00
michal 54809c6376 Pluto geometry artefacts commit. 2014-10-20 18:29:55 -04:00
michal 50b4c1ec36 fixed renderabletrail class to suit for all different delta times, tropical orbits etc etc. lot of stuff to do with precision and set time intervals (pain in the ass). works clockwork.
changes to modules etc. will do more fixes soon. Incoming.
2014-10-20 16:00:38 -04:00
Jonas Strandstedt 18a87ef99e Added ScreenLog
- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
  bool properties that can be edited through Lua.
2014-10-17 12:20:23 +02:00
michal 099bcc2c9b changing renderabletrail class to work for planetocentric 2014-10-16 16:13:54 -04:00
Alexander Bock 0e46642624 Merge branch 'develop' into solarsystem2
Conflicts:
	src/util/factorymanager.cpp
2014-10-11 10:54:52 +02:00
michal 3bb9912356 latest changes involve adding an unfinished class called "renderable fov"- ignore that one.
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
2014-10-11 01:43:31 -04:00
Jonas Strandstedt 9adc1e69fa Added RenderablePlane
- Only first version of the RenderablePlane

Todo:
- Support rotation of planes
- Support billboarding
- Support different local origin (LowerLeft, LowerRight, Center...)
2014-10-10 15:18:16 +02:00
Jonas Strandstedt 9a1b59a73e Intermediate commit 2014-10-10 11:29:16 +02:00
michal 1ed4b74d3e added renderablepath and made changes to renderabletrail 2014-10-08 16:15:37 -04:00
michal 36925cbde7 Finished ephemeries for all 8 planets and fixed so that renderablewavefront object.
NOTE: Basically, added a whole bunch of mod files, I agre - its ugly but later we need to decide ownership of this class.

Ephemeries goes temporarily under the name "RenderableTrail"
It displays a fading ephemeries with nodes of equal time (planetary days for now, will make changable)
For each modfile one specifies all the usual spice stuff with the addition of:
 - Planets tropical orbit
 - Planet/Earth orbit ratio
 - Planets day length in earth hours
Pulled from NASAs webpage so its reliant data, got the link from Brian.
2014-10-07 23:06:21 -04:00
michal 21745b91a5 new class - renderabletrail - will later be renamed and current replace renderableephemeris.
Right now just adding a bunch of mod files, i know this is rather ugly but i just need it to work for friday.
2014-10-07 18:44:14 -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
michal acc8056455 added some new classes for ephemeris rendering.. 2014-10-06 15:30:13 -04:00
Alexander Bock b7da50b3dd Added Lua method to print a screenshot 2014-10-05 17:31:47 +02:00
michal 9eaf25f38c still working on obj loader, trying to maintain regular pushes to git. 2014-10-03 22:35:17 -04:00